diff --git a/demos/gtk-demo/application.ui b/demos/gtk-demo/application.ui
index f4e82dbacd..ecceb997db 100644
--- a/demos/gtk-demo/application.ui
+++ b/demos/gtk-demo/application.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <template class="DemoApplicationWindow" parent="GtkApplicationWindow">
     <property name="title" translatable="yes">Application Class</property>
@@ -32,11 +33,11 @@
                 <property name="action-name">win.logo</property>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkInfoBar" id="infobar">
@@ -63,11 +64,11 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkScrolledWindow">
@@ -79,20 +80,20 @@
                 <property name="buffer">buffer</property>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkStatusbar" id="status">
             <property name="hexpand">1</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">3</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/demos/gtk-demo/appmenu.ui b/demos/gtk-demo/appmenu.ui
index 2d2997277d..5eb87c640d 100644
--- a/demos/gtk-demo/appmenu.ui
+++ b/demos/gtk-demo/appmenu.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <menu id="appmenu">
     <section>
diff --git a/demos/gtk-demo/blendmodes.ui b/demos/gtk-demo/blendmodes.ui
index b735e7394f..f80d7522d9 100644
--- a/demos/gtk-demo/blendmodes.ui
+++ b/demos/gtk-demo/blendmodes.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow" id="window">
@@ -16,11 +17,11 @@
             <style>
               <class name="dim-label"/>
             </style>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow">
@@ -28,22 +29,22 @@
             <property name="vexpand">1</property>
             <property name="shadow-type">in</property>
             <property name="min-content-width">150</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkStackSwitcher">
             <property name="halign">center</property>
             <property name="hexpand">1</property>
             <property name="stack">stack</property>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkStack" id="stack">
@@ -66,53 +67,53 @@
                     <child>
                       <object class="GtkLabel">
                         <property name="label" translatable="yes">Duck</property>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">0</property>
+                        </layout>
                       </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>
+                        <layout>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">0</property>
+                        </layout>
                       </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>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">1</property>
+                        </layout>
                       </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>
+                        <layout>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">1</property>
+                        </layout>
                       </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>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">2</property>
+                          <property name="column-span">2</property>
+                        </layout>
                       </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">
@@ -120,12 +121,12 @@ Blended picture</property>
                         <style>
                           <class name="blend0"/>
                         </style>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">3</property>
+                          <property name="column-span">2</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">3</property>
-                        <property name="width">2</property>
-                      </packing>
                     </child>
                   </object>
                 </property>
@@ -145,53 +146,53 @@ Blended picture</property>
                     <child>
                       <object class="GtkLabel">
                         <property name="label" translatable="yes">Red</property>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">0</property>
+                        </layout>
                       </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>
+                        <layout>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">0</property>
+                        </layout>
                       </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>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">1</property>
+                        </layout>
                       </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>
+                        <layout>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">1</property>
+                        </layout>
                       </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>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">2</property>
+                          <property name="column-span">2</property>
+                        </layout>
                       </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">
@@ -199,12 +200,12 @@ Blended picture</property>
                         <style>
                           <class name="blend1"/>
                         </style>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">3</property>
+                          <property name="column-span">2</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">3</property>
-                        <property name="width">2</property>
-                      </packing>
                     </child>
                   </object>
                 </property>
@@ -227,33 +228,33 @@ Blended picture</property>
                         <style>
                           <class name="cyan"/>
                         </style>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">1</property>
+                        </layout>
                       </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>
+                        <layout>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">1</property>
+                        </layout>
                       </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>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">3</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">3</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkImage">
@@ -261,11 +262,11 @@ Blended picture</property>
                         <style>
                           <class name="blend2"/>
                         </style>
+                        <layout>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">3</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left-attach">1</property>
-                        <property name="top-attach">3</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel">
@@ -274,11 +275,11 @@ Blended picture</property>
                         <style>
                           <class name="dim-label"/>
                         </style>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">0</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel">
@@ -287,11 +288,11 @@ Blended picture</property>
                         <style>
                           <class name="dim-label"/>
                         </style>
+                        <layout>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">0</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left-attach">1</property>
-                        <property name="top-attach">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel">
@@ -300,11 +301,11 @@ Blended picture</property>
                         <style>
                           <class name="dim-label"/>
                         </style>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">2</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">2</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel">
@@ -313,21 +314,21 @@ Blended picture</property>
                         <attributes>
                           <attribute name="weight" value="bold"></attribute>
                         </attributes>
+                        <layout>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">2</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left-attach">1</property>
-                        <property name="top-attach">2</property>
-                      </packing>
                     </child>
                   </object>
                 </property>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/demos/gtk-demo/cursors.ui b/demos/gtk-demo/cursors.ui
index 6394f7e582..4b81bd9f5a 100644
--- a/demos/gtk-demo/cursors.ui
+++ b/demos/gtk-demo/cursors.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GdkCursor" id="default_cursor">
     <property name="name">default</property>
diff --git a/demos/gtk-demo/demo.ui b/demos/gtk-demo/demo.ui
index 7ee0fa245d..6fa269822e 100644
--- a/demos/gtk-demo/demo.ui
+++ b/demos/gtk-demo/demo.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkListStore" id="liststore1">
     <columns>
diff --git a/demos/gtk-demo/filtermodel.ui b/demos/gtk-demo/filtermodel.ui
index 73cfdeeb13..aed068a197 100644
--- a/demos/gtk-demo/filtermodel.ui
+++ b/demos/gtk-demo/filtermodel.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkListStore" id="liststore1">
@@ -44,11 +45,11 @@
             <accessibility>
               <relation type="label-for" target="treeview1"/>
             </accessibility>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview1">
@@ -83,11 +84,11 @@
             <accessibility>
               <relation type="labelled-by" target="label1"/>
             </accessibility>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview2">
@@ -134,11 +135,11 @@
             <accessibility>
               <relation type="labelled-by" target="label2"/>
             </accessibility>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
@@ -150,11 +151,11 @@
             <accessibility>
               <relation type="label-for" target="treeview2"/>
             </accessibility>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
@@ -166,11 +167,11 @@
             <accessibility>
               <relation type="label-for" target="treeview3"/>
             </accessibility>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview3">
@@ -199,11 +200,11 @@
             <accessibility>
               <relation type="labelled-by" target="label3"/>
             </accessibility>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">3</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/demos/gtk-demo/fishbowl.ui b/demos/gtk-demo/fishbowl.ui
index 02efcb42fb..c6216666b6 100644
--- a/demos/gtk-demo/fishbowl.ui
+++ b/demos/gtk-demo/fishbowl.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window">
     <property name="title" translatable="yes">Fishbowl</property>
@@ -27,25 +28,21 @@
           <object class="GtkLabel">
             <property name="label">fps</property>
           </object>
-          <packing/>
         </child>
         <child type="end">
           <object class="GtkLabel">
             <property name="label" bind-source="bowl" bind-property="framerate"/>
           </object>
-          <packing/>
         </child>
         <child type="end">
           <object class="GtkLabel">
             <property name="label">Icons, </property>
           </object>
-          <packing/>
         </child>
         <child type="end">
           <object class="GtkLabel">
             <property name="label" bind-source="bowl" bind-property="count"/>
           </object>
-          <packing/>
         </child>
         <child type="end">
           <object class="GtkToggleButton" id="changes_allow">
@@ -53,7 +50,6 @@
             <property name="icon-name">changes-allow</property>
             <property name="relief">none</property>
           </object>
-          <packing/>
         </child>
         <child type="end">
           <object class="GtkToggleButton" id="changes_prevent">
@@ -62,7 +58,6 @@
             <property name="icon-name">changes-prevent</property>
             <property name="relief">none</property>
           </object>
-          <packing/>
         </child>
       </object>
     </child>
diff --git a/demos/gtk-demo/font-features.ui b/demos/gtk-demo/font-features.ui
index 29cb4af3c2..dbde04bf03 100644
--- a/demos/gtk-demo/font-features.ui
+++ b/demos/gtk-demo/font-features.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window">
diff --git a/demos/gtk-demo/listbox.ui b/demos/gtk-demo/listbox.ui
index 60c259a458..fa4a96df10 100644
--- a/demos/gtk-demo/listbox.ui
+++ b/demos/gtk-demo/listbox.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkMenu" id="menu1">
     <child>
@@ -28,12 +29,12 @@
             <property name="margin-start">8</property>
             <property name="margin-end">8</property>
             <property name="icon-name">image-missing</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+              <property name="row-span">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-            <property name="height">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box1">
@@ -74,11 +75,11 @@
                 </style>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="content_label">
@@ -91,11 +92,11 @@
             <accessibility>
               <role type="static"/>
             </accessibility>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="resent_box">
@@ -118,11 +119,11 @@
                 <property name="uri">http://www.gtk.org</property>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box3">
@@ -181,11 +182,11 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRevealer" id="details_revealer">
@@ -250,11 +251,11 @@ FAVORITES</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">4</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/demos/gtk-demo/main.ui b/demos/gtk-demo/main.ui
index 8ed41e3666..59310762a9 100644
--- a/demos/gtk-demo/main.ui
+++ b/demos/gtk-demo/main.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkTreeStore" id="treestore">
     <columns>
diff --git a/demos/gtk-demo/menus.ui b/demos/gtk-demo/menus.ui
index ace0974da0..d9572b9f39 100644
--- a/demos/gtk-demo/menus.ui
+++ b/demos/gtk-demo/menus.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <menu id="appmenu">
     <section>
diff --git a/demos/gtk-demo/modelbutton.ui b/demos/gtk-demo/modelbutton.ui
index 2e7e11bec2..30a65e8fe1 100644
--- a/demos/gtk-demo/modelbutton.ui
+++ b/demos/gtk-demo/modelbutton.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <child type="titlebar">
diff --git a/demos/gtk-demo/popover.ui b/demos/gtk-demo/popover.ui
index 03ab8d966b..956302d3a1 100644
--- a/demos/gtk-demo/popover.ui
+++ b/demos/gtk-demo/popover.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkListStore" id="liststore1">
     <columns>
diff --git a/demos/gtk-demo/revealer.ui b/demos/gtk-demo/revealer.ui
index 850786cf6d..3356658469 100644
--- a/demos/gtk-demo/revealer.ui
+++ b/demos/gtk-demo/revealer.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window">
     <property name="default-width">300</property>
@@ -17,11 +18,11 @@
                 <property name="icon-size">large</property>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">2</property>
+              <property name="top-attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">2</property>
-            <property name="top-attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRevealer" id="revealer1">
@@ -33,11 +34,11 @@
                 <property name="icon-size">large</property>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">2</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">2</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRevealer" id="revealer2">
@@ -49,11 +50,11 @@
                 <property name="icon-size">large</property>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">3</property>
+              <property name="top-attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">3</property>
-            <property name="top-attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRevealer" id="revealer3">
@@ -64,11 +65,11 @@
                 <property name="icon-size">large</property>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">2</property>
+              <property name="top-attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">2</property>
-            <property name="top-attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRevealer" id="revealer4">
@@ -80,11 +81,11 @@
                 <property name="icon-size">large</property>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRevealer" id="revealer5">
@@ -96,11 +97,11 @@
                 <property name="icon-size">large</property>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">2</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">2</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRevealer" id="revealer6">
@@ -112,11 +113,11 @@
                 <property name="icon-size">large</property>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">4</property>
+              <property name="top-attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">4</property>
-            <property name="top-attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRevealer" id="revealer7">
@@ -127,11 +128,11 @@
                 <property name="icon-size">large</property>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">2</property>
+              <property name="top-attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">2</property>
-            <property name="top-attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRevealer" id="revealer8">
@@ -143,11 +144,11 @@
                 <property name="icon-size">large</property>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/demos/gtk-demo/scale.ui b/demos/gtk-demo/scale.ui
index 98fc717cfd..b9c12059b9 100644
--- a/demos/gtk-demo/scale.ui
+++ b/demos/gtk-demo/scale.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">4</property>
@@ -31,11 +32,11 @@
             <accessibility>
               <relation type="label-for" target="scale_plain"/>
             </accessibility>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkScale" id="scale_plain">
@@ -47,11 +48,11 @@
             <accessibility>
               <relation type="labelled-by" target="label_plain"/>
             </accessibility>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label_marks">
@@ -60,11 +61,11 @@
             <accessibility>
               <relation type="label-for" target="scale_marks"/>
             </accessibility>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkScale" id="scale_marks">
@@ -83,11 +84,11 @@
             <accessibility>
               <relation type="labelled-by" target="label_marks"/>
             </accessibility>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label_discrete">
@@ -96,11 +97,11 @@
             <accessibility>
               <relation type="label-for" target="scale_discrete"/>
             </accessibility>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkScale" id="scale_discrete">
@@ -120,11 +121,11 @@
               <mark value="3" position="bottom"/>
               <mark value="4" position="bottom"/>
             </marks>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">2</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/demos/gtk-demo/shortcuts-boxes.ui b/demos/gtk-demo/shortcuts-boxes.ui
index 72cb194f4b..c55037a389 100644
--- a/demos/gtk-demo/shortcuts-boxes.ui
+++ b/demos/gtk-demo/shortcuts-boxes.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkShortcutsWindow" id="shortcuts-boxes">
     <property name="modal">1</property>
diff --git a/demos/gtk-demo/shortcuts-builder.ui b/demos/gtk-demo/shortcuts-builder.ui
index cfdaef7e26..008859908f 100644
--- a/demos/gtk-demo/shortcuts-builder.ui
+++ b/demos/gtk-demo/shortcuts-builder.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkShortcutsWindow" id="shortcuts-builder">
     <property name="modal">1</property>
diff --git a/demos/gtk-demo/shortcuts-clocks.ui b/demos/gtk-demo/shortcuts-clocks.ui
index f0eeea2d5b..c8066704a0 100644
--- a/demos/gtk-demo/shortcuts-clocks.ui
+++ b/demos/gtk-demo/shortcuts-clocks.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkShortcutsWindow" id="shortcuts-clocks">
     <property name="modal">1</property>
diff --git a/demos/gtk-demo/shortcuts-gedit.ui b/demos/gtk-demo/shortcuts-gedit.ui
index 2412948871..b745c3c11b 100644
--- a/demos/gtk-demo/shortcuts-gedit.ui
+++ b/demos/gtk-demo/shortcuts-gedit.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkShortcutsWindow" id="shortcuts-gedit">
     <property name="modal">1</property>
diff --git a/demos/gtk-demo/shortcuts.ui b/demos/gtk-demo/shortcuts.ui
index 5529fff4f3..00b885efeb 100644
--- a/demos/gtk-demo/shortcuts.ui
+++ b/demos/gtk-demo/shortcuts.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="title" translatable="yes">Shortcuts</property>
diff --git a/demos/gtk-demo/spinbutton.ui b/demos/gtk-demo/spinbutton.ui
index cd49a138d1..d14058430c 100644
--- a/demos/gtk-demo/spinbutton.ui
+++ b/demos/gtk-demo/spinbutton.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkAdjustment" id="basic_adjustment">
     <property name="lower">-10000</property>
@@ -35,11 +36,11 @@
             <property name="use-underline">1</property>
             <property name="mnemonic-widget">basic_spin</property>
             <property name="xalign">1</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSpinButton" id="basic_spin">
@@ -49,21 +50,21 @@
             <property name="climb-rate">1</property>
             <property name="digits">2</property>
             <property name="numeric">1</property>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="basic_label">
             <property name="width-chars">10</property>
             <property name="xalign">1</property>
+            <layout>
+              <property name="left-attach">2</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">2</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
@@ -71,11 +72,11 @@
             <property name="use-underline">1</property>
             <property name="mnemonic-widget">hex_spin</property>
             <property name="xalign">1</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSpinButton" id="hex_spin">
@@ -85,21 +86,21 @@
             <signal name="input" handler="hex_spin_input"/>
             <signal name="output" handler="hex_spin_output"/>
             <property name="wrap">1</property>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="hex_label">
             <property name="width-chars">10</property>
             <property name="xalign">1</property>
+            <layout>
+              <property name="left-attach">2</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">2</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
@@ -107,11 +108,11 @@
             <property name="use-underline">1</property>
             <property name="mnemonic-widget">time_spin</property>
             <property name="xalign">1</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSpinButton" id="time_spin">
@@ -121,21 +122,21 @@
             <signal name="input" handler="time_spin_input"/>
             <signal name="output" handler="time_spin_output"/>
             <property name="wrap">1</property>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="time_label">
             <property name="width-chars">10</property>
             <property name="xalign">1</property>
+            <layout>
+              <property name="left-attach">2</property>
+              <property name="top-attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">2</property>
-            <property name="top-attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
@@ -143,11 +144,11 @@
             <property name="use-underline">1</property>
             <property name="mnemonic-widget">month_spin</property>
             <property name="xalign">1</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSpinButton" id="month_spin">
@@ -158,21 +159,21 @@
             <property name="adjustment">month_adjustment</property>
             <property name="wrap">1</property>
             <property name="update-policy">if-valid</property>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="month_label">
             <property name="width-chars">10</property>
             <property name="xalign">1</property>
+            <layout>
+              <property name="left-attach">2</property>
+              <property name="top-attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">2</property>
-            <property name="top-attach">3</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/demos/gtk-demo/stack.ui b/demos/gtk-demo/stack.ui
index 24b21b713e..adaccfd019 100644
--- a/demos/gtk-demo/stack.ui
+++ b/demos/gtk-demo/stack.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="title" translatable="yes">Stack</property>
@@ -7,11 +8,11 @@
           <object class="GtkStackSwitcher">
             <property name="stack">stack</property>
             <property name="halign">center</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkStack" id="stack">
@@ -57,11 +58,11 @@
                 </property>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/demos/gtk-demo/theming.ui b/demos/gtk-demo/theming.ui
index 58fea83495..c2ee74eb7b 100644
--- a/demos/gtk-demo/theming.ui
+++ b/demos/gtk-demo/theming.ui
@@ -1,3 +1,4 @@
+<?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/window.ui b/demos/icon-browser/window.ui
index 3b5d8b161d..b38cb5eb08 100644
--- a/demos/icon-browser/window.ui
+++ b/demos/icon-browser/window.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="IconStore" id="store"/>
   <object class="GtkTreeModelFilter" id="filter_model">
@@ -46,7 +47,6 @@
               </object>
             </child>
           </object>
-          <packing/>
         </child>
       </object>
     </child>
@@ -95,7 +95,6 @@
                       <object class="GtkCellRendererText" id="text_cell">
                         <property name="xpad">10</property>
                         <property name="ypad">10</property>
-                        <property name="xalign">0.5</property>
                       </object>
                     </child>
                   </object>
@@ -135,11 +134,11 @@
                 <accessibility>
                   <relation type="labelled-by" target="label1"/>
                 </accessibility>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkImage" id="image2">
@@ -148,11 +147,11 @@
                 <accessibility>
                   <relation type="labelled-by" target="label2"/>
                 </accessibility>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkImage" id="image3">
@@ -161,11 +160,11 @@
                 <accessibility>
                   <relation type="labelled-by" target="label3"/>
                 </accessibility>
+                <layout>
+                  <property name="left-attach">2</property>
+                  <property name="top-attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkImage" id="image4">
@@ -174,11 +173,11 @@
                 <accessibility>
                   <relation type="labelled-by" target="label4"/>
                 </accessibility>
+                <layout>
+                  <property name="left-attach">3</property>
+                  <property name="top-attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">3</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkImage" id="image5">
@@ -187,11 +186,11 @@
                 <accessibility>
                   <relation type="labelled-by" target="label5"/>
                 </accessibility>
+                <layout>
+                  <property name="left-attach">4</property>
+                  <property name="top-attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">4</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkImage" id="image6">
@@ -200,11 +199,11 @@
                 <accessibility>
                   <relation type="labelled-by" target="label6"/>
                 </accessibility>
+                <layout>
+                  <property name="left-attach">5</property>
+                  <property name="top-attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">5</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label1">
@@ -217,11 +216,11 @@
                 <accessibility>
                   <relation type="label-for" target="image1"/>
                 </accessibility>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label2">
@@ -234,11 +233,11 @@
                 <accessibility>
                   <relation type="label-for" target="image2"/>
                 </accessibility>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label3">
@@ -251,11 +250,11 @@
                 <accessibility>
                   <relation type="label-for" target="image3"/>
                 </accessibility>
+                <layout>
+                  <property name="left-attach">2</property>
+                  <property name="top-attach">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label4">
@@ -268,11 +267,11 @@
                 <accessibility>
                   <relation type="label-for" target="image4"/>
                 </accessibility>
+                <layout>
+                  <property name="left-attach">3</property>
+                  <property name="top-attach">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">3</property>
-                <property name="top-attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label5">
@@ -285,11 +284,11 @@
                 <accessibility>
                   <relation type="label-for" target="image5"/>
                 </accessibility>
+                <layout>
+                  <property name="left-attach">4</property>
+                  <property name="top-attach">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">4</property>
-                <property name="top-attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label6">
@@ -302,11 +301,11 @@
                 <accessibility>
                   <relation type="label-for" target="image6"/>
                 </accessibility>
+                <layout>
+                  <property name="left-attach">5</property>
+                  <property name="top-attach">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">5</property>
-                <property name="top-attach">2</property>
-              </packing>
             </child>
           </object>
         </child>
diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index 882a53a548..aa61c3b0f7 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <menu id="gear_menu">
     <section>
@@ -593,32 +594,32 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <property name="can-focus">1</property>
                                     <property name="active">1</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">0</property>
+                                    </layout>
                                   </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>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
                                   </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>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">2</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">2</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="checkbutton4">
@@ -626,22 +627,22 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="can-focus">1</property>
                                     <property name="active">1</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">3</property>
+                                    </layout>
                                   </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>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">4</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">4</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="checkbutton6">
@@ -649,22 +650,22 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="inconsistent">1</property>
                                     <property name="can-focus">1</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">5</property>
+                                    </layout>
                                   </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>
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">0</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">0</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="radiobutton2">
@@ -672,11 +673,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="can-focus">1</property>
                                     <property name="active">1</property>
                                     <property name="group">radiobutton1</property>
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="radiobutton3">
@@ -685,11 +686,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="can-focus">1</property>
                                     <property name="active">1</property>
                                     <property name="group">radiobutton1</property>
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">2</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">2</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="radiobutton4">
@@ -697,11 +698,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="can-focus">1</property>
                                     <property name="active">1</property>
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">3</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">3</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="radiobutton5">
@@ -710,11 +711,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="can-focus">1</property>
                                     <property name="active">1</property>
                                     <property name="group">radiobutton3</property>
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">4</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">4</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="radiobutton6">
@@ -724,46 +725,47 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="can-focus">1</property>
                                     <property name="active">1</property>
                                     <property name="group">radiobutton3</property>
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">5</property>
+                                    </layout>
                                   </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>
+                                    <layout>
+                                      <property name="left-attach">2</property>
+                                      <property name="top-attach">0</property>
+                                    </layout>
                                   </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>
+                                  <object class="GtkSpinner" id="spinner2">
+                                    <layout>
+                                      <property name="left-attach">2</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
+                                  </object>
                                 </child>
                                 <child>
                                   <object class="GtkSpinner" id="spinner3">
                                     <property name="active">1</property>
                                     <property name="sensitive">0</property>
+                                    <layout>
+                                      <property name="left-attach">2</property>
+                                      <property name="top-attach">3</property>
+                                    </layout>
                                   </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>
+                                    <layout>
+                                      <property name="left-attach">2</property>
+                                      <property name="top-attach">4</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">2</property>
-                                    <property name="top-attach">4</property>
-                                  </packing>
                                 </child>
                               </object>
                             </child>
@@ -1502,11 +1504,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="valign">center</property>
                                         <property name="value">.5</property>
                                         <property name="halign">center</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">0</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkScaleButton" id="mic-button">
@@ -1520,11 +1522,11 @@ microphone-sensitivity-medium-symbolic</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"/>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">1</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">1</property>
-                                      </packing>
                                     </child>
                                   </object>
                                 </child>
@@ -3193,20 +3195,20 @@ bad things might happen.</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkEntry" id="details_entry">
                 <property name="valign">baseline</property>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel">
@@ -3218,20 +3220,20 @@ bad things might happen.</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkEntry" id="more_details_entry">
                 <property name="valign">baseline</property>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel">
@@ -3243,22 +3245,22 @@ bad things might happen.</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkScale" id="level_scale">
                 <property name="valign">baseline</property>
                 <property name="draw-value">0</property>
                 <property name="adjustment">adjustment1</property>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel">
@@ -3270,21 +3272,21 @@ bad things might happen.</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkSwitch" id="mode_switch">
                 <property name="halign">start</property>
                 <property name="valign">baseline</property>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">3</property>
-              </packing>
             </child>
           </object>
         </child>
@@ -3342,11 +3344,11 @@ bad things might happen.</property>
             <accessibility>
               <relation type="label-for" target="open_popover_entry"/>
             </accessibility>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="description_label">
@@ -3356,11 +3358,11 @@ bad things might happen.</property>
             <accessibility>
               <relation type="label-for" target="open_popover_textview"/>
             </accessibility>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkScrolledWindow">
@@ -3377,11 +3379,11 @@ bad things might happen.</property>
                 </accessibility>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkEntry" id="open_popover_entry">
@@ -3389,11 +3391,11 @@ bad things might happen.</property>
             <accessibility>
               <relation type="labelled-by" target="title_label"/>
             </accessibility>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="open_popover_button">
@@ -3405,11 +3407,11 @@ bad things might happen.</property>
             <style>
               <class name="suggested-action"/>
             </style>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">2</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/docs/reference/gtk/gtk4-docs.xml b/docs/reference/gtk/gtk4-docs.xml
index c1018bf53c..17a5337c6f 100644
--- a/docs/reference/gtk/gtk4-docs.xml
+++ b/docs/reference/gtk/gtk4-docs.xml
@@ -103,7 +103,11 @@
       <title>Layout Managers</title>
       <xi:include href="xml/gtklayoutmanager.xml" />
       <xi:include href="xml/gtklayoutchild.xml" />
+      <xi:include href="xml/gtkbinlayout.xml" />
       <xi:include href="xml/gtkboxlayout.xml" />
+      <xi:include href="xml/gtkcustomlayout.xml" />
+      <xi:include href="xml/gtkfixedlayout.xml" />
+      <xi:include href="xml/gtkgridlayout.xml" />
     </chapter>
 
     <chapter id="DisplayWidgets">
diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 918794d10b..6083aaee1b 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -7190,3 +7190,85 @@ gtk_box_layout_get_baseline_position
 GTK_TYPE_BOX_LAYOUT
 gtk_box_layout_get_type
 </SECTION>
+
+<SECTION>
+<FILE>gtkcustomlayout</FILE>
+GtkCustomLayout
+
+GtkCustomRequestModeFunc
+GtkCustomMeasureFunc
+GtkCustomAllocateFunc
+
+gtk_custom_layout_new
+
+<SUBSECTION Standard>
+GTK_TYPE_CUSTOM_LAYOUT
+gtk_custom_layout_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkbinlayout</FILE>
+GtkBinLayout
+
+gtk_bin_layout_new
+
+<SUBSECTION Standard>
+GTK_TYPE_BIN_LAYOUT
+gtk_bin_layout_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkfixedlayout</FILE>
+GtkFixedLayout
+
+gtk_fixed_layout_new
+
+<SUBSECTION>
+GtkFixedLayoutChild
+
+gtk_fixed_layout_child_set_position
+gtk_fixed_layout_child_get_position
+
+<SUBSECTION Standard>
+GTK_TYPE_FIXED_LAYOUT
+gtk_fixed_layout_get_type
+GTK_TYPE_FIXED_LAYOUT_CHILD
+gtk_fixed_layout_child_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkgridlayout</FILE>
+GtkGridLayout
+
+gtk_grid_layout_new
+gtk_grid_layout_set_row_homogeneous
+gtk_grid_layout_get_row_homogeneous
+gtk_grid_layout_set_row_spacing
+gtk_grid_layout_get_row_spacing
+gtk_grid_layout_set_column_homogeneous
+gtk_grid_layout_get_column_homogeneous
+gtk_grid_layout_set_column_spacing
+gtk_grid_layout_get_column_spacing
+gtk_grid_layout_set_row_baseline_position
+gtk_grid_layout_get_row_baseline_position
+gtk_grid_layout_set_baseline_row
+gtk_grid_layout_get_baseline_row
+
+<SUBSECTION>
+GtkGridLayoutChild
+
+gtk_grid_layout_child_set_top_attach
+gtk_grid_layout_child_get_top_attach
+gtk_grid_layout_child_set_left_attach
+gtk_grid_layout_child_get_left_attach
+gtk_grid_layout_child_set_column_span
+gtk_grid_layout_child_get_column_span
+gtk_grid_layout_child_set_row_span
+gtk_grid_layout_child_get_row_span
+
+<SUBSECTION Standard>
+GTK_TYPE_GRID_LAYOUT
+gtk_grid_layout_get_type
+GTK_TYPE_GRID_LAYOUT_CHILD
+gtk_grid_layout_child_get_type
+</SECTION>
diff --git a/docs/reference/gtk/gtk4.types.in b/docs/reference/gtk/gtk4.types.in
index f8d9c90409..6a3e14e9ec 100644
--- a/docs/reference/gtk/gtk4.types.in
+++ b/docs/reference/gtk/gtk4.types.in
@@ -86,6 +86,8 @@ gtk_gesture_swipe_get_type
 gtk_gesture_zoom_get_type
 gtk_gl_area_get_type
 gtk_grid_get_type
+gtk_grid_layout_child_get_type
+gtk_grid_layout_get_type
 gtk_header_bar_get_type
 gtk_icon_theme_get_type
 gtk_icon_view_get_type
diff --git a/examples/application10/prefs.ui b/examples/application10/prefs.ui
index 00e917763f..90d488ef9c 100644
--- a/examples/application10/prefs.ui
+++ b/examples/application10/prefs.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <template class="ExampleAppPrefs" parent="GtkDialog">
     <property name="title" translatable="yes">Preferences</property>
@@ -16,18 +17,19 @@
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">font</property>
                 <property name="xalign">1</property>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkFontButton" id="font"/>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
-              </packing>
+              <object class="GtkFontButton" id="font">
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">0</property>
+                </layout>
+              </object>
             </child>
             <child>
               <object class="GtkLabel" id="transitionlabel">
@@ -35,11 +37,11 @@
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">transition</property>
                 <property name="xalign">1</property>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkComboBoxText" id="transition">
@@ -48,11 +50,11 @@
                   <item translatable="yes" id="crossfade">Fade</item>
                   <item translatable="yes" id="slide-left-right">Slide</item>
                 </items>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
           </object>
         </child>
diff --git a/examples/application6/prefs.ui b/examples/application6/prefs.ui
index 00e917763f..90d488ef9c 100644
--- a/examples/application6/prefs.ui
+++ b/examples/application6/prefs.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <template class="ExampleAppPrefs" parent="GtkDialog">
     <property name="title" translatable="yes">Preferences</property>
@@ -16,18 +17,19 @@
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">font</property>
                 <property name="xalign">1</property>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkFontButton" id="font"/>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
-              </packing>
+              <object class="GtkFontButton" id="font">
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">0</property>
+                </layout>
+              </object>
             </child>
             <child>
               <object class="GtkLabel" id="transitionlabel">
@@ -35,11 +37,11 @@
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">transition</property>
                 <property name="xalign">1</property>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkComboBoxText" id="transition">
@@ -48,11 +50,11 @@
                   <item translatable="yes" id="crossfade">Fade</item>
                   <item translatable="yes" id="slide-left-right">Slide</item>
                 </items>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
           </object>
         </child>
diff --git a/examples/application7/prefs.ui b/examples/application7/prefs.ui
index 00e917763f..90d488ef9c 100644
--- a/examples/application7/prefs.ui
+++ b/examples/application7/prefs.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <template class="ExampleAppPrefs" parent="GtkDialog">
     <property name="title" translatable="yes">Preferences</property>
@@ -16,18 +17,19 @@
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">font</property>
                 <property name="xalign">1</property>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkFontButton" id="font"/>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
-              </packing>
+              <object class="GtkFontButton" id="font">
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">0</property>
+                </layout>
+              </object>
             </child>
             <child>
               <object class="GtkLabel" id="transitionlabel">
@@ -35,11 +37,11 @@
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">transition</property>
                 <property name="xalign">1</property>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkComboBoxText" id="transition">
@@ -48,11 +50,11 @@
                   <item translatable="yes" id="crossfade">Fade</item>
                   <item translatable="yes" id="slide-left-right">Slide</item>
                 </items>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
           </object>
         </child>
diff --git a/examples/application8/prefs.ui b/examples/application8/prefs.ui
index 00e917763f..90d488ef9c 100644
--- a/examples/application8/prefs.ui
+++ b/examples/application8/prefs.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <template class="ExampleAppPrefs" parent="GtkDialog">
     <property name="title" translatable="yes">Preferences</property>
@@ -16,18 +17,19 @@
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">font</property>
                 <property name="xalign">1</property>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkFontButton" id="font"/>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
-              </packing>
+              <object class="GtkFontButton" id="font">
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">0</property>
+                </layout>
+              </object>
             </child>
             <child>
               <object class="GtkLabel" id="transitionlabel">
@@ -35,11 +37,11 @@
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">transition</property>
                 <property name="xalign">1</property>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkComboBoxText" id="transition">
@@ -48,11 +50,11 @@
                   <item translatable="yes" id="crossfade">Fade</item>
                   <item translatable="yes" id="slide-left-right">Slide</item>
                 </items>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
           </object>
         </child>
diff --git a/examples/application9/prefs.ui b/examples/application9/prefs.ui
index 00e917763f..90d488ef9c 100644
--- a/examples/application9/prefs.ui
+++ b/examples/application9/prefs.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <template class="ExampleAppPrefs" parent="GtkDialog">
     <property name="title" translatable="yes">Preferences</property>
@@ -16,18 +17,19 @@
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">font</property>
                 <property name="xalign">1</property>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkFontButton" id="font"/>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
-              </packing>
+              <object class="GtkFontButton" id="font">
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">0</property>
+                </layout>
+              </object>
             </child>
             <child>
               <object class="GtkLabel" id="transitionlabel">
@@ -35,11 +37,11 @@
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">transition</property>
                 <property name="xalign">1</property>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkComboBoxText" id="transition">
@@ -48,11 +50,11 @@
                   <item translatable="yes" id="crossfade">Fade</item>
                   <item translatable="yes" id="slide-left-right">Slide</item>
                 </items>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
           </object>
         </child>
diff --git a/examples/builder.ui b/examples/builder.ui
index eb4c60c866..0f16026c01 100644
--- a/examples/builder.ui
+++ b/examples/builder.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object id="window" class="GtkWindow">
     <property name="title">Grid</property>
@@ -6,30 +7,30 @@
         <child>
           <object id="button1" class="GtkButton">
             <property name="label">Button 1</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object id="button2" class="GtkButton">
             <property name="label">Button 2</property>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object id="quit" class="GtkButton">
             <property name="label">Quit</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+              <property name="column-span">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-            <property name="width">2</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/gtk/gtk.h b/gtk/gtk.h
index bb637b522a..e460b8dbb0 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -128,6 +128,7 @@
 #include <gtk/gtkgesturezoom.h>
 #include <gtk/gtkglarea.h>
 #include <gtk/gtkgrid.h>
+#include <gtk/gtkgridlayout.h>
 #include <gtk/gtkheaderbar.h>
 #include <gtk/gtkicontheme.h>
 #include <gtk/gtkiconview.h>
diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c
index 68c66adb52..ce67b00609 100644
--- a/gtk/gtkgrid.c
+++ b/gtk/gtkgrid.c
@@ -22,14 +22,15 @@
 
 #include "gtkgrid.h"
 
-#include "gtkorientableprivate.h"
-#include "gtksizerequest.h"
-#include "gtkwidgetprivate.h"
 #include "gtkcontainerprivate.h"
 #include "gtkcsspositionvalueprivate.h"
-#include "gtkstylecontextprivate.h"
-#include "gtkprivate.h"
+#include "gtkgridlayout.h"
+#include "gtkorientableprivate.h"
 #include "gtkintl.h"
+#include "gtkprivate.h"
+#include "gtksizerequest.h"
+#include "gtkstylecontextprivate.h"
+#include "gtkwidgetprivate.h"
 
 
 /**
@@ -56,99 +57,12 @@
  * GtkGrid uses a single CSS node with name grid.
  */
 
-typedef struct _GtkGridChild GtkGridChild;
-typedef struct _GtkGridChildAttach GtkGridChildAttach;
-typedef struct _GtkGridRowProperties GtkGridRowProperties;
-typedef struct _GtkGridLine GtkGridLine;
-typedef struct _GtkGridLines GtkGridLines;
-typedef struct _GtkGridLineData GtkGridLineData;
-typedef struct _GtkGridRequest GtkGridRequest;
-
-struct _GtkGridChildAttach
+typedef struct
 {
-  gint pos;
-  gint span;
-};
-
-struct _GtkGridRowProperties
-{
-  gint row;
-  GtkBaselinePosition baseline_position;
-};
-
-static const GtkGridRowProperties gtk_grid_row_properties_default = {
-  0,
-  GTK_BASELINE_POSITION_CENTER
-};
-
-struct _GtkGridChild
-{
-  GtkGridChildAttach attach[2];
-};
-
-#define CHILD_LEFT(child)    ((child)->attach[GTK_ORIENTATION_HORIZONTAL].pos)
-#define CHILD_WIDTH(child)   ((child)->attach[GTK_ORIENTATION_HORIZONTAL].span)
-#define CHILD_TOP(child)     ((child)->attach[GTK_ORIENTATION_VERTICAL].pos)
-#define CHILD_HEIGHT(child)  ((child)->attach[GTK_ORIENTATION_VERTICAL].span)
-
-/* A GtkGridLineData struct contains row/column specific parts
- * of the grid.
- */
-struct _GtkGridLineData
-{
-  gint16 spacing;
-  guint homogeneous : 1;
-};
-
-struct _GtkGridPrivate
-{
-  GList *row_properties;
+  GtkLayoutManager *layout_manager;
 
   GtkOrientation orientation;
-  gint baseline_row;
-
-  GtkGridLineData linedata[2];
-};
-typedef struct _GtkGridPrivate GtkGridPrivate;
-
-#define ROWS(priv)    (&(priv)->linedata[GTK_ORIENTATION_HORIZONTAL])
-#define COLUMNS(priv) (&(priv)->linedata[GTK_ORIENTATION_VERTICAL])
-
-static GQuark child_data_quark = 0;
-
-/* A GtkGridLine struct represents a single row or column
- * during size requests
- */
-struct _GtkGridLine
-{
-  gint minimum;
-  gint natural;
-  gint minimum_above;
-  gint minimum_below;
-  gint natural_above;
-  gint natural_below;
-
-  gint position;
-  gint allocation;
-  gint allocated_baseline;
-
-  guint need_expand : 1;
-  guint expand      : 1;
-  guint empty       : 1;
-};
-
-struct _GtkGridLines
-{
-  GtkGridLine *lines;
-  gint min, max;
-};
-
-struct _GtkGridRequest
-{
-  GtkGrid *grid;
-  GtkGridLines lines[2];
-};
-
+} GtkGridPrivate;
 
 enum
 {
@@ -159,30 +73,18 @@ enum
   PROP_COLUMN_HOMOGENEOUS,
   PROP_BASELINE_ROW,
   N_PROPERTIES,
+
+  /* GtkOrientable */
   PROP_ORIENTATION
 };
 
 static GParamSpec *obj_properties[N_PROPERTIES] = { NULL, };
 
-enum
-{
-  CHILD_PROP_0,
-  CHILD_PROP_LEFT_ATTACH,
-  CHILD_PROP_TOP_ATTACH,
-  CHILD_PROP_WIDTH,
-  CHILD_PROP_HEIGHT,
-  N_CHILD_PROPERTIES
-};
-
-static GParamSpec *child_properties[N_CHILD_PROPERTIES] = { NULL, };
-
 G_DEFINE_TYPE_WITH_CODE (GtkGrid, gtk_grid, GTK_TYPE_CONTAINER,
                          G_ADD_PRIVATE (GtkGrid)
                          G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, NULL))
 
 
-static void gtk_grid_row_properties_free (GtkGridRowProperties *props);
-
 static void
 gtk_grid_get_property (GObject    *object,
                        guint       prop_id,
@@ -199,23 +101,23 @@ gtk_grid_get_property (GObject    *object,
       break;
 
     case PROP_ROW_SPACING:
-      g_value_set_int (value, COLUMNS (priv)->spacing);
+      g_value_set_int (value, gtk_grid_layout_get_row_spacing (GTK_GRID_LAYOUT (priv->layout_manager)));
       break;
 
     case PROP_COLUMN_SPACING:
-      g_value_set_int (value, ROWS (priv)->spacing);
+      g_value_set_int (value, gtk_grid_layout_get_column_spacing (GTK_GRID_LAYOUT (priv->layout_manager)));
       break;
 
     case PROP_ROW_HOMOGENEOUS:
-      g_value_set_boolean (value, COLUMNS (priv)->homogeneous);
+      g_value_set_boolean (value, gtk_grid_layout_get_row_homogeneous (GTK_GRID_LAYOUT (priv->layout_manager)));
       break;
 
     case PROP_COLUMN_HOMOGENEOUS:
-      g_value_set_boolean (value, ROWS (priv)->homogeneous);
+      g_value_set_boolean (value, gtk_grid_layout_get_column_homogeneous (GTK_GRID_LAYOUT (priv->layout_manager)));
       break;
 
     case PROP_BASELINE_ROW:
-      g_value_set_int (value, priv->baseline_row);
+      g_value_set_int (value, gtk_grid_layout_get_baseline_row (GTK_GRID_LAYOUT (priv->layout_manager)));
       break;
 
     default:
@@ -279,110 +181,6 @@ gtk_grid_set_property (GObject      *object,
     }
 }
 
-static GtkGridChild *
-get_grid_child (GtkWidget *widget)
-{
-  return (GtkGridChild *) g_object_get_qdata (G_OBJECT (widget), child_data_quark);
-}
-
-static void
-gtk_grid_get_child_property (GtkContainer *container,
-                             GtkWidget    *child,
-                             guint         property_id,
-                             GValue       *value,
-                             GParamSpec   *pspec)
-{
-  GtkGridChild *grid_child;
-
-  grid_child = get_grid_child (child);
-
-  if (grid_child == NULL)
-    {
-      GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
-      return;
-    }
-
-  switch (property_id)
-    {
-    case CHILD_PROP_LEFT_ATTACH:
-      g_value_set_int (value, CHILD_LEFT (grid_child));
-      break;
-
-    case CHILD_PROP_TOP_ATTACH:
-      g_value_set_int (value, CHILD_TOP (grid_child));
-      break;
-
-    case CHILD_PROP_WIDTH:
-      g_value_set_int (value, CHILD_WIDTH (grid_child));
-      break;
-
-    case CHILD_PROP_HEIGHT:
-      g_value_set_int (value, CHILD_HEIGHT (grid_child));
-      break;
-
-    default:
-      GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_grid_set_child_property (GtkContainer *container,
-                             GtkWidget    *child,
-                             guint         property_id,
-                             const GValue *value,
-                             GParamSpec   *pspec)
-{
-  GtkGrid *grid = GTK_GRID (container);
-  GtkGridChild *grid_child;
-
-  grid_child = get_grid_child (child);
-
-  if (grid_child == NULL)
-    {
-      GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
-      return;
-    }
-
-  switch (property_id)
-    {
-    case CHILD_PROP_LEFT_ATTACH:
-      CHILD_LEFT (grid_child) = g_value_get_int (value);
-      break;
-
-    case CHILD_PROP_TOP_ATTACH:
-      CHILD_TOP (grid_child) = g_value_get_int (value);
-      break;
-
-   case CHILD_PROP_WIDTH:
-      CHILD_WIDTH (grid_child) = g_value_get_int (value);
-      break;
-
-    case CHILD_PROP_HEIGHT:
-      CHILD_HEIGHT (grid_child) = g_value_get_int (value);
-      break;
-
-    default:
-      GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
-      break;
-    }
-
-  if (_gtk_widget_get_visible (child) &&
-      _gtk_widget_get_visible (GTK_WIDGET (grid)))
-    gtk_widget_queue_resize (child);
-}
-
-static void
-gtk_grid_finalize (GObject *object)
-{
-  GtkGrid *grid = GTK_GRID (object);
-  GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
-
-  g_list_free_full (priv->row_properties, (GDestroyNotify)gtk_grid_row_properties_free);
-
-  G_OBJECT_CLASS (gtk_grid_parent_class)->finalize (object);
-}
-
 static void
 grid_attach (GtkGrid   *grid,
              GtkWidget *widget,
@@ -391,17 +189,16 @@ grid_attach (GtkGrid   *grid,
              gint       width,
              gint       height)
 {
-  GtkGridChild *child;
-
-  child = g_new (GtkGridChild, 1);
-  CHILD_LEFT (child) = left;
-  CHILD_TOP (child) = top;
-  CHILD_WIDTH (child) = width;
-  CHILD_HEIGHT (child) = height;
-
-  g_object_set_qdata_full (G_OBJECT (widget), child_data_quark, child, g_free);
+  GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
+  GtkGridLayoutChild *grid_child;
 
   gtk_widget_set_parent (widget, GTK_WIDGET (grid));
+
+  grid_child = GTK_GRID_LAYOUT_CHILD (gtk_layout_manager_get_layout_child (priv->layout_manager, widget));
+  gtk_grid_layout_child_set_left_attach (grid_child, left);
+  gtk_grid_layout_child_set_top_attach (grid_child, top);
+  gtk_grid_layout_child_set_column_span (grid_child, width);
+  gtk_grid_layout_child_set_row_span (grid_child, height);
 }
 
 /* Find the position 'touching' existing
@@ -418,11 +215,10 @@ find_attach_position (GtkGrid         *grid,
                       gint             op_span,
                       gboolean         max)
 {
-  GtkGridChildAttach *attach;
-  GtkGridChildAttach *opposite;
+  GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
   GtkWidget *child;
-  gint pos;
   gboolean hit;
+  gint pos;
 
   if (max)
     pos = -G_MAXINT;
@@ -435,20 +231,41 @@ find_attach_position (GtkGrid         *grid,
        child != NULL;
        child = gtk_widget_get_next_sibling (child))
     {
-      GtkGridChild *grid_child = get_grid_child (child);
+      GtkGridLayoutChild *grid_child;
+      int attach_pos = 0, attach_span = 0;
+      int opposite_pos = 0, opposite_span = 0;
 
-      attach = &grid_child->attach[orientation];
-      opposite = &grid_child->attach[1 - orientation];
+      grid_child = GTK_GRID_LAYOUT_CHILD (gtk_layout_manager_get_layout_child (priv->layout_manager, child));
+
+      switch (orientation)
+        {
+        case GTK_ORIENTATION_HORIZONTAL:
+          attach_pos = gtk_grid_layout_child_get_left_attach (grid_child);
+          attach_span = gtk_grid_layout_child_get_column_span (grid_child);
+          opposite_pos = gtk_grid_layout_child_get_top_attach (grid_child);
+          opposite_span = gtk_grid_layout_child_get_row_span (grid_child);
+          break;
+
+        case GTK_ORIENTATION_VERTICAL:
+          attach_pos = gtk_grid_layout_child_get_top_attach (grid_child);
+          attach_span = gtk_grid_layout_child_get_row_span (grid_child);
+          opposite_pos = gtk_grid_layout_child_get_left_attach (grid_child);
+          opposite_span = gtk_grid_layout_child_get_column_span (grid_child);
+          break;
+
+        default:
+          break;
+        }
 
       /* check if the ranges overlap */
-      if (opposite->pos <= op_pos + op_span && op_pos <= opposite->pos + opposite->span)
+      if (opposite_pos <= op_pos + op_span && op_pos <= opposite_pos + opposite_span)
         {
           hit = TRUE;
 
           if (max)
-            pos = MAX (pos, attach->pos + attach->span);
+            pos = MAX (pos, attach_pos + attach_span);
           else
-            pos = MIN (pos, attach->pos);
+            pos = MIN (pos, attach_pos);
         }
      }
 
@@ -508,1091 +325,6 @@ gtk_grid_child_type (GtkContainer *container)
   return GTK_TYPE_WIDGET;
 }
 
-static int
-get_spacing (GtkGrid        *grid,
-             GtkOrientation  orientation)
-{
-  GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
-  GtkCssValue *border_spacing;
-  gint css_spacing;
-
-  border_spacing = _gtk_style_context_peek_property (gtk_widget_get_style_context (GTK_WIDGET (grid)), GTK_CSS_PROPERTY_BORDER_SPACING);
-  if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    css_spacing = _gtk_css_position_value_get_x (border_spacing, 100);
-  else
-    css_spacing = _gtk_css_position_value_get_y (border_spacing, 100);
-
-  return css_spacing + priv->linedata[orientation].spacing;
-}
-
-/* Calculates the min and max numbers for both orientations.
- */
-static void
-gtk_grid_request_count_lines (GtkGridRequest *request)
-{
-  GtkWidget *child;
-  gint min[2];
-  gint max[2];
-
-  min[0] = min[1] = G_MAXINT;
-  max[0] = max[1] = G_MININT;
-
-  for (child = gtk_widget_get_first_child (GTK_WIDGET (request->grid));
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    {
-      GtkGridChild *grid_child = get_grid_child (child);
-      GtkGridChildAttach *attach = grid_child->attach;
-
-      min[0] = MIN (min[0], attach[0].pos);
-      max[0] = MAX (max[0], attach[0].pos + attach[0].span);
-      min[1] = MIN (min[1], attach[1].pos);
-      max[1] = MAX (max[1], attach[1].pos + attach[1].span);
-    }
-
-  request->lines[0].min = min[0];
-  request->lines[0].max = max[0];
-  request->lines[1].min = min[1];
-  request->lines[1].max = max[1];
-}
-
-/* Sets line sizes to 0 and marks lines as expand
- * if they have a non-spanning expanding child.
- */
-static void
-gtk_grid_request_init (GtkGridRequest *request,
-                       GtkOrientation  orientation)
-{
-  GtkWidget *child;
-  GtkGridChildAttach *attach;
-  GtkGridLines *lines;
-  gint i;
-
-  lines = &request->lines[orientation];
-
-  for (i = 0; i < lines->max - lines->min; i++)
-    {
-      lines->lines[i].minimum = 0;
-      lines->lines[i].natural = 0;
-      lines->lines[i].minimum_above = -1;
-      lines->lines[i].minimum_below = -1;
-      lines->lines[i].natural_above = -1;
-      lines->lines[i].natural_below = -1;
-      lines->lines[i].expand = FALSE;
-      lines->lines[i].empty = TRUE;
-    }
-
-
-  for (child = gtk_widget_get_first_child (GTK_WIDGET (request->grid));
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    {
-      GtkGridChild *grid_child = get_grid_child (child);
-
-      attach = &grid_child->attach[orientation];
-      if (attach->span == 1 && gtk_widget_compute_expand (child, orientation))
-        lines->lines[attach->pos - lines->min].expand = TRUE;
-    }
-}
-
-/* Sums allocations for lines spanned by child and their spacing.
- */
-static gint
-compute_allocation_for_child (GtkGridRequest *request,
-                              GtkGridChild   *child,
-                              GtkOrientation  orientation)
-{
-  GtkGridLines *lines;
-  GtkGridLine *line;
-  GtkGridChildAttach *attach;
-  gint size;
-  gint i;
-
-  lines = &request->lines[orientation];
-  attach = &child->attach[orientation];
-
-  size = (attach->span - 1) * get_spacing (request->grid, orientation);
-  for (i = 0; i < attach->span; i++)
-    {
-      line = &lines->lines[attach->pos - lines->min + i];
-      size += line->allocation;
-    }
-
-  return size;
-}
-
-static void
-compute_request_for_child (GtkGridRequest *request,
-                           GtkWidget      *child,
-                           GtkGridChild   *grid_child,
-                           GtkOrientation  orientation,
-                           gboolean        contextual,
-                           gint           *minimum,
-                           gint           *natural,
-			   gint           *minimum_baseline,
-                           gint           *natural_baseline)
-{
-  if (minimum_baseline)
-    *minimum_baseline = -1;
-  if (natural_baseline)
-    *natural_baseline = -1;
-
-  if (contextual)
-    {
-      gint size;
-
-      size = compute_allocation_for_child (request, grid_child, 1 - orientation);
-
-      gtk_widget_measure (child,
-                          orientation,
-                          size,
-                          minimum, natural,
-                          minimum_baseline, natural_baseline);
-    }
-  else
-    {
-      gtk_widget_measure (child,
-                          orientation,
-                          -1,
-                          minimum, natural,
-                          minimum_baseline, natural_baseline);
-    }
-}
-
-/* Sets requisition to max. of non-spanning children.
- * If contextual is TRUE, requires allocations of
- * lines in the opposite orientation to be set.
- */
-static void
-gtk_grid_request_non_spanning (GtkGridRequest *request,
-                               GtkOrientation  orientation,
-                               gboolean        contextual)
-{
-  GtkWidget *child;
-  GtkGridChildAttach *attach;
-  GtkGridLines *lines;
-  GtkGridLine *line;
-  gint i;
-  GtkBaselinePosition baseline_pos;
-  gint minimum, minimum_baseline;
-  gint natural, natural_baseline;
-
-  lines = &request->lines[orientation];
-
-  for (child = gtk_widget_get_first_child (GTK_WIDGET (request->grid));
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    {
-      GtkGridChild *grid_child = get_grid_child (child);
-
-      if (!_gtk_widget_get_visible (child))
-        continue;
-
-      attach = &grid_child->attach[orientation];
-      if (attach->span != 1)
-        continue;
-
-      compute_request_for_child (request, child, grid_child, orientation, contextual, &minimum, &natural, &minimum_baseline, &natural_baseline);
-
-      line = &lines->lines[attach->pos - lines->min];
-
-      if (minimum_baseline != -1)
-	{
-	  line->minimum_above = MAX (line->minimum_above, minimum_baseline);
-	  line->minimum_below = MAX (line->minimum_below, minimum - minimum_baseline);
-	  line->natural_above = MAX (line->natural_above, natural_baseline);
-	  line->natural_below = MAX (line->natural_below, natural - natural_baseline);
-	}
-      else
-	{
-	  line->minimum = MAX (line->minimum, minimum);
-	  line->natural = MAX (line->natural, natural);
-	}
-    }
-
-  for (i = 0; i < lines->max - lines->min; i++)
-    {
-      line = &lines->lines[i];
-
-      if (line->minimum_above != -1)
-	{
-	  line->minimum = MAX (line->minimum, line->minimum_above + line->minimum_below);
-	  line->natural = MAX (line->natural, line->natural_above + line->natural_below);
-
-	  baseline_pos = gtk_grid_get_row_baseline_position (request->grid, i + lines->min);
-
-	  switch (baseline_pos)
-	    {
-	    case GTK_BASELINE_POSITION_TOP:
-	      line->minimum_above += 0;
-	      line->minimum_below += line->minimum - (line->minimum_above + line->minimum_below);
-	      line->natural_above += 0;
-	      line->natural_below += line->natural - (line->natural_above + line->natural_below);
-	      break;
-	    case GTK_BASELINE_POSITION_CENTER:
-	      line->minimum_above += (line->minimum - (line->minimum_above + line->minimum_below))/2;
-	      line->minimum_below += (line->minimum - (line->minimum_above + line->minimum_below))/2;
-	      line->natural_above += (line->natural - (line->natural_above + line->natural_below))/2;
-	      line->natural_below += (line->natural - (line->natural_above + line->natural_below))/2;
-	      break;
-	    case GTK_BASELINE_POSITION_BOTTOM:
-	      line->minimum_above += line->minimum - (line->minimum_above + line->minimum_below);
-	      line->minimum_below += 0;
-	      line->natural_above += line->natural - (line->natural_above + line->natural_below);
-	      line->natural_below += 0;
-	      break;
-            default:
-              break;
-	    }
-	}
-    }
-}
-
-/* Enforce homogeneous sizes.
- */
-static void
-gtk_grid_request_homogeneous (GtkGridRequest *request,
-                              GtkOrientation  orientation)
-{
-  GtkGridPrivate *priv = gtk_grid_get_instance_private (request->grid);
-  GtkGridLineData *linedata;
-  GtkGridLines *lines;
-  gint minimum, natural;
-  gint i;
-
-  linedata = &priv->linedata[orientation];
-  lines = &request->lines[orientation];
-
-  if (!linedata->homogeneous)
-    return;
-
-  minimum = 0;
-  natural = 0;
-
-  for (i = 0; i < lines->max - lines->min; i++)
-    {
-      minimum = MAX (minimum, lines->lines[i].minimum);
-      natural = MAX (natural, lines->lines[i].natural);
-    }
-
-  for (i = 0; i < lines->max - lines->min; i++)
-    {
-      lines->lines[i].minimum = minimum;
-      lines->lines[i].natural = natural;
-      /* TODO: Do we want to adjust the baseline here too?
-       * And if so, also in the homogenous resize.
-       */
-    }
-}
-
-/* Deals with spanning children.
- * Requires expand fields of lines to be set for
- * non-spanning children.
- */
-static void
-gtk_grid_request_spanning (GtkGridRequest *request,
-                           GtkOrientation  orientation,
-                           gboolean        contextual)
-{
-  GtkGridPrivate *priv = gtk_grid_get_instance_private (request->grid);
-  GtkWidget *child;
-  GtkGridChildAttach *attach;
-  GtkGridLineData *linedata;
-  GtkGridLines *lines;
-  GtkGridLine *line;
-  gint minimum;
-  gint natural;
-  gint span_minimum;
-  gint span_natural;
-  gint span_expand;
-  gboolean force_expand;
-  gint spacing;
-  gint extra;
-  gint expand;
-  gint line_extra;
-  gint i;
-
-  linedata = &priv->linedata[orientation];
-  lines = &request->lines[orientation];
-  spacing = get_spacing (request->grid, orientation);
-
-  for (child = gtk_widget_get_first_child (GTK_WIDGET (request->grid));
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    {
-      GtkGridChild *grid_child = get_grid_child (child);
-
-      if (!_gtk_widget_get_visible (child))
-        continue;
-
-      attach = &grid_child->attach[orientation];
-      if (attach->span == 1)
-        continue;
-
-      /* We ignore baselines for spanning children */
-      compute_request_for_child (request, child, grid_child, orientation, contextual, &minimum, &natural, NULL, NULL);
-
-      span_minimum = (attach->span - 1) * spacing;
-      span_natural = (attach->span - 1) * spacing;
-      span_expand = 0;
-      force_expand = FALSE;
-      for (i = 0; i < attach->span; i++)
-        {
-          line = &lines->lines[attach->pos - lines->min + i];
-          span_minimum += line->minimum;
-          span_natural += line->natural;
-          if (line->expand)
-            span_expand += 1;
-        }
-      if (span_expand == 0)
-        {
-          span_expand = attach->span;
-          force_expand = TRUE;
-        }
-
-      /* If we need to request more space for this child to fill
-       * its requisition, then divide up the needed space amongst the
-       * lines it spans, favoring expandable lines if any.
-       *
-       * When doing homogeneous allocation though, try to keep the
-       * line allocations even, since we're going to force them to
-       * be the same anyway, and we don't want to introduce unnecessary
-       * extra space.
-       */
-      if (span_minimum < minimum)
-        {
-          if (linedata->homogeneous)
-            {
-              gint total, m;
-
-              total = minimum - (attach->span - 1) * spacing;
-              m = total / attach->span + (total % attach->span ? 1 : 0);
-              for (i = 0; i < attach->span; i++)
-                {
-                  line = &lines->lines[attach->pos - lines->min + i];
-                  line->minimum = MAX(line->minimum, m);
-                }
-            }
-          else
-            {
-              extra = minimum - span_minimum;
-              expand = span_expand;
-              for (i = 0; i < attach->span; i++)
-                {
-                  line = &lines->lines[attach->pos - lines->min + i];
-                  if (force_expand || line->expand)
-                    {
-                      line_extra = extra / expand;
-                      line->minimum += line_extra;
-                      extra -= line_extra;
-                      expand -= 1;
-                    }
-                }
-            }
-        }
-
-      if (span_natural < natural)
-        {
-          if (linedata->homogeneous)
-            {
-              gint total, n;
-
-              total = natural - (attach->span - 1) * spacing;
-              n = total / attach->span + (total % attach->span ? 1 : 0);
-              for (i = 0; i < attach->span; i++)
-                {
-                  line = &lines->lines[attach->pos - lines->min + i];
-                  line->natural = MAX(line->natural, n);
-                }
-            }
-          else
-            {
-              extra = natural - span_natural;
-              expand = span_expand;
-              for (i = 0; i < attach->span; i++)
-                {
-                  line = &lines->lines[attach->pos - lines->min + i];
-                  if (force_expand || line->expand)
-                    {
-                      line_extra = extra / expand;
-                      line->natural += line_extra;
-                      extra -= line_extra;
-                      expand -= 1;
-                    }
-                }
-            }
-        }
-    }
-}
-
-/* Marks empty and expanding lines and counts them.
- */
-static void
-gtk_grid_request_compute_expand (GtkGridRequest *request,
-                                 GtkOrientation  orientation,
-				 gint            min,
-				 gint            max,
-                                 gint           *nonempty_lines,
-                                 gint           *expand_lines)
-{
-  GtkWidget *child;
-  GtkGridChildAttach *attach;
-  gint i;
-  GtkGridLines *lines;
-  GtkGridLine *line;
-  gboolean has_expand;
-  gint expand;
-  gint empty;
-
-  lines = &request->lines[orientation];
-
-  min = MAX (min, lines->min);
-  max = MIN (max, lines->max);
-
-  for (i = min - lines->min; i < max - lines->min; i++)
-    {
-      lines->lines[i].need_expand = FALSE;
-      lines->lines[i].expand = FALSE;
-      lines->lines[i].empty = TRUE;
-    }
-
-  for (child = gtk_widget_get_first_child (GTK_WIDGET (request->grid));
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    {
-      GtkGridChild *grid_child = get_grid_child (child);
-
-      if (!_gtk_widget_get_visible (child))
-        continue;
-
-      attach = &grid_child->attach[orientation];
-      if (attach->span != 1)
-        continue;
-
-      if (attach->pos >= max || attach->pos < min)
-	continue;
-
-      line = &lines->lines[attach->pos - lines->min];
-      line->empty = FALSE;
-      if (gtk_widget_compute_expand (child, orientation))
-        line->expand = TRUE;
-    }
-
-  for (child = gtk_widget_get_first_child (GTK_WIDGET (request->grid));
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    {
-      GtkGridChild *grid_child = get_grid_child (child);
-
-      if (!_gtk_widget_get_visible (child))
-        continue;
-
-      attach = &grid_child->attach[orientation];
-      if (attach->span == 1)
-        continue;
-
-      has_expand = FALSE;
-      for (i = 0; i < attach->span; i++)
-        {
-          line = &lines->lines[attach->pos - lines->min + i];
-
-          if (line->expand)
-            has_expand = TRUE;
-
-	  if (attach->pos + i >= max || attach->pos + 1 < min)
-	    continue;
-
-          line->empty = FALSE;
-        }
-
-      if (!has_expand && gtk_widget_compute_expand (child, orientation))
-        {
-          for (i = 0; i < attach->span; i++)
-            {
-	      if (attach->pos + i >= max || attach->pos + 1 < min)
-		continue;
-
-              line = &lines->lines[attach->pos - lines->min + i];
-              line->need_expand = TRUE;
-            }
-        }
-    }
-
-  empty = 0;
-  expand = 0;
-  for (i = min - lines->min; i < max - lines->min; i++)
-    {
-      line = &lines->lines[i];
-
-      if (line->need_expand)
-        line->expand = TRUE;
-
-      if (line->empty)
-        empty += 1;
-
-      if (line->expand)
-        expand += 1;
-    }
-
-  if (nonempty_lines)
-    *nonempty_lines = max - min - empty;
-
-  if (expand_lines)
-    *expand_lines = expand;
-}
-
-/* Sums the minimum and natural fields of lines and their spacing.
- */
-static void
-gtk_grid_request_sum (GtkGridRequest *request,
-                      GtkOrientation  orientation,
-                      gint           *minimum,
-                      gint           *natural,
-		      gint           *minimum_baseline,
-		      gint           *natural_baseline)
-{
-  GtkGridPrivate *priv = gtk_grid_get_instance_private (request->grid);
-  GtkGridLines *lines;
-  gint i;
-  gint min, nat;
-  gint nonempty;
-  gint spacing;
-
-  gtk_grid_request_compute_expand (request, orientation, G_MININT, G_MAXINT, &nonempty, NULL);
-
-  lines = &request->lines[orientation];
-  spacing = get_spacing (request->grid, orientation);
-
-  min = 0;
-  nat = 0;
-  for (i = 0; i < lines->max - lines->min; i++)
-    {
-      if (orientation == GTK_ORIENTATION_VERTICAL &&
-	  lines->min + i == priv->baseline_row &&
-	  lines->lines[i].minimum_above != -1)
-	{
-	  if (minimum_baseline)
-	    *minimum_baseline = min + lines->lines[i].minimum_above;
-	  if (natural_baseline)
-	    *natural_baseline = nat + lines->lines[i].natural_above;
-	}
-
-      min += lines->lines[i].minimum;
-      nat += lines->lines[i].natural;
-
-      if (!lines->lines[i].empty)
-	{
-	  min += spacing;
-	  nat += spacing;
-	}
-    }
-
-  /* Remove last spacing, if any was applied */
-  if (nonempty > 0)
-    {
-      min -= spacing;
-      nat -= spacing;
-    }
-
-  *minimum = min;
-  *natural = nat;
-}
-
-/* Computes minimum and natural fields of lines.
- * When contextual is TRUE, requires allocation of
- * lines in the opposite orientation to be set.
- */
-static void
-gtk_grid_request_run (GtkGridRequest *request,
-                      GtkOrientation  orientation,
-                      gboolean        contextual)
-{
-  gtk_grid_request_init (request, orientation);
-  gtk_grid_request_non_spanning (request, orientation, contextual);
-  gtk_grid_request_homogeneous (request, orientation);
-  gtk_grid_request_spanning (request, orientation, contextual);
-  gtk_grid_request_homogeneous (request, orientation);
-}
-
-static void
-gtk_grid_distribute_non_homogeneous (GtkGridLines *lines,
-				     gint nonempty,
-				     gint expand,
-				     gint size,
-				     gint min,
-				     gint max)
-{
-  GtkRequestedSize *sizes;
-  GtkGridLine *line;
-  gint extra;
-  gint rest;
-  int i, j;
-
-  if (nonempty == 0)
-    return;
-
-  sizes = g_newa (GtkRequestedSize, nonempty);
-
-  j = 0;
-  for (i = min - lines->min; i < max - lines->min; i++)
-    {
-      line = &lines->lines[i];
-      if (line->empty)
-	continue;
-
-      size -= line->minimum;
-
-      sizes[j].minimum_size = line->minimum;
-      sizes[j].natural_size = line->natural;
-      sizes[j].data = line;
-      j++;
-    }
-
-  size = gtk_distribute_natural_allocation (MAX (0, size), nonempty, sizes);
-
-  if (expand > 0)
-    {
-      extra = size / expand;
-      rest = size % expand;
-    }
-  else
-    {
-      extra = 0;
-      rest = 0;
-    }
-
-  j = 0;
-  for (i = min - lines->min; i < max - lines->min; i++)
-    {
-      line = &lines->lines[i];
-      if (line->empty)
-	continue;
-
-      g_assert (line == sizes[j].data);
-
-      line->allocation = sizes[j].minimum_size;
-      if (line->expand)
-	{
-	  line->allocation += extra;
-	  if (rest > 0)
-	    {
-	      line->allocation += 1;
-	      rest -= 1;
-	    }
-	}
-
-      j++;
-    }
-}
-
-/* Requires that the minimum and natural fields of lines
- * have been set, computes the allocation field of lines
- * by distributing total_size among lines.
- */
-static void
-gtk_grid_request_allocate (GtkGridRequest *request,
-                           GtkOrientation  orientation,
-                           gint            total_size)
-{
-  GtkGridPrivate *priv = gtk_grid_get_instance_private (request->grid);
-  GtkGridLineData *linedata;
-  GtkGridLines *lines;
-  GtkGridLine *line;
-  gint nonempty1, nonempty2;
-  gint expand1, expand2;
-  gint i;
-  GtkBaselinePosition baseline_pos;
-  gint baseline;
-  gint extra, extra2;
-  gint rest;
-  gint size1, size2;
-  gint split, split_pos;
-  gint spacing;
-
-  linedata = &priv->linedata[orientation];
-  lines = &request->lines[orientation];
-  spacing = get_spacing (request->grid, orientation);
-
-  baseline = gtk_widget_get_allocated_baseline (GTK_WIDGET (request->grid));
-
-  if (orientation == GTK_ORIENTATION_VERTICAL && baseline != -1 &&
-      priv->baseline_row >= lines->min && priv->baseline_row < lines->max &&
-      lines->lines[priv->baseline_row - lines->min].minimum_above != -1)
-    {
-      split = priv->baseline_row;
-      split_pos = baseline - lines->lines[priv->baseline_row - lines->min].minimum_above;
-      gtk_grid_request_compute_expand (request, orientation, lines->min, split, &nonempty1, &expand1);
-      gtk_grid_request_compute_expand (request, orientation, split, lines->max, &nonempty2, &expand2);
-
-      if (nonempty2 > 0)
-	{
-	  size1 = split_pos - (nonempty1) * spacing;
-	  size2 = (total_size - split_pos) - (nonempty2 - 1) * spacing;
-	}
-      else
-	{
-	  size1 = total_size - (nonempty1 - 1) * spacing;
-	  size2 = 0;
-	}
-    }
-  else
-    {
-      gtk_grid_request_compute_expand (request, orientation, lines->min, lines->max, &nonempty1, &expand1);
-      nonempty2 = expand2 = 0;
-      split = lines->max;
-
-      size1 = total_size - (nonempty1 - 1) * spacing;
-      size2 = 0;
-    }
-
-  if (nonempty1 == 0 && nonempty2 == 0)
-    return;
-
-  if (linedata->homogeneous)
-    {
-      if (nonempty1 > 0)
-	{
-	  extra = size1 / nonempty1;
-	  rest = size1 % nonempty1;
-	}
-      else
-	{
-	  extra = 0;
-	  rest = 0;
-	}
-      if (nonempty2 > 0)
-	{
-	  extra2 = size2 / nonempty2;
-	  if (extra2 < extra || nonempty1 == 0)
-	    {
-	      extra = extra2;
-	      rest = size2 % nonempty2;
-	    }
-	}
-
-      for (i = 0; i < lines->max - lines->min; i++)
-        {
-          line = &lines->lines[i];
-          if (line->empty)
-            continue;
-
-          line->allocation = extra;
-          if (rest > 0)
-            {
-              line->allocation += 1;
-              rest -= 1;
-            }
-        }
-    }
-  else
-    {
-      gtk_grid_distribute_non_homogeneous (lines,
-					   nonempty1,
-					   expand1,
-					   size1,
-					   lines->min,
-					   split);
-      gtk_grid_distribute_non_homogeneous (lines,
-					   nonempty2,
-					   expand2,
-					   size2,
-					   split,
-					   lines->max);
-    }
-
-  for (i = 0; i < lines->max - lines->min; i++)
-    {
-      line = &lines->lines[i];
-      if (line->empty)
-	continue;
-
-      if (line->minimum_above != -1)
-	{
-	  /* Note: This is overridden in gtk_grid_request_position for the allocated baseline */
-	  baseline_pos = gtk_grid_get_row_baseline_position (request->grid, i + lines->min);
-
-	  switch (baseline_pos)
-	    {
-	    case GTK_BASELINE_POSITION_TOP:
-	      line->allocated_baseline =
-		line->minimum_above;
-	      break;
-	    case GTK_BASELINE_POSITION_CENTER:
-	      line->allocated_baseline =
-		line->minimum_above +
-		(line->allocation - (line->minimum_above + line->minimum_below)) / 2;
-	      break;
-	    case GTK_BASELINE_POSITION_BOTTOM:
-	      line->allocated_baseline =
-		line->allocation - line->minimum_below;
-	      break;
-            default:
-              break;
-	    }
-	}
-      else
-	line->allocated_baseline = -1;
-    }
-}
-
-/* Computes the position fields from allocation and spacing.
- */
-static void
-gtk_grid_request_position (GtkGridRequest *request,
-                           GtkOrientation  orientation)
-{
-  GtkGridPrivate *priv = gtk_grid_get_instance_private (request->grid);
-  GtkGridLines *lines;
-  GtkGridLine *line;
-  gint position, old_position;
-  int allocated_baseline;
-  gint spacing;
-  gint i, j;
-
-  lines = &request->lines[orientation];
-  spacing = get_spacing (request->grid, orientation);
-
-  allocated_baseline = gtk_widget_get_allocated_baseline (GTK_WIDGET(request->grid));
-
-  position = 0;
-  for (i = 0; i < lines->max - lines->min; i++)
-    {
-      line = &lines->lines[i];
-
-      if (orientation == GTK_ORIENTATION_VERTICAL &&
-	  i + lines->min == priv->baseline_row &&
-	  allocated_baseline != -1 &&
-	  lines->lines[i].minimum_above != -1)
-	{
-	  old_position = position;
-	  position = allocated_baseline - line->minimum_above;
-
-	  /* Back-patch previous rows */
-	  for (j = 0; j < i; j++)
-	    {
-	      if (!lines->lines[j].empty)
-		lines->lines[j].position += position - old_position;
-	    }
-	}
-
-      if (!line->empty)
-        {
-          line->position = position;
-          position += line->allocation + spacing;
-
-	  if (orientation == GTK_ORIENTATION_VERTICAL &&
-	      i + lines->min == priv->baseline_row &&
-	      allocated_baseline != -1 &&
-	      lines->lines[i].minimum_above != -1)
-	    line->allocated_baseline = allocated_baseline - line->position;
-        }
-    }
-}
-
-static void
-gtk_grid_get_size (GtkGrid        *grid,
-                   GtkOrientation  orientation,
-                   gint           *minimum,
-                   gint           *natural,
-		   gint           *minimum_baseline,
-		   gint           *natural_baseline)
-{
-  GtkGridRequest request;
-  GtkGridLines *lines;
-
-  *minimum = 0;
-  *natural = 0;
-
-  if (minimum_baseline)
-    *minimum_baseline = -1;
-
-  if (natural_baseline)
-    *natural_baseline = -1;
-
-  if (gtk_widget_get_first_child (GTK_WIDGET (grid)) == NULL)
-    return;
-
-  request.grid = grid;
-  gtk_grid_request_count_lines (&request);
-  lines = &request.lines[orientation];
-  lines->lines = g_newa (GtkGridLine, lines->max - lines->min);
-  memset (lines->lines, 0, (lines->max - lines->min) * sizeof (GtkGridLine));
-
-  gtk_grid_request_run (&request, orientation, FALSE);
-  gtk_grid_request_sum (&request, orientation, minimum, natural,
-			minimum_baseline, natural_baseline);
-}
-
-static void
-gtk_grid_get_size_for_size (GtkGrid        *grid,
-                            GtkOrientation  orientation,
-                            gint            size,
-                            gint           *minimum,
-                            gint           *natural,
-			    gint           *minimum_baseline,
-                            gint           *natural_baseline)
-{
-  GtkGridRequest request;
-  GtkGridLines *lines;
-  gint min_size, nat_size;
-
-  *minimum = 0;
-  *natural = 0;
-
-  if (minimum_baseline)
-    *minimum_baseline = -1;
-
-  if (natural_baseline)
-    *natural_baseline = -1;
-
-  if (gtk_widget_get_first_child (GTK_WIDGET (grid)) == NULL)
-    return;
-
-  request.grid = grid;
-  gtk_grid_request_count_lines (&request);
-  lines = &request.lines[0];
-  lines->lines = g_newa (GtkGridLine, lines->max - lines->min);
-  memset (lines->lines, 0, (lines->max - lines->min) * sizeof (GtkGridLine));
-  lines = &request.lines[1];
-  lines->lines = g_newa (GtkGridLine, lines->max - lines->min);
-  memset (lines->lines, 0, (lines->max - lines->min) * sizeof (GtkGridLine));
-
-  gtk_grid_request_run (&request, 1 - orientation, FALSE);
-  gtk_grid_request_sum (&request, 1 - orientation, &min_size, &nat_size, NULL, NULL);
-  gtk_grid_request_allocate (&request, 1 - orientation, MAX (size, min_size));
-
-  gtk_grid_request_run (&request, orientation, TRUE);
-  gtk_grid_request_sum (&request, orientation, minimum, natural, minimum_baseline, natural_baseline);
-}
-
-static void
-gtk_grid_measure (GtkWidget     *widget,
-                  GtkOrientation  orientation,
-                  int             for_size,
-                  int            *minimum,
-                  int            *natural,
-                  int            *minimum_baseline,
-                  int            *natural_baseline)
-{
-  GtkGrid *grid = GTK_GRID (widget);
-
-  if ((orientation == GTK_ORIENTATION_HORIZONTAL &&
-       gtk_widget_get_request_mode (widget) == GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT) ||
-      (orientation == GTK_ORIENTATION_VERTICAL &&
-       gtk_widget_get_request_mode (widget) == GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH))
-    gtk_grid_get_size_for_size (grid, orientation, for_size, minimum, natural, minimum_baseline, natural_baseline);
-  else
-    gtk_grid_get_size (grid, orientation, minimum, natural, minimum_baseline, natural_baseline);
-}
-
-static void
-allocate_child (GtkGridRequest *request,
-                GtkOrientation  orientation,
-                GtkWidget      *child,
-                GtkGridChild   *grid_child,
-                gint           *position,
-                gint           *size,
-		gint           *baseline)
-{
-  GtkGridLines *lines;
-  GtkGridLine *line;
-  GtkGridChildAttach *attach;
-  gint i;
-
-  lines = &request->lines[orientation];
-  attach = &grid_child->attach[orientation];
-
-  *position = lines->lines[attach->pos - lines->min].position;
-  if (attach->span == 1 && gtk_widget_get_valign (child) == GTK_ALIGN_BASELINE)
-    *baseline = lines->lines[attach->pos - lines->min].allocated_baseline;
-  else
-    *baseline = -1;
-
-  *size = (attach->span - 1) * get_spacing (request->grid, orientation);
-  for (i = 0; i < attach->span; i++)
-    {
-      line = &lines->lines[attach->pos - lines->min + i];
-      *size += line->allocation;
-    }
-}
-
-static void
-gtk_grid_request_allocate_children (GtkGridRequest *request,
-                                    int             grid_width,
-                                    int             grid_height)
-{
-  GtkWidget *child;
-  GtkAllocation child_allocation;
-  gint x, y, width, height, baseline, ignore;
-
-
-  for (child = gtk_widget_get_first_child (GTK_WIDGET (request->grid));
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    {
-      GtkGridChild *grid_child = get_grid_child (child);
-
-      if (!_gtk_widget_get_visible (child))
-        continue;
-
-      allocate_child (request, GTK_ORIENTATION_HORIZONTAL, child, grid_child, &x, &width, &ignore);
-      allocate_child (request, GTK_ORIENTATION_VERTICAL, child, grid_child, &y, &height, &baseline);
-
-      child_allocation.x = x;
-      child_allocation.y = y;
-      child_allocation.width = width;
-      child_allocation.height = height;
-
-      if (_gtk_widget_get_direction (GTK_WIDGET (request->grid)) == GTK_TEXT_DIR_RTL)
-        child_allocation.x = grid_width - child_allocation.x - child_allocation.width;
-
-      gtk_widget_size_allocate (child, &child_allocation, baseline);
-    }
-}
-
-#define GET_SIZE(width, height, orientation) (orientation == GTK_ORIENTATION_HORIZONTAL ? width : height)
-
-static void
-gtk_grid_size_allocate (GtkWidget *widget,
-                        int        width,
-                        int        height,
-                        int        baseline)
-{
-  GtkGrid *grid = GTK_GRID (widget);
-  GtkGridRequest request;
-  GtkGridLines *lines;
-  GtkOrientation orientation;
-
-  if (gtk_widget_get_first_child (widget) == NULL)
-    return;
-
-  request.grid = grid;
-
-  gtk_grid_request_count_lines (&request);
-  lines = &request.lines[0];
-  lines->lines = g_newa (GtkGridLine, lines->max - lines->min);
-  memset (lines->lines, 0, (lines->max - lines->min) * sizeof (GtkGridLine));
-  lines = &request.lines[1];
-  lines->lines = g_newa (GtkGridLine, lines->max - lines->min);
-  memset (lines->lines, 0, (lines->max - lines->min) * sizeof (GtkGridLine));
-
-  if (gtk_widget_get_request_mode (widget) == GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT)
-    orientation = GTK_ORIENTATION_HORIZONTAL;
-  else
-    orientation = GTK_ORIENTATION_VERTICAL;
-
-  gtk_grid_request_run (&request, 1 - orientation, FALSE);
-  gtk_grid_request_allocate (&request, 1 - orientation, GET_SIZE (width, height, 1 - orientation));
-  gtk_grid_request_run (&request, orientation, TRUE);
-
-  gtk_grid_request_allocate (&request, orientation, GET_SIZE (width, height, orientation));
-
-  gtk_grid_request_position (&request, 0);
-  gtk_grid_request_position (&request, 1);
-
-  gtk_grid_request_allocate_children (&request, width, height);
-}
-
 static void
 gtk_grid_class_init (GtkGridClass *class)
 {
@@ -1602,17 +334,11 @@ gtk_grid_class_init (GtkGridClass *class)
 
   object_class->get_property = gtk_grid_get_property;
   object_class->set_property = gtk_grid_set_property;
-  object_class->finalize = gtk_grid_finalize;
-
-  widget_class->size_allocate = gtk_grid_size_allocate;
-  widget_class->measure = gtk_grid_measure;
 
   container_class->add = gtk_grid_add;
   container_class->remove = gtk_grid_remove;
   container_class->forall = gtk_grid_forall;
   container_class->child_type = gtk_grid_child_type;
-  container_class->set_child_property = gtk_grid_set_child_property;
-  container_class->get_child_property = gtk_grid_get_child_property;
 
   g_object_class_override_property (object_class, PROP_ORIENTATION, "orientation");
 
@@ -1651,41 +377,8 @@ gtk_grid_class_init (GtkGridClass *class)
                       0, G_MAXINT, 0,
                       GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
 
-  g_object_class_install_properties (object_class,
-                                     N_PROPERTIES,
-                                     obj_properties);
+  g_object_class_install_properties (object_class, N_PROPERTIES, obj_properties);
 
-  child_properties[CHILD_PROP_LEFT_ATTACH] =
-    g_param_spec_int ("left-attach",
-                      P_("Left attachment"),
-                      P_("The column number to attach the left side of the child to"),
-                      G_MININT, G_MAXINT, 0,
-                      GTK_PARAM_READWRITE);
-
-  child_properties[CHILD_PROP_TOP_ATTACH] =
-    g_param_spec_int ("top-attach",
-                      P_("Top attachment"),
-                      P_("The row number to attach the top side of a child widget to"),
-                      G_MININT, G_MAXINT, 0,
-                      GTK_PARAM_READWRITE);
-
-  child_properties[CHILD_PROP_WIDTH] =
-    g_param_spec_int ("width",
-                      P_("Width"),
-                      P_("The number of columns that a child spans"),
-                      1, G_MAXINT, 1,
-                      GTK_PARAM_READWRITE);
-
-  child_properties[CHILD_PROP_HEIGHT] =
-    g_param_spec_int ("height",
-                      P_("Height"),
-                      P_("The number of rows that a child spans"),
-                      1, G_MAXINT, 1,
-                      GTK_PARAM_READWRITE);
-
-
-  gtk_container_class_install_child_properties (container_class, N_CHILD_PROPERTIES, child_properties);
-  child_data_quark = g_quark_from_static_string ("gtk-grid-child-data");
   gtk_widget_class_set_css_name (widget_class, I_("grid"));
 }
 
@@ -1696,15 +389,10 @@ gtk_grid_init (GtkGrid *grid)
 
   gtk_widget_set_has_surface (GTK_WIDGET (grid), FALSE);
 
+  priv->layout_manager = gtk_grid_layout_new ();
+  gtk_widget_set_layout_manager (GTK_WIDGET (grid), priv->layout_manager);
+
   priv->orientation = GTK_ORIENTATION_HORIZONTAL;
-  priv->baseline_row = 0;
-
-  priv->linedata[0].spacing = 0;
-  priv->linedata[1].spacing = 0;
-
-  priv->linedata[0].homogeneous = FALSE;
-  priv->linedata[1].homogeneous = FALSE;
-
   _gtk_orientable_set_style_classes (GTK_ORIENTABLE (grid));
 }
 
@@ -1781,7 +469,8 @@ gtk_grid_attach_next_to (GtkGrid         *grid,
                          gint             width,
                          gint             height)
 {
-  GtkGridChild *grid_sibling;
+  GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
+  GtkGridLayoutChild *grid_sibling;
   gint left, top;
 
   g_return_if_fail (GTK_IS_GRID (grid));
@@ -1791,27 +480,29 @@ gtk_grid_attach_next_to (GtkGrid         *grid,
   g_return_if_fail (width > 0);
   g_return_if_fail (height > 0);
 
-  if (sibling)
+  if (sibling != NULL)
     {
-      grid_sibling = get_grid_child (sibling);
+      grid_sibling = GTK_GRID_LAYOUT_CHILD (gtk_layout_manager_get_layout_child (priv->layout_manager, sibling));
 
       switch (side)
         {
         case GTK_POS_LEFT:
-          left = CHILD_LEFT (grid_sibling) - width;
-          top = CHILD_TOP (grid_sibling);
+          left = gtk_grid_layout_child_get_left_attach (grid_sibling) - width;
+          top = gtk_grid_layout_child_get_top_attach (grid_sibling);
           break;
         case GTK_POS_RIGHT:
-          left = CHILD_LEFT (grid_sibling) + CHILD_WIDTH (grid_sibling);
-          top = CHILD_TOP (grid_sibling);
+          left = gtk_grid_layout_child_get_left_attach (grid_sibling) +
+                 gtk_grid_layout_child_get_column_span (grid_sibling);
+          top = gtk_grid_layout_child_get_top_attach (grid_sibling);
           break;
         case GTK_POS_TOP:
-          left = CHILD_LEFT (grid_sibling);
-          top = CHILD_TOP (grid_sibling) - height;
+          left = gtk_grid_layout_child_get_left_attach (grid_sibling);
+          top = gtk_grid_layout_child_get_top_attach (grid_sibling) - height;
           break;
         case GTK_POS_BOTTOM:
-          left = CHILD_LEFT (grid_sibling);
-          top = CHILD_TOP (grid_sibling) + CHILD_HEIGHT (grid_sibling);
+          left = gtk_grid_layout_child_get_left_attach (grid_sibling);
+          top = gtk_grid_layout_child_get_top_attach (grid_sibling) +
+                gtk_grid_layout_child_get_row_span (grid_sibling);
           break;
         default:
           g_assert_not_reached ();
@@ -1863,6 +554,7 @@ gtk_grid_get_child_at (GtkGrid *grid,
                        gint     left,
                        gint     top)
 {
+  GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
   GtkWidget *child;
 
   g_return_val_if_fail (GTK_IS_GRID (grid), NULL);
@@ -1871,12 +563,19 @@ gtk_grid_get_child_at (GtkGrid *grid,
        child != NULL;
        child = gtk_widget_get_next_sibling (child))
     {
-      GtkGridChild *grid_child = get_grid_child (child);
+      GtkGridLayoutChild *grid_child;
+      int child_left, child_top, child_width, child_height;
+      
+      grid_child = GTK_GRID_LAYOUT_CHILD (gtk_layout_manager_get_layout_child (priv->layout_manager, child));
+      child_left = gtk_grid_layout_child_get_left_attach (grid_child);
+      child_top = gtk_grid_layout_child_get_top_attach (grid_child);
+      child_width = gtk_grid_layout_child_get_column_span (grid_child);
+      child_height = gtk_grid_layout_child_get_row_span (grid_child);
 
-      if (CHILD_LEFT (grid_child) <= left &&
-          CHILD_LEFT (grid_child) + CHILD_WIDTH (grid_child) > left &&
-          CHILD_TOP (grid_child) <= top &&
-          CHILD_TOP (grid_child) + CHILD_HEIGHT (grid_child) > top)
+      if (child_left <= left &&
+          child_left + child_width > left &&
+          child_top <= top &&
+          child_top + child_height > top)
         return child;
     }
 
@@ -1901,7 +600,6 @@ gtk_grid_insert_row (GtkGrid *grid,
   GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
   GtkWidget *child;
   int top, height;
-  GList *list;
 
   g_return_if_fail (GTK_IS_GRID (grid));
 
@@ -1909,33 +607,16 @@ gtk_grid_insert_row (GtkGrid *grid,
        child != NULL;
        child = gtk_widget_get_next_sibling (child))
     {
-      GtkGridChild *grid_child = get_grid_child (child);
-
-      top = CHILD_TOP (grid_child);
-      height = CHILD_HEIGHT (grid_child);
+      GtkGridLayoutChild *grid_child;
+      
+      grid_child = GTK_GRID_LAYOUT_CHILD (gtk_layout_manager_get_layout_child (priv->layout_manager, child));
+      top = gtk_grid_layout_child_get_top_attach (grid_child);
+      height = gtk_grid_layout_child_get_row_span (grid_child);
 
       if (top >= position)
-        {
-          CHILD_TOP (grid_child) = top + 1;
-          gtk_container_child_notify_by_pspec (GTK_CONTAINER (grid),
-                                               child,
-                                               child_properties[CHILD_PROP_TOP_ATTACH]);
-        }
+        gtk_grid_layout_child_set_top_attach (grid_child, top + 1);
       else if (top + height > position)
-        {
-          CHILD_HEIGHT (grid_child) = height + 1;
-          gtk_container_child_notify_by_pspec (GTK_CONTAINER (grid),
-                                               child,
-                                               child_properties[CHILD_PROP_HEIGHT]);
-        }
-    }
-
-  for (list = priv->row_properties; list != NULL; list = list->next)
-    {
-      GtkGridRowProperties *prop = list->data;
-
-      if (prop->row >= position)
-	prop->row += 1;
+        gtk_grid_layout_child_set_row_span (grid_child, height + 1);
     }
 }
 
@@ -1955,7 +636,7 @@ void
 gtk_grid_remove_row (GtkGrid *grid,
                      gint     position)
 {
-  int top, height;
+  GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
   GtkWidget *child;
 
   g_return_if_fail (GTK_IS_GRID (grid));
@@ -1963,11 +644,13 @@ gtk_grid_remove_row (GtkGrid *grid,
   child = gtk_widget_get_first_child (GTK_WIDGET (grid));
   while (child)
     {
-      GtkGridChild *grid_child = get_grid_child (child);
       GtkWidget *next = gtk_widget_get_next_sibling (child);
+      GtkGridLayoutChild *grid_child;
+      int top, height;
 
-      top = CHILD_TOP (grid_child);
-      height = CHILD_HEIGHT (grid_child);
+      grid_child = GTK_GRID_LAYOUT_CHILD (gtk_layout_manager_get_layout_child (priv->layout_manager, child));
+      top = gtk_grid_layout_child_get_top_attach (grid_child);
+      height = gtk_grid_layout_child_get_row_span (grid_child);
 
       if (top <= position && top + height > position)
         height--;
@@ -1975,12 +658,15 @@ gtk_grid_remove_row (GtkGrid *grid,
         top--;
 
       if (height <= 0)
-        gtk_container_remove (GTK_CONTAINER (grid), child);
+        {
+          gtk_container_remove (GTK_CONTAINER (grid), child);
+        }
       else
-        gtk_container_child_set (GTK_CONTAINER (grid), child,
-                                 "height", height,
-                                 "top-attach", top,
-                                 NULL);
+        {
+          gtk_grid_layout_child_set_row_span (grid_child, height);
+          gtk_grid_layout_child_set_top_attach (grid_child, top);
+        }
+
       child = next;
     }
 }
@@ -2000,8 +686,8 @@ void
 gtk_grid_insert_column (GtkGrid *grid,
                         gint     position)
 {
+  GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
   GtkWidget *child;
-  int left, width;
 
   g_return_if_fail (GTK_IS_GRID (grid));
 
@@ -2009,25 +695,17 @@ gtk_grid_insert_column (GtkGrid *grid,
        child != NULL;
        child = gtk_widget_get_next_sibling (child))
     {
-      GtkGridChild *grid_child = get_grid_child (child);
+      GtkGridLayoutChild *grid_child;
+      int left, width;
 
-      left = CHILD_LEFT (grid_child);
-      width = CHILD_WIDTH (grid_child);
+      grid_child = GTK_GRID_LAYOUT_CHILD (gtk_layout_manager_get_layout_child (priv->layout_manager, child));
+      left = gtk_grid_layout_child_get_left_attach (grid_child);
+      width = gtk_grid_layout_child_get_column_span (grid_child);
 
       if (left >= position)
-        {
-          CHILD_LEFT (grid_child) = left + 1;
-          gtk_container_child_notify_by_pspec (GTK_CONTAINER (grid),
-                                               child,
-                                               child_properties[CHILD_PROP_LEFT_ATTACH]);
-        }
+        gtk_grid_layout_child_set_left_attach (grid_child, left + 1);
       else if (left + width > position)
-        {
-          CHILD_WIDTH (grid_child) = width + 1;
-          gtk_container_child_notify_by_pspec (GTK_CONTAINER (grid),
-                                               child,
-                                               child_properties[CHILD_PROP_WIDTH]);
-        }
+        gtk_grid_layout_child_set_column_span (grid_child, width + 1);
     }
 }
 
@@ -2047,19 +725,22 @@ void
 gtk_grid_remove_column (GtkGrid *grid,
                         gint     position)
 {
+  GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
   GtkWidget *child;
-  int left, width;
 
   g_return_if_fail (GTK_IS_GRID (grid));
 
   child = gtk_widget_get_first_child (GTK_WIDGET (grid));
   while (child)
     {
-      GtkGridChild *grid_child = get_grid_child (child);
       GtkWidget *next = gtk_widget_get_next_sibling (child);
+      GtkGridLayoutChild *grid_child;
+      int left, width;
 
-      left = CHILD_LEFT (grid_child);
-      width = CHILD_WIDTH (grid_child);
+      grid_child = GTK_GRID_LAYOUT_CHILD (gtk_layout_manager_get_layout_child (priv->layout_manager, child));
+
+      left = gtk_grid_layout_child_get_left_attach (grid_child);
+      width = gtk_grid_layout_child_get_column_span (grid_child);
 
       if (left <= position && left + width > position)
         width--;
@@ -2067,12 +748,14 @@ gtk_grid_remove_column (GtkGrid *grid,
         left--;
 
       if (width <= 0)
-        gtk_container_remove (GTK_CONTAINER (grid), child);
+        {
+          gtk_container_remove (GTK_CONTAINER (grid), child);
+        }
       else
-        gtk_container_child_set (GTK_CONTAINER (grid), child,
-                                 "width", width,
-                                 "left-attach", left,
-                                 NULL);
+        {
+          gtk_grid_layout_child_set_column_span (grid_child, width);
+          gtk_grid_layout_child_set_left_attach (grid_child, left);
+        }
 
       child = next;
     }
@@ -2097,27 +780,36 @@ gtk_grid_insert_next_to (GtkGrid         *grid,
                          GtkWidget       *sibling,
                          GtkPositionType  side)
 {
-  GtkGridChild *child;
+  GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
+  GtkGridLayoutChild *child;
 
   g_return_if_fail (GTK_IS_GRID (grid));
   g_return_if_fail (GTK_IS_WIDGET (sibling));
   g_return_if_fail (_gtk_widget_get_parent (sibling) == (GtkWidget*)grid);
 
-  child = get_grid_child (sibling);
+  child = GTK_GRID_LAYOUT_CHILD (gtk_layout_manager_get_layout_child (priv->layout_manager, sibling));
 
   switch (side)
     {
     case GTK_POS_LEFT:
-      gtk_grid_insert_column (grid, CHILD_LEFT (child));
+      gtk_grid_insert_column (grid, gtk_grid_layout_child_get_left_attach (child));
       break;
     case GTK_POS_RIGHT:
-      gtk_grid_insert_column (grid, CHILD_LEFT (child) + CHILD_WIDTH (child));
+      {
+        int col = gtk_grid_layout_child_get_left_attach (child) +
+                  gtk_grid_layout_child_get_column_span (child);
+        gtk_grid_insert_column (grid, col);
+      }
       break;
     case GTK_POS_TOP:
-      gtk_grid_insert_row (grid, CHILD_TOP (child));
+      gtk_grid_insert_row (grid, gtk_grid_layout_child_get_top_attach (child));
       break;
     case GTK_POS_BOTTOM:
-      gtk_grid_insert_row (grid, CHILD_TOP (child) + CHILD_HEIGHT (child));
+      {
+        int row = gtk_grid_layout_child_get_top_attach (child) +
+                  gtk_grid_layout_child_get_row_span (child);
+        gtk_grid_insert_row (grid, row);
+      }
       break;
     default:
       g_assert_not_reached ();
@@ -2136,16 +828,14 @@ gtk_grid_set_row_homogeneous (GtkGrid  *grid,
                               gboolean  homogeneous)
 {
   GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
+  gboolean old_val;
+
   g_return_if_fail (GTK_IS_GRID (grid));
 
-  /* Yes, homogeneous rows means all the columns have the same size */
-  if (COLUMNS (priv)->homogeneous != homogeneous)
+  old_val = gtk_grid_layout_get_row_homogeneous (GTK_GRID_LAYOUT (priv->layout_manager));
+  if (old_val != !!homogeneous)
     {
-      COLUMNS (priv)->homogeneous = homogeneous;
-
-      if (_gtk_widget_get_visible (GTK_WIDGET (grid)))
-        gtk_widget_queue_resize (GTK_WIDGET (grid));
-
+      gtk_grid_layout_set_row_homogeneous (GTK_GRID_LAYOUT (priv->layout_manager), homogeneous);
       g_object_notify_by_pspec (G_OBJECT (grid), obj_properties [PROP_ROW_HOMOGENEOUS]);
     }
 }
@@ -2162,9 +852,10 @@ gboolean
 gtk_grid_get_row_homogeneous (GtkGrid *grid)
 {
   GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
+
   g_return_val_if_fail (GTK_IS_GRID (grid), FALSE);
 
-  return COLUMNS (priv)->homogeneous;
+  return gtk_grid_layout_get_row_homogeneous (GTK_GRID_LAYOUT (priv->layout_manager));
 }
 
 /**
@@ -2179,16 +870,14 @@ gtk_grid_set_column_homogeneous (GtkGrid  *grid,
                                  gboolean  homogeneous)
 {
   GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
+  gboolean old_val;
+
   g_return_if_fail (GTK_IS_GRID (grid));
 
-  /* Yes, homogeneous columns means all the rows have the same size */
-  if (ROWS (priv)->homogeneous != homogeneous)
+  old_val = gtk_grid_layout_get_column_homogeneous (GTK_GRID_LAYOUT (priv->layout_manager));
+  if (old_val != !!homogeneous)
     {
-      ROWS (priv)->homogeneous = homogeneous;
-
-      if (_gtk_widget_get_visible (GTK_WIDGET (grid)))
-        gtk_widget_queue_resize (GTK_WIDGET (grid));
-
+      gtk_grid_layout_set_column_homogeneous (GTK_GRID_LAYOUT (priv->layout_manager), homogeneous);
       g_object_notify_by_pspec (G_OBJECT (grid), obj_properties [PROP_COLUMN_HOMOGENEOUS]);
     }
 }
@@ -2205,9 +894,10 @@ gboolean
 gtk_grid_get_column_homogeneous (GtkGrid *grid)
 {
   GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
+
   g_return_val_if_fail (GTK_IS_GRID (grid), FALSE);
 
-  return ROWS (priv)->homogeneous;
+  return gtk_grid_layout_get_column_homogeneous (GTK_GRID_LAYOUT (priv->layout_manager));
 }
 
 /**
@@ -2222,16 +912,15 @@ gtk_grid_set_row_spacing (GtkGrid *grid,
                           guint    spacing)
 {
   GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
+  guint old_spacing;
+
   g_return_if_fail (GTK_IS_GRID (grid));
   g_return_if_fail (spacing <= G_MAXINT16);
 
-  if (COLUMNS (priv)->spacing != spacing)
+  old_spacing = gtk_grid_layout_get_row_spacing (GTK_GRID_LAYOUT (priv->layout_manager));
+  if (old_spacing != spacing)
     {
-      COLUMNS (priv)->spacing = spacing;
-
-      if (_gtk_widget_get_visible (GTK_WIDGET (grid)))
-        gtk_widget_queue_resize (GTK_WIDGET (grid));
-
+      gtk_grid_layout_set_row_spacing (GTK_GRID_LAYOUT (priv->layout_manager), spacing);
       g_object_notify_by_pspec (G_OBJECT (grid), obj_properties [PROP_ROW_SPACING]);
     }
 }
@@ -2248,9 +937,10 @@ guint
 gtk_grid_get_row_spacing (GtkGrid *grid)
 {
   GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
+
   g_return_val_if_fail (GTK_IS_GRID (grid), 0);
 
-  return COLUMNS (priv)->spacing;
+  return gtk_grid_layout_get_row_spacing (GTK_GRID_LAYOUT (priv->layout_manager));
 }
 
 /**
@@ -2265,16 +955,15 @@ gtk_grid_set_column_spacing (GtkGrid *grid,
                              guint    spacing)
 {
   GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
+  guint old_spacing;
+
   g_return_if_fail (GTK_IS_GRID (grid));
   g_return_if_fail (spacing <= G_MAXINT16);
 
-  if (ROWS (priv)->spacing != spacing)
+  old_spacing = gtk_grid_layout_get_column_spacing (GTK_GRID_LAYOUT (priv->layout_manager));
+  if (old_spacing != spacing)
     {
-      ROWS (priv)->spacing = spacing;
-
-      if (_gtk_widget_get_visible (GTK_WIDGET (grid)))
-        gtk_widget_queue_resize (GTK_WIDGET (grid));
-
+      gtk_grid_layout_set_column_spacing (GTK_GRID_LAYOUT (priv->layout_manager), spacing);
       g_object_notify_by_pspec (G_OBJECT (grid), obj_properties [PROP_COLUMN_SPACING]);
     }
 }
@@ -2294,63 +983,7 @@ gtk_grid_get_column_spacing (GtkGrid *grid)
 
   g_return_val_if_fail (GTK_IS_GRID (grid), 0);
 
-  return ROWS (priv)->spacing;
-}
-
-static GtkGridRowProperties *
-find_row_properties (GtkGrid      *grid,
-		     gint          row)
-{
-  GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
-  GList *l;
-
-  for (l = priv->row_properties; l != NULL; l = l->next)
-    {
-      GtkGridRowProperties *prop = l->data;
-      if (prop->row == row)
-	return prop;
-    }
-
-  return NULL;
-}
-
-static void
-gtk_grid_row_properties_free (GtkGridRowProperties *props)
-{
-  g_slice_free (GtkGridRowProperties, props);
-}
-
-static GtkGridRowProperties *
-get_row_properties_or_create (GtkGrid      *grid,
-			      gint          row)
-{
-  GtkGridRowProperties *props;
-  GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
-
-  props = find_row_properties (grid, row);
-  if (props)
-    return props;
-
-  props = g_slice_new (GtkGridRowProperties);
-  *props = gtk_grid_row_properties_default;
-  props->row = row;
-
-  priv->row_properties =
-    g_list_prepend (priv->row_properties, props);
-
-  return props;
-}
-
-static const GtkGridRowProperties *
-get_row_properties_or_default (GtkGrid      *grid,
-			       gint          row)
-{
-  GtkGridRowProperties *props;
-
-  props = find_row_properties (grid, row);
-  if (props)
-    return props;
-  return &gtk_grid_row_properties_default;
+  return gtk_grid_layout_get_column_spacing (GTK_GRID_LAYOUT (priv->layout_manager));
 }
 
 /**
@@ -2367,19 +1000,13 @@ gtk_grid_set_row_baseline_position (GtkGrid            *grid,
 				    gint                row,
 				    GtkBaselinePosition pos)
 {
-  GtkGridRowProperties *props;
+  GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
 
   g_return_if_fail (GTK_IS_GRID (grid));
 
-  props = get_row_properties_or_create (grid, row);
-
-  if (props->baseline_position != pos)
-    {
-      props->baseline_position = pos;
-
-      if (_gtk_widget_get_visible (GTK_WIDGET (grid)))
-        gtk_widget_queue_resize (GTK_WIDGET (grid));
-    }
+  gtk_grid_layout_set_row_baseline_position (GTK_GRID_LAYOUT (priv->layout_manager),
+                                             row,
+                                             pos);
 }
 
 /**
@@ -2397,13 +1024,11 @@ GtkBaselinePosition
 gtk_grid_get_row_baseline_position (GtkGrid      *grid,
 				    gint          row)
 {
-  const GtkGridRowProperties *props;
+  GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
 
   g_return_val_if_fail (GTK_IS_GRID (grid), GTK_BASELINE_POSITION_CENTER);
 
-  props = get_row_properties_or_default (grid, row);
-
-  return props->baseline_position;
+  return gtk_grid_layout_get_row_baseline_position (GTK_GRID_LAYOUT (priv->layout_manager), row);
 }
 
 /**
@@ -2421,15 +1046,14 @@ gtk_grid_set_baseline_row (GtkGrid *grid,
 			   gint     row)
 {
   GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
+  int old_row;
 
   g_return_if_fail (GTK_IS_GRID (grid));
 
-  if (priv->baseline_row != row)
+  old_row = gtk_grid_layout_get_baseline_row (GTK_GRID_LAYOUT (priv->layout_manager));
+  if (old_row != row)
     {
-      priv->baseline_row = row;
-
-      if (_gtk_widget_get_visible (GTK_WIDGET (grid)))
-	gtk_widget_queue_resize (GTK_WIDGET (grid));
+      gtk_grid_layout_set_baseline_row (GTK_GRID_LAYOUT (priv->layout_manager), row);
       g_object_notify (G_OBJECT (grid), "baseline-row");
     }
 }
@@ -2449,5 +1073,43 @@ gtk_grid_get_baseline_row (GtkGrid *grid)
 
   g_return_val_if_fail (GTK_IS_GRID (grid), 0);
 
-  return priv->baseline_row;
+  return gtk_grid_layout_get_baseline_row (GTK_GRID_LAYOUT (priv->layout_manager));
+}
+
+/**
+ * gtk_grid_query_child:
+ * @grid: a #GtkGrid
+ * @child: a #GtkWidget child of @grid
+ * @left: (out): the column used to attach the left side of @child
+ * @top: (out): the row used to attach the top side of @child
+ * @width: (out): the number of columns @child spans
+ * @height: (out): the number of rows @child spans
+ *
+ * Queries the attach points and spans of @child inside the given #GtkGrid.
+ */
+void
+gtk_grid_query_child (GtkGrid   *grid,
+                      GtkWidget *child,
+                      gint      *left,
+                      gint      *top,
+                      gint      *width,
+                      gint      *height)
+{
+  GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
+  GtkGridLayoutChild *grid_child;
+
+  g_return_if_fail (GTK_IS_GRID (grid));
+  g_return_if_fail (GTK_IS_WIDGET (child));
+  g_return_if_fail (_gtk_widget_get_parent (child) == (GtkWidget *) grid);
+
+  grid_child = GTK_GRID_LAYOUT_CHILD (gtk_layout_manager_get_layout_child (priv->layout_manager, child));
+
+  if (left != NULL)
+    *left = gtk_grid_layout_child_get_left_attach (grid_child);
+  if (top != NULL)
+    *top = gtk_grid_layout_child_get_top_attach (grid_child);
+  if (width != NULL)
+    *width = gtk_grid_layout_child_get_column_span (grid_child);
+  if (height != NULL)
+    *height = gtk_grid_layout_child_get_row_span (grid_child);
 }
diff --git a/gtk/gtkgrid.h b/gtk/gtkgrid.h
index f40ed7e862..2ac97cba4e 100644
--- a/gtk/gtkgrid.h
+++ b/gtk/gtkgrid.h
@@ -137,6 +137,13 @@ void       gtk_grid_set_baseline_row       (GtkGrid         *grid,
 GDK_AVAILABLE_IN_ALL
 gint       gtk_grid_get_baseline_row       (GtkGrid         *grid);
 
+GDK_AVAILABLE_IN_ALL
+void       gtk_grid_query_child            (GtkGrid         *grid,
+                                            GtkWidget       *child,
+                                            gint            *left,
+                                            gint            *top,
+                                            gint            *width,
+                                            gint            *height);
 
 G_END_DECLS
 
diff --git a/gtk/gtkgridlayout.c b/gtk/gtkgridlayout.c
new file mode 100644
index 0000000000..fe7c9ff4b1
--- /dev/null
+++ b/gtk/gtkgridlayout.c
@@ -0,0 +1,2045 @@
+/* gtkgridlayout.c: Layout manager for grid-like widgets
+ * Copyright 2019  GNOME Foundation
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * SECTION:gtkgridlayout
+ * @Short_description: Layout manager for grid-like widgets
+ * @Title: GtkGridLayout
+ * @See_also: #GtkBoxLayout
+ *
+ * GtkGridLayout is a layout manager which arranges child widgets in
+ * rows and columns, with arbitrary positions and horizontal/vertical
+ * spans.
+ *
+ * Children have an "attach point" defined by the horizontal and vertical
+ * index of the cell they occupy; children can span multiple rows or columns.
+ * The layout properties for setting the attach points and spans are set
+ * using the #GtkGridLayoutChild associated to each child widget.
+ *
+ * The behaviour of GtkGrid when several children occupy the same grid cell
+ * is undefined.
+ *
+ * GtkGridLayout can be used like a #GtkBoxLayout if all children are attached
+ * to the same row or column; however, if you only ever need a single row or
+ * column, you should consider using #GtkBoxLayout.
+ */
+
+#include "config.h"
+
+#include "gtkgridlayout.h"
+
+#include "gtkcontainerprivate.h"
+#include "gtkcsspositionvalueprivate.h"
+#include "gtkdebug.h"
+#include "gtkintl.h"
+#include "gtklayoutchild.h"
+#include "gtkorientableprivate.h"
+#include "gtkprivate.h"
+#include "gtksizerequest.h"
+#include "gtkstylecontextprivate.h"
+#include "gtkwidgetprivate.h"
+
+/* {{{ GtkGridLayoutChild */
+typedef struct {
+  int pos;
+  int span;
+} GridChildAttach;
+
+struct _GtkGridLayoutChild
+{
+  GtkLayoutChild parent_instance;
+
+  GridChildAttach attach[2];
+};
+
+#define CHILD_LEFT_ATTACH(child)        ((child)->attach[GTK_ORIENTATION_HORIZONTAL].pos)
+#define CHILD_COL_SPAN(child)           ((child)->attach[GTK_ORIENTATION_HORIZONTAL].span)
+#define CHILD_TOP_ATTACH(child)         ((child)->attach[GTK_ORIENTATION_VERTICAL].pos)
+#define CHILD_ROW_SPAN(child)           ((child)->attach[GTK_ORIENTATION_VERTICAL].span)
+
+enum {
+  PROP_CHILD_LEFT_ATTACH = 1,
+  PROP_CHILD_TOP_ATTACH,
+  PROP_CHILD_COLUMN_SPAN,
+  PROP_CHILD_ROW_SPAN,
+
+  N_CHILD_PROPERTIES
+};
+
+static GParamSpec *child_props[N_CHILD_PROPERTIES];
+
+G_DEFINE_TYPE (GtkGridLayoutChild, gtk_grid_layout_child, GTK_TYPE_LAYOUT_CHILD)
+
+static void
+gtk_grid_layout_child_set_property (GObject      *gobject,
+                                    guint         prop_id,
+                                    const GValue *value,
+                                    GParamSpec   *pspec)
+{
+  GtkGridLayoutChild *self = GTK_GRID_LAYOUT_CHILD (gobject);
+
+  switch (prop_id)
+    {
+    case PROP_CHILD_LEFT_ATTACH:
+      gtk_grid_layout_child_set_left_attach (self, g_value_get_int (value));
+      break;
+
+    case PROP_CHILD_TOP_ATTACH:
+      gtk_grid_layout_child_set_top_attach (self, g_value_get_int (value));
+      break;
+
+    case PROP_CHILD_COLUMN_SPAN:
+      gtk_grid_layout_child_set_column_span (self, g_value_get_int (value));
+      break;
+
+    case PROP_CHILD_ROW_SPAN:
+      gtk_grid_layout_child_set_row_span (self, g_value_get_int (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_grid_layout_child_get_property (GObject    *gobject,
+                                    guint       prop_id,
+                                    GValue     *value,
+                                    GParamSpec *pspec)
+{
+  GtkGridLayoutChild *self = GTK_GRID_LAYOUT_CHILD (gobject);
+
+  switch (prop_id)
+    {
+    case PROP_CHILD_LEFT_ATTACH:
+      g_value_set_int (value, CHILD_LEFT_ATTACH (self));
+      break;
+
+    case PROP_CHILD_TOP_ATTACH:
+      g_value_set_int (value, CHILD_TOP_ATTACH (self));
+      break;
+
+    case PROP_CHILD_COLUMN_SPAN:
+      g_value_set_int (value, CHILD_COL_SPAN (self));
+      break;
+
+    case PROP_CHILD_ROW_SPAN:
+      g_value_set_int (value, CHILD_ROW_SPAN (self));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_grid_layout_child_class_init (GtkGridLayoutChildClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->set_property = gtk_grid_layout_child_set_property;
+  gobject_class->get_property = gtk_grid_layout_child_get_property;
+
+  /**
+   * GtkGridLayoutChild:left-attach:
+   *
+   * The column number to attach the left side of the child to.
+   */
+  child_props[PROP_CHILD_LEFT_ATTACH] =
+    g_param_spec_int ("left-attach",
+                      P_("Left attachment"),
+                      P_("The column number to attach the left side of the child to"),
+                      G_MININT, G_MAXINT, 0,
+                      GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
+
+  /**
+   * GtkGridLayoutChild:top-attach:
+   *
+   * The row number to attach the top side of the child to.
+   */
+  child_props[PROP_CHILD_TOP_ATTACH] =
+    g_param_spec_int ("top-attach",
+                      P_("Top attachment"),
+                      P_("The row number to attach the top side of a child widget to"),
+                      G_MININT, G_MAXINT, 0,
+                      GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
+
+  /**
+   * GtkGridLayoutChild:column-span:
+   *
+   * The number of columns the child spans to.
+   */
+  child_props[PROP_CHILD_COLUMN_SPAN] =
+    g_param_spec_int ("column-span",
+                      P_("Column span"),
+                      P_("The number of columns that a child spans"),
+                      1, G_MAXINT, 1,
+                      GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
+
+  /**
+   * GtkGridLayoutChild:row-span:
+   *
+   * The number of rows the child spans to.
+   */
+  child_props[PROP_CHILD_ROW_SPAN] =
+    g_param_spec_int ("row-span",
+                      P_("Row span"),
+                      P_("The number of rows that a child spans"),
+                      1, G_MAXINT, 1,
+                      GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
+
+  g_object_class_install_properties (gobject_class, N_CHILD_PROPERTIES, child_props);
+}
+
+static void
+gtk_grid_layout_child_init (GtkGridLayoutChild *self)
+{
+}
+
+/**
+ * gtk_grid_layout_child_set_top_attach:
+ * @child: a #GtkGridLayoutChild
+ * @attach: the attach point for @child
+ *
+ * Sets the row number to attach the top side of @child.
+ */
+void
+gtk_grid_layout_child_set_top_attach (GtkGridLayoutChild *child,
+                                      int                 attach)
+{
+  g_return_if_fail (GTK_IS_GRID_LAYOUT_CHILD (child));
+
+  if (CHILD_TOP_ATTACH (child) == attach)
+    return;
+
+  CHILD_TOP_ATTACH (child) = attach;
+
+  gtk_layout_manager_layout_changed (gtk_layout_child_get_layout_manager (GTK_LAYOUT_CHILD (child)));
+
+  g_object_notify_by_pspec (G_OBJECT (child), child_props[PROP_CHILD_TOP_ATTACH]);
+}
+
+/**
+ * gtk_grid_layout_child_get_top_attach:
+ * @child: a #GtkGridLayoutChild
+ *
+ * Retrieves the row number to which @child attaches its top side.
+ *
+ * Returns: the row number
+ */
+int
+gtk_grid_layout_child_get_top_attach (GtkGridLayoutChild *child)
+{
+  g_return_val_if_fail (GTK_IS_GRID_LAYOUT_CHILD (child), 0);
+
+  return CHILD_TOP_ATTACH (child);
+}
+
+/**
+ * gtk_grid_layout_child_set_left_attach:
+ * @child: a #GtkGridLayoutChild
+ * @attach: the attach point for @child
+ *
+ * Sets the column number to attach the left side of @child.
+ */
+void
+gtk_grid_layout_child_set_left_attach (GtkGridLayoutChild *child,
+                                       int                 attach)
+{
+  g_return_if_fail (GTK_IS_GRID_LAYOUT_CHILD (child));
+
+  if (CHILD_LEFT_ATTACH (child) == attach)
+    return;
+
+  CHILD_LEFT_ATTACH (child) = attach;
+
+  gtk_layout_manager_layout_changed (gtk_layout_child_get_layout_manager (GTK_LAYOUT_CHILD (child)));
+
+  g_object_notify_by_pspec (G_OBJECT (child), child_props[PROP_CHILD_LEFT_ATTACH]);
+}
+
+/**
+ * gtk_grid_layout_child_get_left_attach:
+ * @child: a #GtkGridLayoutChild
+ *
+ * Retrieves the column number to which @child attaches its left side.
+ *
+ * Returns: the column number
+ */
+int
+gtk_grid_layout_child_get_left_attach (GtkGridLayoutChild *child)
+{
+  g_return_val_if_fail (GTK_IS_GRID_LAYOUT_CHILD (child), 0);
+
+  return CHILD_LEFT_ATTACH (child);
+}
+
+/**
+ * gtk_grid_layout_child_set_column_span:
+ * @child: a #GtkGridLayoutChild
+ * @span: the span of @child
+ *
+ * Sets the number of columns @child spans to.
+ */
+void
+gtk_grid_layout_child_set_column_span (GtkGridLayoutChild *child,
+                                       int                 span)
+{
+  g_return_if_fail (GTK_IS_GRID_LAYOUT_CHILD (child));
+
+  if (CHILD_COL_SPAN (child) == span)
+    return;
+
+  CHILD_COL_SPAN (child) = span;
+
+  gtk_layout_manager_layout_changed (gtk_layout_child_get_layout_manager (GTK_LAYOUT_CHILD (child)));
+
+  g_object_notify_by_pspec (G_OBJECT (child), child_props[PROP_CHILD_COLUMN_SPAN]);
+}
+
+/**
+ * gtk_grid_layout_child_get_column_span:
+ * @child: a #GtkGridLayoutChild
+ *
+ * Retrieves the number of columns that @child spans to.
+ *
+ * Returns: the number of columns
+ */
+int
+gtk_grid_layout_child_get_column_span (GtkGridLayoutChild *child)
+{
+  g_return_val_if_fail (GTK_IS_GRID_LAYOUT_CHILD (child), 1);
+
+  return CHILD_COL_SPAN (child);
+}
+
+/**
+ * gtk_grid_layout_child_set_row_span:
+ * @child: a #GtkGridLayoutChild
+ * @span: the span of @child
+ *
+ * Sets the number of rows @child spans to.
+ */
+void
+gtk_grid_layout_child_set_row_span (GtkGridLayoutChild *child,
+                                    int                 span)
+{
+  g_return_if_fail (GTK_IS_GRID_LAYOUT_CHILD (child));
+
+  if (CHILD_ROW_SPAN (child) == span)
+    return;
+
+  CHILD_ROW_SPAN (child) = span;
+
+  gtk_layout_manager_layout_changed (gtk_layout_child_get_layout_manager (GTK_LAYOUT_CHILD (child)));
+
+  g_object_notify_by_pspec (G_OBJECT (child), child_props[PROP_CHILD_ROW_SPAN]);
+}
+
+/**
+ * gtk_grid_layout_child_get_row_span:
+ * @child: a #GtkGridLayoutChild
+ *
+ * Retrieves the number of rows that @child spans to.
+ *
+ * Returns: the number of row
+ */
+int
+gtk_grid_layout_child_get_row_span (GtkGridLayoutChild *child)
+{
+  g_return_val_if_fail (GTK_IS_GRID_LAYOUT_CHILD (child), 1);
+
+  return CHILD_ROW_SPAN (child);
+}
+
+/* }}} */
+
+/* {{{ GtkGridLayout */
+
+typedef struct {
+  int row;
+  GtkBaselinePosition baseline_position;
+} GridRowProperties;
+
+static const GridRowProperties grid_row_properties_default = {
+  0,
+  GTK_BASELINE_POSITION_CENTER
+};
+
+/* A GridLineData struct contains row/column specific parts
+ * of the grid.
+ */
+typedef struct {
+  gint16 spacing;
+  guint homogeneous : 1;
+} GridLineData;
+
+#define ROWS(layout)    (&(layout)->linedata[GTK_ORIENTATION_HORIZONTAL])
+#define COLUMNS(layout) (&(layout)->linedata[GTK_ORIENTATION_VERTICAL])
+
+/* A GridLine struct represents a single row or column
+ * during size requests
+ */
+typedef struct {
+  int minimum;
+  int natural;
+  int minimum_above;
+  int minimum_below;
+  int natural_above;
+  int natural_below;
+
+  int position;
+  int allocation;
+  int allocated_baseline;
+
+  guint need_expand : 1;
+  guint expand      : 1;
+  guint empty       : 1;
+} GridLine;
+
+typedef struct {
+  GridLine *lines;
+  int min, max;
+} GridLines;
+
+typedef struct {
+  GtkGridLayout *layout;
+  GtkWidget *widget;
+
+  GridLines lines[2];
+} GridRequest;
+
+struct _GtkGridLayout
+{
+  GtkLayoutManager parent_instance;
+
+  /* Array<GridRowProperties> */
+  GArray *row_properties;
+
+  GtkOrientation orientation;
+  int baseline_row;
+
+  GridLineData linedata[2];
+};
+
+enum {
+  PROP_ROW_SPACING = 1,
+  PROP_COLUMN_SPACING,
+  PROP_ROW_HOMOGENEOUS,
+  PROP_COLUMN_HOMOGENEOUS,
+  PROP_BASELINE_ROW,
+
+  N_PROPERTIES
+};
+
+static GParamSpec *layout_props[N_PROPERTIES];
+
+G_DEFINE_TYPE (GtkGridLayout, gtk_grid_layout, GTK_TYPE_LAYOUT_MANAGER)
+
+static inline GtkGridLayoutChild *
+get_grid_child (GtkGridLayout *self,
+                GtkWidget     *child)
+{
+  GtkLayoutManager *manager = GTK_LAYOUT_MANAGER (self);
+
+  return GTK_GRID_LAYOUT_CHILD (gtk_layout_manager_get_layout_child (manager, child));
+}
+
+static int
+get_spacing (GtkGridLayout  *self,
+             GtkWidget      *widget,
+             GtkOrientation  orientation)
+{
+  GtkCssValue *border_spacing;
+  gint css_spacing;
+
+  border_spacing = _gtk_style_context_peek_property (gtk_widget_get_style_context (widget),
+                                                     GTK_CSS_PROPERTY_BORDER_SPACING);
+  if (orientation == GTK_ORIENTATION_HORIZONTAL)
+    css_spacing = _gtk_css_position_value_get_x (border_spacing, 100);
+  else
+    css_spacing = _gtk_css_position_value_get_y (border_spacing, 100);
+
+  return css_spacing + self->linedata[orientation].spacing;
+}
+
+/* Calculates the min and max numbers for both orientations. */
+static void
+grid_request_count_lines (GridRequest *request)
+{
+  GtkWidget *child;
+  int min[2];
+  int max[2];
+
+  min[0] = min[1] = G_MAXINT;
+  max[0] = max[1] = G_MININT;
+
+  for (child = gtk_widget_get_first_child (request->widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    {
+      GtkGridLayoutChild *grid_child = get_grid_child (request->layout, child);
+      GridChildAttach *attach = grid_child->attach;
+
+      min[0] = MIN (min[0], attach[0].pos);
+      max[0] = MAX (max[0], attach[0].pos + attach[0].span);
+      min[1] = MIN (min[1], attach[1].pos);
+      max[1] = MAX (max[1], attach[1].pos + attach[1].span);
+    }
+
+  request->lines[0].min = min[0];
+  request->lines[0].max = max[0];
+  request->lines[1].min = min[1];
+  request->lines[1].max = max[1];
+}
+
+/* Sets line sizes to 0 and marks lines as expand
+ * if they have a non-spanning expanding child.
+ */
+static void
+grid_request_init (GridRequest    *request,
+                   GtkOrientation  orientation)
+{
+  GtkWidget *child;
+  GridLines *lines;
+  int i;
+
+  lines = &request->lines[orientation];
+
+  for (i = 0; i < lines->max - lines->min; i++)
+    {
+      lines->lines[i].minimum = 0;
+      lines->lines[i].natural = 0;
+      lines->lines[i].minimum_above = -1;
+      lines->lines[i].minimum_below = -1;
+      lines->lines[i].natural_above = -1;
+      lines->lines[i].natural_below = -1;
+      lines->lines[i].expand = FALSE;
+      lines->lines[i].empty = TRUE;
+    }
+
+
+  for (child = gtk_widget_get_first_child (request->widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    {
+      GtkGridLayoutChild *grid_child = get_grid_child (request->layout, child);
+      GridChildAttach *attach;
+
+      attach = &grid_child->attach[orientation];
+      if (attach->span == 1 && gtk_widget_compute_expand (child, orientation))
+        lines->lines[attach->pos - lines->min].expand = TRUE;
+    }
+}
+
+/* Sums allocations for lines spanned by child and their spacing.
+ */
+static gint
+compute_allocation_for_child (GridRequest        *request,
+                              GtkGridLayoutChild *child,
+                              GtkOrientation      orientation)
+{
+  GridLines *lines;
+  GridLine *line;
+  GridChildAttach *attach;
+  int size;
+  int i;
+
+  lines = &request->lines[orientation];
+  attach = &child->attach[orientation];
+
+  size = (attach->span - 1) * get_spacing (request->layout, request->widget, orientation);
+  for (i = 0; i < attach->span; i++)
+    {
+      line = &lines->lines[attach->pos - lines->min + i];
+      size += line->allocation;
+    }
+
+  return size;
+}
+
+static void
+compute_request_for_child (GridRequest        *request,
+                           GtkWidget          *child,
+                           GtkGridLayoutChild *grid_child,
+                           GtkOrientation      orientation,
+                           gboolean            contextual,
+                           int                *minimum,
+                           int                *natural,
+                           int                *minimum_baseline,
+                           int                *natural_baseline)
+{
+  if (minimum_baseline != NULL)
+    *minimum_baseline = -1;
+  if (natural_baseline != NULL)
+    *natural_baseline = -1;
+
+  if (contextual)
+    {
+      int size;
+
+      size = compute_allocation_for_child (request, grid_child, 1 - orientation);
+
+      gtk_widget_measure (child,
+                          orientation,
+                          size,
+                          minimum, natural,
+                          minimum_baseline, natural_baseline);
+    }
+  else
+    {
+      gtk_widget_measure (child,
+                          orientation,
+                          -1,
+                          minimum, natural,
+                          minimum_baseline, natural_baseline);
+    }
+}
+
+/* Sets requisition to max. of non-spanning children.
+ * If contextual is TRUE, requires allocations of
+ * lines in the opposite orientation to be set.
+ */
+static void
+grid_request_non_spanning (GridRequest    *request,
+                           GtkOrientation  orientation,
+                             gboolean        contextual)
+{
+  GtkWidget *child;
+  GridLines *lines;
+  GridLine *line;
+  int i;
+  GtkBaselinePosition baseline_pos;
+  int minimum, minimum_baseline;
+  int natural, natural_baseline;
+
+  lines = &request->lines[orientation];
+
+  for (child = gtk_widget_get_first_child (request->widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    {
+      GtkGridLayoutChild *grid_child = get_grid_child (request->layout, child);
+      GridChildAttach *attach;
+
+      if (!_gtk_widget_get_visible (child))
+        continue;
+
+      attach = &grid_child->attach[orientation];
+      if (attach->span != 1)
+        continue;
+
+      compute_request_for_child (request, child, grid_child, orientation, contextual, &minimum, &natural, &minimum_baseline, &natural_baseline);
+
+      line = &lines->lines[attach->pos - lines->min];
+
+      if (minimum_baseline != -1)
+        {
+          line->minimum_above = MAX (line->minimum_above, minimum_baseline);
+          line->minimum_below = MAX (line->minimum_below, minimum - minimum_baseline);
+          line->natural_above = MAX (line->natural_above, natural_baseline);
+          line->natural_below = MAX (line->natural_below, natural - natural_baseline);
+        }
+      else
+        {
+          line->minimum = MAX (line->minimum, minimum);
+          line->natural = MAX (line->natural, natural);
+        }
+    }
+
+  for (i = 0; i < lines->max - lines->min; i++)
+    {
+      line = &lines->lines[i];
+
+      if (line->minimum_above != -1)
+        {
+          line->minimum = MAX (line->minimum, line->minimum_above + line->minimum_below);
+          line->natural = MAX (line->natural, line->natural_above + line->natural_below);
+
+          baseline_pos = gtk_grid_layout_get_row_baseline_position (request->layout, i + lines->min);
+
+          switch (baseline_pos)
+            {
+            case GTK_BASELINE_POSITION_TOP:
+              line->minimum_above += 0;
+              line->minimum_below += line->minimum - (line->minimum_above + line->minimum_below);
+              line->natural_above += 0;
+              line->natural_below += line->natural - (line->natural_above + line->natural_below);
+              break;
+
+            case GTK_BASELINE_POSITION_CENTER:
+              line->minimum_above += (line->minimum - (line->minimum_above + line->minimum_below))/2;
+              line->minimum_below += (line->minimum - (line->minimum_above + line->minimum_below))/2;
+              line->natural_above += (line->natural - (line->natural_above + line->natural_below))/2;
+              line->natural_below += (line->natural - (line->natural_above + line->natural_below))/2;
+              break;
+
+            case GTK_BASELINE_POSITION_BOTTOM:
+              line->minimum_above += line->minimum - (line->minimum_above + line->minimum_below);
+              line->minimum_below += 0;
+              line->natural_above += line->natural - (line->natural_above + line->natural_below);
+              line->natural_below += 0;
+              break;
+
+            default:
+              break;
+            }
+        }
+    }
+}
+
+/* Enforce homogeneous sizes */
+static void
+grid_request_homogeneous (GridRequest    *request,
+                          GtkOrientation  orientation)
+{
+  GtkGridLayout *self = request->layout;
+  GridLineData *linedata;
+  GridLines *lines;
+  gint minimum, natural;
+  gint i;
+
+  linedata = &self->linedata[orientation];
+  lines = &request->lines[orientation];
+
+  if (!linedata->homogeneous)
+    return;
+
+  minimum = 0;
+  natural = 0;
+
+  for (i = 0; i < lines->max - lines->min; i++)
+    {
+      minimum = MAX (minimum, lines->lines[i].minimum);
+      natural = MAX (natural, lines->lines[i].natural);
+    }
+
+  for (i = 0; i < lines->max - lines->min; i++)
+    {
+      lines->lines[i].minimum = minimum;
+      lines->lines[i].natural = natural;
+
+      /* TODO: Do we want to adjust the baseline here too?
+       * And if so, also in the homogeneous resize.
+       */
+    }
+}
+
+/* Deals with spanning children.
+ * Requires expand fields of lines to be set for
+ * non-spanning children.
+ */
+static void
+grid_request_spanning (GridRequest    *request,
+                       GtkOrientation  orientation,
+                       gboolean        contextual)
+{
+  GtkGridLayout *self = request->layout;
+  GtkWidget *child;
+  GridChildAttach *attach;
+  GridLineData *linedata;
+  GridLines *lines;
+  GridLine *line;
+  int minimum, natural;
+  int span_minimum, span_natural;
+  int span_expand;
+  gboolean force_expand;
+  int spacing;
+  int extra;
+  int expand;
+  int line_extra;
+  int i;
+
+  linedata = &self->linedata[orientation];
+  lines = &request->lines[orientation];
+  spacing = get_spacing (request->layout, request->widget, orientation);
+
+  for (child = gtk_widget_get_first_child (request->widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    {
+      GtkGridLayoutChild *grid_child = get_grid_child (request->layout, child);
+
+      if (!_gtk_widget_get_visible (child))
+        continue;
+
+      attach = &grid_child->attach[orientation];
+      if (attach->span == 1)
+        continue;
+
+      /* We ignore baselines for spanning children */
+      compute_request_for_child (request, child, grid_child, orientation, contextual, &minimum, &natural, NULL, NULL);
+
+      span_minimum = (attach->span - 1) * spacing;
+      span_natural = (attach->span - 1) * spacing;
+      span_expand = 0;
+      force_expand = FALSE;
+      for (i = 0; i < attach->span; i++)
+        {
+          line = &lines->lines[attach->pos - lines->min + i];
+          span_minimum += line->minimum;
+          span_natural += line->natural;
+          if (line->expand)
+            span_expand += 1;
+        }
+      if (span_expand == 0)
+        {
+          span_expand = attach->span;
+          force_expand = TRUE;
+        }
+
+      /* If we need to request more space for this child to fill
+       * its requisition, then divide up the needed space amongst the
+       * lines it spans, favoring expandable lines if any.
+       *
+       * When doing homogeneous allocation though, try to keep the
+       * line allocations even, since we're going to force them to
+       * be the same anyway, and we don't want to introduce unnecessary
+       * extra space.
+       */
+      if (span_minimum < minimum)
+        {
+          if (linedata->homogeneous)
+            {
+              int total, m;
+
+              total = minimum - (attach->span - 1) * spacing;
+              m = total / attach->span + (total % attach->span ? 1 : 0);
+              for (i = 0; i < attach->span; i++)
+                {
+                  line = &lines->lines[attach->pos - lines->min + i];
+                  line->minimum = MAX (line->minimum, m);
+                }
+            }
+          else
+            {
+              extra = minimum - span_minimum;
+              expand = span_expand;
+              for (i = 0; i < attach->span; i++)
+                {
+                  line = &lines->lines[attach->pos - lines->min + i];
+                  if (force_expand || line->expand)
+                    {
+                      line_extra = extra / expand;
+                      line->minimum += line_extra;
+                      extra -= line_extra;
+                      expand -= 1;
+                    }
+                }
+            }
+        }
+
+      if (span_natural < natural)
+        {
+          if (linedata->homogeneous)
+            {
+              int total, n;
+
+              total = natural - (attach->span - 1) * spacing;
+              n = total / attach->span + (total % attach->span ? 1 : 0);
+              for (i = 0; i < attach->span; i++)
+                {
+                  line = &lines->lines[attach->pos - lines->min + i];
+                  line->natural = MAX (line->natural, n);
+                }
+            }
+          else
+            {
+              extra = natural - span_natural;
+              expand = span_expand;
+              for (i = 0; i < attach->span; i++)
+                {
+                  line = &lines->lines[attach->pos - lines->min + i];
+                  if (force_expand || line->expand)
+                    {
+                      line_extra = extra / expand;
+                      line->natural += line_extra;
+                      extra -= line_extra;
+                      expand -= 1;
+                    }
+                }
+            }
+        }
+    }
+}
+
+/* Marks empty and expanding lines and counts them */
+static void
+grid_request_compute_expand (GridRequest    *request,
+                             GtkOrientation  orientation,
+                             int             min,
+                             int             max,
+                             int            *nonempty_lines,
+                             int            *expand_lines)
+{
+  GtkWidget *child;
+  GridChildAttach *attach;
+  int i;
+  GridLines *lines;
+  GridLine *line;
+  gboolean has_expand;
+  int expand;
+  int empty;
+
+  lines = &request->lines[orientation];
+
+  min = MAX (min, lines->min);
+  max = MIN (max, lines->max);
+
+  for (i = min - lines->min; i < max - lines->min; i++)
+    {
+      lines->lines[i].need_expand = FALSE;
+      lines->lines[i].expand = FALSE;
+      lines->lines[i].empty = TRUE;
+    }
+
+  for (child = gtk_widget_get_first_child (request->widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    {
+      GtkGridLayoutChild *grid_child = get_grid_child (request->layout, child);
+
+      if (!_gtk_widget_get_visible (child))
+        continue;
+
+      attach = &grid_child->attach[orientation];
+      if (attach->span != 1)
+        continue;
+
+      if (attach->pos >= max || attach->pos < min)
+        continue;
+
+      line = &lines->lines[attach->pos - lines->min];
+      line->empty = FALSE;
+      if (gtk_widget_compute_expand (child, orientation))
+        line->expand = TRUE;
+    }
+
+  for (child = gtk_widget_get_first_child (request->widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    {
+      GtkGridLayoutChild *grid_child = get_grid_child (request->layout, child);
+
+      if (!_gtk_widget_get_visible (child))
+        continue;
+
+      attach = &grid_child->attach[orientation];
+      if (attach->span == 1)
+        continue;
+
+      has_expand = FALSE;
+      for (i = 0; i < attach->span; i++)
+        {
+          line = &lines->lines[attach->pos - lines->min + i];
+
+          if (line->expand)
+            has_expand = TRUE;
+
+          if (attach->pos + i >= max || attach->pos + 1 < min)
+            continue;
+
+          line->empty = FALSE;
+        }
+
+      if (!has_expand && gtk_widget_compute_expand (child, orientation))
+        {
+          for (i = 0; i < attach->span; i++)
+            {
+              if (attach->pos + i >= max || attach->pos + 1 < min)
+                continue;
+
+              line = &lines->lines[attach->pos - lines->min + i];
+              line->need_expand = TRUE;
+            }
+        }
+    }
+
+  empty = 0;
+  expand = 0;
+  for (i = min - lines->min; i < max - lines->min; i++)
+    {
+      line = &lines->lines[i];
+
+      if (line->need_expand)
+        line->expand = TRUE;
+
+      if (line->empty)
+        empty += 1;
+
+      if (line->expand)
+        expand += 1;
+    }
+
+  if (nonempty_lines)
+    *nonempty_lines = max - min - empty;
+
+  if (expand_lines)
+    *expand_lines = expand;
+}
+
+/* Sums the minimum and natural fields of lines and their spacing */
+static void
+grid_request_sum (GridRequest    *request,
+                  GtkOrientation  orientation,
+                  int            *minimum,
+                  int            *natural,
+                  int            *minimum_baseline,
+                  int            *natural_baseline)
+{
+  GtkGridLayout *self = request->layout;
+  GridLines *lines;
+  int i;
+  int min, nat;
+  int nonempty;
+  int spacing;
+
+  grid_request_compute_expand (request, orientation, G_MININT, G_MAXINT, &nonempty, NULL);
+
+  lines = &request->lines[orientation];
+  spacing = get_spacing (request->layout, request->widget, orientation);
+
+  min = 0;
+  nat = 0;
+  for (i = 0; i < lines->max - lines->min; i++)
+    {
+      if (orientation == GTK_ORIENTATION_VERTICAL &&
+          lines->min + i == self->baseline_row &&
+          lines->lines[i].minimum_above != -1)
+        {
+          if (minimum_baseline)
+            *minimum_baseline = min + lines->lines[i].minimum_above;
+          if (natural_baseline)
+            *natural_baseline = nat + lines->lines[i].natural_above;
+        }
+
+      min += lines->lines[i].minimum;
+      nat += lines->lines[i].natural;
+
+      if (!lines->lines[i].empty)
+        {
+          min += spacing;
+          nat += spacing;
+        }
+    }
+
+  /* Remove last spacing, if any was applied */
+  if (nonempty > 0)
+    {
+      min -= spacing;
+      nat -= spacing;
+    }
+
+  *minimum = min;
+  *natural = nat;
+}
+
+/* Computes minimum and natural fields of lines.
+ * When contextual is TRUE, requires allocation of
+ * lines in the opposite orientation to be set.
+ */
+static void
+grid_request_run (GridRequest    *request,
+                  GtkOrientation  orientation,
+                  gboolean        contextual)
+{
+  grid_request_init (request, orientation);
+  grid_request_non_spanning (request, orientation, contextual);
+  grid_request_homogeneous (request, orientation);
+  grid_request_spanning (request, orientation, contextual);
+  grid_request_homogeneous (request, orientation);
+}
+
+static void
+grid_distribute_non_homogeneous (GridLines *lines,
+                                 int        nonempty,
+                                 int        expand,
+                                 int        size,
+                                 int        min,
+                                 int        max)
+{
+  GtkRequestedSize *sizes;
+  GridLine *line;
+  int extra;
+  int rest;
+  int i, j;
+
+  if (nonempty == 0)
+    return;
+
+  sizes = g_newa (GtkRequestedSize, nonempty);
+
+  j = 0;
+  for (i = min - lines->min; i < max - lines->min; i++)
+    {
+      line = &lines->lines[i];
+      if (line->empty)
+        continue;
+
+      size -= line->minimum;
+
+      sizes[j].minimum_size = line->minimum;
+      sizes[j].natural_size = line->natural;
+      sizes[j].data = line;
+      j++;
+    }
+
+  size = gtk_distribute_natural_allocation (MAX (0, size), nonempty, sizes);
+
+  if (expand > 0)
+    {
+      extra = size / expand;
+      rest = size % expand;
+    }
+  else
+    {
+      extra = 0;
+      rest = 0;
+    }
+
+  j = 0;
+  for (i = min - lines->min; i < max - lines->min; i++)
+    {
+      line = &lines->lines[i];
+      if (line->empty)
+        continue;
+
+      g_assert (line == sizes[j].data);
+
+      line->allocation = sizes[j].minimum_size;
+      if (line->expand)
+        {
+          line->allocation += extra;
+          if (rest > 0)
+            {
+              line->allocation += 1;
+              rest -= 1;
+            }
+        }
+
+      j++;
+    }
+}
+
+/* Requires that the minimum and natural fields of lines
+ * have been set, computes the allocation field of lines
+ * by distributing total_size among lines.
+ */
+static void
+grid_request_allocate (GridRequest    *request,
+                       GtkOrientation  orientation,
+                       int             total_size)
+{
+  GtkGridLayout *self = request->layout;
+  GridLineData *linedata;
+  GridLines *lines;
+  GridLine *line;
+  int nonempty1, nonempty2;
+  int expand1, expand2;
+  int i;
+  GtkBaselinePosition baseline_pos;
+  int baseline;
+  int extra, extra2;
+  int rest;
+  int size1, size2;
+  int split, split_pos;
+  int spacing;
+
+  linedata = &self->linedata[orientation];
+  lines = &request->lines[orientation];
+  spacing = get_spacing (request->layout, request->widget, orientation);
+
+  baseline = gtk_widget_get_allocated_baseline (request->widget);
+
+  if (orientation == GTK_ORIENTATION_VERTICAL && baseline != -1 &&
+      self->baseline_row >= lines->min && self->baseline_row < lines->max &&
+      lines->lines[self->baseline_row - lines->min].minimum_above != -1)
+    {
+      split = self->baseline_row;
+      split_pos = baseline - lines->lines[self->baseline_row - lines->min].minimum_above;
+      grid_request_compute_expand (request, orientation, lines->min, split, &nonempty1, &expand1);
+      grid_request_compute_expand (request, orientation, split, lines->max, &nonempty2, &expand2);
+
+      if (nonempty2 > 0)
+        {
+          size1 = split_pos - (nonempty1) * spacing;
+          size2 = (total_size - split_pos) - (nonempty2 - 1) * spacing;
+        }
+      else
+        {
+          size1 = total_size - (nonempty1 - 1) * spacing;
+          size2 = 0;
+        }
+    }
+  else
+    {
+      grid_request_compute_expand (request, orientation, lines->min, lines->max, &nonempty1, &expand1);
+      nonempty2 = expand2 = 0;
+      split = lines->max;
+
+      size1 = total_size - (nonempty1 - 1) * spacing;
+      size2 = 0;
+    }
+
+  if (nonempty1 == 0 && nonempty2 == 0)
+    return;
+
+  if (linedata->homogeneous)
+    {
+      if (nonempty1 > 0)
+        {
+          extra = size1 / nonempty1;
+          rest = size1 % nonempty1;
+        }
+      else
+        {
+          extra = 0;
+          rest = 0;
+        }
+      if (nonempty2 > 0)
+        {
+          extra2 = size2 / nonempty2;
+          if (extra2 < extra || nonempty1 == 0)
+            {
+              extra = extra2;
+              rest = size2 % nonempty2;
+            }
+        }
+
+      for (i = 0; i < lines->max - lines->min; i++)
+        {
+          line = &lines->lines[i];
+          if (line->empty)
+            continue;
+
+          line->allocation = extra;
+          if (rest > 0)
+            {
+              line->allocation += 1;
+              rest -= 1;
+            }
+        }
+    }
+  else
+    {
+      grid_distribute_non_homogeneous (lines,
+                                       nonempty1,
+                                       expand1,
+                                       size1,
+                                       lines->min,
+                                       split);
+      grid_distribute_non_homogeneous (lines,
+                                       nonempty2,
+                                       expand2,
+                                       size2,
+                                       split,
+                                       lines->max);
+    }
+
+  for (i = 0; i < lines->max - lines->min; i++)
+    {
+      line = &lines->lines[i];
+
+      if (line->empty)
+        continue;
+
+      if (line->minimum_above != -1)
+        {
+          /* Note: This is overridden in grid_request_position for the allocated baseline */
+          baseline_pos = gtk_grid_layout_get_row_baseline_position (request->layout, i + lines->min);
+
+          switch (baseline_pos)
+            {
+            case GTK_BASELINE_POSITION_TOP:
+              line->allocated_baseline = line->minimum_above;
+              break;
+            case GTK_BASELINE_POSITION_CENTER:
+              line->allocated_baseline = line->minimum_above +
+                                         (line->allocation - (line->minimum_above + line->minimum_below)) / 2;
+              break;
+            case GTK_BASELINE_POSITION_BOTTOM:
+              line->allocated_baseline = line->allocation - line->minimum_below;
+              break;
+            default:
+              break;
+            }
+        }
+      else
+        line->allocated_baseline = -1;
+    }
+}
+
+/* Computes the position fields from allocation and spacing */
+static void
+grid_request_position (GridRequest    *request,
+                       GtkOrientation  orientation)
+{
+  GtkGridLayout *self = request->layout;
+  GridLines *lines;
+  GridLine *line;
+  int position, old_position;
+  int allocated_baseline;
+  int spacing;
+  int i, j;
+
+  lines = &request->lines[orientation];
+  spacing = get_spacing (request->layout, request->widget, orientation);
+
+  allocated_baseline = gtk_widget_get_allocated_baseline (request->widget);
+
+  position = 0;
+  for (i = 0; i < lines->max - lines->min; i++)
+    {
+      line = &lines->lines[i];
+
+      if (orientation == GTK_ORIENTATION_VERTICAL &&
+          i + lines->min == self->baseline_row &&
+          allocated_baseline != -1 &&
+          lines->lines[i].minimum_above != -1)
+        {
+          old_position = position;
+          position = allocated_baseline - line->minimum_above;
+
+          /* Back-patch previous rows */
+          for (j = 0; j < i; j++)
+            {
+              if (!lines->lines[j].empty)
+                lines->lines[j].position += position - old_position;
+            }
+        }
+
+      if (!line->empty)
+        {
+          line->position = position;
+          position += line->allocation + spacing;
+
+          if (orientation == GTK_ORIENTATION_VERTICAL &&
+              i + lines->min == self->baseline_row &&
+              allocated_baseline != -1 &&
+              lines->lines[i].minimum_above != -1)
+            line->allocated_baseline = allocated_baseline - line->position;
+        }
+    }
+}
+
+static void
+gtk_grid_layout_get_size (GtkGridLayout  *self,
+                          GtkWidget      *widget,
+                          GtkOrientation  orientation,
+                          int            *minimum,
+                          int            *natural,
+                          int            *minimum_baseline,
+                          int            *natural_baseline)
+{
+  GridRequest request;
+  GridLines *lines;
+
+  *minimum = 0;
+  *natural = 0;
+
+  if (minimum_baseline)
+    *minimum_baseline = -1;
+
+  if (natural_baseline)
+    *natural_baseline = -1;
+
+  if (gtk_widget_get_first_child (widget) == NULL)
+    return;
+
+  request.layout = self;
+  request.widget = widget;
+  grid_request_count_lines (&request);
+
+  lines = &request.lines[orientation];
+  lines->lines = g_newa (GridLine, lines->max - lines->min);
+  memset (lines->lines, 0, (lines->max - lines->min) * sizeof (GridLine));
+
+  grid_request_run (&request, orientation, FALSE);
+  grid_request_sum (&request, orientation,
+                    minimum, natural,
+                    minimum_baseline, natural_baseline);
+}
+
+static void
+gtk_grid_layout_get_size_for_size (GtkGridLayout  *self,
+                                   GtkWidget      *widget,
+                                   GtkOrientation  orientation,
+                                   int             size,
+                                   int            *minimum,
+                                   int            *natural,
+                                   int            *minimum_baseline,
+                                   int            *natural_baseline)
+{
+  GridRequest request;
+  GridLines *lines;
+  gint min_size, nat_size;
+
+  *minimum = 0;
+  *natural = 0;
+
+  if (minimum_baseline)
+    *minimum_baseline = -1;
+
+  if (natural_baseline)
+    *natural_baseline = -1;
+
+  if (gtk_widget_get_first_child (widget) == NULL)
+    return;
+
+  request.layout = self;
+  request.widget = widget;
+  grid_request_count_lines (&request);
+
+  lines = &request.lines[0];
+  lines->lines = g_newa (GridLine, lines->max - lines->min);
+  memset (lines->lines, 0, (lines->max - lines->min) * sizeof (GridLine));
+  lines = &request.lines[1];
+  lines->lines = g_newa (GridLine, lines->max - lines->min);
+  memset (lines->lines, 0, (lines->max - lines->min) * sizeof (GridLine));
+
+  grid_request_run (&request, 1 - orientation, FALSE);
+  grid_request_sum (&request, 1 - orientation, &min_size, &nat_size, NULL, NULL);
+  grid_request_allocate (&request, 1 - orientation, MAX (size, min_size));
+
+  grid_request_run (&request, orientation, TRUE);
+  grid_request_sum (&request, orientation,
+                    minimum, natural,
+                    minimum_baseline, natural_baseline);
+}
+
+static void
+gtk_grid_layout_measure (GtkLayoutManager *manager,
+                         GtkWidget        *widget,
+                         GtkOrientation    orientation,
+                         int               for_size,
+                         int              *minimum,
+                         int              *natural,
+                         int              *minimum_baseline,
+                         int              *natural_baseline)
+{
+  GtkGridLayout *self = GTK_GRID_LAYOUT (manager);
+
+  if ((orientation == GTK_ORIENTATION_HORIZONTAL &&
+       gtk_widget_get_request_mode (widget) == GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT) ||
+      (orientation == GTK_ORIENTATION_VERTICAL &&
+       gtk_widget_get_request_mode (widget) == GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH))
+    gtk_grid_layout_get_size_for_size (self, widget, orientation, for_size,
+                                       minimum, natural,
+                                       minimum_baseline, natural_baseline);
+  else
+    gtk_grid_layout_get_size (self, widget, orientation,
+                              minimum, natural,
+                              minimum_baseline, natural_baseline);
+}
+
+static void
+allocate_child (GridRequest        *request,
+                GtkOrientation      orientation,
+                GtkWidget          *child,
+                GtkGridLayoutChild *grid_child,
+                int                *position,
+                int                *size,
+                int                *baseline)
+{
+  GridLines *lines;
+  GridLine *line;
+  GridChildAttach *attach;
+  int i;
+
+  lines = &request->lines[orientation];
+  attach = &grid_child->attach[orientation];
+
+  *position = lines->lines[attach->pos - lines->min].position;
+  if (attach->span == 1 && gtk_widget_get_valign (child) == GTK_ALIGN_BASELINE)
+    *baseline = lines->lines[attach->pos - lines->min].allocated_baseline;
+  else
+    *baseline = -1;
+
+  *size = (attach->span - 1) * get_spacing (request->layout, request->widget, orientation);
+  for (i = 0; i < attach->span; i++)
+    {
+      line = &lines->lines[attach->pos - lines->min + i];
+      *size += line->allocation;
+    }
+}
+
+static void
+grid_request_allocate_children (GridRequest *request,
+                                int          grid_width,
+                                int          grid_height)
+{
+  GtkWidget *child;
+  GtkAllocation child_allocation;
+  gint x, y, width, height, baseline, ignore;
+
+
+  for (child = gtk_widget_get_first_child (request->widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    {
+      GtkGridLayoutChild *grid_child = get_grid_child (request->layout, child);
+
+      if (!_gtk_widget_get_visible (child))
+        continue;
+
+      allocate_child (request, GTK_ORIENTATION_HORIZONTAL, child, grid_child, &x, &width, &ignore);
+      allocate_child (request, GTK_ORIENTATION_VERTICAL, child, grid_child, &y, &height, &baseline);
+
+      child_allocation.x = x;
+      child_allocation.y = y;
+      child_allocation.width = width;
+      child_allocation.height = height;
+
+      if (_gtk_widget_get_direction (request->widget) == GTK_TEXT_DIR_RTL)
+        child_allocation.x = grid_width - child_allocation.x - child_allocation.width;
+
+      gtk_widget_size_allocate (child, &child_allocation, baseline);
+    }
+}
+
+#define GET_SIZE(width, height, orientation) (orientation == GTK_ORIENTATION_HORIZONTAL ? width : height)
+
+static void
+gtk_grid_layout_allocate (GtkLayoutManager *manager,
+                          GtkWidget        *widget,
+                          int               width,
+                          int               height,
+                          int              baseline)
+{
+  GtkGridLayout *self = GTK_GRID_LAYOUT (manager);
+  GridRequest request;
+  GridLines *lines;
+  GtkOrientation orientation;
+
+  if (gtk_widget_get_first_child (widget) == NULL)
+    return;
+
+  request.layout = self;
+  request.widget = widget;
+
+  grid_request_count_lines (&request);
+  lines = &request.lines[0];
+  lines->lines = g_newa (GridLine, lines->max - lines->min);
+  memset (lines->lines, 0, (lines->max - lines->min) * sizeof (GridLine));
+  lines = &request.lines[1];
+  lines->lines = g_newa (GridLine, lines->max - lines->min);
+  memset (lines->lines, 0, (lines->max - lines->min) * sizeof (GridLine));
+
+  if (gtk_widget_get_request_mode (widget) == GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT)
+    orientation = GTK_ORIENTATION_HORIZONTAL;
+  else
+    orientation = GTK_ORIENTATION_VERTICAL;
+
+  grid_request_run (&request, OPPOSITE_ORIENTATION (orientation), FALSE);
+  grid_request_allocate (&request, OPPOSITE_ORIENTATION (orientation),
+                         GET_SIZE (width, height, OPPOSITE_ORIENTATION (orientation)));
+
+  grid_request_run (&request, orientation, TRUE);
+  grid_request_allocate (&request, orientation, GET_SIZE (width, height, orientation));
+
+  grid_request_position (&request, 0);
+  grid_request_position (&request, 1);
+  grid_request_allocate_children (&request, width, height);
+}
+
+static void
+gtk_grid_layout_set_property (GObject      *gobject,
+                              guint         prop_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+  GtkGridLayout *self = GTK_GRID_LAYOUT (gobject);
+
+  switch (prop_id)
+    {
+    case PROP_ROW_SPACING:
+      gtk_grid_layout_set_row_spacing (self, g_value_get_int (value));
+      break;
+
+    case PROP_COLUMN_SPACING:
+      gtk_grid_layout_set_column_spacing (self, g_value_get_int (value));
+      break;
+
+    case PROP_ROW_HOMOGENEOUS:
+      gtk_grid_layout_set_row_homogeneous (self, g_value_get_boolean (value));
+      break;
+
+    case PROP_COLUMN_HOMOGENEOUS:
+      gtk_grid_layout_set_column_homogeneous (self, g_value_get_boolean (value));
+      break;
+
+    case PROP_BASELINE_ROW:
+      gtk_grid_layout_set_baseline_row (self, g_value_get_int (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_grid_layout_get_property (GObject    *gobject,
+                              guint       prop_id,
+                              GValue     *value,
+                              GParamSpec *pspec)
+{
+  GtkGridLayout *self = GTK_GRID_LAYOUT (gobject);
+
+  switch (prop_id)
+    {
+    case PROP_ROW_SPACING:
+      g_value_set_int (value, COLUMNS (self)->spacing);
+      break;
+
+    case PROP_COLUMN_SPACING:
+      g_value_set_int (value, ROWS (self)->spacing);
+      break;
+
+    case PROP_ROW_HOMOGENEOUS:
+      g_value_set_boolean (value, COLUMNS (self)->homogeneous);
+      break;
+
+    case PROP_COLUMN_HOMOGENEOUS:
+      g_value_set_boolean (value, ROWS (self)->homogeneous);
+      break;
+
+    case PROP_BASELINE_ROW:
+      g_value_set_int (value, self->baseline_row);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_grid_layout_finalize (GObject *gobject)
+{
+  GtkGridLayout *self = GTK_GRID_LAYOUT (gobject);
+
+  g_clear_pointer (&self->row_properties, g_array_unref);
+
+  G_OBJECT_CLASS (gtk_grid_layout_parent_class)->finalize (gobject);
+}
+
+static void
+gtk_grid_layout_class_init (GtkGridLayoutClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GtkLayoutManagerClass *layout_class = GTK_LAYOUT_MANAGER_CLASS (klass);
+
+  layout_class->layout_child_type = GTK_TYPE_GRID_LAYOUT_CHILD;
+  layout_class->measure = gtk_grid_layout_measure;
+  layout_class->allocate = gtk_grid_layout_allocate;
+
+  gobject_class->set_property = gtk_grid_layout_set_property;
+  gobject_class->get_property = gtk_grid_layout_get_property;
+  gobject_class->finalize = gtk_grid_layout_finalize;
+
+  /**
+   * GtkGridLayout:row-spacing:
+   *
+   * The amount of space between to consecutive rows.
+   */
+  layout_props[PROP_ROW_SPACING] =
+    g_param_spec_int ("row-spacing",
+                      P_("Row spacing"),
+                      P_("The amount of space between two consecutive rows"),
+                      0, G_MAXINT16, 0,
+                      GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
+
+  /**
+   * GtkGridLayout:column-spacing:
+   *
+   * The amount of space between to consecutive columns.
+   */
+  layout_props[PROP_COLUMN_SPACING] =
+    g_param_spec_int ("column-spacing",
+                      P_("Column spacing"),
+                      P_("The amount of space between two consecutive columns"),
+                      0, G_MAXINT16, 0,
+                      GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
+
+  /**
+   * GtkGridLayout:row-homogeneous:
+   *
+   * Whether all the rows in the grid have the same height.
+   */
+  layout_props[PROP_ROW_HOMOGENEOUS] =
+    g_param_spec_boolean ("row-homogeneous",
+                          P_("Row Homogeneous"),
+                          P_("If TRUE, the rows are all the same height"),
+                          FALSE,
+                          GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
+
+  /**
+   * GtkGridLayout:column-homogeneous:
+   *
+   * Whether all the columns in the grid have the same width.
+   */
+  layout_props[PROP_COLUMN_HOMOGENEOUS] =
+    g_param_spec_boolean ("column-homogeneous",
+                          P_("Column Homogeneous"),
+                          P_("If TRUE, the columns are all the same width"),
+                          FALSE,
+                          GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
+
+  /**
+   * GtkGridLayout:baseline-row:
+   *
+   * The row to align to the baseline, when #GtkWidget:valign is set
+   * to %GTK_ALIGN_BASELINE.
+   */
+  layout_props[PROP_BASELINE_ROW] =
+    g_param_spec_int ("baseline-row",
+                      P_("Baseline Row"),
+                      P_("The row to align the to the baseline when valign is GTK_ALIGN_BASELINE"),
+                      0, G_MAXINT, 0,
+                      GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
+
+  g_object_class_install_properties (gobject_class, N_PROPERTIES, layout_props);
+}
+
+static void
+gtk_grid_layout_init (GtkGridLayout *self)
+{
+}
+
+/**
+ * gtk_grid_layou_new:
+ *
+ * Creates a new #GtkGridLayout.
+ *
+ * Returns: the newly created #GtkGridLayout
+ */
+GtkLayoutManager *
+gtk_grid_layout_new (void)
+{
+  return g_object_new (GTK_TYPE_GRID_LAYOUT, NULL);
+}
+
+/**
+ * gtk_grid_layout_set_row_homogeneous:
+ * @grid: a #GtkGridLayout
+ * @homogeneous: %TRUE to make rows homogeneous
+ *
+ * Sets whether all rows of @grid should have the same height.
+ */
+void
+gtk_grid_layout_set_row_homogeneous (GtkGridLayout *grid,
+                                     gboolean       homogeneous)
+{
+  g_return_if_fail (GTK_IS_GRID_LAYOUT (grid));
+
+  /* Yes, homogeneous rows means all the columns have the same size */
+  if (COLUMNS (grid)->homogeneous == !!homogeneous)
+    return;
+
+  COLUMNS (grid)->homogeneous = !!homogeneous;
+
+  gtk_layout_manager_layout_changed (GTK_LAYOUT_MANAGER (grid));
+  g_object_notify_by_pspec (G_OBJECT (grid), layout_props[PROP_ROW_HOMOGENEOUS]);
+}
+
+/**
+ * gtk_grid_layout_get_row_homogeneous:
+ * @grid: a #GtkGridLayout
+ *
+ * Checks whether all rows of @grid should have the same height.
+ *
+ * Returns: %TRUE if the rows are homogeneous, and %FALSE otherwise
+ */
+gboolean
+gtk_grid_layout_get_row_homogeneous (GtkGridLayout *grid)
+{
+  g_return_val_if_fail (GTK_IS_GRID_LAYOUT (grid), FALSE);
+
+  return COLUMNS (grid)->homogeneous;
+}
+
+/**
+ * gtk_grid_layout_set_row_spacing:
+ * @grid: a #GtkGridLayout
+ * @spacing: the amount of space between rows, in pixels
+ *
+ * Sets the amount of space to insert between consecutive rows.
+ */
+void
+gtk_grid_layout_set_row_spacing (GtkGridLayout *grid,
+                                 guint          spacing)
+{
+  g_return_if_fail (GTK_IS_GRID_LAYOUT (grid));
+  g_return_if_fail (spacing <= G_MAXINT16);
+
+  if (COLUMNS (grid)->spacing == spacing)
+    return;
+
+  COLUMNS (grid)->spacing = spacing;
+
+  gtk_layout_manager_layout_changed (GTK_LAYOUT_MANAGER (grid));
+  g_object_notify_by_pspec (G_OBJECT (grid), layout_props[PROP_ROW_SPACING]);
+}
+
+/**
+ * gtk_grid_layout_get_row_spacing:
+ * @grid: a #GtkGridLayout
+ *
+ * Retrieves the spacing set with gtk_grid_layout_set_row_spacing().
+ *
+ * Returns: the spacing between consecutive rows
+ */
+guint
+gtk_grid_layout_get_row_spacing (GtkGridLayout *grid)
+{
+  g_return_val_if_fail (GTK_IS_GRID_LAYOUT (grid), 0);
+
+  return COLUMNS (grid)->spacing;
+}
+
+/**
+ * gtk_grid_layout_set_column_homogeneous:
+ * @grid: a #GtkGridLayout
+ * @homogeneous: %TRUE to make columns homogeneous
+ *
+ * Sets whether all columns of @grid should have the same width.
+ */
+void
+gtk_grid_layout_set_column_homogeneous (GtkGridLayout *grid,
+                                        gboolean       homogeneous)
+{
+  g_return_if_fail (GTK_IS_GRID_LAYOUT (grid));
+
+  /* Yes, homogeneous columns means all the rows have the same size */
+  if (ROWS (grid)->homogeneous == !!homogeneous)
+    return;
+
+  ROWS (grid)->homogeneous = !!homogeneous;
+
+  gtk_layout_manager_layout_changed (GTK_LAYOUT_MANAGER (grid));
+  g_object_notify_by_pspec (G_OBJECT (grid), layout_props[PROP_COLUMN_HOMOGENEOUS]);
+}
+
+/**
+ * gtk_grid_layout_get_column_homogeneous:
+ * @grid: a #GtkGridLayout
+ *
+ * Checks whether all columns of @grid should have the same width.
+ *
+ * Returns: %TRUE if the columns are homogeneous, and %FALSE otherwise
+ */
+gboolean
+gtk_grid_layout_get_column_homogeneous (GtkGridLayout *grid)
+{
+  g_return_val_if_fail (GTK_IS_GRID_LAYOUT (grid), FALSE);
+
+  return ROWS (grid)->homogeneous;
+}
+
+/**
+ * gtk_grid_layout_set_column_spacing:
+ * @grid: a #GtkGridLayout
+ * @spacing: the amount of space between columns, in pixels
+ *
+ * Sets the amount of space to insert between consecutive columns.
+ */
+void
+gtk_grid_layout_set_column_spacing (GtkGridLayout *grid,
+                                    guint          spacing)
+{
+  g_return_if_fail (GTK_IS_GRID_LAYOUT (grid));
+  g_return_if_fail (spacing <= G_MAXINT16);
+
+  if (ROWS (grid)->spacing == spacing)
+    return;
+
+  ROWS (grid)->spacing = spacing;
+
+  gtk_layout_manager_layout_changed (GTK_LAYOUT_MANAGER (grid));
+  g_object_notify_by_pspec (G_OBJECT (grid), layout_props[PROP_COLUMN_SPACING]);
+}
+
+/**
+ * gtk_grid_layout_get_column_spacing:
+ * @grid: a #GtkGridLayout
+ *
+ * Retrieves the spacing set with gtk_grid_layout_set_column_spacing().
+ *
+ * Returns: the spacing between consecutive columns
+ */
+guint
+gtk_grid_layout_get_column_spacing (GtkGridLayout *grid)
+{
+  g_return_val_if_fail (GTK_IS_GRID_LAYOUT (grid), 0);
+
+  return ROWS (grid)->spacing;
+}
+
+static GridRowProperties *
+find_row_properties (GtkGridLayout *self,
+		     int            row)
+{
+  int i;
+
+  if (self->row_properties == NULL)
+    return NULL;
+
+  for (i = 0; i < self->row_properties->len; i++)
+    {
+      GridRowProperties *prop = &g_array_index (self->row_properties, GridRowProperties, i);
+
+      if (prop->row == row)
+        return prop;
+    }
+
+  return NULL;
+}
+
+static GridRowProperties *
+get_row_properties_or_create (GtkGridLayout *self,
+			      int            row)
+{
+  GridRowProperties *props;
+
+  props = find_row_properties (self, row);
+  if (props != NULL)
+    return props;
+
+  /* This is the only place where we create the row properties array;
+   * find_row_properties() is used by getters, so we should not create
+   * the array there.
+   */
+  if (self->row_properties == NULL)
+    self->row_properties = g_array_new (FALSE, FALSE, sizeof (GridRowProperties));
+
+  g_array_append_vals (self->row_properties, &grid_row_properties_default, 1);
+  props = &g_array_index (self->row_properties, GridRowProperties, self->row_properties->len - 1);
+  props->row = row;
+
+  return props;
+}
+
+static const GridRowProperties *
+get_row_properties_or_default (GtkGridLayout *self,
+			       int            row)
+{
+  GridRowProperties *props;
+
+  props = find_row_properties (self, row);
+  if (props != NULL)
+    return props;
+
+  return &grid_row_properties_default;
+}
+
+/**
+ * gtk_grid_layout_set_row_baseline_position:
+ * @grid: a #GtkGridLayout
+ * @row: a row index
+ * @pos: a #GtkBaselinePosition
+ *
+ * Sets how the baseline should be positioned on @row of the
+ * grid, in case that row is assigned more space than is requested.
+ */
+void
+gtk_grid_layout_set_row_baseline_position (GtkGridLayout       *grid,
+                                           int                  row,
+                                           GtkBaselinePosition  pos)
+{
+  GridRowProperties *props;
+
+  g_return_if_fail (GTK_IS_GRID_LAYOUT (grid));
+
+  props = get_row_properties_or_create (grid, row);
+
+  if (props->baseline_position == pos)
+    return;
+
+  props->baseline_position = pos;
+  gtk_layout_manager_layout_changed (GTK_LAYOUT_MANAGER (grid));
+}
+
+/**
+ * gtk_grid_layout_get_row_baseline_position:
+ * @grid: a #GtkGridLayout
+ * @row: a row index
+ *
+ * Returns the baseline position of @row as set by
+ * gtk_grid_layout_set_row_baseline_position(), or the default value
+ * of %GTK_BASELINE_POSITION_CENTER.
+ *
+ * Returns: the baseline position of @row
+ */
+GtkBaselinePosition
+gtk_grid_layout_get_row_baseline_position (GtkGridLayout *grid,
+                                           int            row)
+{
+  const GridRowProperties *props;
+
+  g_return_val_if_fail (GTK_IS_GRID_LAYOUT (grid), GTK_BASELINE_POSITION_CENTER);
+
+  props = get_row_properties_or_default (grid, row);
+
+  return props->baseline_position;
+}
+
+/**
+ * gtk_grid_layout_set_baseline_row:
+ * @grid: a #GtkGridLayout
+ * @row: the row index
+ *
+ * Sets which row defines the global baseline for the entire grid.
+ *
+ * Each row in the grid can have its own local baseline, but only
+ * one of those is global, meaning it will be the baseline in the
+ * parent of the @grid.
+ */
+void
+gtk_grid_layout_set_baseline_row (GtkGridLayout *grid,
+                                  int            row)
+{
+  g_return_if_fail (GTK_IS_GRID_LAYOUT (grid));
+
+  if (grid->baseline_row == row)
+    return;
+
+  grid->baseline_row = row;
+  gtk_layout_manager_layout_changed (GTK_LAYOUT_MANAGER (grid));
+  g_object_notify_by_pspec (G_OBJECT (grid), layout_props[PROP_BASELINE_ROW]);
+}
+
+/**
+ * gtk_grid_layout_get_baseline_row:
+ * @grid: a #GtkGridLayout
+ *
+ * Retrieves the row set with gtk_grid_layout_set_baseline_row().
+ *
+ * Returns: the global baseline row
+ */
+int
+gtk_grid_layout_get_baseline_row (GtkGridLayout *grid)
+{
+  g_return_val_if_fail (GTK_IS_GRID_LAYOUT (grid), GTK_BASELINE_POSITION_CENTER);
+
+  return grid->baseline_row;
+}
+/* }}} */
diff --git a/gtk/gtkgridlayout.h b/gtk/gtkgridlayout.h
new file mode 100644
index 0000000000..a0bd9e4717
--- /dev/null
+++ b/gtk/gtkgridlayout.h
@@ -0,0 +1,101 @@
+/* gtkgridlayout.h: Layout manager for grid-like widgets
+ * Copyright 2019  GNOME Foundation
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include <gtk/gtklayoutmanager.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_GRID_LAYOUT (gtk_grid_layout_get_type ())
+#define GTK_TYPE_GRID_LAYOUT_CHILD (gtk_grid_layout_child_get_type ())
+
+/**
+ * GtkGridLayout:
+ *
+ * Layout manager for grid-like widgets.
+ */
+GDK_AVAILABLE_IN_ALL
+G_DECLARE_FINAL_TYPE (GtkGridLayout, gtk_grid_layout, GTK, GRID_LAYOUT, GtkLayoutManager)
+
+GDK_AVAILABLE_IN_ALL
+GtkLayoutManager *      gtk_grid_layout_new                             (void);
+
+GDK_AVAILABLE_IN_ALL
+void                    gtk_grid_layout_set_row_homogeneous             (GtkGridLayout       *grid,
+                                                                         gboolean             homogeneous);
+GDK_AVAILABLE_IN_ALL
+gboolean                gtk_grid_layout_get_row_homogeneous             (GtkGridLayout       *grid);
+GDK_AVAILABLE_IN_ALL
+void                    gtk_grid_layout_set_row_spacing                 (GtkGridLayout       *grid,
+                                                                         guint                spacing);
+GDK_AVAILABLE_IN_ALL
+guint                   gtk_grid_layout_get_row_spacing                 (GtkGridLayout       *grid);
+GDK_AVAILABLE_IN_ALL
+void                    gtk_grid_layout_set_column_homogeneous          (GtkGridLayout       *grid,
+                                                                         gboolean             homogeneous);
+GDK_AVAILABLE_IN_ALL
+gboolean                gtk_grid_layout_get_column_homogeneous          (GtkGridLayout       *grid);
+GDK_AVAILABLE_IN_ALL
+void                    gtk_grid_layout_set_column_spacing              (GtkGridLayout       *grid,
+                                                                         guint                spacing);
+GDK_AVAILABLE_IN_ALL
+guint                   gtk_grid_layout_get_column_spacing              (GtkGridLayout       *grid);
+GDK_AVAILABLE_IN_ALL
+void                    gtk_grid_layout_set_row_baseline_position       (GtkGridLayout       *grid,
+                                                                         int                  row,
+                                                                         GtkBaselinePosition  pos);
+GDK_AVAILABLE_IN_ALL
+GtkBaselinePosition     gtk_grid_layout_get_row_baseline_position       (GtkGridLayout       *grid,
+                                                                         int                  row);
+GDK_AVAILABLE_IN_ALL
+void                    gtk_grid_layout_set_baseline_row                (GtkGridLayout       *grid,
+                                                                         int                  row);
+GDK_AVAILABLE_IN_ALL
+int                     gtk_grid_layout_get_baseline_row                (GtkGridLayout       *grid);
+
+/**
+ * GtkGridLayoutChild:
+ *
+ * Layout properties for children of #GtkGridLayout.
+ */
+GDK_AVAILABLE_IN_ALL
+G_DECLARE_FINAL_TYPE (GtkGridLayoutChild, gtk_grid_layout_child, GTK, GRID_LAYOUT_CHILD, GtkLayoutChild)
+
+GDK_AVAILABLE_IN_ALL
+void                    gtk_grid_layout_child_set_top_attach            (GtkGridLayoutChild  *child,
+                                                                         int                  attach);
+GDK_AVAILABLE_IN_ALL
+int                     gtk_grid_layout_child_get_top_attach            (GtkGridLayoutChild  *child);
+GDK_AVAILABLE_IN_ALL
+void                    gtk_grid_layout_child_set_left_attach           (GtkGridLayoutChild  *child,
+                                                                         int                  attach);
+GDK_AVAILABLE_IN_ALL
+int                     gtk_grid_layout_child_get_left_attach           (GtkGridLayoutChild  *child);
+GDK_AVAILABLE_IN_ALL
+void                    gtk_grid_layout_child_set_column_span           (GtkGridLayoutChild  *child,
+                                                                         int                  span);
+GDK_AVAILABLE_IN_ALL
+int                     gtk_grid_layout_child_get_column_span           (GtkGridLayoutChild  *child);
+GDK_AVAILABLE_IN_ALL
+void                    gtk_grid_layout_child_set_row_span              (GtkGridLayoutChild  *child,
+                                                                         int                  span);
+GDK_AVAILABLE_IN_ALL
+int                     gtk_grid_layout_child_get_row_span              (GtkGridLayoutChild  *child);
+
+G_END_DECLS
diff --git a/gtk/meson.build b/gtk/meson.build
index 36615fdbd1..e38effb93c 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -248,6 +248,7 @@ gtk_public_sources = files([
   'gtkgesturezoom.c',
   'gtkglarea.c',
   'gtkgrid.c',
+  'gtkgridlayout.c',
   'gtkheaderbar.c',
   'gtkicontheme.c',
   'gtkiconview.c',
@@ -505,6 +506,7 @@ gtk_public_headers = files([
   'gtkgesturezoom.h',
   'gtkglarea.h',
   'gtkgrid.h',
+  'gtkgridlayout.h',
   'gtkheaderbar.h',
   'gtkicontheme.h',
   'gtkiconview.h',
diff --git a/gtk/tools/gtk-builder-tool-simplify.c b/gtk/tools/gtk-builder-tool-simplify.c
index 44f5f59e53..9489e4efb0 100644
--- a/gtk/tools/gtk-builder-tool-simplify.c
+++ b/gtk/tools/gtk-builder-tool-simplify.c
@@ -163,8 +163,6 @@ needs_explicit_setting (GParamSpec *pspec,
     { "GtkCalendar", "day", PROP_KIND_OBJECT },
     { "GtkPlacesSidebar", "show-desktop", PROP_KIND_OBJECT },
     { "GtkRadioButton", "draw-indicator", PROP_KIND_OBJECT },
-    { "GtkGrid", "left-attach", PROP_KIND_PACKING },
-    { "GtkGrid", "top-attach", PROP_KIND_PACKING },
     { "GtkWidget", "hexpand", PROP_KIND_OBJECT },
     { "GtkWidget", "vexpand", PROP_KIND_OBJECT },
   };
@@ -208,6 +206,10 @@ keep_for_rewrite (const char *class_name,
     { "GtkPaned", "shrink", PROP_KIND_PACKING },
     { "GtkOverlay", "measure", PROP_KIND_PACKING },
     { "GtkOverlay", "clip-overlay", PROP_KIND_PACKING },
+    { "GtkGrid", "left-attach", PROP_KIND_PACKING },
+    { "GtkGrid", "top-attach", PROP_KIND_PACKING },
+    { "GtkGrid", "width", PROP_KIND_PACKING },
+    { "GtkGrid", "height", PROP_KIND_PACKING },
   };
   gboolean found;
   gint k;
@@ -407,6 +409,24 @@ get_attribute_value (Element *element,
   return NULL;
 }
 
+static void
+set_attribute_value (Element *element,
+                     const char *name,
+                     const char *value)
+{
+  int i;
+
+  for (i = 0; element->attribute_names[i]; i++)
+    {
+      if (g_str_equal (element->attribute_names[i], name))
+        {
+          g_free (element->attribute_values[i]);
+          element->attribute_values[i] = g_strdup (value);
+          return;
+        }
+    }
+}
+
 static const char *
 get_class_name (Element *element)
 {
@@ -518,7 +538,7 @@ property_can_be_omitted (Element      *element,
       };
      
       g_printerr (_("%s: %sproperty %s::%s not found\n"),
-                  kind_str[kind], data->input_filename, class_name, property_name);
+                  data->input_filename, kind_str[kind], class_name, property_name);
       return FALSE;
     }
 
@@ -1131,6 +1151,90 @@ rewrite_layout_props (Element *element,
     }
 }
 
+static void
+rewrite_grid_layout_prop (Element *element,
+                          const char *attr_name,
+                          const char *old_value,
+                          const char *new_value)
+{
+  char *canonical_name;
+
+  canonical_name = g_strdup (old_value);
+  g_strdelimit (canonical_name, "_", '-');
+
+  if (g_str_equal (element->element_name, "property"))
+    {
+      if (has_attribute (element, attr_name, old_value) ||
+          has_attribute (element, attr_name, canonical_name))
+        {
+          set_attribute_value (element, attr_name, new_value);
+        }
+    }
+
+  g_free (canonical_name);
+}
+
+static void
+rewrite_grid_layout (Element *element,
+                     MyParserData *data)
+{
+  struct _Prop {
+    const char *attr_name;
+    const char *old_value;
+    const char *new_value;
+  } props[] = {
+    { "name", "width", "column-span", },
+    { "name", "height", "row-span", },
+  };
+  GList *l, *ll;
+
+  for (l = element->children; l; l = l->next)
+    {
+      Element *child = l->data;
+
+      if (g_str_equal (child->element_name, "child"))
+        {
+          Element *object = NULL;
+          Element *packing = NULL;
+
+          for (ll = child->children; ll; ll = ll->next)
+            {
+              Element *elt2 = ll->data;
+
+              if (g_str_equal (elt2->element_name, "object"))
+                object = elt2;
+
+              if (g_str_equal (elt2->element_name, "packing"))
+                packing = elt2;
+            }
+
+          if (object && packing)
+            {
+              int i;
+
+              child->children = g_list_remove (child->children, packing);
+
+              g_free (packing->element_name);
+              packing->element_name = g_strdup ("layout");
+
+              packing->parent = object;
+              object->children = g_list_append (object->children, packing);
+
+              for (ll = packing->children; ll; ll = ll->next)
+                {
+                  Element *elt = ll->data;
+
+                  for (i = 0; i < G_N_ELEMENTS (props); i++)
+                    rewrite_grid_layout_prop (elt,
+                                              props[i].attr_name,
+                                              props[i].old_value,
+                                              props[i].new_value);
+                }
+            }
+        }
+    }
+}
+
 static gboolean
 simplify_element (Element      *element,
                   MyParserData *data)
@@ -1206,6 +1310,14 @@ simplify_element (Element      *element,
           g_str_equal (get_class_name (element), "GtkOverlay"))
         rewrite_layout_props (element, data);
 
+      if (g_str_equal (element->element_name, "object") &&
+          g_str_equal (get_class_name (element), "GtkGrid"))
+        rewrite_grid_layout (element, data);
+
+      if (g_str_equal (element->element_name, "object") &&
+          g_str_equal (get_class_name (element), "GtkFixed"))
+        rewrite_layout_props (element, data);
+
       if (g_str_equal (element->element_name, "property") &&
           property_has_been_removed (element, data))
         return TRUE;
diff --git a/gtk/ui/gtkaboutdialog.ui b/gtk/ui/gtkaboutdialog.ui
index 3d4996fa45..e339138a8a 100644
--- a/gtk/ui/gtkaboutdialog.ui
+++ b/gtk/ui/gtkaboutdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkAboutDialog" parent="GtkDialog">
     <property name="resizable">0</property>
diff --git a/gtk/ui/gtkappchooserdialog.ui b/gtk/ui/gtkappchooserdialog.ui
index e309422f76..c04757ec03 100644
--- a/gtk/ui/gtkappchooserdialog.ui
+++ b/gtk/ui/gtkappchooserdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkAppChooserDialog" parent="GtkDialog">
     <property name="title" translatable="yes">Select Application</property>
diff --git a/gtk/ui/gtkappchooserwidget.ui b/gtk/ui/gtkappchooserwidget.ui
index d23a402ca8..a87ec7b343 100644
--- a/gtk/ui/gtkappchooserwidget.ui
+++ b/gtk/ui/gtkappchooserwidget.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkListStore" id="program_list_store">
     <columns>
diff --git a/gtk/ui/gtkapplication-quartz.ui b/gtk/ui/gtkapplication-quartz.ui
index 42fc3127b2..e41df2d337 100644
--- a/gtk/ui/gtkapplication-quartz.ui
+++ b/gtk/ui/gtkapplication-quartz.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <menu id="app-menu">
     <section>
diff --git a/gtk/ui/gtkassistant.ui b/gtk/ui/gtkassistant.ui
index f39fbf494b..d3f760e2e1 100644
--- a/gtk/ui/gtkassistant.ui
+++ b/gtk/ui/gtkassistant.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkAssistant" parent="GtkWindow">
     <child type="titlebar">
diff --git a/gtk/ui/gtkcolorchooserdialog.ui b/gtk/ui/gtkcolorchooserdialog.ui
index 7eb0d14636..767e3bdb41 100644
--- a/gtk/ui/gtkcolorchooserdialog.ui
+++ b/gtk/ui/gtkcolorchooserdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkColorChooserDialog" parent="GtkDialog">
     <property name="title" translatable="yes">Select a Color</property>
diff --git a/gtk/ui/gtkcoloreditor.ui b/gtk/ui/gtkcoloreditor.ui
index fb650a34d8..2b24dbfd0e 100644
--- a/gtk/ui/gtkcoloreditor.ui
+++ b/gtk/ui/gtkcoloreditor.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkAdjustment" id="a_adj">
     <property name="upper">1</property>
@@ -44,11 +45,11 @@
                 <style>
                   <class name="circular"/>
                 </style>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkColorSwatch" id="swatch">
@@ -57,11 +58,11 @@
                 <property name="rgba">rgb(255,255,255)</property>
                 <property name="selectable">False</property>
                 <property name="has-menu">False</property>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkEntry" id="entry">
@@ -74,11 +75,11 @@
                 <signal name="activate" handler="entry_apply" swapped="no"/>
                 <signal name="notify::has-focus" handler="entry_focus_changed" swapped="no"/>
                 <signal name="notify::text" handler="entry_text_changed" swapped="no"/>
+                <layout>
+                  <property name="left-attach">2</property>
+                  <property name="top-attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkColorScale" id="h_slider">
@@ -88,11 +89,11 @@
                 <property name="draw-value">False</property>
                 <property name="has-origin">False</property>
                 <signal name="popup-menu" handler="popup_edit" swapped="no"/>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkColorScale" id="a_slider">
@@ -105,12 +106,12 @@
                   <class name="marks-before"/>
                 </style>
                 <signal name="popup-menu" handler="popup_edit" swapped="no"/>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">2</property>
+                  <property name="column-span">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">2</property>
-                <property name="width">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkColorPlane" id="sv_plane">
@@ -121,12 +122,12 @@
                 <property name="s-adjustment">s_adj</property>
                 <property name="v-adjustment">v_adj</property>
                 <signal name="popup-menu" handler="popup_edit" swapped="no"/>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">1</property>
+                  <property name="column-span">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">1</property>
-                <property name="width">2</property>
-              </packing>
             </child>
           </object>
         </child>
@@ -149,11 +150,11 @@
         <child>
           <object class="GtkLabel" id="label4">
             <property name="label" translatable="yes" context="Color channel">A</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSpinButton" id="a_entry">
@@ -166,11 +167,11 @@
                 <property name="AtkObject::accessible-name" translatable="yes">Alpha</property>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
       </object>
     </child>
@@ -191,11 +192,11 @@
         <child>
           <object class="GtkLabel" id="label3">
             <property name="label" translatable="yes" context="Color channel">H</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSpinButton" id="h_entry">
@@ -208,11 +209,11 @@
                 <property name="AtkObject::accessible-name" translatable="yes">Hue</property>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
       </object>
     </child>
@@ -234,20 +235,20 @@
         <child>
           <object class="GtkLabel" id="label1">
             <property name="label" translatable="yes" context="Color Channel">S</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
             <property name="label" translatable="yes" context="Color Channel">V</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSpinButton" id="s_entry">
@@ -260,11 +261,11 @@
                 <property name="AtkObject::accessible-name" translatable="yes">Saturation</property>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSpinButton" id="v_entry">
@@ -277,11 +278,11 @@
                 <property name="AtkObject::accessible-name" translatable="yes">Value</property>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/gtk/ui/gtkcombobox.ui b/gtk/ui/gtkcombobox.ui
index 9cd3b3d735..41b5754b75 100644
--- a/gtk/ui/gtkcombobox.ui
+++ b/gtk/ui/gtkcombobox.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkComboBox" parent="GtkBin">
     <child>
diff --git a/gtk/ui/gtkdialog.ui b/gtk/ui/gtkdialog.ui
index 33d768e86a..9c83c84207 100644
--- a/gtk/ui/gtkdialog.ui
+++ b/gtk/ui/gtkdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkDialog" parent="GtkWindow">
     <property name="window-position">center-on-parent</property>
diff --git a/gtk/ui/gtkemojichooser.ui b/gtk/ui/gtkemojichooser.ui
index dfa5357f49..1f7a2e9485 100644
--- a/gtk/ui/gtkemojichooser.ui
+++ b/gtk/ui/gtkemojichooser.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkEmojiChooser" parent="GtkPopover">
     <style>
@@ -309,11 +310,11 @@
                         <style>
                           <class name="dim-label"/>
                         </style>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">0</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel">
@@ -322,11 +323,11 @@
                           <attribute name="weight" value="bold"></attribute>
                           <attribute name="scale" value="1.44"></attribute>
                         </attributes>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">1</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">1</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel">
@@ -334,11 +335,11 @@
                         <style>
                           <class name="dim-label"/>
                         </style>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">2</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">2</property>
-                      </packing>
                     </child>
                   </object>
                 </property>
diff --git a/gtk/ui/gtkemojicompletion.ui b/gtk/ui/gtkemojicompletion.ui
index 964b4bf26c..0abdb7742a 100644
--- a/gtk/ui/gtkemojicompletion.ui
+++ b/gtk/ui/gtkemojicompletion.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkEmojiCompletion" parent="GtkPopover">
     <property name="modal">0</property>
diff --git a/gtk/ui/gtkfilechooserdialog.ui b/gtk/ui/gtkfilechooserdialog.ui
index f8b454e90d..4434b186de 100644
--- a/gtk/ui/gtkfilechooserdialog.ui
+++ b/gtk/ui/gtkfilechooserdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkFileChooserDialog" parent="GtkDialog">
     <property name="type-hint">dialog</property>
diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
index 84ea0e9f98..9ea493cec9 100644
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkFileChooserWidget" parent="GtkWidget">
     <child>
@@ -284,11 +285,11 @@
                                         <style>
                                           <class name="dim-label"/>
                                         </style>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">0</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel">
@@ -297,11 +298,11 @@
                                           <attribute name="weight" value="bold"></attribute>
                                           <attribute name="scale" value="1.44"></attribute>
                                         </attributes>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">1</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">1</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel">
@@ -309,11 +310,11 @@
                                         <style>
                                           <class name="dim-label"/>
                                         </style>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">2</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">2</property>
-                                      </packing>
                                     </child>
                                   </object>
                                 </property>
@@ -389,10 +390,10 @@
             <attributes>
               <attribute name="weight" value="bold"></attribute>
             </attributes>
+            <layout>
+              <property name="column-span">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="width">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkEntry" id="new_folder_name_entry">
@@ -400,11 +401,11 @@
             <property name="activates-default">1</property>
             <property name="hexpand">1</property>
             <signal name="changed" handler="new_folder_name_changed"/>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="new_folder_create_button">
@@ -416,19 +417,20 @@
             <style>
               <class name="suggested-action"/>
             </style>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
-          <object class="GtkFileChooserErrorStack" id="new_folder_error_stack"/>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
-            <property name="width">2</property>
-          </packing>
+          <object class="GtkFileChooserErrorStack" id="new_folder_error_stack">
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">2</property>
+              <property name="column-span">2</property>
+            </layout>
+          </object>
         </child>
       </object>
     </child>
@@ -449,20 +451,20 @@
             <attributes>
               <attribute name="weight" value="bold"></attribute>
             </attributes>
+            <layout>
+              <property name="column-span">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="width">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkEntry" id="rename_file_name_entry">
             <property name="activates-default">1</property>
             <signal name="changed" handler="rename_file_name_changed"/>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="rename_file_rename_button">
@@ -474,19 +476,20 @@
             <style>
               <class name="suggested-action"/>
             </style>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
-          <object class="GtkFileChooserErrorStack" id="rename_file_error_stack"/>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
-            <property name="width">2</property>
-          </packing>
+          <object class="GtkFileChooserErrorStack" id="rename_file_error_stack">
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">2</property>
+              <property name="column-span">2</property>
+            </layout>
+          </object>
         </child>
       </object>
     </child>
diff --git a/gtk/ui/gtkfontchooserdialog.ui b/gtk/ui/gtkfontchooserdialog.ui
index be72f3908c..72c314a14f 100644
--- a/gtk/ui/gtkfontchooserdialog.ui
+++ b/gtk/ui/gtkfontchooserdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkFontChooserDialog" parent="GtkDialog">
     <property name="title" translatable="yes">Select Font</property>
diff --git a/gtk/ui/gtkfontchooserwidget.ui b/gtk/ui/gtkfontchooserwidget.ui
index 0ffb9fe434..1a4ea543ae 100644
--- a/gtk/ui/gtkfontchooserwidget.ui
+++ b/gtk/ui/gtkfontchooserwidget.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkListStore" id="model">
     <columns>
@@ -41,11 +42,11 @@
                     <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"/>
+                    <layout>
+                      <property name="left-attach">0</property>
+                      <property name="top-attach">0</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkStack" id="list_stack">
@@ -94,12 +95,12 @@
                                     </child>
                                   </object>
                                 </child>
+                                <layout>
+                                  <property name="left-attach">0</property>
+                                  <property name="top-attach">1</property>
+                                  <property name="column-span">3</property>
+                                </layout>
                               </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">
@@ -111,23 +112,23 @@
                                     <signal name="scroll" handler="resize_by_scroll_cb"/>
                                   </object>
                                 </child>
+                                <layout>
+                                  <property name="left-attach">0</property>
+                                  <property name="top-attach">2</property>
+                                  <property name="column-span">3</property>
+                                </layout>
                               </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>
+                                <layout>
+                                  <property name="left-attach">0</property>
+                                  <property name="top-attach">3</property>
+                                </layout>
                               </object>
-                              <packing>
-                                <property name="left-attach">0</property>
-                                <property name="top-attach">3</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkScale" id="size_slider">
@@ -142,11 +143,11 @@
                                     <signal name="scroll" handler="resize_by_scroll_cb"/>
                                   </object>
                                 </child>
+                                <layout>
+                                  <property name="left-attach">1</property>
+                                  <property name="top-attach">3</property>
+                                </layout>
                               </object>
-                              <packing>
-                                <property name="left-attach">1</property>
-                                <property name="top-attach">3</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkSpinButton" id="size_spin">
@@ -154,11 +155,11 @@
                                 <property name="adjustment">spin_adjustment</property>
                                 <property name="valign">center</property>
                                 <signal name="output" handler="output_cb"/>
+                                <layout>
+                                  <property name="left-attach">2</property>
+                                  <property name="top-attach">3</property>
+                                </layout>
                               </object>
-                              <packing>
-                                <property name="left-attach">2</property>
-                                <property name="top-attach">3</property>
-                              </packing>
                             </child>
                           </object>
                         </property>
@@ -181,11 +182,11 @@
                               <object class="GtkImage">
                                 <property name="gicon">fonticon</property>
                                 <property name="pixel-size">64</property>
+                                <layout>
+                                  <property name="left-attach">0</property>
+                                  <property name="top-attach">0</property>
+                                </layout>
                               </object>
-                              <packing>
-                                <property name="left-attach">0</property>
-                                <property name="top-attach">0</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkLabel">
@@ -194,21 +195,21 @@
                                   <attribute name="weight" value="bold"></attribute>
                                   <attribute name="scale" value="1.2"></attribute>
                                 </attributes>
+                                <layout>
+                                  <property name="left-attach">0</property>
+                                  <property name="top-attach">1</property>
+                                </layout>
                               </object>
-                              <packing>
-                                <property name="left-attach">0</property>
-                                <property name="top-attach">1</property>
-                              </packing>
                             </child>
                           </object>
                         </property>
                       </object>
                     </child>
+                    <layout>
+                      <property name="left-attach">0</property>
+                      <property name="top-attach">1</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">1</property>
-                  </packing>
                 </child>
               </object>
             </property>
@@ -261,11 +262,11 @@
                                 <property name="label" translatable="yes">Size</property>
                                 <property name="xalign">0</property>
                                 <property name="valign">baseline</property>
+                                <layout>
+                                  <property name="left-attach">0</property>
+                                  <property name="top-attach">0</property>
+                                </layout>
                               </object>
-                              <packing>
-                                <property name="left-attach">0</property>
-                                <property name="top-attach">0</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkScale" id="size_slider2">
@@ -274,11 +275,11 @@
                                 <property name="adjustment">slider_adjustment</property>
                                 <property name="draw-value">0</property>
                                 <property name="round-digits">0</property>
+                                <layout>
+                                  <property name="left-attach">1</property>
+                                  <property name="top-attach">0</property>
+                                </layout>
                               </object>
-                              <packing>
-                                <property name="left-attach">1</property>
-                                <property name="top-attach">0</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkSpinButton" id="size_spin2">
@@ -286,11 +287,11 @@
                                 <property name="adjustment">spin_adjustment</property>
                                 <property name="valign">center</property>
                                 <signal name="output" handler="output_cb"/>
+                                <layout>
+                                  <property name="left-attach">2</property>
+                                  <property name="top-attach">0</property>
+                                </layout>
                               </object>
-                              <packing>
-                                <property name="left-attach">2</property>
-                                <property name="top-attach">0</property>
-                              </packing>
                             </child>
                           </object>
                         </child>
diff --git a/gtk/ui/gtkinfobar.ui b/gtk/ui/gtkinfobar.ui
index 2dcc1a6aab..66e4e3d78a 100644
--- a/gtk/ui/gtkinfobar.ui
+++ b/gtk/ui/gtkinfobar.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkInfoBar" parent="GtkBox">
     <child>
diff --git a/gtk/ui/gtklockbutton.ui b/gtk/ui/gtklockbutton.ui
index 328c02ff07..820ba63692 100644
--- a/gtk/ui/gtklockbutton.ui
+++ b/gtk/ui/gtklockbutton.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkLockButton" parent="GtkButton">
     <property name="can-focus">1</property>
diff --git a/gtk/ui/gtkmediacontrols.ui b/gtk/ui/gtkmediacontrols.ui
index 19eee4f4e2..011d3f9ca2 100644
--- a/gtk/ui/gtkmediacontrols.ui
+++ b/gtk/ui/gtkmediacontrols.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkAdjustment" id="time_adjustment">
     <property name="upper">10</property>
diff --git a/gtk/ui/gtkmessagedialog.ui b/gtk/ui/gtkmessagedialog.ui
index 61f1b3d095..c2ec33b197 100644
--- a/gtk/ui/gtkmessagedialog.ui
+++ b/gtk/ui/gtkmessagedialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkMessageDialog" parent="GtkDialog">
     <property name="title"></property>
diff --git a/gtk/ui/gtkpagesetupunixdialog.ui b/gtk/ui/gtkpagesetupunixdialog.ui
index 85ffaf0c9a..78e2c2b6e3 100644
--- a/gtk/ui/gtkpagesetupunixdialog.ui
+++ b/gtk/ui/gtkpagesetupunixdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkListStore" id="custom_paper_list">
     <columns>
@@ -38,11 +39,11 @@
                 <property name="label" translatable="yes">_Format for:</property>
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">printer_combo</property>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkComboBox" id="printer_combo">
@@ -55,12 +56,12 @@
                     <attribute name="markup">0</attribute>
                   </attributes>
                 </child>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">0</property>
+                  <property name="column-span">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
-                <property name="width">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="paper_size_combo_label">
@@ -69,11 +70,11 @@
                 <property name="label" translatable="yes">_Paper size:</property>
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">paper_size_combo</property>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkComboBox" id="paper_size_combo">
@@ -83,23 +84,23 @@
                 <child>
                   <object class="GtkCellRendererText" id="paper_size_cell"/>
                 </child>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">1</property>
+                  <property name="column-span">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">1</property>
-                <property name="width">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="paper_size_label">
                 <property name="halign">start</property>
                 <property name="valign">center</property>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">2</property>
+                  <property name="column-span">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">2</property>
-                <property name="width">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="orientation_label">
@@ -108,11 +109,11 @@
                 <property name="label" translatable="yes">_Orientation:</property>
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">portrait_radio</property>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkRadioButton" id="portrait_radio">
@@ -134,11 +135,11 @@
                     </child>
                   </object>
                 </child>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkRadioButton" id="reverse_portrait_radio">
@@ -161,11 +162,11 @@
                     </child>
                   </object>
                 </child>
+                <layout>
+                  <property name="left-attach">2</property>
+                  <property name="top-attach">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkRadioButton" id="landscape_radio">
@@ -188,11 +189,11 @@
                     </child>
                   </object>
                 </child>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">4</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">4</property>
-              </packing>
             </child>
             <child>
               <object class="GtkRadioButton" id="reverse_landscape_radio">
@@ -214,11 +215,11 @@
                     </child>
                   </object>
                 </child>
+                <layout>
+                  <property name="left-attach">2</property>
+                  <property name="top-attach">4</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">4</property>
-              </packing>
             </child>
           </object>
         </child>
diff --git a/gtk/ui/gtkpathbar.ui b/gtk/ui/gtkpathbar.ui
index be2fe80905..29fe44c3bd 100644
--- a/gtk/ui/gtkpathbar.ui
+++ b/gtk/ui/gtkpathbar.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkButton" id="down_slider_button">
     <property name="can-focus">1</property>
diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui
index 39022efdb9..010612b90f 100644
--- a/gtk/ui/gtkplacesview.ui
+++ b/gtk/ui/gtkplacesview.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkListStore" id="completion_store">
@@ -65,11 +66,11 @@
                 <attributes>
                   <attribute name="weight" value="bold"></attribute>
                 </attributes>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel">
@@ -78,11 +79,11 @@
                 <attributes>
                   <attribute name="weight" value="bold"></attribute>
                 </attributes>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
           </object>
         </child>
diff --git a/gtk/ui/gtkplacesviewrow.ui b/gtk/ui/gtkplacesviewrow.ui
index 6225d3b9ec..e9f9e8908a 100644
--- a/gtk/ui/gtkplacesviewrow.ui
+++ b/gtk/ui/gtkplacesviewrow.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <requires lib="gtk+" version="3.16"/>
   <template class="GtkPlacesViewRow" parent="GtkListBoxRow">
diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui
index 826811aa6a..bacfd31e07 100644
--- a/gtk/ui/gtkprintunixdialog.ui
+++ b/gtk/ui/gtkprintunixdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkAdjustment" id="copies_spin_adjustment">
     <property name="lower">1</property>
@@ -169,12 +170,12 @@
                                         <property name="can-focus">1</property>
                                         <property name="use-underline">1</property>
                                         <property name="active">1</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">0</property>
+                                          <property name="column-span">2</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">0</property>
-                                        <property name="width">2</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="current_page_radio">
@@ -184,12 +185,12 @@
                                         <property name="use-underline">1</property>
                                         <property name="active">1</property>
                                         <property name="group">all_pages_radio</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">1</property>
+                                          <property name="column-span">2</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">1</property>
-                                        <property name="width">2</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="selection_radio">
@@ -199,12 +200,12 @@
                                         <property name="use-underline">1</property>
                                         <property name="active">1</property>
                                         <property name="group">all_pages_radio</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">2</property>
+                                          <property name="column-span">2</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">2</property>
-                                        <property name="width">2</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="page_range_radio">
@@ -216,11 +217,11 @@
                                         <property name="active">1</property>
                                         <property name="group">all_pages_radio</property>
                                         <signal name="toggled" handler="update_page_range_entry_sensitivity" swapped="no"/>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">3</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">3</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkEntry" id="page_range_entry">
@@ -236,11 +237,11 @@
  e.g. 1–3, 7, 11</property>
                                           </object>
                                         </child>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">3</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">3</property>
-                                      </packing>
                                     </child>
                                     <accessibility>
                                       <relation type="labelled-by" target="label_widget1"/>
@@ -279,11 +280,11 @@
                                         <property name="label" translatable="yes">Copie_s:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">copies_spin</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">0</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkSpinButton" id="copies_spin">
@@ -292,11 +293,11 @@
                                         <property name="adjustment">copies_spin_adjustment</property>
                                         <signal name="changed" handler="update_dialog_from_capabilities" object="GtkPrintUnixDialog" swapped="yes"/>
                                         <signal name="value-changed" handler="update_dialog_from_capabilities" object="GtkPrintUnixDialog" swapped="yes"/>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">0</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="collate_check">
@@ -304,11 +305,11 @@
                                         <property name="can-focus">1</property>
                                         <property name="use-underline">1</property>
                                         <signal name="toggled" handler="update_collate_icon" swapped="no"/>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">1</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">1</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="reverse_check">
@@ -316,22 +317,22 @@
                                         <property name="can-focus">1</property>
                                         <property name="use-underline">1</property>
                                         <signal name="toggled" handler="update_collate_icon" swapped="no"/>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">2</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">2</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkDrawingArea" id="collate_image">
                                         <property name="content-width">70</property>
                                         <property name="content-height">90</property>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">1</property>
+                                          <property name="row-span">2</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">1</property>
-                                        <property name="height">2</property>
-                                      </packing>
                                     </child>
                                     <accessibility>
                                       <relation type="labelled-by" target="label_widget2"/>
@@ -391,20 +392,20 @@
                                         <property name="label" translatable="yes">T_wo-sided:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">duplex</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">0</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkPrinterOptionWidget" id="duplex">
                                         <property name="valign">baseline</property>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">0</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label6">
@@ -413,22 +414,22 @@
                                         <property name="label" translatable="yes">Pages per _side:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">pages_per_sheet</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">1</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">1</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkPrinterOptionWidget" id="pages_per_sheet">
                                         <property name="valign">baseline</property>
                                         <signal name="changed" handler="redraw_page_layout_preview" object="GtkPrintUnixDialog" swapped="yes"/>
                                         <signal name="changed" handler="update_number_up_layout" object="GtkPrintUnixDialog" swapped="yes"/>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">1</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">1</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label7">
@@ -437,21 +438,21 @@
                                         <property name="label" translatable="yes">Page or_dering:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">number_up_layout</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">2</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">2</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkPrinterOptionWidget" id="number_up_layout">
                                         <property name="valign">baseline</property>
                                         <signal name="changed" handler="redraw_page_layout_preview" object="GtkPrintUnixDialog" swapped="yes"/>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">2</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">2</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label8">
@@ -460,11 +461,11 @@
                                         <property name="label" translatable="yes">_Only print:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">page_set_combo</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">3</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">3</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBoxText" id="page_set_combo">
@@ -477,11 +478,11 @@
                                           <item translatable="yes">Even sheets</item>
                                           <item translatable="yes">Odd sheets</item>
                                         </items>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">3</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">3</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label9">
@@ -490,11 +491,11 @@
                                         <property name="label" translatable="yes">Sc_ale:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">scale_spin</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">4</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">4</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkBox" id="box5">
@@ -514,11 +515,11 @@
                                             <property name="label">%</property>
                                           </object>
                                         </child>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">4</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">4</property>
-                                      </packing>
                                     </child>
                                     <accessibility>
                                       <relation type="labelled-by" target="label_widget3"/>
@@ -557,20 +558,20 @@
                                         <property name="label" translatable="yes">Paper _type:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">paper_type</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">0</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkPrinterOptionWidget" id="paper_type">
                                         <property name="valign">baseline</property>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">0</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label12">
@@ -579,20 +580,20 @@
                                         <property name="label" translatable="yes">Paper _source:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">paper_source</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">1</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">1</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkPrinterOptionWidget" id="paper_source">
                                         <property name="valign">baseline</property>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">1</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">1</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label13">
@@ -601,20 +602,20 @@
                                         <property name="label" translatable="yes">Output t_ray:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">output_tray</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">2</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">2</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkPrinterOptionWidget" id="output_tray">
                                         <property name="valign">baseline</property>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">2</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">2</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="paper_size_combo_label">
@@ -623,11 +624,11 @@
                                         <property name="label" translatable="yes">_Paper size:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">paper_size_combo</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">3</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">3</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBox" id="paper_size_combo">
@@ -637,11 +638,11 @@
                                         <child>
                                           <object class="GtkCellRendererText" id="paper_size_renderer"/>
                                         </child>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">3</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">3</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="orientation_combo_label">
@@ -650,11 +651,11 @@
                                         <property name="label" translatable="yes">Or_ientation:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">orientation_combo</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">4</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">4</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBoxText" id="orientation_combo">
@@ -669,11 +670,11 @@
                                           <item translatable="yes">Reverse portrait</item>
                                           <item translatable="yes">Reverse landscape</item>
                                         </items>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">4</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">4</property>
-                                      </packing>
                                     </child>
                                     <accessibility>
                                       <relation type="labelled-by" target="label_widget4"/>
@@ -740,18 +741,19 @@
                                     <property name="label" translatable="yes">Pri_ority:</property>
                                     <property name="use-underline">1</property>
                                     <property name="mnemonic-widget">job_prio</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">0</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">0</property>
-                                  </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkPrinterOptionWidget" id="job_prio"/>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">0</property>
-                                  </packing>
+                                  <object class="GtkPrinterOptionWidget" id="job_prio">
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">0</property>
+                                    </layout>
+                                  </object>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label17">
@@ -760,29 +762,30 @@
                                     <property name="label" translatable="yes">_Billing info:</property>
                                     <property name="use-underline">1</property>
                                     <property name="mnemonic-widget">billing_info</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkPrinterOptionWidget" id="billing_info"/>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
+                                  <object class="GtkPrinterOptionWidget" id="billing_info">
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
+                                  </object>
                                 </child>
                                 <accessibility>
                                   <relation type="labelled-by" target="label_widget5"/>
                                 </accessibility>
                               </object>
                             </child>
+                            <layout>
+                              <property name="left-attach">0</property>
+                              <property name="top-attach">0</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left-attach">0</property>
-                            <property name="top-attach">0</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkBox" id="frame_template6">
@@ -813,12 +816,12 @@
                                     <property name="use-underline">1</property>
                                     <property name="active">1</property>
                                     <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">0</property>
+                                      <property name="column-span">2</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">0</property>
-                                    <property name="width">2</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="print_at_radio">
@@ -833,11 +836,11 @@
                                     <property name="group">print_now_radio</property>
                                     <signal name="toggled" handler="update_print_at_entry_sensitivity" swapped="no"/>
                                     <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkEntry" id="print_at_entry">
@@ -856,11 +859,11 @@
                                       </object>
                                     </child>
                                     <signal name="changed" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="print_hold_radio">
@@ -872,23 +875,23 @@
                                     <property name="use-underline">1</property>
                                     <property name="group">print_now_radio</property>
                                     <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">2</property>
+                                      <property name="column-span">2</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">2</property>
-                                    <property name="width">2</property>
-                                  </packing>
                                 </child>
                                 <accessibility>
                                   <relation type="labelled-by" target="label_widget6"/>
                                 </accessibility>
                               </object>
                             </child>
+                            <layout>
+                              <property name="left-attach">0</property>
+                              <property name="top-attach">1</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left-attach">0</property>
-                            <property name="top-attach">1</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkBox" id="frame_template7">
@@ -919,18 +922,19 @@
                                     <property name="label" translatable="yes" comments="this is the label used for the option in the print dialog that controls the front cover page.">Be_fore:</property>
                                     <property name="use-underline">1</property>
                                     <property name="mnemonic-widget">cover_before</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">0</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">0</property>
-                                  </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkPrinterOptionWidget" id="cover_before"/>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">0</property>
-                                  </packing>
+                                  <object class="GtkPrinterOptionWidget" id="cover_before">
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">0</property>
+                                    </layout>
+                                  </object>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label19">
@@ -939,29 +943,30 @@
                                     <property name="label" translatable="yes" comments="this is the label used for the option in the print dialog that controls the back cover page.">_After:</property>
                                     <property name="use-underline">1</property>
                                     <property name="mnemonic-widget">cover_after</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkPrinterOptionWidget" id="cover_after"/>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
+                                  <object class="GtkPrinterOptionWidget" id="cover_after">
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
+                                  </object>
                                 </child>
                                 <accessibility>
                                   <relation type="labelled-by" target="label_widget7"/>
                                 </accessibility>
                               </object>
                             </child>
+                            <layout>
+                              <property name="left-attach">1</property>
+                              <property name="top-attach">0</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left-attach">1</property>
-                            <property name="top-attach">0</property>
-                          </packing>
                         </child>
                       </object>
                     </property>
diff --git a/gtk/ui/gtkscalebutton.ui b/gtk/ui/gtkscalebutton.ui
index 560ec39def..4dcdb71620 100644
--- a/gtk/ui/gtkscalebutton.ui
+++ b/gtk/ui/gtkscalebutton.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkScaleButton" parent="GtkButton">
     <property name="can-focus">1</property>
diff --git a/gtk/ui/gtksidebarrow.ui b/gtk/ui/gtksidebarrow.ui
index b31078fe5b..5b71724e29 100644
--- a/gtk/ui/gtksidebarrow.ui
+++ b/gtk/ui/gtksidebarrow.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkSidebarRow" parent="GtkListBoxRow">
     <property name="margin-top">1</property>
diff --git a/gtk/ui/gtkstatusbar.ui b/gtk/ui/gtkstatusbar.ui
index eb0a23d53a..bbd871594d 100644
--- a/gtk/ui/gtkstatusbar.ui
+++ b/gtk/ui/gtkstatusbar.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkStatusbar" parent="GtkWidget">
     <child>
diff --git a/gtk/ui/gtktooltipwindow.ui b/gtk/ui/gtktooltipwindow.ui
index 848d4cedc4..bb4329f18b 100644
--- a/gtk/ui/gtktooltipwindow.ui
+++ b/gtk/ui/gtktooltipwindow.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkTooltipWindow" parent="GtkWindow">
     <property name="resizable">0</property>
diff --git a/gtk/ui/gtkvolumebutton.ui b/gtk/ui/gtkvolumebutton.ui
index cd5f3224d1..67e881f015 100644
--- a/gtk/ui/gtkvolumebutton.ui
+++ b/gtk/ui/gtkvolumebutton.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkAdjustment" id="adjustment">
     <property name="upper">1</property>
diff --git a/tests/dialog.ui b/tests/dialog.ui
index 276c4271c7..73db63479c 100644
--- a/tests/dialog.ui
+++ b/tests/dialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkListStore" id="liststore1">
     <columns>
@@ -48,7 +49,6 @@
             <property name="receives_default">1</property>
             <property name="use_underline">1</property>
           </object>
-          <packing/>
         </child>
       </object>
     </child>
@@ -74,11 +74,11 @@
                     <child>
                       <object class="GtkLabel" id="margin">
                         <property name="width_request">24</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">0</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkEntry" id="password_entry">
@@ -88,12 +88,12 @@
                         <property name="activates_default">1</property>
                         <property name="placeholder_text" translatable="yes">optional</property>
                         <property name="input_purpose">password</property>
+                        <layout>
+                          <property name="left_attach">2</property>
+                          <property name="top_attach">2</property>
+                          <property name="column-span">2</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">2</property>
-                        <property name="top_attach">2</property>
-                        <property name="width">2</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkEntry" id="name_entry">
@@ -102,12 +102,12 @@
                         <property name="margin_top">24</property>
                         <property name="activates_default">1</property>
                         <property name="completion">name_completion</property>
+                        <layout>
+                          <property name="left_attach">2</property>
+                          <property name="top_attach">1</property>
+                          <property name="column-span">2</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="width">2</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="add_connection_button">
@@ -130,20 +130,20 @@
                             </child>
                           </object>
                         </child>
+                        <layout>
+                          <property name="left_attach">3</property>
+                          <property name="top_attach">0</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">3</property>
-                        <property name="top_attach">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkComboBoxText" id="connection_combo">
                         <property name="hexpand">1</property>
+                        <layout>
+                          <property name="left_attach">2</property>
+                          <property name="top_attach">0</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">2</property>
-                        <property name="top_attach">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="connection_label">
@@ -151,11 +151,11 @@
                         <property name="label" translatable="yes">C_onnection</property>
                         <property name="use_underline">1</property>
                         <property name="mnemonic_widget">connection_combo</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">0</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="name_label">
@@ -164,11 +164,11 @@
                         <property name="label" translatable="yes">Room _Name</property>
                         <property name="use_underline">1</property>
                         <property name="mnemonic_widget">name_entry</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">1</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="password_label">
@@ -176,11 +176,11 @@
                         <property name="label" translatable="yes">_Password</property>
                         <property name="use_underline">1</property>
                         <property name="mnemonic_widget">password_entry</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">2</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">2</property>
-                      </packing>
                     </child>
                   </object>
                 </property>
diff --git a/tests/popupat.ui b/tests/popupat.ui
index fbe8c7ad1d..7cb06c3a5d 100644
--- a/tests/popupat.ui
+++ b/tests/popupat.ui
@@ -1,394 +1,289 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkMenu" id="menu25">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="halign">start</property>
     <property name="valign">start</property>
     <child>
       <object class="GtkMenuItem" id="menuitem63">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Start-Aligned Item A</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem64">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Start-Aligned Item B</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem65">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Start-Aligned Item C</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="menu26">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="halign">center</property>
     <property name="valign">center</property>
     <child>
       <object class="GtkMenuItem" id="menuitem66">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Center-Aligned Item D</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem67">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Center-Aligned Item E</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem68">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Center-Aligned Item F</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="menu27">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="halign">end</property>
     <property name="valign">end</property>
     <child>
       <object class="GtkMenuItem" id="menuitem69">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">End-Aligned Item G</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem70">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">End-Aligned Item H</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem71">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">End-Aligned Item I</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="menu30">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="halign">start</property>
     <property name="valign">start</property>
     <child>
       <object class="GtkMenuItem" id="menuitem126">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Start-Aligned Item A</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem127">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Start-Aligned Item B</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem128">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Start-Aligned Item C</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="menu31">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="halign">center</property>
     <property name="valign">center</property>
     <child>
       <object class="GtkMenuItem" id="menuitem129">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Center-Aligned Item D</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem130">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Center-Aligned Item E</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem131">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Center-Aligned Item F</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="menu32">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="halign">end</property>
     <property name="valign">end</property>
     <child>
       <object class="GtkMenuItem" id="menuitem132">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">End-Aligned Item G</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem133">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">End-Aligned Item H</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem134">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">End-Aligned Item I</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="menu33">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="halign">start</property>
     <property name="valign">start</property>
     <child>
       <object class="GtkMenuItem" id="menuitem135">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Start-Aligned Item A</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem136">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Start-Aligned Item B</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem137">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Start-Aligned Item C</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="menu34">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="halign">center</property>
     <property name="valign">center</property>
     <child>
       <object class="GtkMenuItem" id="menuitem138">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Center-Aligned Item D</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem139">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Center-Aligned Item E</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem140">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Center-Aligned Item F</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="menu35">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="halign">end</property>
     <property name="valign">end</property>
     <child>
       <object class="GtkMenuItem" id="menuitem141">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">End-Aligned Item G</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem142">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">End-Aligned Item H</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem143">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">End-Aligned Item I</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="menu36">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="halign">start</property>
     <property name="valign">start</property>
     <child>
       <object class="GtkMenuItem" id="menuitem144">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Start-Aligned Item A</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem145">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Start-Aligned Item B</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem146">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Start-Aligned Item C</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="menu37">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="halign">center</property>
     <property name="valign">center</property>
     <child>
       <object class="GtkMenuItem" id="menuitem147">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Center-Aligned Item D</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem148">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Center-Aligned Item E</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem149">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Center-Aligned Item F</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="menu38">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="halign">end</property>
     <property name="valign">end</property>
     <child>
       <object class="GtkMenuItem" id="menuitem150">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">End-Aligned Item G</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem151">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">End-Aligned Item H</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem152">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">End-Aligned Item I</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
   </object>
   <object class="GtkMenu" id="menu39">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="halign">start</property>
     <property name="valign">start</property>
     <child>
       <object class="GtkMenuItem" id="menuitem153">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Start-Aligned Item A</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem154">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Start-Aligned Item B</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem155">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Start-Aligned Item C</property>
-        <property name="use_underline">True</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
   </object>
@@ -396,835 +291,616 @@
     <property name="text" translatable="yes">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</property>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkNotebook" id="notebook1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="scrollable">True</property>
-        <property name="enable_popup">True</property>
+        <property name="can_focus">1</property>
+        <property name="scrollable">1</property>
+        <property name="enable_popup">1</property>
         <child>
-          <object class="GtkGrid" id="grid1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkMenuBar" id="menubar1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="valign">start</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkGrid" id="grid1">
                 <child>
-                  <object class="GtkMenuItem" id="menuitem1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_File</property>
-                    <property name="use_underline">True</property>
-                    <child type="submenu">
-                      <object class="GtkMenu" id="menu1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkMenuItem" id="imagemenuitem1">
-                            <property name="label">gtk-new</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="imagemenuitem2">
-                            <property name="label">gtk-open</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="imagemenuitem3">
-                            <property name="label">gtk-save</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="imagemenuitem4">
-                            <property name="label">gtk-save-as</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="imagemenuitem5">
-                            <property name="label">gtk-quit</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
+                  <object class="GtkMenuBar" id="menubar1">
+                    <property name="valign">start</property>
+                    <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="imagemenuitem1">
+                                <property name="label">gtk-new</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="imagemenuitem2">
+                                <property name="label">gtk-open</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="imagemenuitem3">
+                                <property name="label">gtk-save</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="imagemenuitem4">
+                                <property name="label">gtk-save-as</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkSeparatorMenuItem" id="separatormenuitem1"/>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="imagemenuitem5">
+                                <property name="label">gtk-quit</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
                           </object>
                         </child>
                       </object>
                     </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkMenuItem" id="menuitem2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Edit</property>
-                    <property name="use_underline">True</property>
-                    <child type="submenu">
-                      <object class="GtkMenu" id="menu2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkMenuItem" id="imagemenuitem6">
-                            <property name="label">gtk-cut</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="imagemenuitem7">
-                            <property name="label">gtk-copy</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="imagemenuitem8">
-                            <property name="label">gtk-paste</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="imagemenuitem9">
-                            <property name="label">gtk-delete</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
+                    <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="imagemenuitem6">
+                                <property name="label">gtk-cut</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="imagemenuitem7">
+                                <property name="label">gtk-copy</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="imagemenuitem8">
+                                <property name="label">gtk-paste</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="imagemenuitem9">
+                                <property name="label">gtk-delete</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
                           </object>
                         </child>
                       </object>
                     </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkMenuItem" id="menuitem3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_View</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkMenuItem" id="menuitem4">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Help</property>
-                    <property name="use_underline">True</property>
-                    <child type="submenu">
-                      <object class="GtkMenu" id="menu3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkMenuItem" id="imagemenuitem10">
-                            <property name="label">gtk-about</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem3">
+                        <property name="label" translatable="yes">_View</property>
+                        <property name="use_underline">1</property>
+                      </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="imagemenuitem10">
+                                <property name="label">gtk-about</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
                           </object>
                         </child>
                       </object>
                     </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkMenuItem" id="menuitem72">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Really _Tall Menu</property>
-                    <property name="use_underline">True</property>
-                    <child type="submenu">
-                      <object class="GtkMenu" id="menu28">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem73">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _A</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem74">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _B</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem75">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _C</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem76">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _D</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem77">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _E</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem78">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _F</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem79">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _G</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem80">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _H</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem81">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _I</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem82">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _J</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem83">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _K</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem84">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _L</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem85">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _M</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem86">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _N</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem87">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _O</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem88">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _P</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem89">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _Q</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem90">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _R</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem91">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _S</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem92">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _T</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem93">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _U</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem94">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _V</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem95">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _W</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem96">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _X</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem97">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _Y</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem98">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _Z</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem156">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item a</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem157">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item b</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem158">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item c</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem159">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item d</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem160">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item e</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem161">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item f</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem162">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item g</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem163">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item h</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem164">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item i</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem165">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item j</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem166">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item k</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem167">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item l</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem168">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item m</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem169">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item n</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem170">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item o</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem171">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item p</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem172">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item q</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem173">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item r</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem174">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item s</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem175">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item t</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem176">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item u</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem177">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item v</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem178">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item w</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem179">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item x</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem180">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item y</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem181">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item z</property>
-                            <property name="use_underline">True</property>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem72">
+                        <property name="label" translatable="yes">Really _Tall Menu</property>
+                        <property name="use_underline">1</property>
+                        <child type="submenu">
+                          <object class="GtkMenu" id="menu28">
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem73">
+                                <property name="label" translatable="yes">Item _A</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem74">
+                                <property name="label" translatable="yes">Item _B</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem75">
+                                <property name="label" translatable="yes">Item _C</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem76">
+                                <property name="label" translatable="yes">Item _D</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem77">
+                                <property name="label" translatable="yes">Item _E</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem78">
+                                <property name="label" translatable="yes">Item _F</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem79">
+                                <property name="label" translatable="yes">Item _G</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem80">
+                                <property name="label" translatable="yes">Item _H</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem81">
+                                <property name="label" translatable="yes">Item _I</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem82">
+                                <property name="label" translatable="yes">Item _J</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem83">
+                                <property name="label" translatable="yes">Item _K</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem84">
+                                <property name="label" translatable="yes">Item _L</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem85">
+                                <property name="label" translatable="yes">Item _M</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem86">
+                                <property name="label" translatable="yes">Item _N</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem87">
+                                <property name="label" translatable="yes">Item _O</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem88">
+                                <property name="label" translatable="yes">Item _P</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem89">
+                                <property name="label" translatable="yes">Item _Q</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem90">
+                                <property name="label" translatable="yes">Item _R</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem91">
+                                <property name="label" translatable="yes">Item _S</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem92">
+                                <property name="label" translatable="yes">Item _T</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem93">
+                                <property name="label" translatable="yes">Item _U</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem94">
+                                <property name="label" translatable="yes">Item _V</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem95">
+                                <property name="label" translatable="yes">Item _W</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem96">
+                                <property name="label" translatable="yes">Item _X</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem97">
+                                <property name="label" translatable="yes">Item _Y</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem98">
+                                <property name="label" translatable="yes">Item _Z</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem156">
+                                <property name="label" translatable="yes">Item a</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem157">
+                                <property name="label" translatable="yes">Item b</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem158">
+                                <property name="label" translatable="yes">Item c</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem159">
+                                <property name="label" translatable="yes">Item d</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem160">
+                                <property name="label" translatable="yes">Item e</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem161">
+                                <property name="label" translatable="yes">Item f</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem162">
+                                <property name="label" translatable="yes">Item g</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem163">
+                                <property name="label" translatable="yes">Item h</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem164">
+                                <property name="label" translatable="yes">Item i</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem165">
+                                <property name="label" translatable="yes">Item j</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem166">
+                                <property name="label" translatable="yes">Item k</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem167">
+                                <property name="label" translatable="yes">Item l</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem168">
+                                <property name="label" translatable="yes">Item m</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem169">
+                                <property name="label" translatable="yes">Item n</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem170">
+                                <property name="label" translatable="yes">Item o</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem171">
+                                <property name="label" translatable="yes">Item p</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem172">
+                                <property name="label" translatable="yes">Item q</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem173">
+                                <property name="label" translatable="yes">Item r</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem174">
+                                <property name="label" translatable="yes">Item s</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem175">
+                                <property name="label" translatable="yes">Item t</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem176">
+                                <property name="label" translatable="yes">Item u</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem177">
+                                <property name="label" translatable="yes">Item v</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem178">
+                                <property name="label" translatable="yes">Item w</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem179">
+                                <property name="label" translatable="yes">Item x</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem180">
+                                <property name="label" translatable="yes">Item y</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem181">
+                                <property name="label" translatable="yes">Item z</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
                           </object>
                         </child>
                       </object>
                     </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkMenuItem" id="menuitem5">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Really _Deep Menu</property>
-                    <property name="use_underline">True</property>
-                    <child type="submenu">
-                      <object class="GtkMenu" id="menu4">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem6">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _A</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem7">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _B</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem8">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _C</property>
-                            <property name="use_underline">True</property>
-                            <child type="submenu">
-                              <object class="GtkMenu" id="menu5">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="GtkMenuItem" id="menuitem9">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Item _D</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkMenuItem" id="menuitem10">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Item _E</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkMenuItem" id="menuitem11">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Item _F</property>
-                                    <property name="use_underline">True</property>
-                                    <child type="submenu">
-                                      <object class="GtkMenu" id="menu6">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <child>
-                                          <object class="GtkMenuItem" id="menuitem12">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Item _G</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkMenuItem" id="menuitem13">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Item _H</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkMenuItem" id="menuitem14">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Item _I</property>
-                                            <property name="use_underline">True</property>
-                                            <child type="submenu">
-                                              <object class="GtkMenu" id="menu7">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <child>
-                                                  <object class="GtkMenuItem" id="menuitem15">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
-                                                    <property name="label" translatable="yes">Item _J</property>
-                                                    <property name="use_underline">True</property>
-                                                  </object>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkMenuItem" id="menuitem16">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
-                                                    <property name="label" translatable="yes">Item _K</property>
-                                                    <property name="use_underline">True</property>
-                                                  </object>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkMenuItem" id="menuitem17">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
-                                                    <property name="label" translatable="yes">Item _L</property>
-                                                    <property name="use_underline">True</property>
-                                                    <child type="submenu">
-                                                      <object class="GtkMenu" id="menu8">
-                                                        <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
-                                                        <child>
-                                                          <object class="GtkMenuItem" id="menuitem18">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _M</property>
-                                                            <property name="use_underline">True</property>
-                                                          </object>
-                                                        </child>
-                                                        <child>
-                                                          <object class="GtkMenuItem" id="menuitem19">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _N</property>
-                                                            <property name="use_underline">True</property>
-                                                          </object>
-                                                        </child>
-                                                        <child>
-                                                          <object class="GtkMenuItem" id="menuitem20">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _O</property>
-                                                            <property name="use_underline">True</property>
-                                                            <child type="submenu">
-                                                            <object class="GtkMenu" id="menu9">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem5">
+                        <property name="label" translatable="yes">Really _Deep Menu</property>
+                        <property name="use_underline">1</property>
+                        <child type="submenu">
+                          <object class="GtkMenu" id="menu4">
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem6">
+                                <property name="label" translatable="yes">Item _A</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem7">
+                                <property name="label" translatable="yes">Item _B</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem8">
+                                <property name="label" translatable="yes">Item _C</property>
+                                <property name="use_underline">1</property>
+                                <child type="submenu">
+                                  <object class="GtkMenu" id="menu5">
+                                    <child>
+                                      <object class="GtkMenuItem" id="menuitem9">
+                                        <property name="label" translatable="yes">Item _D</property>
+                                        <property name="use_underline">1</property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkMenuItem" id="menuitem10">
+                                        <property name="label" translatable="yes">Item _E</property>
+                                        <property name="use_underline">1</property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkMenuItem" id="menuitem11">
+                                        <property name="label" translatable="yes">Item _F</property>
+                                        <property name="use_underline">1</property>
+                                        <child type="submenu">
+                                          <object class="GtkMenu" id="menu6">
+                                            <child>
+                                              <object class="GtkMenuItem" id="menuitem12">
+                                                <property name="label" translatable="yes">Item _G</property>
+                                                <property name="use_underline">1</property>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkMenuItem" id="menuitem13">
+                                                <property name="label" translatable="yes">Item _H</property>
+                                                <property name="use_underline">1</property>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkMenuItem" id="menuitem14">
+                                                <property name="label" translatable="yes">Item _I</property>
+                                                <property name="use_underline">1</property>
+                                                <child type="submenu">
+                                                  <object class="GtkMenu" id="menu7">
+                                                    <child>
+                                                      <object class="GtkMenuItem" id="menuitem15">
+                                                        <property name="label" translatable="yes">Item _J</property>
+                                                        <property name="use_underline">1</property>
+                                                      </object>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkMenuItem" id="menuitem16">
+                                                        <property name="label" translatable="yes">Item _K</property>
+                                                        <property name="use_underline">1</property>
+                                                      </object>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkMenuItem" id="menuitem17">
+                                                        <property name="label" translatable="yes">Item _L</property>
+                                                        <property name="use_underline">1</property>
+                                                        <child type="submenu">
+                                                          <object class="GtkMenu" id="menu8">
                                                             <child>
-                                                            <object class="GtkMenuItem" id="menuitem21">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _P</property>
-                                                            <property name="use_underline">True</property>
-                                                            </object>
+                                                              <object class="GtkMenuItem" id="menuitem18">
+                                                                <property name="label" translatable="yes">Item _M</property>
+                                                                <property name="use_underline">1</property>
+                                                              </object>
                                                             </child>
                                                             <child>
-                                                            <object class="GtkMenuItem" id="menuitem22">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _Q</property>
-                                                            <property name="use_underline">True</property>
-                                                            </object>
+                                                              <object class="GtkMenuItem" id="menuitem19">
+                                                                <property name="label" translatable="yes">Item _N</property>
+                                                                <property name="use_underline">1</property>
+                                                              </object>
                                                             </child>
                                                             <child>
-                                                            <object class="GtkMenuItem" id="menuitem23">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _R</property>
-                                                            <property name="use_underline">True</property>
-                                                            <child type="submenu">
-                                                            <object class="GtkMenu" id="menu10">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <child>
-                                                            <object class="GtkMenuItem" id="menuitem24">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _S</property>
-                                                            <property name="use_underline">True</property>
-                                                            </object>
-                                                            </child>
-                                                            <child>
-                                                            <object class="GtkMenuItem" id="menuitem25">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _T</property>
-                                                            <property name="use_underline">True</property>
-                                                            </object>
-                                                            </child>
-                                                            <child>
-                                                            <object class="GtkMenuItem" id="menuitem26">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _U</property>
-                                                            <property name="use_underline">True</property>
-                                                            <child type="submenu">
-                                                            <object class="GtkMenu" id="menu11">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <child>
-                                                            <object class="GtkMenuItem" id="menuitem27">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _V</property>
-                                                            <property name="use_underline">True</property>
-                                                            </object>
-                                                            </child>
-                                                            <child>
-                                                            <object class="GtkMenuItem" id="menuitem28">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _W</property>
-                                                            <property name="use_underline">True</property>
-                                                            </object>
-                                                            </child>
-                                                            <child>
-                                                            <object class="GtkMenuItem" id="menuitem29">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _X</property>
-                                                            <property name="use_underline">True</property>
-                                                            <child type="submenu">
-                                                            <object class="GtkMenu" id="menu12">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <child>
-                                                            <object class="GtkMenuItem" id="menuitem30">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _Y</property>
-                                                            <property name="use_underline">True</property>
-                                                            </object>
-                                                            </child>
-                                                            <child>
-                                                            <object class="GtkMenuItem" id="menuitem31">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _Z</property>
-                                                            <property name="use_underline">True</property>
-                                                            </object>
-                                                            </child>
-                                                            </object>
-                                                            </child>
-                                                            </object>
-                                                            </child>
-                                                            </object>
-                                                            </child>
-                                                            </object>
-                                                            </child>
-                                                            </object>
-                                                            </child>
-                                                            </object>
-                                                            </child>
-                                                            </object>
+                                                              <object class="GtkMenuItem" id="menuitem20">
+                                                                <property name="label" translatable="yes">Item _O</property>
+                                                                <property name="use_underline">1</property>
+                                                                <child type="submenu">
+                                                                  <object class="GtkMenu" id="menu9">
+                                                                    <child>
+                                                                      <object class="GtkMenuItem" id="menuitem21">
+                                                                        <property name="label" translatable="yes">Item _P</property>
+                                                                        <property name="use_underline">1</property>
+                                                                      </object>
+                                                                    </child>
+                                                                    <child>
+                                                                      <object class="GtkMenuItem" id="menuitem22">
+                                                                        <property name="label" translatable="yes">Item _Q</property>
+                                                                        <property name="use_underline">1</property>
+                                                                      </object>
+                                                                    </child>
+                                                                    <child>
+                                                                      <object class="GtkMenuItem" id="menuitem23">
+                                                                        <property name="label" translatable="yes">Item _R</property>
+                                                                        <property name="use_underline">1</property>
+                                                                        <child type="submenu">
+                                                                          <object class="GtkMenu" id="menu10">
+                                                                            <child>
+                                                                              <object class="GtkMenuItem" id="menuitem24">
+                                                                                <property name="label" translatable="yes">Item _S</property>
+                                                                                <property name="use_underline">1</property>
+                                                                              </object>
+                                                                            </child>
+                                                                            <child>
+                                                                              <object class="GtkMenuItem" id="menuitem25">
+                                                                                <property name="label" translatable="yes">Item _T</property>
+                                                                                <property name="use_underline">1</property>
+                                                                              </object>
+                                                                            </child>
+                                                                            <child>
+                                                                              <object class="GtkMenuItem" id="menuitem26">
+                                                                                <property name="label" translatable="yes">Item _U</property>
+                                                                                <property name="use_underline">1</property>
+                                                                                <child type="submenu">
+                                                                                  <object class="GtkMenu" id="menu11">
+                                                                                    <child>
+                                                                                      <object class="GtkMenuItem" id="menuitem27">
+                                                                                        <property name="label" translatable="yes">Item _V</property>
+                                                                                        <property name="use_underline">1</property>
+                                                                                      </object>
+                                                                                    </child>
+                                                                                    <child>
+                                                                                      <object class="GtkMenuItem" id="menuitem28">
+                                                                                        <property name="label" translatable="yes">Item _W</property>
+                                                                                        <property name="use_underline">1</property>
+                                                                                      </object>
+                                                                                    </child>
+                                                                                    <child>
+                                                                                      <object class="GtkMenuItem" id="menuitem29">
+                                                                                        <property name="label" translatable="yes">Item _X</property>
+                                                                                        <property name="use_underline">1</property>
+                                                                                        <child type="submenu">
+                                                                                          <object class="GtkMenu" id="menu12">
+                                                                                            <child>
+                                                                                              <object class="GtkMenuItem" id="menuitem30">
+                                                                                                <property name="label" translatable="yes">Item _Y</property>
+                                                                                                <property name="use_underline">1</property>
+                                                                                              </object>
+                                                                                            </child>
+                                                                                            <child>
+                                                                                              <object class="GtkMenuItem" id="menuitem31">
+                                                                                                <property name="label" translatable="yes">Item _Z</property>
+                                                                                                <property name="use_underline">1</property>
+                                                                                              </object>
+                                                                                            </child>
+                                                                                          </object>
+                                                                                        </child>
+                                                                                      </object>
+                                                                                    </child>
+                                                                                  </object>
+                                                                                </child>
+                                                                              </object>
+                                                                            </child>
+                                                                          </object>
+                                                                        </child>
+                                                                      </object>
+                                                                    </child>
+                                                                  </object>
+                                                                </child>
+                                                              </object>
                                                             </child>
                                                           </object>
                                                         </child>
@@ -1246,833 +922,614 @@
                         </child>
                       </object>
                     </child>
+                    <layout>
+                      <property name="left_attach">0</property>
+                      <property name="top_attach">0</property>
+                    </layout>
                   </object>
                 </child>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkMenuBar" id="menubar2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">start</property>
-                <property name="pack_direction">ttb</property>
                 <child>
-                  <object class="GtkMenuItem" id="menuitem32">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_File</property>
-                    <property name="use_underline">True</property>
-                    <child type="submenu">
-                      <object class="GtkMenu" id="menu13">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkMenuItem" id="imagemenuitem11">
-                            <property name="label">gtk-new</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="imagemenuitem12">
-                            <property name="label">gtk-open</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="imagemenuitem13">
-                            <property name="label">gtk-save</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="imagemenuitem14">
-                            <property name="label">gtk-save-as</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkSeparatorMenuItem" id="separatormenuitem2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="imagemenuitem15">
-                            <property name="label">gtk-quit</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
+                  <object class="GtkMenuBar" id="menubar2">
+                    <property name="halign">start</property>
+                    <property name="pack_direction">ttb</property>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem32">
+                        <property name="label" translatable="yes">_File</property>
+                        <property name="use_underline">1</property>
+                        <child type="submenu">
+                          <object class="GtkMenu" id="menu13">
+                            <child>
+                              <object class="GtkMenuItem" id="imagemenuitem11">
+                                <property name="label">gtk-new</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="imagemenuitem12">
+                                <property name="label">gtk-open</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="imagemenuitem13">
+                                <property name="label">gtk-save</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="imagemenuitem14">
+                                <property name="label">gtk-save-as</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkSeparatorMenuItem" id="separatormenuitem2"/>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="imagemenuitem15">
+                                <property name="label">gtk-quit</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
                           </object>
                         </child>
                       </object>
                     </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkMenuItem" id="menuitem33">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Edit</property>
-                    <property name="use_underline">True</property>
-                    <child type="submenu">
-                      <object class="GtkMenu" id="menu14">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkMenuItem" id="imagemenuitem16">
-                            <property name="label">gtk-cut</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="imagemenuitem17">
-                            <property name="label">gtk-copy</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="imagemenuitem18">
-                            <property name="label">gtk-paste</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="imagemenuitem19">
-                            <property name="label">gtk-delete</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem33">
+                        <property name="label" translatable="yes">_Edit</property>
+                        <property name="use_underline">1</property>
+                        <child type="submenu">
+                          <object class="GtkMenu" id="menu14">
+                            <child>
+                              <object class="GtkMenuItem" id="imagemenuitem16">
+                                <property name="label">gtk-cut</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="imagemenuitem17">
+                                <property name="label">gtk-copy</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="imagemenuitem18">
+                                <property name="label">gtk-paste</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="imagemenuitem19">
+                                <property name="label">gtk-delete</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
                           </object>
                         </child>
                       </object>
                     </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkMenuItem" id="menuitem34">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_View</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkMenuItem" id="menuitem35">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Help</property>
-                    <property name="use_underline">True</property>
-                    <child type="submenu">
-                      <object class="GtkMenu" id="menu15">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkMenuItem" id="imagemenuitem20">
-                            <property name="label">gtk-about</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem34">
+                        <property name="label" translatable="yes">_View</property>
+                        <property name="use_underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem35">
+                        <property name="label" translatable="yes">_Help</property>
+                        <property name="use_underline">1</property>
+                        <child type="submenu">
+                          <object class="GtkMenu" id="menu15">
+                            <child>
+                              <object class="GtkMenuItem" id="imagemenuitem20">
+                                <property name="label">gtk-about</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
                           </object>
                         </child>
                       </object>
                     </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkMenuItem" id="menuitem99">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Really _Tall Menu</property>
-                    <property name="use_underline">True</property>
-                    <child type="submenu">
-                      <object class="GtkMenu" id="menu29">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem100">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _A</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem101">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _B</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem102">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _C</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem103">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _D</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem104">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _E</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem105">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _F</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem106">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _G</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem107">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _H</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem108">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _I</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem109">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _J</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem110">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _K</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem111">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _L</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem112">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _M</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem113">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _N</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem114">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _O</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem115">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _P</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem116">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _Q</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem117">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _R</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem118">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _S</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem119">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _T</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem120">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _U</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem121">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _V</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem122">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _W</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem123">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _X</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem124">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _Y</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem125">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _Z</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem182">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item a</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem183">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item b</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem184">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item c</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem185">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item d</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem186">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item e</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem187">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item f</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem188">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item g</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem189">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item h</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem190">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item i</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem191">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item j</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem192">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item k</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem193">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item l</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem194">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item m</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem195">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item n</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem196">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item o</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem197">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item p</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem198">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item q</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem199">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item r</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem200">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item s</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem201">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item t</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem202">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item u</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem203">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item v</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem204">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item w</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem205">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item x</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem206">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item y</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem207">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item z</property>
-                            <property name="use_underline">True</property>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem99">
+                        <property name="label" translatable="yes">Really _Tall Menu</property>
+                        <property name="use_underline">1</property>
+                        <child type="submenu">
+                          <object class="GtkMenu" id="menu29">
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem100">
+                                <property name="label" translatable="yes">Item _A</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem101">
+                                <property name="label" translatable="yes">Item _B</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem102">
+                                <property name="label" translatable="yes">Item _C</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem103">
+                                <property name="label" translatable="yes">Item _D</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem104">
+                                <property name="label" translatable="yes">Item _E</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem105">
+                                <property name="label" translatable="yes">Item _F</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem106">
+                                <property name="label" translatable="yes">Item _G</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem107">
+                                <property name="label" translatable="yes">Item _H</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem108">
+                                <property name="label" translatable="yes">Item _I</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem109">
+                                <property name="label" translatable="yes">Item _J</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem110">
+                                <property name="label" translatable="yes">Item _K</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem111">
+                                <property name="label" translatable="yes">Item _L</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem112">
+                                <property name="label" translatable="yes">Item _M</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem113">
+                                <property name="label" translatable="yes">Item _N</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem114">
+                                <property name="label" translatable="yes">Item _O</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem115">
+                                <property name="label" translatable="yes">Item _P</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem116">
+                                <property name="label" translatable="yes">Item _Q</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem117">
+                                <property name="label" translatable="yes">Item _R</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem118">
+                                <property name="label" translatable="yes">Item _S</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem119">
+                                <property name="label" translatable="yes">Item _T</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem120">
+                                <property name="label" translatable="yes">Item _U</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem121">
+                                <property name="label" translatable="yes">Item _V</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem122">
+                                <property name="label" translatable="yes">Item _W</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem123">
+                                <property name="label" translatable="yes">Item _X</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem124">
+                                <property name="label" translatable="yes">Item _Y</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem125">
+                                <property name="label" translatable="yes">Item _Z</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem182">
+                                <property name="label" translatable="yes">Item a</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem183">
+                                <property name="label" translatable="yes">Item b</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem184">
+                                <property name="label" translatable="yes">Item c</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem185">
+                                <property name="label" translatable="yes">Item d</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem186">
+                                <property name="label" translatable="yes">Item e</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem187">
+                                <property name="label" translatable="yes">Item f</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem188">
+                                <property name="label" translatable="yes">Item g</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem189">
+                                <property name="label" translatable="yes">Item h</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem190">
+                                <property name="label" translatable="yes">Item i</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem191">
+                                <property name="label" translatable="yes">Item j</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem192">
+                                <property name="label" translatable="yes">Item k</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem193">
+                                <property name="label" translatable="yes">Item l</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem194">
+                                <property name="label" translatable="yes">Item m</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem195">
+                                <property name="label" translatable="yes">Item n</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem196">
+                                <property name="label" translatable="yes">Item o</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem197">
+                                <property name="label" translatable="yes">Item p</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem198">
+                                <property name="label" translatable="yes">Item q</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem199">
+                                <property name="label" translatable="yes">Item r</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem200">
+                                <property name="label" translatable="yes">Item s</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem201">
+                                <property name="label" translatable="yes">Item t</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem202">
+                                <property name="label" translatable="yes">Item u</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem203">
+                                <property name="label" translatable="yes">Item v</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem204">
+                                <property name="label" translatable="yes">Item w</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem205">
+                                <property name="label" translatable="yes">Item x</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem206">
+                                <property name="label" translatable="yes">Item y</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem207">
+                                <property name="label" translatable="yes">Item z</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
                           </object>
                         </child>
                       </object>
                     </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkMenuItem" id="menuitem36">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Really _Deep Menu</property>
-                    <property name="use_underline">True</property>
-                    <child type="submenu">
-                      <object class="GtkMenu" id="menu16">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem37">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _A</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem38">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _B</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menuitem39">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Item _C</property>
-                            <property name="use_underline">True</property>
-                            <child type="submenu">
-                              <object class="GtkMenu" id="menu17">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="GtkMenuItem" id="menuitem40">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Item _D</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkMenuItem" id="menuitem41">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Item _E</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkMenuItem" id="menuitem42">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Item _F</property>
-                                    <property name="use_underline">True</property>
-                                    <child type="submenu">
-                                      <object class="GtkMenu" id="menu18">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <child>
-                                          <object class="GtkMenuItem" id="menuitem43">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Item _G</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkMenuItem" id="menuitem44">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Item _H</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkMenuItem" id="menuitem45">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Item _I</property>
-                                            <property name="use_underline">True</property>
-                                            <child type="submenu">
-                                              <object class="GtkMenu" id="menu19">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <child>
-                                                  <object class="GtkMenuItem" id="menuitem46">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
-                                                    <property name="label" translatable="yes">Item _J</property>
-                                                    <property name="use_underline">True</property>
-                                                  </object>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkMenuItem" id="menuitem47">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
-                                                    <property name="label" translatable="yes">Item _K</property>
-                                                    <property name="use_underline">True</property>
-                                                  </object>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkMenuItem" id="menuitem48">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
-                                                    <property name="label" translatable="yes">Item _L</property>
-                                                    <property name="use_underline">True</property>
-                                                    <child type="submenu">
-                                                      <object class="GtkMenu" id="menu20">
-                                                        <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
-                                                        <child>
-                                                          <object class="GtkMenuItem" id="menuitem49">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _M</property>
-                                                            <property name="use_underline">True</property>
-                                                          </object>
-                                                        </child>
-                                                        <child>
-                                                          <object class="GtkMenuItem" id="menuitem50">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _N</property>
-                                                            <property name="use_underline">True</property>
-                                                          </object>
-                                                        </child>
-                                                        <child>
-                                                          <object class="GtkMenuItem" id="menuitem51">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _O</property>
-                                                            <property name="use_underline">True</property>
-                                                            <child type="submenu">
-                                                            <object class="GtkMenu" id="menu21">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem36">
+                        <property name="label" translatable="yes">Really _Deep Menu</property>
+                        <property name="use_underline">1</property>
+                        <child type="submenu">
+                          <object class="GtkMenu" id="menu16">
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem37">
+                                <property name="label" translatable="yes">Item _A</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem38">
+                                <property name="label" translatable="yes">Item _B</property>
+                                <property name="use_underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem39">
+                                <property name="label" translatable="yes">Item _C</property>
+                                <property name="use_underline">1</property>
+                                <child type="submenu">
+                                  <object class="GtkMenu" id="menu17">
+                                    <child>
+                                      <object class="GtkMenuItem" id="menuitem40">
+                                        <property name="label" translatable="yes">Item _D</property>
+                                        <property name="use_underline">1</property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkMenuItem" id="menuitem41">
+                                        <property name="label" translatable="yes">Item _E</property>
+                                        <property name="use_underline">1</property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkMenuItem" id="menuitem42">
+                                        <property name="label" translatable="yes">Item _F</property>
+                                        <property name="use_underline">1</property>
+                                        <child type="submenu">
+                                          <object class="GtkMenu" id="menu18">
+                                            <child>
+                                              <object class="GtkMenuItem" id="menuitem43">
+                                                <property name="label" translatable="yes">Item _G</property>
+                                                <property name="use_underline">1</property>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkMenuItem" id="menuitem44">
+                                                <property name="label" translatable="yes">Item _H</property>
+                                                <property name="use_underline">1</property>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkMenuItem" id="menuitem45">
+                                                <property name="label" translatable="yes">Item _I</property>
+                                                <property name="use_underline">1</property>
+                                                <child type="submenu">
+                                                  <object class="GtkMenu" id="menu19">
+                                                    <child>
+                                                      <object class="GtkMenuItem" id="menuitem46">
+                                                        <property name="label" translatable="yes">Item _J</property>
+                                                        <property name="use_underline">1</property>
+                                                      </object>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkMenuItem" id="menuitem47">
+                                                        <property name="label" translatable="yes">Item _K</property>
+                                                        <property name="use_underline">1</property>
+                                                      </object>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkMenuItem" id="menuitem48">
+                                                        <property name="label" translatable="yes">Item _L</property>
+                                                        <property name="use_underline">1</property>
+                                                        <child type="submenu">
+                                                          <object class="GtkMenu" id="menu20">
                                                             <child>
-                                                            <object class="GtkMenuItem" id="menuitem52">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _P</property>
-                                                            <property name="use_underline">True</property>
-                                                            </object>
+                                                              <object class="GtkMenuItem" id="menuitem49">
+                                                                <property name="label" translatable="yes">Item _M</property>
+                                                                <property name="use_underline">1</property>
+                                                              </object>
                                                             </child>
                                                             <child>
-                                                            <object class="GtkMenuItem" id="menuitem53">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _Q</property>
-                                                            <property name="use_underline">True</property>
-                                                            </object>
+                                                              <object class="GtkMenuItem" id="menuitem50">
+                                                                <property name="label" translatable="yes">Item _N</property>
+                                                                <property name="use_underline">1</property>
+                                                              </object>
                                                             </child>
                                                             <child>
-                                                            <object class="GtkMenuItem" id="menuitem54">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _R</property>
-                                                            <property name="use_underline">True</property>
-                                                            <child type="submenu">
-                                                            <object class="GtkMenu" id="menu22">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <child>
-                                                            <object class="GtkMenuItem" id="menuitem55">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _S</property>
-                                                            <property name="use_underline">True</property>
-                                                            </object>
-                                                            </child>
-                                                            <child>
-                                                            <object class="GtkMenuItem" id="menuitem56">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _T</property>
-                                                            <property name="use_underline">True</property>
-                                                            </object>
-                                                            </child>
-                                                            <child>
-                                                            <object class="GtkMenuItem" id="menuitem57">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _U</property>
-                                                            <property name="use_underline">True</property>
-                                                            <child type="submenu">
-                                                            <object class="GtkMenu" id="menu23">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <child>
-                                                            <object class="GtkMenuItem" id="menuitem58">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _V</property>
-                                                            <property name="use_underline">True</property>
-                                                            </object>
-                                                            </child>
-                                                            <child>
-                                                            <object class="GtkMenuItem" id="menuitem59">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _W</property>
-                                                            <property name="use_underline">True</property>
-                                                            </object>
-                                                            </child>
-                                                            <child>
-                                                            <object class="GtkMenuItem" id="menuitem60">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _X</property>
-                                                            <property name="use_underline">True</property>
-                                                            <child type="submenu">
-                                                            <object class="GtkMenu" id="menu24">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <child>
-                                                            <object class="GtkMenuItem" id="menuitem61">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _Y</property>
-                                                            <property name="use_underline">True</property>
-                                                            </object>
-                                                            </child>
-                                                            <child>
-                                                            <object class="GtkMenuItem" id="menuitem62">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Item _Z</property>
-                                                            <property name="use_underline">True</property>
-                                                            </object>
-                                                            </child>
-                                                            </object>
-                                                            </child>
-                                                            </object>
-                                                            </child>
-                                                            </object>
-                                                            </child>
-                                                            </object>
-                                                            </child>
-                                                            </object>
-                                                            </child>
-                                                            </object>
-                                                            </child>
-                                                            </object>
+                                                              <object class="GtkMenuItem" id="menuitem51">
+                                                                <property name="label" translatable="yes">Item _O</property>
+                                                                <property name="use_underline">1</property>
+                                                                <child type="submenu">
+                                                                  <object class="GtkMenu" id="menu21">
+                                                                    <child>
+                                                                      <object class="GtkMenuItem" id="menuitem52">
+                                                                        <property name="label" translatable="yes">Item _P</property>
+                                                                        <property name="use_underline">1</property>
+                                                                      </object>
+                                                                    </child>
+                                                                    <child>
+                                                                      <object class="GtkMenuItem" id="menuitem53">
+                                                                        <property name="label" translatable="yes">Item _Q</property>
+                                                                        <property name="use_underline">1</property>
+                                                                      </object>
+                                                                    </child>
+                                                                    <child>
+                                                                      <object class="GtkMenuItem" id="menuitem54">
+                                                                        <property name="label" translatable="yes">Item _R</property>
+                                                                        <property name="use_underline">1</property>
+                                                                        <child type="submenu">
+                                                                          <object class="GtkMenu" id="menu22">
+                                                                            <child>
+                                                                              <object class="GtkMenuItem" id="menuitem55">
+                                                                                <property name="label" translatable="yes">Item _S</property>
+                                                                                <property name="use_underline">1</property>
+                                                                              </object>
+                                                                            </child>
+                                                                            <child>
+                                                                              <object class="GtkMenuItem" id="menuitem56">
+                                                                                <property name="label" translatable="yes">Item _T</property>
+                                                                                <property name="use_underline">1</property>
+                                                                              </object>
+                                                                            </child>
+                                                                            <child>
+                                                                              <object class="GtkMenuItem" id="menuitem57">
+                                                                                <property name="label" translatable="yes">Item _U</property>
+                                                                                <property name="use_underline">1</property>
+                                                                                <child type="submenu">
+                                                                                  <object class="GtkMenu" id="menu23">
+                                                                                    <child>
+                                                                                      <object class="GtkMenuItem" id="menuitem58">
+                                                                                        <property name="label" translatable="yes">Item _V</property>
+                                                                                        <property name="use_underline">1</property>
+                                                                                      </object>
+                                                                                    </child>
+                                                                                    <child>
+                                                                                      <object class="GtkMenuItem" id="menuitem59">
+                                                                                        <property name="label" translatable="yes">Item _W</property>
+                                                                                        <property name="use_underline">1</property>
+                                                                                      </object>
+                                                                                    </child>
+                                                                                    <child>
+                                                                                      <object class="GtkMenuItem" id="menuitem60">
+                                                                                        <property name="label" translatable="yes">Item _X</property>
+                                                                                        <property name="use_underline">1</property>
+                                                                                        <child type="submenu">
+                                                                                          <object class="GtkMenu" id="menu24">
+                                                                                            <child>
+                                                                                              <object class="GtkMenuItem" id="menuitem61">
+                                                                                                <property name="label" translatable="yes">Item _Y</property>
+                                                                                                <property name="use_underline">1</property>
+                                                                                              </object>
+                                                                                            </child>
+                                                                                            <child>
+                                                                                              <object class="GtkMenuItem" id="menuitem62">
+                                                                                                <property name="label" translatable="yes">Item _Z</property>
+                                                                                                <property name="use_underline">1</property>
+                                                                                              </object>
+                                                                                            </child>
+                                                                                          </object>
+                                                                                        </child>
+                                                                                      </object>
+                                                                                    </child>
+                                                                                  </object>
+                                                                                </child>
+                                                                              </object>
+                                                                            </child>
+                                                                          </object>
+                                                                        </child>
+                                                                      </object>
+                                                                    </child>
+                                                                  </object>
+                                                                </child>
+                                                              </object>
                                                             </child>
                                                           </object>
                                                         </child>
@@ -2094,795 +1551,623 @@
                         </child>
                       </object>
                     </child>
+                    <layout>
+                      <property name="left_attach">0</property>
+                      <property name="top_attach">1</property>
+                    </layout>
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="label1">
+                <property name="label" translatable="yes">GtkMenu</property>
+              </object>
+            </property>
           </object>
         </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">GtkMenu</property>
-          </object>
-          <packing>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
         <child>
-          <object class="GtkGrid" id="grid2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkMenuButton" id="menubutton1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="popup">menu39</property>
-                <property name="direction">none</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkMenuButton" id="menubutton2">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="halign">end</property>
-                <property name="valign">end</property>
-                <property name="vexpand">True</property>
-                <property name="popup">menu27</property>
-                <property name="direction">up</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkMenuButton" id="menubutton3">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="halign">center</property>
-                <property name="valign">end</property>
-                <property name="vexpand">True</property>
-                <property name="popup">menu26</property>
-                <property name="direction">up</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkMenuButton" id="menubutton4">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="halign">start</property>
-                <property name="valign">end</property>
-                <property name="vexpand">True</property>
-                <property name="popup">menu25</property>
-                <property name="direction">up</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">3</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkMenuButton" id="menubutton5">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="halign">start</property>
-                <property name="valign">end</property>
-                <property name="hexpand">True</property>
-                <property name="popup">menu32</property>
-                <property name="direction">right</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">4</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkMenuButton" id="menubutton6">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="halign">start</property>
-                <property name="valign">center</property>
-                <property name="hexpand">True</property>
-                <property name="popup">menu31</property>
-                <property name="direction">right</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">4</property>
-                <property name="top_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkMenuButton" id="menubutton7">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="halign">start</property>
-                <property name="valign">start</property>
-                <property name="hexpand">True</property>
-                <property name="popup">menu30</property>
-                <property name="direction">right</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">4</property>
-                <property name="top_attach">3</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkMenuButton" id="menubutton8">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="halign">start</property>
-                <property name="valign">start</property>
-                <property name="vexpand">True</property>
-                <property name="popup">menu33</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">3</property>
-                <property name="top_attach">4</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkMenuButton" id="menubutton9">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="halign">center</property>
-                <property name="valign">start</property>
-                <property name="vexpand">True</property>
-                <property name="popup">menu34</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">4</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkMenuButton" id="menubutton10">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="halign">end</property>
-                <property name="valign">start</property>
-                <property name="vexpand">True</property>
-                <property name="popup">menu35</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">4</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkMenuButton" id="menubutton11">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="halign">end</property>
-                <property name="valign">start</property>
-                <property name="hexpand">True</property>
-                <property name="popup">menu36</property>
-                <property name="direction">left</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">3</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkMenuButton" id="menubutton12">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="halign">end</property>
-                <property name="valign">center</property>
-                <property name="hexpand">True</property>
-                <property name="popup">menu37</property>
-                <property name="direction">left</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkMenuButton" id="menubutton13">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="halign">end</property>
-                <property name="valign">end</property>
-                <property name="hexpand">True</property>
-                <property name="popup">menu38</property>
-                <property name="direction">left</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
+          <object class="GtkNotebookPage">
             <property name="position">1</property>
-          </packing>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">GtkMenuButton</property>
-          </object>
-          <packing>
-            <property name="position">1</property>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="label" translatable="yes">This is a label.</property>
-            <property name="selectable">True</property>
-          </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">GtkLabel</property>
-          </object>
-          <packing>
-            <property name="position">2</property>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLinkButton" id="linkbutton1">
-            <property name="label" translatable="yes">https://planet.gnome.org</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="relief">none</property>
-            <property name="uri">https://planet.gnome.org</property>
-          </object>
-          <packing>
-            <property name="position">3</property>
-          </packing>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">GtkLinkButton</property>
-          </object>
-          <packing>
-            <property name="position">3</property>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkGrid" id="grid3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkToolbar" id="toolbar1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="valign">start</property>
+            <property name="child">
+              <object class="GtkGrid" id="grid2">
                 <child>
-                  <object class="GtkToolButton" id="toolbutton1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Tool Button A</property>
-                    <property name="use_underline">True</property>
+                  <object class="GtkMenuButton" id="menubutton1">
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="popup">menu39</property>
+                    <property name="direction">none</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <layout>
+                      <property name="left_attach">2</property>
+                      <property name="top_attach">2</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
                 </child>
                 <child>
-                  <object class="GtkToolButton" id="toolbutton2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Tool Button B</property>
-                    <property name="use_underline">True</property>
+                  <object class="GtkMenuButton" id="menubutton2">
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
+                    <property name="halign">end</property>
+                    <property name="valign">end</property>
+                    <property name="vexpand">1</property>
+                    <property name="popup">menu27</property>
+                    <property name="direction">up</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <layout>
+                      <property name="left_attach">1</property>
+                      <property name="top_attach">0</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
                 </child>
                 <child>
-                  <object class="GtkToolButton" id="toolbutton3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Tool Button C</property>
-                    <property name="use_underline">True</property>
+                  <object class="GtkMenuButton" id="menubutton3">
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
+                    <property name="halign">center</property>
+                    <property name="valign">end</property>
+                    <property name="vexpand">1</property>
+                    <property name="popup">menu26</property>
+                    <property name="direction">up</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <layout>
+                      <property name="left_attach">2</property>
+                      <property name="top_attach">0</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
                 </child>
                 <child>
-                  <object class="GtkToolButton" id="toolbutton4">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Tool Button D</property>
-                    <property name="use_underline">True</property>
+                  <object class="GtkMenuButton" id="menubutton4">
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
+                    <property name="halign">start</property>
+                    <property name="valign">end</property>
+                    <property name="vexpand">1</property>
+                    <property name="popup">menu25</property>
+                    <property name="direction">up</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <layout>
+                      <property name="left_attach">3</property>
+                      <property name="top_attach">0</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
                 </child>
                 <child>
-                  <object class="GtkToolButton" id="toolbutton5">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Tool Button E</property>
-                    <property name="use_underline">True</property>
+                  <object class="GtkMenuButton" id="menubutton5">
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
+                    <property name="halign">start</property>
+                    <property name="valign">end</property>
+                    <property name="hexpand">1</property>
+                    <property name="popup">menu32</property>
+                    <property name="direction">right</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <layout>
+                      <property name="left_attach">4</property>
+                      <property name="top_attach">1</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
+                </child>
+                <child>
+                  <object class="GtkMenuButton" id="menubutton6">
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
+                    <property name="halign">start</property>
+                    <property name="valign">center</property>
+                    <property name="hexpand">1</property>
+                    <property name="popup">menu31</property>
+                    <property name="direction">right</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <layout>
+                      <property name="left_attach">4</property>
+                      <property name="top_attach">2</property>
+                    </layout>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkMenuButton" id="menubutton7">
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
+                    <property name="halign">start</property>
+                    <property name="valign">start</property>
+                    <property name="hexpand">1</property>
+                    <property name="popup">menu30</property>
+                    <property name="direction">right</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <layout>
+                      <property name="left_attach">4</property>
+                      <property name="top_attach">3</property>
+                    </layout>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkMenuButton" id="menubutton8">
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
+                    <property name="halign">start</property>
+                    <property name="valign">start</property>
+                    <property name="vexpand">1</property>
+                    <property name="popup">menu33</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <layout>
+                      <property name="left_attach">3</property>
+                      <property name="top_attach">4</property>
+                    </layout>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkMenuButton" id="menubutton9">
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
+                    <property name="halign">center</property>
+                    <property name="valign">start</property>
+                    <property name="vexpand">1</property>
+                    <property name="popup">menu34</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <layout>
+                      <property name="left_attach">2</property>
+                      <property name="top_attach">4</property>
+                    </layout>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkMenuButton" id="menubutton10">
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
+                    <property name="halign">end</property>
+                    <property name="valign">start</property>
+                    <property name="vexpand">1</property>
+                    <property name="popup">menu35</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <layout>
+                      <property name="left_attach">1</property>
+                      <property name="top_attach">4</property>
+                    </layout>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkMenuButton" id="menubutton11">
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
+                    <property name="halign">end</property>
+                    <property name="valign">start</property>
+                    <property name="hexpand">1</property>
+                    <property name="popup">menu36</property>
+                    <property name="direction">left</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <layout>
+                      <property name="left_attach">0</property>
+                      <property name="top_attach">3</property>
+                    </layout>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkMenuButton" id="menubutton12">
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
+                    <property name="halign">end</property>
+                    <property name="valign">center</property>
+                    <property name="hexpand">1</property>
+                    <property name="popup">menu37</property>
+                    <property name="direction">left</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <layout>
+                      <property name="left_attach">0</property>
+                      <property name="top_attach">2</property>
+                    </layout>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkMenuButton" id="menubutton13">
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
+                    <property name="halign">end</property>
+                    <property name="valign">end</property>
+                    <property name="hexpand">1</property>
+                    <property name="popup">menu38</property>
+                    <property name="direction">left</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <layout>
+                      <property name="left_attach">0</property>
+                      <property name="top_attach">1</property>
+                    </layout>
+                  </object>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
                 </child>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolbar" id="toolbar2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">start</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkToolButton" id="toolbutton6">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Tool Button F</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="toolbutton7">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Tool Button G</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="toolbutton8">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Tool Button H</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="toolbutton9">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Tool Button I</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="toolbutton10">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Tool Button J</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="toolbutton11">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Tool Button K</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="toolbutton12">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Tool Button L</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="toolbutton13">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Tool Button M</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="toolbutton14">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Tool Button N</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="toolbutton15">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Tool Button O</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="toolbutton16">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Tool Button P</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="toolbutton17">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Tool Button Q</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="label2">
+                <property name="label" translatable="yes">GtkMenuButton</property>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
+            </property>
           </object>
-          <packing>
-            <property name="position">4</property>
-          </packing>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">GtkToolbar</property>
-          </object>
-          <packing>
-            <property name="position">4</property>
-            <property name="tab_fill">False</property>
-          </packing>
         </child>
         <child>
-          <object class="GtkEntry" id="entry1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="text" translatable="yes">This is an entry.</property>
-          </object>
-          <packing>
-            <property name="position">5</property>
-          </packing>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">GtkEntry</property>
-          </object>
-          <packing>
-            <property name="position">5</property>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkTextView" id="textview1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="wrap_mode">word</property>
-            <property name="buffer">textbuffer1</property>
-          </object>
-          <packing>
-            <property name="position">6</property>
-          </packing>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">GtkTextView</property>
-          </object>
-          <packing>
-            <property name="position">6</property>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkGrid" id="grid4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkComboBoxText" id="comboboxtext1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+          <object class="GtkNotebookPage">
+            <property name="position">2</property>
+            <property name="child">
+              <object class="GtkLabel" id="label4">
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="has_entry">True</property>
-                <items>
-                  <item translatable="yes">Combo Box Item A</item>
-                  <item translatable="yes">Combo Box Item B</item>
-                  <item translatable="yes">Combo Box Item C</item>
-                  <item translatable="yes">Combo Box Item D</item>
-                  <item translatable="yes">Combo Box Item E</item>
-                </items>
-                <child internal-child="entry">
-                  <object class="GtkEntry" id="comboboxtext-entry">
-                    <property name="can_focus">False</property>
+                <property name="label" translatable="yes">This is a label.</property>
+                <property name="selectable">1</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="label3">
+                <property name="label" translatable="yes">GtkLabel</property>
+              </object>
+            </property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkNotebookPage">
+            <property name="position">3</property>
+            <property name="child">
+              <object class="GtkLinkButton" id="linkbutton1">
+                <property name="label" translatable="yes">https://planet.gnome.org</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="relief">none</property>
+                <property name="uri">https://planet.gnome.org</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="label5">
+                <property name="label" translatable="yes">GtkLinkButton</property>
+              </object>
+            </property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkNotebookPage">
+            <property name="position">4</property>
+            <property name="child">
+              <object class="GtkGrid" id="grid3">
+                <child>
+                  <object class="GtkToolbar" id="toolbar1">
+                    <property name="valign">start</property>
+                    <child>
+                      <object class="GtkToolButton" id="toolbutton1">
+                        <property name="homogeneous">True</property>
+                        <property name="label" translatable="yes">Tool Button A</property>
+                        <property name="use_underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkToolButton" id="toolbutton2">
+                        <property name="homogeneous">True</property>
+                        <property name="label" translatable="yes">Tool Button B</property>
+                        <property name="use_underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkToolButton" id="toolbutton3">
+                        <property name="homogeneous">True</property>
+                        <property name="label" translatable="yes">Tool Button C</property>
+                        <property name="use_underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkToolButton" id="toolbutton4">
+                        <property name="homogeneous">True</property>
+                        <property name="label" translatable="yes">Tool Button D</property>
+                        <property name="use_underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkToolButton" id="toolbutton5">
+                        <property name="homogeneous">True</property>
+                        <property name="label" translatable="yes">Tool Button E</property>
+                        <property name="use_underline">1</property>
+                      </object>
+                    </child>
+                    <layout>
+                      <property name="left_attach">0</property>
+                      <property name="top_attach">0</property>
+                    </layout>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkToolbar" id="toolbar2">
+                    <property name="halign">start</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkToolButton" id="toolbutton6">
+                        <property name="homogeneous">True</property>
+                        <property name="label" translatable="yes">Tool Button F</property>
+                        <property name="use_underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkToolButton" id="toolbutton7">
+                        <property name="homogeneous">True</property>
+                        <property name="label" translatable="yes">Tool Button G</property>
+                        <property name="use_underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkToolButton" id="toolbutton8">
+                        <property name="homogeneous">True</property>
+                        <property name="label" translatable="yes">Tool Button H</property>
+                        <property name="use_underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkToolButton" id="toolbutton9">
+                        <property name="homogeneous">True</property>
+                        <property name="label" translatable="yes">Tool Button I</property>
+                        <property name="use_underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkToolButton" id="toolbutton10">
+                        <property name="homogeneous">True</property>
+                        <property name="label" translatable="yes">Tool Button J</property>
+                        <property name="use_underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkToolButton" id="toolbutton11">
+                        <property name="homogeneous">True</property>
+                        <property name="label" translatable="yes">Tool Button K</property>
+                        <property name="use_underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkToolButton" id="toolbutton12">
+                        <property name="homogeneous">True</property>
+                        <property name="label" translatable="yes">Tool Button L</property>
+                        <property name="use_underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkToolButton" id="toolbutton13">
+                        <property name="homogeneous">True</property>
+                        <property name="label" translatable="yes">Tool Button M</property>
+                        <property name="use_underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkToolButton" id="toolbutton14">
+                        <property name="homogeneous">True</property>
+                        <property name="label" translatable="yes">Tool Button N</property>
+                        <property name="use_underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkToolButton" id="toolbutton15">
+                        <property name="homogeneous">True</property>
+                        <property name="label" translatable="yes">Tool Button O</property>
+                        <property name="use_underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkToolButton" id="toolbutton16">
+                        <property name="homogeneous">True</property>
+                        <property name="label" translatable="yes">Tool Button P</property>
+                        <property name="use_underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkToolButton" id="toolbutton17">
+                        <property name="homogeneous">True</property>
+                        <property name="label" translatable="yes">Tool Button Q</property>
+                        <property name="use_underline">1</property>
+                      </object>
+                    </child>
+                    <layout>
+                      <property name="left_attach">0</property>
+                      <property name="top_attach">1</property>
+                    </layout>
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkComboBoxText" id="comboboxtext2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="label6">
+                <property name="label" translatable="yes">GtkToolbar</property>
+              </object>
+            </property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkNotebookPage">
+            <property name="position">5</property>
+            <property name="child">
+              <object class="GtkEntry" id="entry1">
+                <property name="can_focus">1</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <items>
-                  <item translatable="yes">Combo Box Item F</item>
-                  <item translatable="yes">Combo Box Item G</item>
-                  <item translatable="yes">Combo Box Item H</item>
-                  <item translatable="yes">Combo Box Item I</item>
-                  <item translatable="yes">Combo Box Item J</item>
-                </items>
+                <property name="text" translatable="yes">This is an entry.</property>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="label7">
+                <property name="label" translatable="yes">GtkEntry</property>
+              </object>
+            </property>
           </object>
-          <packing>
+        </child>
+        <child>
+          <object class="GtkNotebookPage">
+            <property name="position">6</property>
+            <property name="child">
+              <object class="GtkTextView" id="textview1">
+                <property name="can_focus">1</property>
+                <property name="wrap_mode">word</property>
+                <property name="buffer">textbuffer1</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="label8">
+                <property name="label" translatable="yes">GtkTextView</property>
+              </object>
+            </property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkNotebookPage">
             <property name="position">7</property>
-          </packing>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">GtkComboBox</property>
+            <property name="child">
+              <object class="GtkGrid" id="grid4">
+                <child>
+                  <object class="GtkComboBoxText" id="comboboxtext1">
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="hexpand">1</property>
+                    <property name="vexpand">1</property>
+                    <property name="has_entry">1</property>
+                    <items>
+                      <item translatable="yes">Combo Box Item A</item>
+                      <item translatable="yes">Combo Box Item B</item>
+                      <item translatable="yes">Combo Box Item C</item>
+                      <item translatable="yes">Combo Box Item D</item>
+                      <item translatable="yes">Combo Box Item E</item>
+                    </items>
+                    <child internal-child="entry">
+                      <object class="GtkEntry" id="comboboxtext-entry"/>
+                    </child>
+                    <layout>
+                      <property name="left_attach">0</property>
+                      <property name="top_attach">0</property>
+                    </layout>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="comboboxtext2">
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="hexpand">1</property>
+                    <property name="vexpand">1</property>
+                    <items>
+                      <item translatable="yes">Combo Box Item F</item>
+                      <item translatable="yes">Combo Box Item G</item>
+                      <item translatable="yes">Combo Box Item H</item>
+                      <item translatable="yes">Combo Box Item I</item>
+                      <item translatable="yes">Combo Box Item J</item>
+                    </items>
+                    <layout>
+                      <property name="left_attach">0</property>
+                      <property name="top_attach">1</property>
+                    </layout>
+                  </object>
+                </child>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="label9">
+                <property name="label" translatable="yes">GtkComboBox</property>
+              </object>
+            </property>
           </object>
-          <packing>
-            <property name="position">7</property>
-            <property name="tab_fill">False</property>
-          </packing>
         </child>
         <child>
-          <object class="GtkAppChooserWidget" id="appchooserwidget">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="content_type">text/plain</property>
-          </object>
-          <packing>
+          <object class="GtkNotebookPage">
             <property name="position">8</property>
-          </packing>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">GtkAppChooserWidget</property>
+            <property name="child">
+              <object class="GtkAppChooserWidget" id="appchooserwidget">
+                <property name="content_type">text/plain</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="label10">
+                <property name="label" translatable="yes">GtkAppChooserWidget</property>
+              </object>
+            </property>
           </object>
-          <packing>
-            <property name="position">8</property>
-            <property name="tab_fill">False</property>
-          </packing>
         </child>
         <child>
-          <object class="GtkFileChooserWidget" id="filechooserwidget1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
+          <object class="GtkNotebookPage">
             <property name="position">9</property>
-          </packing>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">GtkMountOperation/GtkPlacesView</property>
+            <property name="child">
+              <object class="GtkFileChooserWidget" id="filechooserwidget1"/>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="label11">
+                <property name="label" translatable="yes">GtkMountOperation/GtkPlacesView</property>
+              </object>
+            </property>
           </object>
-          <packing>
-            <property name="position">9</property>
-            <property name="tab_fill">False</property>
-          </packing>
         </child>
         <child>
-          <object class="GtkColorButton" id="colorselection1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
+          <object class="GtkNotebookPage">
             <property name="position">11</property>
-          </packing>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">GtkColorButton</property>
+            <property name="child">
+              <object class="GtkColorButton" id="colorselection1"/>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="label13">
+                <property name="label" translatable="yes">GtkColorButton</property>
+              </object>
+            </property>
           </object>
-          <packing>
-            <property name="position">11</property>
-            <property name="tab_fill">False</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/tests/testsplitheaders.ui b/tests/testsplitheaders.ui
index 569c497d08..512c22fdca 100644
--- a/tests/testsplitheaders.ui
+++ b/tests/testsplitheaders.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window">
     <property name="default-width">600</property>
@@ -11,7 +12,6 @@
               <object class="GtkCheckButton">
                 <property name="valign">center</property>
               </object>
-              <packing/>
             </child>
           </object>
         </child>
@@ -41,7 +41,6 @@
                   </object>
                 </child>
               </object>
-              <packing/>
             </child>
           </object>
         </child>
@@ -92,36 +91,37 @@
                 <child>
                   <object class="GtkLabel">
                     <property name="label">Layout</property>
+                    <layout>
+                      <property name="left-attach">0</property>
+                      <property name="top-attach">0</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkEntry" id="layout-entry">
                     <property name="width-chars">25</property>
+                    <layout>
+                      <property name="left-attach">1</property>
+                      <property name="top-attach">0</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkLabel">
                     <property name="label">Decorations</property>
+                    <layout>
+                      <property name="left-attach">0</property>
+                      <property name="top-attach">1</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">1</property>
-                  </packing>
                 </child>
                 <child>
-                  <object class="GtkCheckButton" id="decorations"/>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">1</property>
-                  </packing>
+                  <object class="GtkCheckButton" id="decorations">
+                    <layout>
+                      <property name="left-attach">1</property>
+                      <property name="top-attach">1</property>
+                    </layout>
+                  </object>
                 </child>
               </object>
             </child>
diff --git a/testsuite/a11y/buttons.ui b/testsuite/a11y/buttons.ui
index 7b86217d81..46e1f7e802 100644
--- a/testsuite/a11y/buttons.ui
+++ b/testsuite/a11y/buttons.ui
@@ -1,132 +1,116 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
         <child>
           <object class="GtkToggleButton" id="button1">
             <property name="label" translatable="yes">Hello World!</property>
-            <property name="visible">True</property>
-            <property name="active">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="active">1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkCheckButton" id="button2">
             <property name="label" translatable="yes">Hello World!</property>
-            <property name="visible">True</property>
-            <property name="active">False</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRadioButton" id="button3">
             <property name="label" translatable="yes">Hello World!</property>
-            <property name="visible">True</property>
-            <property name="active">False</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRadioButton" id="button4">
             <property name="label" translatable="yes">Hello World!</property>
-            <property name="visible">True</property>
-            <property name="active">True</property>
+            <property name="active">1</property>
             <property name="group">button3</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSwitch" id="button5">
-            <property name="visible">True</property>
-            <property name="active">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="active">1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSwitch" id="button6">
-            <property name="visible">True</property>
-            <property name="active">False</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="button6-accessible">
                 <property name="accessible-name">Test switch</property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
-
         <child>
           <object class="GtkButton" id="button7">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="label">Text Button</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button8">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button9">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/a11y/pickers.ui b/testsuite/a11y/pickers.ui
index a540fa1ccb..2a9a02756e 100644
--- a/testsuite/a11y/pickers.ui
+++ b/testsuite/a11y/pickers.ui
@@ -1,50 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
         <child>
           <object class="GtkAppChooserButton" id="button1">
-            <property name="visible">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkColorButton" id="button2">
-            <property name="visible">True</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkFontButton" id="button3">
-            <property name="visible">True</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
-<!--
-        <child>
-          <object class="GtkFileChooserButton" id="button4">
-            <property name="visible">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
-        </child>
--->
       </object>
     </child>
   </object>
diff --git a/testsuite/a11y/range.ui b/testsuite/a11y/range.ui
index 9c1ac450fa..319acf0db5 100644
--- a/testsuite/a11y/range.ui
+++ b/testsuite/a11y/range.ui
@@ -1,41 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">0.5</property>
     <property name="upper">99.5</property>
-    <property name="page-size">0</property>
     <property name="value">45.5</property>
     <property name="step-increment">0.5</property>
     <property name="page-increment">5.0</property>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
         <child>
           <object class="GtkScale" id="scale1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can_focus">1</property>
             <property name="adjustment">adjustment1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkScrollbar" id="scrollbar1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can_focus">1</property>
             <property name="adjustment">adjustment1</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/css/nodes/box.ltr.ui b/testsuite/css/nodes/box.ltr.ui
index 7e774e97ca..7454f63236 100644
--- a/testsuite/css/nodes/box.ltr.ui
+++ b/testsuite/css/nodes/box.ltr.ui
@@ -1,28 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="orientation">horizontal</property>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
             <property name="name">label1</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
             <property name="name">label2</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
             <property name="name">label3</property>
           </object>
         </child>
diff --git a/testsuite/css/nodes/box.rtl.ui b/testsuite/css/nodes/box.rtl.ui
index 7e774e97ca..7454f63236 100644
--- a/testsuite/css/nodes/box.rtl.ui
+++ b/testsuite/css/nodes/box.rtl.ui
@@ -1,28 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="orientation">horizontal</property>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
             <property name="name">label1</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
             <property name="name">label2</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
             <property name="name">label3</property>
           </object>
         </child>
diff --git a/testsuite/css/nodes/buttons.ui b/testsuite/css/nodes/buttons.ui
index 826f840769..f9343c6725 100644
--- a/testsuite/css/nodes/buttons.ui
+++ b/testsuite/css/nodes/buttons.ui
@@ -1,134 +1,118 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
         <child>
           <object class="GtkToggleButton" id="button1">
             <property name="label" translatable="yes">Hello World!</property>
-            <property name="visible">True</property>
-            <property name="active">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="active">1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkCheckButton" id="button2">
             <property name="label" translatable="yes">Hello World!</property>
-            <property name="visible">True</property>
-            <property name="active">False</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRadioButton" id="button3">
             <property name="label" translatable="yes">Hello World!</property>
-            <property name="visible">True</property>
-            <property name="active">False</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="active">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRadioButton" id="button4">
             <property name="label" translatable="yes">Hello World!</property>
-            <property name="visible">True</property>
-            <property name="active">True</property>
             <property name="group">button3</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSwitch" id="button5">
-            <property name="visible">True</property>
-            <property name="active">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="active">1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSwitch" id="button6">
-            <property name="visible">True</property>
-            <property name="active">False</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="button6-accessible">
                 <property name="accessible-name">Test switch</property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
-
         <child>
           <object class="GtkButton" id="button7">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="label">Text Button</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button8">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="icon-name">edit-find-replace</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button9">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="icon-name">window-close-symbolic</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/css/nodes/checkbutton.ltr.ui b/testsuite/css/nodes/checkbutton.ltr.ui
index 5482265ac6..98cd73b52f 100644
--- a/testsuite/css/nodes/checkbutton.ltr.ui
+++ b/testsuite/css/nodes/checkbutton.ltr.ui
@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkCheckButton">
-            <property name="visible">True</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="label">label</property>
               </object>
             </child>
@@ -21,10 +16,8 @@
         </child>
         <child>
           <object class="GtkRadioButton">
-            <property name="visible">True</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="label">label</property>
               </object>
             </child>
diff --git a/testsuite/css/nodes/checkbutton.rtl.ui b/testsuite/css/nodes/checkbutton.rtl.ui
index 5482265ac6..98cd73b52f 100644
--- a/testsuite/css/nodes/checkbutton.rtl.ui
+++ b/testsuite/css/nodes/checkbutton.rtl.ui
@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkCheckButton">
-            <property name="visible">True</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="label">label</property>
               </object>
             </child>
@@ -21,10 +16,8 @@
         </child>
         <child>
           <object class="GtkRadioButton">
-            <property name="visible">True</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="label">label</property>
               </object>
             </child>
diff --git a/testsuite/css/nodes/combobox.ui b/testsuite/css/nodes/combobox.ui
index a6be038c41..c899a71823 100644
--- a/testsuite/css/nodes/combobox.ui
+++ b/testsuite/css/nodes/combobox.ui
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
           <object class="GtkComboBoxText" id="combo1">
-            <property name="visible">True</property>
             <items>
               <item id="one">One</item>
               <item id="two">Two</item>
@@ -18,8 +15,7 @@
         </child>
         <child>
           <object class="GtkComboBoxText" id="combo2">
-            <property name="visible">True</property>
-            <property name="has-entry">True</property>
+            <property name="has-entry">1</property>
             <items>
               <item id="one">One</item>
               <item id="two">Two</item>
diff --git a/testsuite/css/nodes/entries.ui b/testsuite/css/nodes/entries.ui
index c6fa1e8d16..5d75aa4407 100644
--- a/testsuite/css/nodes/entries.ui
+++ b/testsuite/css/nodes/entries.ui
@@ -1,63 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">0.5</property>
     <property name="upper">99.5</property>
-    <property name="page-size">0</property>
     <property name="value">45.5</property>
     <property name="step-increment">0.5</property>
     <property name="page-increment">5.0</property>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
           <object class="GtkLabel" id="label1">
             <property name="label">_entry:</property>
-            <property name="visible">True</property>
-            <property name="use-underline">True</property>
+            <property name="use-underline">1</property>
             <property name="mnemonic-widget">entry1</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
             <property name="label">_password entry:</property>
-            <property name="visible">True</property>
-            <property name="use-underline">True</property>
+            <property name="use-underline">1</property>
             <property name="mnemonic-widget">entry2</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
             <property name="label">_spinbutton:</property>
-            <property name="visible">True</property>
-            <property name="use-underline">True</property>
+            <property name="use-underline">1</property>
             <property name="mnemonic-widget">spinbutton1</property>
           </object>
         </child>
         <child>
           <object class="GtkEntry" id="entry1">
             <property name="text" translatable="yes">text</property>
-            <property name="visible">True</property>
             <property name="progress-fraction">0.3</property>
           </object>
         </child>
         <child>
           <object class="GtkEntry" id="entry2">
             <property name="text" translatable="yes">password text</property>
-            <property name="visible">True</property>
-            <property name="visibility">False</property>
-            <property name="invisible_char">*</property>
-            <property name="invisible_char_set">True</property>
+            <property name="visibility">0</property>
+            <property name="invisible_char_set">1</property>
           </object>
         </child>
         <child>
           <object class="GtkEntry" id="entry3">
             <property name="text" translatable="yes">icons</property>
-            <property name="visible">True</property>
             <property name="primary-icon-name">edit-copy</property>
             <property name="secondary-icon-name">edit-paste</property>
           </object>
@@ -65,7 +55,6 @@
         <child>
           <object class="GtkSpinButton" id="spinbutton1">
             <property name="adjustment">adjustment1</property>
-            <property name="visible">True</property>
           </object>
         </child>
       </object>
diff --git a/testsuite/css/nodes/expander.ltr.ui b/testsuite/css/nodes/expander.ltr.ui
index db90ffd577..f0185db2b7 100644
--- a/testsuite/css/nodes/expander.ltr.ui
+++ b/testsuite/css/nodes/expander.ltr.ui
@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkExpander">
-        <property name="visible">True</property>
         <child type="label">
           <object class="GtkLabel">
-            <property name="visible">True</property>
             <property name="label">label</property>
           </object>
         </child>
         <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-          </object>
+          <object class="GtkBox"/>
         </child>
       </object>
     </child>
diff --git a/testsuite/css/nodes/expander.rtl.ui b/testsuite/css/nodes/expander.rtl.ui
index db90ffd577..f0185db2b7 100644
--- a/testsuite/css/nodes/expander.rtl.ui
+++ b/testsuite/css/nodes/expander.rtl.ui
@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkExpander">
-        <property name="visible">True</property>
         <child type="label">
           <object class="GtkLabel">
-            <property name="visible">True</property>
             <property name="label">label</property>
           </object>
         </child>
         <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-          </object>
+          <object class="GtkBox"/>
         </child>
       </object>
     </child>
diff --git a/testsuite/css/nodes/levelbar.ltr.ui b/testsuite/css/nodes/levelbar.ltr.ui
index a74784fff1..4ff7b23a09 100644
--- a/testsuite/css/nodes/levelbar.ltr.ui
+++ b/testsuite/css/nodes/levelbar.ltr.ui
@@ -1,42 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
             <property name="value">0.5</property>
           </object>
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
-            <property name="inverted">True</property>
+            <property name="inverted">1</property>
             <property name="value">0.5</property>
           </object>
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
             <property name="value">0.2</property>
           </object>
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
             <property name="value">0.8</property>
           </object>
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
-            <property name="min-value">0</property>
             <property name="max-value">10</property>
             <property name="value">5</property>
             <property name="mode">discrete</property>
@@ -49,8 +40,6 @@
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
-            <property name="min-value">0</property>
             <property name="max-value">10</property>
             <property name="value">2</property>
             <property name="mode">discrete</property>
@@ -63,8 +52,6 @@
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
-            <property name="min-value">0</property>
             <property name="max-value">10</property>
             <property name="value">8</property>
             <property name="mode">discrete</property>
diff --git a/testsuite/css/nodes/levelbar.rtl.ui b/testsuite/css/nodes/levelbar.rtl.ui
index a74784fff1..4ff7b23a09 100644
--- a/testsuite/css/nodes/levelbar.rtl.ui
+++ b/testsuite/css/nodes/levelbar.rtl.ui
@@ -1,42 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
             <property name="value">0.5</property>
           </object>
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
-            <property name="inverted">True</property>
+            <property name="inverted">1</property>
             <property name="value">0.5</property>
           </object>
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
             <property name="value">0.2</property>
           </object>
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
             <property name="value">0.8</property>
           </object>
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
-            <property name="min-value">0</property>
             <property name="max-value">10</property>
             <property name="value">5</property>
             <property name="mode">discrete</property>
@@ -49,8 +40,6 @@
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
-            <property name="min-value">0</property>
             <property name="max-value">10</property>
             <property name="value">2</property>
             <property name="mode">discrete</property>
@@ -63,8 +52,6 @@
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
-            <property name="min-value">0</property>
             <property name="max-value">10</property>
             <property name="value">8</property>
             <property name="mode">discrete</property>
diff --git a/testsuite/css/nodes/notebook-arrows.ui b/testsuite/css/nodes/notebook-arrows.ui
index 4b3bd70fab..8763e80b68 100644
--- a/testsuite/css/nodes/notebook-arrows.ui
+++ b/testsuite/css/nodes/notebook-arrows.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
diff --git a/testsuite/css/nodes/notebook-arrows2.ui b/testsuite/css/nodes/notebook-arrows2.ui
index bd563af34a..8de9edc0f0 100644
--- a/testsuite/css/nodes/notebook-arrows2.ui
+++ b/testsuite/css/nodes/notebook-arrows2.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <child>
diff --git a/testsuite/css/nodes/notebook.bottom.ltr.ui b/testsuite/css/nodes/notebook.bottom.ltr.ui
index 927ec1f252..4c8774de39 100644
--- a/testsuite/css/nodes/notebook.bottom.ltr.ui
+++ b/testsuite/css/nodes/notebook.bottom.ltr.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
diff --git a/testsuite/css/nodes/notebook.bottom.rtl.ui b/testsuite/css/nodes/notebook.bottom.rtl.ui
index 927ec1f252..4c8774de39 100644
--- a/testsuite/css/nodes/notebook.bottom.rtl.ui
+++ b/testsuite/css/nodes/notebook.bottom.rtl.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
diff --git a/testsuite/css/nodes/notebook.left.ltr.ui b/testsuite/css/nodes/notebook.left.ltr.ui
index 3b654a680b..e1678785bd 100644
--- a/testsuite/css/nodes/notebook.left.ltr.ui
+++ b/testsuite/css/nodes/notebook.left.ltr.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
diff --git a/testsuite/css/nodes/notebook.left.rtl.ui b/testsuite/css/nodes/notebook.left.rtl.ui
index 3b654a680b..e1678785bd 100644
--- a/testsuite/css/nodes/notebook.left.rtl.ui
+++ b/testsuite/css/nodes/notebook.left.rtl.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
diff --git a/testsuite/css/nodes/notebook.right.ltr.ui b/testsuite/css/nodes/notebook.right.ltr.ui
index 26877095d7..2a4592e356 100644
--- a/testsuite/css/nodes/notebook.right.ltr.ui
+++ b/testsuite/css/nodes/notebook.right.ltr.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
diff --git a/testsuite/css/nodes/notebook.right.rtl.ui b/testsuite/css/nodes/notebook.right.rtl.ui
index 26877095d7..2a4592e356 100644
--- a/testsuite/css/nodes/notebook.right.rtl.ui
+++ b/testsuite/css/nodes/notebook.right.rtl.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
diff --git a/testsuite/css/nodes/notebook.top.ltr.ui b/testsuite/css/nodes/notebook.top.ltr.ui
index a51b936a42..05cff7f79f 100644
--- a/testsuite/css/nodes/notebook.top.ltr.ui
+++ b/testsuite/css/nodes/notebook.top.ltr.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
diff --git a/testsuite/css/nodes/notebook.top.rtl.ui b/testsuite/css/nodes/notebook.top.rtl.ui
index a51b936a42..05cff7f79f 100644
--- a/testsuite/css/nodes/notebook.top.rtl.ui
+++ b/testsuite/css/nodes/notebook.top.rtl.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
diff --git a/testsuite/css/nodes/paned.ltr.ui b/testsuite/css/nodes/paned.ltr.ui
index 69b08b672d..be2e3936fc 100644
--- a/testsuite/css/nodes/paned.ltr.ui
+++ b/testsuite/css/nodes/paned.ltr.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
diff --git a/testsuite/css/nodes/paned.rtl.ui b/testsuite/css/nodes/paned.rtl.ui
index 69b08b672d..be2e3936fc 100644
--- a/testsuite/css/nodes/paned.rtl.ui
+++ b/testsuite/css/nodes/paned.rtl.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
diff --git a/testsuite/css/nodes/progressbar.ui b/testsuite/css/nodes/progressbar.ui
index 83badd4348..18510402fd 100644
--- a/testsuite/css/nodes/progressbar.ui
+++ b/testsuite/css/nodes/progressbar.ui
@@ -1,44 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="name">progressbars</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkProgressBar">
-            <property name="visible">True</property>
-            <property name="show-text">True</property>
-            <property name="fraction">0</property>
+            <property name="show-text">1</property>
           </object>
         </child>
         <child>
           <object class="GtkProgressBar">
-            <property name="visible">True</property>
             <property name="fraction">1</property>
           </object>
         </child>
         <child>
           <object class="GtkProgressBar">
-            <property name="visible">True</property>
-            <property name="show-text">True</property>
+            <property name="show-text">1</property>
             <property name="fraction">0.4</property>
           </object>
         </child>
         <child>
           <object class="GtkProgressBar">
-            <property name="visible">True</property>
-            <property name="inverted">True</property>
+            <property name="inverted">1</property>
             <property name="fraction">0.4</property>
           </object>
         </child>
         <child>
           <object class="GtkProgressBar">
-            <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <property name="fraction">0.4</property>
           </object>
diff --git a/testsuite/gtk/grid.c b/testsuite/gtk/grid.c
index 436cfa30f2..34feec7107 100644
--- a/testsuite/gtk/grid.c
+++ b/testsuite/gtk/grid.c
@@ -31,12 +31,9 @@ test_attach (void)
 
   child = gtk_label_new ("a");
   gtk_grid_attach_next_to (g, child, NULL, GTK_POS_LEFT, 1, 1);
-  gtk_container_child_get (GTK_CONTAINER (g), child,
-                           "left-attach", &left,
-                           "top-attach", &top,
-                           "width", &width,
-                           "height", &height,
-                           NULL);
+  gtk_grid_query_child (g, child,
+                        &left, &top,
+                        &width, &height);
   g_assert_cmpint (left,   ==, -1);
   g_assert_cmpint (top,    ==, 0);
   g_assert_cmpint (width,  ==, 1);
@@ -45,12 +42,9 @@ test_attach (void)
   sibling = child;
   child = gtk_label_new ("b");
   gtk_grid_attach_next_to (g, child, sibling, GTK_POS_RIGHT, 2, 2);
-  gtk_container_child_get (GTK_CONTAINER (g), child,
-                           "left-attach", &left,
-                           "top-attach", &top,
-                           "width", &width,
-                           "height", &height,
-                           NULL);
+  gtk_grid_query_child (g, child,
+                        &left, &top,
+                        &width, &height);
   g_assert_cmpint (left,   ==, 0);
   g_assert_cmpint (top,    ==, 0);
   g_assert_cmpint (width,  ==, 2);
@@ -62,12 +56,9 @@ test_attach (void)
 
   child = gtk_label_new ("c");
   gtk_grid_attach_next_to (g, child, sibling, GTK_POS_BOTTOM, 3, 1);
-  gtk_container_child_get (GTK_CONTAINER (g), child,
-                           "left-attach", &left,
-                           "top-attach", &top,
-                           "width", &width,
-                           "height", &height,
-                           NULL);
+  gtk_grid_query_child (g, child,
+                        &left, &top,
+                        &width, &height);
   g_assert_cmpint (left,   ==, -1);
   g_assert_cmpint (top,    ==, 1);
   g_assert_cmpint (width,  ==, 3);
@@ -75,12 +66,9 @@ test_attach (void)
 
   child = gtk_label_new ("u");
   gtk_grid_attach_next_to (g, child, z, GTK_POS_LEFT, 2, 1);
-  gtk_container_child_get (GTK_CONTAINER (g), child,
-                           "left-attach", &left,
-                           "top-attach", &top,
-                           "width", &width,
-                           "height", &height,
-                           NULL);
+  gtk_grid_query_child (g, child,
+                        &left, &top,
+                        &width, &height);
   g_assert_cmpint (left,   ==, 2);
   g_assert_cmpint (top,    ==, 4);
   g_assert_cmpint (width,  ==, 2);
@@ -88,12 +76,9 @@ test_attach (void)
 
   child = gtk_label_new ("v");
   gtk_grid_attach_next_to (g, child, z, GTK_POS_RIGHT, 2, 1);
-  gtk_container_child_get (GTK_CONTAINER (g), child,
-                           "left-attach", &left,
-                           "top-attach", &top,
-                           "width", &width,
-                           "height", &height,
-                           NULL);
+  gtk_grid_query_child (g, child,
+                        &left, &top,
+                        &width, &height);
   g_assert_cmpint (left,   ==, 5);
   g_assert_cmpint (top,    ==, 4);
   g_assert_cmpint (width,  ==, 2);
@@ -101,12 +86,9 @@ test_attach (void)
 
   child = gtk_label_new ("x");
   gtk_grid_attach_next_to (g, child, z, GTK_POS_TOP, 1, 2);
-  gtk_container_child_get (GTK_CONTAINER (g), child,
-                           "left-attach", &left,
-                           "top-attach", &top,
-                           "width", &width,
-                           "height", &height,
-                           NULL);
+  gtk_grid_query_child (g, child,
+                        &left, &top,
+                        &width, &height);
   g_assert_cmpint (left,   ==, 4);
   g_assert_cmpint (top,    ==, 2);
   g_assert_cmpint (width,  ==, 1);
@@ -114,12 +96,9 @@ test_attach (void)
 
   child = gtk_label_new ("x");
   gtk_grid_attach_next_to (g, child, z, GTK_POS_TOP, 1, 2);
-  gtk_container_child_get (GTK_CONTAINER (g), child,
-                           "left-attach", &left,
-                           "top-attach", &top,
-                           "width", &width,
-                           "height", &height,
-                           NULL);
+  gtk_grid_query_child (g, child,
+                        &left, &top,
+                        &width, &height);
   g_assert_cmpint (left,   ==, 4);
   g_assert_cmpint (top,    ==, 2);
   g_assert_cmpint (width,  ==, 1);
@@ -127,12 +106,9 @@ test_attach (void)
 
   child = gtk_label_new ("y");
   gtk_grid_attach_next_to (g, child, z, GTK_POS_BOTTOM, 1, 2);
-  gtk_container_child_get (GTK_CONTAINER (g), child,
-                           "left-attach", &left,
-                           "top-attach", &top,
-                           "width", &width,
-                           "height", &height,
-                           NULL);
+  gtk_grid_query_child (g, child,
+                        &left, &top,
+                        &width, &height);
   g_assert_cmpint (left,   ==, 4);
   g_assert_cmpint (top,    ==, 5);
   g_assert_cmpint (width,  ==, 1);
@@ -145,12 +121,9 @@ test_attach (void)
 
   child  = gtk_label_new ("D");
   gtk_grid_attach_next_to (g, child, A, GTK_POS_RIGHT, 1, 3);
-  gtk_container_child_get (GTK_CONTAINER (g), child,
-                           "left-attach", &left,
-                           "top-attach", &top,
-                           "width", &width,
-                           "height", &height,
-                           NULL);
+  gtk_grid_query_child (g, child,
+                        &left, &top,
+                        &width, &height);
   g_assert_cmpint (left,   ==, 11);
   g_assert_cmpint (top,    ==, 10);
   g_assert_cmpint (width,  ==,  1);
@@ -170,12 +143,9 @@ test_add (void)
 
   child = gtk_label_new ("a");
   gtk_container_add (GTK_CONTAINER (g), child);
-  gtk_container_child_get (GTK_CONTAINER (g), child,
-                           "left-attach", &left,
-                           "top-attach", &top,
-                           "width", &width,
-                           "height", &height,
-                           NULL);
+  gtk_grid_query_child (g, child,
+                        &left, &top,
+                        &width, &height);
   g_assert_cmpint (left,   ==, 0);
   g_assert_cmpint (top,    ==, 0);
   g_assert_cmpint (width,  ==, 1);
@@ -183,12 +153,9 @@ test_add (void)
 
   child = gtk_label_new ("b");
   gtk_container_add (GTK_CONTAINER (g), child);
-  gtk_container_child_get (GTK_CONTAINER (g), child,
-                           "left-attach", &left,
-                           "top-attach", &top,
-                           "width", &width,
-                           "height", &height,
-                           NULL);
+  gtk_grid_query_child (g, child,
+                        &left, &top,
+                        &width, &height);
   g_assert_cmpint (left,   ==, 1);
   g_assert_cmpint (top,    ==, 0);
   g_assert_cmpint (width,  ==, 1);
@@ -196,12 +163,9 @@ test_add (void)
 
   child = gtk_label_new ("c");
   gtk_container_add (GTK_CONTAINER (g), child);
-  gtk_container_child_get (GTK_CONTAINER (g), child,
-                           "left-attach", &left,
-                           "top-attach", &top,
-                           "width", &width,
-                           "height", &height,
-                           NULL);
+  gtk_grid_query_child (g, child,
+                        &left, &top,
+                        &width, &height);
   g_assert_cmpint (left,   ==, 2);
   g_assert_cmpint (top,    ==, 0);
   g_assert_cmpint (width,  ==, 1);
@@ -211,12 +175,9 @@ test_add (void)
 
   child = gtk_label_new ("d");
   gtk_container_add (GTK_CONTAINER (g), child);
-  gtk_container_child_get (GTK_CONTAINER (g), child,
-                           "left-attach", &left,
-                           "top-attach", &top,
-                           "width", &width,
-                           "height", &height,
-                           NULL);
+  gtk_grid_query_child (g, child,
+                        &left, &top,
+                        &width, &height);
   g_assert_cmpint (left,   ==, 0);
   g_assert_cmpint (top,    ==, 1);
   g_assert_cmpint (width,  ==, 1);
diff --git a/testsuite/reftests/721800-0px-dotted-border.ref.ui b/testsuite/reftests/721800-0px-dotted-border.ref.ui
index bcf41a55e8..56115658fe 100644
--- a/testsuite/reftests/721800-0px-dotted-border.ref.ui
+++ b/testsuite/reftests/721800-0px-dotted-border.ref.ui
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Tue Jan 14 03:12:07 2014 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World</property>
       </object>
     </child>
diff --git a/testsuite/reftests/721800-0px-dotted-border.ui b/testsuite/reftests/721800-0px-dotted-border.ui
index 3165aa4caf..0da0e9de66 100644
--- a/testsuite/reftests/721800-0px-dotted-border.ui
+++ b/testsuite/reftests/721800-0px-dotted-border.ui
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Tue Jan 14 03:14:21 2014 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World</property>
         <style>
           <class name="broken"/>
diff --git a/testsuite/reftests/actionbar.ref.ui b/testsuite/reftests/actionbar.ref.ui
index 29297984ea..f92771d949 100644
--- a/testsuite/reftests/actionbar.ref.ui
+++ b/testsuite/reftests/actionbar.ref.ui
@@ -1,25 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkBox">
             <child>
               <object class="GtkButton">
-                <property name="visible">True</property>
                 <property name="label">1</property>
-              </object>         
+              </object>
             </child>
             <child>
               <object class="GtkButton">
-                <property name="visible">True</property>
                 <property name="label">2</property>
-              </object>         
+              </object>
             </child>
-          </object>         
+          </object>
         </child>
         <child>
           <object class="GtkButton">
@@ -30,17 +27,15 @@
           <object class="GtkBox">
             <child>
               <object class="GtkButton">
-                <property name="visible">True</property>
                 <property name="label">2</property>
-              </object>         
+              </object>
             </child>
             <child>
               <object class="GtkButton">
-                <property name="visible">True</property>
                 <property name="label">1</property>
-              </object>         
+              </object>
             </child>
-          </object>         
+          </object>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/actionbar.ui b/testsuite/reftests/actionbar.ui
index 2071b50020..064d90e143 100644
--- a/testsuite/reftests/actionbar.ui
+++ b/testsuite/reftests/actionbar.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
@@ -7,13 +8,11 @@
           <object class="GtkButton">
             <property name="label">1</property>
           </object>
-          <packing/>
         </child>
         <child type="start">
           <object class="GtkButton">
             <property name="label">2</property>
           </object>
-          <packing/>
         </child>
         <child type="center">
           <object class="GtkButton">
@@ -24,13 +23,11 @@
           <object class="GtkButton">
             <property name="label">1</property>
           </object>
-          <packing/>
         </child>
         <child type="end">
           <object class="GtkButton">
             <property name="label">2</property>
           </object>
-          <packing/>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/animation-direction.ref.ui b/testsuite/reftests/animation-direction.ref.ui
index c43ed1c11a..abcd7d641e 100644
--- a/testsuite/reftests/animation-direction.ref.ui
+++ b/testsuite/reftests/animation-direction.ref.ui
@@ -1,494 +1,426 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="column_spacing">2</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label32">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label17">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label18">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label19">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label20">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label21">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label22">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label23">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label24">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label25">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label26">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label27">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label28">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label29">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label30">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label31">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <signal name="map" handler="reftest:strip_attributes_if_no_animation"/>
             <attributes>
-              <attribute name="foreground" value="#ffffffff0000"/>
+              <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/animation-direction.ui b/testsuite/reftests/animation-direction.ui
index 887dd1dc86..3cc6672287 100644
--- a/testsuite/reftests/animation-direction.ui
+++ b/testsuite/reftests/animation-direction.ui
@@ -1,494 +1,426 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="column_spacing">2</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-normal"/>
               <class name="delay-5s"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-reverse"/>
               <class name="delay-5s"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate"/>
               <class name="delay-5s"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate-reverse"/>
               <class name="delay-5s"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate-reverse"/>
               <class name="delay-15s"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate-reverse"/>
               <class name="delay-25s"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate-reverse"/>
               <class name="delay-35s"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate-reverse"/>
               <class name="delay-45s"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate-reverse"/>
               <class name="delay-55s"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate-reverse"/>
               <class name="delay-65s"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate-reverse"/>
               <class name="delay-75s"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate"/>
               <class name="delay-15s"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate"/>
               <class name="delay-25s"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate"/>
               <class name="delay-35s"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label17">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate"/>
               <class name="delay-45s"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label18">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate"/>
               <class name="delay-55s"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label19">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate"/>
               <class name="delay-65s"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label20">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-alternate"/>
               <class name="delay-75s"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label23">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-reverse"/>
               <class name="delay-15s"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label24">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-reverse"/>
               <class name="delay-25s"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label25">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-reverse"/>
               <class name="delay-35s"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label26">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-reverse"/>
               <class name="delay-45s"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label27">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-reverse"/>
               <class name="delay-55s"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label28">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-reverse"/>
               <class name="delay-65s"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label29">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-reverse"/>
               <class name="delay-75s"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label32">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-normal"/>
               <class name="delay-15s"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label33">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-normal"/>
               <class name="delay-25s"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label34">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-normal"/>
               <class name="delay-35s"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label35">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-normal"/>
               <class name="delay-45s"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label36">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-normal"/>
               <class name="delay-55s"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label37">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-normal"/>
               <class name="delay-65s"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label38">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">XXX</property>
             <style>
               <class name="direction-normal"/>
               <class name="delay-75s"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui b/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui
index 914e4e8cbc..abc051f883 100644
--- a/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui
+++ b/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui
@@ -1,75 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">normal</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">reverse</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">alternate</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">alternate-reverse</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 2⅕x</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box31">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -77,18 +61,16 @@
             <style>
               <class name="lightorange"/>
             </style>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box32">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -96,18 +78,16 @@
             <style>
               <class name="darkorange"/>
             </style>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box30">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -115,18 +95,16 @@
             <style>
               <class name="lightorange"/>
             </style>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box29">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -134,18 +112,16 @@
             <style>
               <class name="darkorange"/>
             </style>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box28">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -153,18 +129,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box27">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -172,18 +146,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box26">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -191,18 +163,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box18">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -210,42 +180,36 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 2⅕x</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 2x</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box25">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -253,18 +217,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box24">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -272,18 +234,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box23">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -291,18 +251,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box22">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -310,18 +268,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box21">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -329,18 +285,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box20">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -348,18 +302,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box19">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -367,18 +319,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box17">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -386,42 +336,36 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 2x</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 1⅕x</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box10">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -429,18 +373,16 @@
             <style>
               <class name="lightorange"/>
             </style>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box16">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -448,18 +390,16 @@
             <style>
               <class name="darkorange"/>
             </style>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box15">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -467,18 +407,16 @@
             <style>
               <class name="darkorange"/>
             </style>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box14">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -486,30 +424,26 @@
             <style>
               <class name="lightorange"/>
             </style>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 1⅕x</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box9">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -517,18 +451,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box11">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -536,18 +468,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box12">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -555,18 +485,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box13">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -574,30 +502,26 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 1x</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box5">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -605,18 +529,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box6">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -624,18 +546,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box7">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -643,18 +563,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box8">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -662,30 +580,26 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 1x</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box1">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -693,18 +607,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box2">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -712,18 +624,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box3">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -731,18 +641,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box4">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -750,42 +658,36 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 ⅕x</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 ⅕x</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box33">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -793,18 +695,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box34">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -812,18 +712,16 @@
             <style>
               <class name="lightorange"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box35">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -831,18 +729,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box36">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -850,18 +746,16 @@
             <style>
               <class name="darkorange"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box37">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -869,18 +763,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box38">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -888,18 +780,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box39">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -907,18 +797,16 @@
             <style>
               <class name="lightorange"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box40">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -926,42 +814,36 @@
             <style>
               <class name="darkorange"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 0x</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 0x</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box41">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -969,18 +851,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box42">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -988,18 +868,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box43">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1007,18 +885,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box44">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1026,18 +902,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box45">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1045,18 +919,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box46">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1064,18 +936,16 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box47">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1083,18 +953,16 @@
             <style>
               <class name="red"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box48">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1102,11 +970,11 @@
             <style>
               <class name="yellow"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <placeholder/>
diff --git a/testsuite/reftests/animation-fill-mode-iteration-count.ui b/testsuite/reftests/animation-fill-mode-iteration-count.ui
index cfb64c74fa..4f88c507cb 100644
--- a/testsuite/reftests/animation-fill-mode-iteration-count.ui
+++ b/testsuite/reftests/animation-fill-mode-iteration-count.ui
@@ -1,75 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">normal</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">reverse</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">alternate</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">alternate-reverse</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 2⅕x</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box31">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -79,18 +63,16 @@
               <class name="after"/>
               <class name="x22"/>
             </style>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box32">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -100,18 +82,16 @@
               <class name="after"/>
               <class name="x22"/>
             </style>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box30">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -121,18 +101,16 @@
               <class name="after"/>
               <class name="x22"/>
             </style>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box29">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -142,30 +120,26 @@
               <class name="after"/>
               <class name="x22"/>
             </style>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 2⅕x</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box18">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -175,18 +149,16 @@
               <class name="before"/>
               <class name="x22"/>
             </style>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box26">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -196,18 +168,16 @@
               <class name="before"/>
               <class name="x22"/>
             </style>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box27">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -217,18 +187,16 @@
               <class name="before"/>
               <class name="x22"/>
             </style>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box28">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -238,18 +206,16 @@
               <class name="before"/>
               <class name="x22"/>
             </style>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box22">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -259,18 +225,16 @@
               <class name="after"/>
               <class name="x2"/>
             </style>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box23">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -280,18 +244,16 @@
               <class name="after"/>
               <class name="x2"/>
             </style>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box24">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -301,18 +263,16 @@
               <class name="after"/>
               <class name="x2"/>
             </style>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box25">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -322,42 +282,36 @@
               <class name="after"/>
               <class name="x2"/>
             </style>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 2x</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 2x</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box17">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -367,18 +321,16 @@
               <class name="before"/>
               <class name="x2"/>
             </style>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box19">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -388,18 +340,16 @@
               <class name="before"/>
               <class name="x2"/>
             </style>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box20">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -409,18 +359,16 @@
               <class name="before"/>
               <class name="x2"/>
             </style>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box21">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -430,30 +378,26 @@
               <class name="before"/>
               <class name="x2"/>
             </style>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 1⅕x</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box10">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -463,18 +407,16 @@
               <class name="after"/>
               <class name="x12"/>
             </style>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box16">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -484,18 +426,16 @@
               <class name="after"/>
               <class name="x12"/>
             </style>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box15">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -505,18 +445,16 @@
               <class name="after"/>
               <class name="x12"/>
             </style>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box14">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -526,18 +464,16 @@
               <class name="after"/>
               <class name="x12"/>
             </style>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box13">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -547,18 +483,16 @@
               <class name="before"/>
               <class name="x12"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box12">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -568,18 +502,16 @@
               <class name="before"/>
               <class name="x12"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box11">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -589,18 +521,16 @@
               <class name="before"/>
               <class name="x12"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box9">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -610,42 +540,36 @@
               <class name="before"/>
               <class name="x12"/>
             </style>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 1⅕x</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 1x</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box5">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -655,18 +579,16 @@
               <class name="after"/>
               <class name="x1"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box6">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -676,18 +598,16 @@
               <class name="after"/>
               <class name="x1"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box7">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -697,18 +617,16 @@
               <class name="after"/>
               <class name="x1"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box8">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -718,30 +636,26 @@
               <class name="after"/>
               <class name="x1"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 1x</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box1">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -751,18 +665,16 @@
               <class name="before"/>
               <class name="x1"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box2">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -772,18 +684,16 @@
               <class name="before"/>
               <class name="x1"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box3">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -793,18 +703,16 @@
               <class name="before"/>
               <class name="x1"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box4">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -814,42 +722,36 @@
               <class name="before"/>
               <class name="x1"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 ⅕x</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 ⅕x</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box33">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -859,18 +761,16 @@
               <class name="before"/>
               <class name="x02"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box34">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -880,18 +780,16 @@
               <class name="after"/>
               <class name="x02"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box35">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -901,18 +799,16 @@
               <class name="after"/>
               <class name="x02"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box36">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -922,18 +818,16 @@
               <class name="before"/>
               <class name="x02"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box37">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -943,18 +837,16 @@
               <class name="before"/>
               <class name="x02"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box38">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -964,18 +856,16 @@
               <class name="after"/>
               <class name="x02"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box39">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -985,18 +875,16 @@
               <class name="before"/>
               <class name="x02"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box40">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1006,42 +894,36 @@
               <class name="after"/>
               <class name="x02"/>
             </style>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;--
 0x</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">--&gt;
 0x</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box41">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1051,18 +933,16 @@
               <class name="before"/>
               <class name="x0"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box42">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1072,18 +952,16 @@
               <class name="after"/>
               <class name="x0"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box43">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1093,18 +971,16 @@
               <class name="after"/>
               <class name="x0"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box44">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1114,18 +990,16 @@
               <class name="after"/>
               <class name="x0"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box45">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1135,18 +1009,16 @@
               <class name="after"/>
               <class name="x0"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box46">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1156,18 +1028,16 @@
               <class name="before"/>
               <class name="x0"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box47">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1177,18 +1047,16 @@
               <class name="before"/>
               <class name="x0"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box48">
             <property name="width_request">50</property>
             <property name="height_request">50</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -1198,11 +1066,11 @@
               <class name="before"/>
               <class name="x0"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <placeholder/>
diff --git a/testsuite/reftests/background-area.ref.ui b/testsuite/reftests/background-area.ref.ui
index 4d63083dd0..33789a1040 100644
--- a/testsuite/reftests/background-area.ref.ui
+++ b/testsuite/reftests/background-area.ref.ui
@@ -1,53 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-	  <object class="GtkButton" id="button1">
-	    <property name="name">reference1</property>
-	    <property name="visible">True</property>
-	    <property name="can_focus">True</property>
-	    <property name="receives_default">True</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
-	  </object>
-	</child>
+          <object class="GtkButton" id="button1">
+            <property name="name">reference1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-	  <object class="GtkButton" id="button2">
-	    <property name="name">reference2</property>
-	    <property name="visible">True</property>
-	    <property name="can_focus">True</property>
-	    <property name="receives_default">True</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
-	  </object>
-	</child>
+          <object class="GtkButton" id="button2">
+            <property name="name">reference2</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-	  <object class="GtkButton" id="button3">
-	    <property name="name">reference3</property>
-	    <property name="visible">True</property>
-	    <property name="can_focus">True</property>
-	    <property name="receives_default">True</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
-	    <child>
-	      <object class="GtkButton" id="button4">
-		<property name="name">reference3inner</property>
-		<property name="visible">True</property>
-		<property name="can_focus">True</property>
-		<property name="receives_default">True</property>
-	      </object>
-	    </child>
-	  </object>
-	</child>
+          <object class="GtkButton" id="button3">
+            <property name="name">reference3</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+            <child>
+              <object class="GtkButton" id="button4">
+                <property name="name">reference3inner</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
+              </object>
+            </child>
+          </object>
+        </child>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/background-area.ui b/testsuite/reftests/background-area.ui
index d9f1303835..f4b96de1d4 100644
--- a/testsuite/reftests/background-area.ui
+++ b/testsuite/reftests/background-area.ui
@@ -1,45 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-	  <object class="GtkButton" id="button1">
-	    <property name="name">button1</property>
-	    <property name="visible">True</property>
-	    <property name="can_focus">True</property>
-	    <property name="receives_default">True</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
-	  </object>
-	</child>
+          <object class="GtkButton" id="button1">
+            <property name="name">button1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-	  <object class="GtkButton" id="button2">
-	    <property name="name">button2</property>
-	    <property name="visible">True</property>
-	    <property name="can_focus">True</property>
-	    <property name="receives_default">True</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
-	  </object>
-	</child>
+          <object class="GtkButton" id="button2">
+            <property name="name">button2</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-	  <object class="GtkButton" id="button3">
-	    <property name="name">button3</property>
-	    <property name="visible">True</property>
-	    <property name="can_focus">True</property>
-	    <property name="receives_default">True</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
-	  </object>
-	</child>
+          <object class="GtkButton" id="button3">
+            <property name="name">button3</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/background-blend-mode-clip-interaction.ref.ui b/testsuite/reftests/background-blend-mode-clip-interaction.ref.ui
index fdedb423e2..d8e47d84e3 100644
--- a/testsuite/reftests/background-blend-mode-clip-interaction.ref.ui
+++ b/testsuite/reftests/background-blend-mode-clip-interaction.ref.ui
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">50</property>
     <property name="height_request">50</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">reference</property>
     <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
+      <object class="GtkBox"/>
     </child>
   </object>
 </interface>
diff --git a/testsuite/reftests/background-blend-mode-clip-interaction.ui b/testsuite/reftests/background-blend-mode-clip-interaction.ui
index 82d787a57b..8b5af4d54e 100644
--- a/testsuite/reftests/background-blend-mode-clip-interaction.ui
+++ b/testsuite/reftests/background-blend-mode-clip-interaction.ui
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">50</property>
     <property name="height_request">50</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
+      <object class="GtkBox"/>
     </child>
   </object>
 </interface>
diff --git a/testsuite/reftests/background-color-transparent.ref.ui b/testsuite/reftests/background-color-transparent.ref.ui
index 1afe963e45..d76a96e08c 100644
--- a/testsuite/reftests/background-color-transparent.ref.ui
+++ b/testsuite/reftests/background-color-transparent.ref.ui
@@ -1,42 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkButton" id="opaque">
             <property name="label" translatable="yes">opaque</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="transparent">
             <property name="label" translatable="yes">transparent</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
-              <class name="reference" />
+              <class name="reference"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/background-color-transparent.ui b/testsuite/reftests/background-color-transparent.ui
index f0bcfce9e9..07c53021d5 100644
--- a/testsuite/reftests/background-color-transparent.ui
+++ b/testsuite/reftests/background-color-transparent.ui
@@ -1,42 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkButton" id="opaque">
             <property name="label" translatable="yes">opaque</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="transparent">
             <property name="label" translatable="yes">transparent</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
-              <class name="transparent" />
+              <class name="transparent"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/background-image-multiple.ref.ui b/testsuite/reftests/background-image-multiple.ref.ui
index e8218af6b1..079929abf1 100644
--- a/testsuite/reftests/background-image-multiple.ref.ui
+++ b/testsuite/reftests/background-image-multiple.ref.ui
@@ -1,117 +1,102 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-	  <object class="GtkButton" id="ref1">
-	    <property name="name">ref1</property>
-	    <property name="visible">True</property>
-	    <property name="can_focus">True</property>
-	    <property name="receives_default">True</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
-	  </object>
-	</child>
+          <object class="GtkButton" id="ref1">
+            <property name="name">ref1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-	  <object class="GtkButton" id="ref2">
-	    <property name="name">ref2</property>
-	    <property name="visible">True</property>
-	    <property name="can_focus">True</property>
-	    <property name="receives_default">True</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
-	  </object>
-	</child>
+          <object class="GtkButton" id="ref2">
+            <property name="name">ref2</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-	  <object class="GtkButton" id="ref3">
-	    <property name="name">ref3</property>
-	    <property name="visible">True</property>
-	    <property name="can_focus">True</property>
-	    <property name="receives_default">True</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
-	  </object>
-	</child>
+          <object class="GtkButton" id="ref3">
+            <property name="name">ref3</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-	  <object class="GtkFixed" id="fixed1">
-	    <property name="visible">True</property>
-	    <property name="can_focus">False</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
+          <object class="GtkFixed" id="fixed1">
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
             <child>
               <object class="GtkButton" id="ref4-bg">
-	        <property name="name">ref4-bg</property>
-	        <property name="visible">True</property>
-	        <property name="can_focus">True</property>
-	        <property name="receives_default">True</property>
-	        <property name="width_request">144</property>
-	        <property name="height_request">70</property>
+                <property name="name">ref4-bg</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
+                <property name="width_request">144</property>
+                <property name="height_request">70</property>
+                <layout>
+                  <property name="x">0</property>
+                  <property name="y">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">0</property>
-                <property name="y">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="ref4-fg">
-	        <property name="name">ref4-fg</property>
-	        <property name="visible">True</property>
-	        <property name="can_focus">True</property>
-	        <property name="receives_default">True</property>
-	        <property name="width_request">120</property>
-	        <property name="height_request">46</property>
+                <property name="name">ref4-fg</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
+                <property name="width_request">120</property>
+                <property name="height_request">46</property>
+                <layout>
+                  <property name="x">12</property>
+                  <property name="y">12</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">12</property>
-                <property name="y">12</property>
-              </packing>
             </child>
-	  </object>
-	</child>
+          </object>
+        </child>
         <child>
-	  <object class="GtkFixed" id="fixed2">
-	    <property name="visible">True</property>
-	    <property name="can_focus">False</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
+          <object class="GtkFixed" id="fixed2">
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
             <child>
               <object class="GtkButton" id="ref5-bg">
-	        <property name="name">ref5-bg</property>
-	        <property name="visible">True</property>
-	        <property name="can_focus">True</property>
-	        <property name="receives_default">True</property>
-	        <property name="width_request">144</property>
-	        <property name="height_request">70</property>
+                <property name="name">ref5-bg</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
+                <property name="width_request">144</property>
+                <property name="height_request">70</property>
+                <layout>
+                  <property name="x">0</property>
+                  <property name="y">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">0</property>
-                <property name="y">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="ref5-fg">
-	        <property name="name">ref5-fg</property>
-	        <property name="visible">True</property>
-	        <property name="can_focus">True</property>
-	        <property name="receives_default">True</property>
-	        <property name="width_request">120</property>
-	        <property name="height_request">46</property>
+                <property name="name">ref5-fg</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
+                <property name="width_request">120</property>
+                <property name="height_request">46</property>
+                <layout>
+                  <property name="x">12</property>
+                  <property name="y">12</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">12</property>
-                <property name="y">12</property>
-              </packing>
             </child>
-	  </object>
-	</child>
+          </object>
+        </child>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/background-image-multiple.ui b/testsuite/reftests/background-image-multiple.ui
index 1d212e6136..b30e02f939 100644
--- a/testsuite/reftests/background-image-multiple.ui
+++ b/testsuite/reftests/background-image-multiple.ui
@@ -1,65 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-	  <object class="GtkButton" id="button1">
-	    <property name="name">button1</property>
-	    <property name="visible">True</property>
-	    <property name="can_focus">True</property>
-	    <property name="receives_default">True</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
-	  </object>
-	</child>
+          <object class="GtkButton" id="button1">
+            <property name="name">button1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-	  <object class="GtkButton" id="button2">
-	    <property name="name">button2</property>
-	    <property name="visible">True</property>
-	    <property name="can_focus">True</property>
-	    <property name="receives_default">True</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
-	  </object>
-	</child>
+          <object class="GtkButton" id="button2">
+            <property name="name">button2</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-	  <object class="GtkButton" id="button3">
-	    <property name="name">button3</property>
-	    <property name="visible">True</property>
-	    <property name="can_focus">True</property>
-	    <property name="receives_default">True</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
-	  </object>
-	</child>
+          <object class="GtkButton" id="button3">
+            <property name="name">button3</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-	  <object class="GtkButton" id="button4">
-	    <property name="name">button4</property>
-	    <property name="visible">True</property>
-	    <property name="can_focus">True</property>
-	    <property name="receives_default">True</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
-	  </object>
-	</child>
+          <object class="GtkButton" id="button4">
+            <property name="name">button4</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-	  <object class="GtkButton" id="button5">
-	    <property name="name">button5</property>
-	    <property name="visible">True</property>
-	    <property name="can_focus">True</property>
-	    <property name="receives_default">True</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
-	  </object>
-	</child>
+          <object class="GtkButton" id="button5">
+            <property name="name">button5</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/background-origin.ref.ui b/testsuite/reftests/background-origin.ref.ui
index 804fd56615..bb9080172a 100644
--- a/testsuite/reftests/background-origin.ref.ui
+++ b/testsuite/reftests/background-origin.ref.ui
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="width_request">154</property>
     <property name="height_request">680</property>
     <child>
       <object class="GtkButton" id="button">
-	<property name="name">reference</property>
-	<property name="visible">True</property>
-	<property name="can_focus">True</property>
-	<property name="receives_default">True</property>
+        <property name="name">reference</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/background-origin.ui b/testsuite/reftests/background-origin.ui
index ab28b735f2..061c285cb1 100644
--- a/testsuite/reftests/background-origin.ui
+++ b/testsuite/reftests/background-origin.ui
@@ -1,105 +1,92 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-	  <object class="GtkButton" id="button1">
-	    <property name="name">button1</property>
-	    <property name="visible">True</property>
-	    <property name="can_focus">True</property>
-	    <property name="receives_default">True</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
-	  </object>
-	</child>
+          <object class="GtkButton" id="button1">
+            <property name="name">button1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-	  <object class="GtkButton" id="button2">
-	    <property name="name">button2</property>
-	    <property name="visible">True</property>
-	    <property name="can_focus">True</property>
-	    <property name="receives_default">True</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
-	  </object>
-	</child>
+          <object class="GtkButton" id="button2">
+            <property name="name">button2</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-	  <object class="GtkButton" id="button3">
-	    <property name="name">button3</property>
-	    <property name="visible">True</property>
-	    <property name="can_focus">True</property>
-	    <property name="receives_default">True</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
-	  </object>
-	</child>
+          <object class="GtkButton" id="button3">
+            <property name="name">button3</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-	  <object class="GtkButton" id="button4">
-	    <property name="name">button4</property>
-	    <property name="visible">True</property>
-	    <property name="can_focus">True</property>
-	    <property name="receives_default">True</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
-	  </object>
-	</child>
+          <object class="GtkButton" id="button4">
+            <property name="name">button4</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-	  <object class="GtkButton" id="button5">
-	    <property name="name">button5</property>
-	    <property name="visible">True</property>
-	    <property name="can_focus">True</property>
-	    <property name="receives_default">True</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
-	  </object>
-	</child>
+          <object class="GtkButton" id="button5">
+            <property name="name">button5</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-	  <object class="GtkButton" id="button6">
-	    <property name="name">button6</property>
-	    <property name="visible">True</property>
-	    <property name="can_focus">True</property>
-	    <property name="receives_default">True</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
-	  </object>
-	</child>
+          <object class="GtkButton" id="button6">
+            <property name="name">button6</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-	  <object class="GtkButton" id="button7">
-	    <property name="name">button7</property>
-	    <property name="visible">True</property>
-	    <property name="can_focus">True</property>
-	    <property name="receives_default">True</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
-	  </object>
-	</child>
+          <object class="GtkButton" id="button7">
+            <property name="name">button7</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-	  <object class="GtkButton" id="button8">
-	    <property name="name">button8</property>
-	    <property name="visible">True</property>
-	    <property name="can_focus">True</property>
-	    <property name="receives_default">True</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
-	  </object>
-	</child>
+          <object class="GtkButton" id="button8">
+            <property name="name">button8</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
         <child>
-	  <object class="GtkButton" id="button9">
-	    <property name="name">button9</property>
-	    <property name="visible">True</property>
-	    <property name="can_focus">True</property>
-	    <property name="receives_default">True</property>
-	    <property name="width_request">144</property>
-	    <property name="height_request">70</property>
-	  </object>
-	</child>
+          <object class="GtkButton" id="button9">
+            <property name="name">button9</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="width_request">144</property>
+            <property name="height_request">70</property>
+          </object>
+        </child>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/background-position-repeat.ref.ui b/testsuite/reftests/background-position-repeat.ref.ui
index 5a25d1be7c..399e9b34a4 100644
--- a/testsuite/reftests/background-position-repeat.ref.ui
+++ b/testsuite/reftests/background-position-repeat.ref.ui
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1_ref">
         <property name="name">button1_ref</property>
         <property name="width_request">40</property>
         <property name="height_request">41</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/background-position-repeat.ui b/testsuite/reftests/background-position-repeat.ui
index 057db36567..28c855bcba 100644
--- a/testsuite/reftests/background-position-repeat.ui
+++ b/testsuite/reftests/background-position-repeat.ui
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">button1</property>
         <property name="width_request">40</property>
         <property name="height_request">41</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/background-position-simple.ref.ui b/testsuite/reftests/background-position-simple.ref.ui
index a3367df249..73a6a91297 100644
--- a/testsuite/reftests/background-position-simple.ref.ui
+++ b/testsuite/reftests/background-position-simple.ref.ui
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="name">reference</property>
     <property name="width_request">40</property>
     <property name="height_request">40</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <placeholder/>
diff --git a/testsuite/reftests/background-position-simple.ui b/testsuite/reftests/background-position-simple.ui
index 27849e15e4..a15b766c8b 100644
--- a/testsuite/reftests/background-position-simple.ui
+++ b/testsuite/reftests/background-position-simple.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">40</property>
     <property name="height_request">40</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <placeholder/>
diff --git a/testsuite/reftests/background-position.ref.ui b/testsuite/reftests/background-position.ref.ui
index abbbec1aaa..627a16f656 100644
--- a/testsuite/reftests/background-position.ref.ui
+++ b/testsuite/reftests/background-position.ref.ui
@@ -1,141 +1,128 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">ref</property>
     <child>
       <object class="GtkFixed" id="fixed1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-            <property name="width_request">120</property>
-            <property name="height_request">120</property>
+        <property name="width_request">120</property>
+        <property name="height_request">120</property>
         <child>
           <object class="GtkButton" id="button1">
             <property name="width_request">20</property>
             <property name="height_request">20</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">ref</property>
+            <layout>
+              <property name="x">10</property>
+              <property name="y">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="x">10</property>
-            <property name="y">10</property>
-         </packing>
         </child>
         <child>
           <object class="GtkButton" id="button2">
             <property name="width_request">20</property>
             <property name="height_request">20</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">ref</property>
+            <layout>
+              <property name="x">40</property>
+              <property name="y">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="x">40</property>
-            <property name="y">10</property>
-         </packing>
         </child>
         <child>
           <object class="GtkButton" id="button3">
             <property name="width_request">20</property>
             <property name="height_request">20</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">ref</property>
+            <layout>
+              <property name="x">80</property>
+              <property name="y">20</property>
+            </layout>
           </object>
-          <packing>
-            <property name="x">80</property>
-            <property name="y">20</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button4">
             <property name="width_request">20</property>
             <property name="height_request">20</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">ref</property>
+            <layout>
+              <property name="x">20</property>
+              <property name="y">60</property>
+            </layout>
           </object>
-          <packing>
-            <property name="x">20</property>
-            <property name="y">60</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button5">
             <property name="width_request">20</property>
             <property name="height_request">20</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">ref</property>
+            <layout>
+              <property name="x">60</property>
+              <property name="y">40</property>
+            </layout>
           </object>
-          <packing>
-            <property name="x">60</property>
-            <property name="y">40</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button6">
             <property name="width_request">20</property>
             <property name="height_request">20</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">ref</property>
+            <layout>
+              <property name="x">100</property>
+              <property name="y">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="x">100</property>
-            <property name="y">50</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button7">
             <property name="width_request">20</property>
             <property name="height_request">20</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">ref</property>
+            <layout>
+              <property name="x">10</property>
+              <property name="y">90</property>
+            </layout>
           </object>
-          <packing>
-            <property name="x">10</property>
-            <property name="y">90</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button8">
             <property name="width_request">10</property>
             <property name="height_request">20</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">ref</property>
+            <layout>
+              <property name="x">40</property>
+              <property name="y">90</property>
+            </layout>
           </object>
-          <packing>
-            <property name="x">40</property>
-            <property name="y">90</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button9">
             <property name="width_request">20</property>
             <property name="height_request">20</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">ref</property>
+            <layout>
+              <property name="x">100</property>
+              <property name="y">100</property>
+            </layout>
           </object>
-          <packing>
-            <property name="x">100</property>
-            <property name="y">100</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/background-position.ui b/testsuite/reftests/background-position.ui
index 94e088e1a1..cfa5cb1c59 100644
--- a/testsuite/reftests/background-position.ui
+++ b/testsuite/reftests/background-position.ui
@@ -1,158 +1,143 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="row_spacing">0</property>
-        <property name="column_spacing">0</property>
         <child>
           <object class="GtkButton" id="button1">
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">a</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button2">
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">b</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button3">
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">c</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button4">
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">d</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button5">
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">e</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button6">
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">f</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button7">
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">g</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button8">
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">h</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button9">
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">i</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/background-positioning-area-empty.ref.ui b/testsuite/reftests/background-positioning-area-empty.ref.ui
index 7e5c85572e..2367e407d9 100644
--- a/testsuite/reftests/background-positioning-area-empty.ref.ui
+++ b/testsuite/reftests/background-positioning-area-empty.ref.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="receives_default">True</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/background-positioning-area-empty.ui b/testsuite/reftests/background-positioning-area-empty.ui
index 7e5c85572e..2367e407d9 100644
--- a/testsuite/reftests/background-positioning-area-empty.ui
+++ b/testsuite/reftests/background-positioning-area-empty.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="receives_default">True</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/background-repeat.ref.ui b/testsuite/reftests/background-repeat.ref.ui
index f719da0ce5..e0bedecf05 100644
--- a/testsuite/reftests/background-repeat.ref.ui
+++ b/testsuite/reftests/background-repeat.ref.ui
@@ -1,77 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">50</property>
     <property name="height_request">60</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkImage" id="image1">
             <property name="width_request">50</property>
             <property name="height_request">60</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="pixbuf">border-image-ball-red.png</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image2">
             <property name="width_request">20</property>
             <property name="height_request">60</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="pixbuf">border-image-3-balls-green.png</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image3">
             <property name="width_request">20</property>
             <property name="height_request">60</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="pixbuf">border-image-3-balls-green.png</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="default">
             <property name="name">default-ref</property>
             <property name="width_request">50</property>
             <property name="height_request">60</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <placeholder/>
             </child>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/background-repeat.ui b/testsuite/reftests/background-repeat.ui
index 8630182ff1..dffc4645bd 100644
--- a/testsuite/reftests/background-repeat.ui
+++ b/testsuite/reftests/background-repeat.ui
@@ -1,68 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">50</property>
     <property name="height_request">60</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkButton" id="no-repeat">
             <property name="name">no-repeat</property>
             <property name="width_request">50</property>
             <property name="height_request">60</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <placeholder/>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="repeat">
             <property name="name">repeat</property>
             <property name="width_request">40</property>
             <property name="height_request">60</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <placeholder/>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="default">
             <property name="name">default</property>
             <property name="width_request">50</property>
             <property name="height_request">60</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <placeholder/>
             </child>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/background-size-keywords.ref.ui b/testsuite/reftests/background-size-keywords.ref.ui
index 20294b38a4..397398434e 100644
--- a/testsuite/reftests/background-size-keywords.ref.ui
+++ b/testsuite/reftests/background-size-keywords.ref.ui
@@ -1,217 +1,201 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="name">reference</property>
         <child>
           <object class="GtkButton" id="button1">
             <property name="label" translatable="yes">A</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">a</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button2">
             <property name="label" translatable="yes">B</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">b</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button3">
             <property name="label" translatable="yes">C</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">c</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button4">
             <property name="label" translatable="yes">D</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">d</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button5">
             <property name="label" translatable="yes">E</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">e</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button6">
             <property name="label" translatable="yes">F</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">f</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button7">
             <property name="label" translatable="yes">G</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">g</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button8">
             <property name="label" translatable="yes">H</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">h</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button9">
             <property name="label" translatable="yes">I</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">i</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button10">
             <property name="label" translatable="yes">J</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">j</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button11">
             <property name="label" translatable="yes">K</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">k</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button12">
             <property name="label" translatable="yes">L</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">l</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/background-size-keywords.ui b/testsuite/reftests/background-size-keywords.ui
index 71c48676cd..d6acd4e05e 100644
--- a/testsuite/reftests/background-size-keywords.ui
+++ b/testsuite/reftests/background-size-keywords.ui
@@ -1,216 +1,200 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkButton" id="button1">
             <property name="label" translatable="yes">A</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">a</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button2">
             <property name="label" translatable="yes">B</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">b</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button3">
             <property name="label" translatable="yes">C</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">c</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button4">
             <property name="label" translatable="yes">D</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">d</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button5">
             <property name="label" translatable="yes">E</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">e</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button6">
             <property name="label" translatable="yes">F</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">f</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button7">
             <property name="label" translatable="yes">G</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">g</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button8">
             <property name="label" translatable="yes">H</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">h</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button9">
             <property name="label" translatable="yes">I</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">i</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button10">
             <property name="label" translatable="yes">J</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">j</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button11">
             <property name="label" translatable="yes">K</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">k</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button12">
             <property name="label" translatable="yes">L</property>
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">l</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/background-size-zero.ref.ui b/testsuite/reftests/background-size-zero.ref.ui
index 9d475c3aaa..5cb0e82ca6 100644
--- a/testsuite/reftests/background-size-zero.ref.ui
+++ b/testsuite/reftests/background-size-zero.ref.ui
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">reference</property>
     <child>
diff --git a/testsuite/reftests/background-size-zero.ui b/testsuite/reftests/background-size-zero.ui
index 51595c7894..ec70764dc3 100644
--- a/testsuite/reftests/background-size-zero.ui
+++ b/testsuite/reftests/background-size-zero.ui
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <placeholder/>
diff --git a/testsuite/reftests/background-size.ref.ui b/testsuite/reftests/background-size.ref.ui
index 2a2374a159..3fe2e2f29e 100644
--- a/testsuite/reftests/background-size.ref.ui
+++ b/testsuite/reftests/background-size.ref.ui
@@ -1,217 +1,201 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="name">reference</property>
         <child>
           <object class="GtkButton" id="button1">
             <property name="label" translatable="yes">A</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">a</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button2">
             <property name="label" translatable="yes">B</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">b</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button3">
             <property name="label" translatable="yes">C</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">c</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button4">
             <property name="label" translatable="yes">D</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">d</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button5">
             <property name="label" translatable="yes">E</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">e</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button6">
             <property name="label" translatable="yes">F</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">f</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button7">
             <property name="label" translatable="yes">G</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">g</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button8">
             <property name="label" translatable="yes">H</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">h</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button9">
             <property name="label" translatable="yes">I</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">i</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button10">
             <property name="label" translatable="yes">J</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">j</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button11">
             <property name="label" translatable="yes">K</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">k</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button12">
             <property name="label" translatable="yes">L</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">l</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/background-size.ui b/testsuite/reftests/background-size.ui
index 1de1219972..5fd91c028c 100644
--- a/testsuite/reftests/background-size.ui
+++ b/testsuite/reftests/background-size.ui
@@ -1,216 +1,200 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkButton" id="button1">
             <property name="label" translatable="yes">A</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">a</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button2">
             <property name="label" translatable="yes">B</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">b</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button3">
             <property name="label" translatable="yes">C</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">c</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button4">
             <property name="label" translatable="yes">D</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">d</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button5">
             <property name="label" translatable="yes">E</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">e</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button6">
             <property name="label" translatable="yes">F</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">f</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button7">
             <property name="label" translatable="yes">G</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">g</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button8">
             <property name="label" translatable="yes">H</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">h</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button9">
             <property name="label" translatable="yes">I</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">i</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button10">
             <property name="label" translatable="yes">J</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">j</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button11">
             <property name="label" translatable="yes">K</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">k</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button12">
             <property name="label" translatable="yes">L</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">l</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/background-window-transparent.ref.ui b/testsuite/reftests/background-window-transparent.ref.ui
index 368cd75cb5..62011eb05c 100644
--- a/testsuite/reftests/background-window-transparent.ref.ui
+++ b/testsuite/reftests/background-window-transparent.ref.ui
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">reference</property>
     <child>
       <object class="GtkViewport" id="viewport1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/background-window-transparent.ui b/testsuite/reftests/background-window-transparent.ui
index be902b7bdb..9b4f1d07ed 100644
--- a/testsuite/reftests/background-window-transparent.ui
+++ b/testsuite/reftests/background-window-transparent.ui
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkViewport" id="viewport1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/bad-color-names.ref.ui b/testsuite/reftests/bad-color-names.ref.ui
index 5cb9f67be1..297844bb36 100644
--- a/testsuite/reftests/bad-color-names.ref.ui
+++ b/testsuite/reftests/bad-color-names.ref.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/bad-color-names.ui b/testsuite/reftests/bad-color-names.ui
index 5cb9f67be1..297844bb36 100644
--- a/testsuite/reftests/bad-color-names.ui
+++ b/testsuite/reftests/bad-color-names.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/border-color-default.ref.ui b/testsuite/reftests/border-color-default.ref.ui
index c6aa81d1ce..c4e75901a2 100644
--- a/testsuite/reftests/border-color-default.ref.ui
+++ b/testsuite/reftests/border-color-default.ref.ui
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/border-color-default.ui b/testsuite/reftests/border-color-default.ui
index 248cd28c0b..5171539c74 100644
--- a/testsuite/reftests/border-color-default.ui
+++ b/testsuite/reftests/border-color-default.ui
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/border-corner-zero-width-rendering.ref.ui b/testsuite/reftests/border-corner-zero-width-rendering.ref.ui
index 16ccad538e..df0ac760ae 100644
--- a/testsuite/reftests/border-corner-zero-width-rendering.ref.ui
+++ b/testsuite/reftests/border-corner-zero-width-rendering.ref.ui
@@ -1,205 +1,185 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkButton" id="button1">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button2">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button3">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button4">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button5">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button6">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button7">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button8">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button9">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button10">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button11">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button12">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button13">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button14">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button15">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button16">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/border-corner-zero-width-rendering.ui b/testsuite/reftests/border-corner-zero-width-rendering.ui
index e413029cfe..51f3df159a 100644
--- a/testsuite/reftests/border-corner-zero-width-rendering.ui
+++ b/testsuite/reftests/border-corner-zero-width-rendering.ui
@@ -1,267 +1,247 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkButton" id="button1">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button2">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="top"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button3">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="bottom"/>
               <class name="top"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button4">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="bottom"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button5">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="left"/>
               <class name="right"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button6">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="right"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button7">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="left"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button8">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="bottom"/>
               <class name="top"/>
               <class name="left"/>
               <class name="right"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button9">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="bottom"/>
               <class name="left"/>
               <class name="right"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button10">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="top"/>
               <class name="left"/>
               <class name="right"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button11">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="bottom"/>
               <class name="top"/>
               <class name="right"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button12">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="bottom"/>
               <class name="top"/>
               <class name="left"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button13">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="bottom"/>
               <class name="right"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button14">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="top"/>
               <class name="right"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button15">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="bottom"/>
               <class name="left"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button16">
             <property name="label" translatable="yes">button</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="top"/>
               <class name="left"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/border-half-pixel.ref.ui b/testsuite/reftests/border-half-pixel.ref.ui
index c6aa81d1ce..c4e75901a2 100644
--- a/testsuite/reftests/border-half-pixel.ref.ui
+++ b/testsuite/reftests/border-half-pixel.ref.ui
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/border-half-pixel.ui b/testsuite/reftests/border-half-pixel.ui
index 248cd28c0b..5171539c74 100644
--- a/testsuite/reftests/border-half-pixel.ui
+++ b/testsuite/reftests/border-half-pixel.ui
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/border-image-excess-size.ref.ui b/testsuite/reftests/border-image-excess-size.ref.ui
index 488d6976d1..9da0c1204d 100644
--- a/testsuite/reftests/border-image-excess-size.ref.ui
+++ b/testsuite/reftests/border-image-excess-size.ref.ui
@@ -1,74 +1,66 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="row_spacing">8</property>
         <property name="column_spacing">8</property>
         <child>
           <object class="GtkToolbar" id="toolbar1">
             <property name="width_request">1</property>
             <property name="height_request">1</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="show_arrow">False</property>
+            <property name="can_focus">1</property>
+            <property name="show_arrow">0</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar2">
             <property name="width_request">1</property>
             <property name="height_request">1</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="show_arrow">False</property>
+            <property name="can_focus">1</property>
+            <property name="show_arrow">0</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar3">
             <property name="width_request">1</property>
             <property name="height_request">1</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="show_arrow">False</property>
+            <property name="can_focus">1</property>
+            <property name="show_arrow">0</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar4">
             <property name="width_request">1</property>
             <property name="height_request">1</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="show_arrow">False</property>
+            <property name="can_focus">1</property>
+            <property name="show_arrow">0</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/border-image-excess-size.ui b/testsuite/reftests/border-image-excess-size.ui
index 43bbfc7c52..f4a5021f48 100644
--- a/testsuite/reftests/border-image-excess-size.ui
+++ b/testsuite/reftests/border-image-excess-size.ui
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkToolbar" id="toolbar1">
         <property name="width_request">10</property>
         <property name="height_request">10</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="show_arrow">False</property>
+        <property name="can_focus">1</property>
+        <property name="show_arrow">0</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/border-image-url-scaled.ref.ui b/testsuite/reftests/border-image-url-scaled.ref.ui
index 959d3fd398..3509cbc830 100644
--- a/testsuite/reftests/border-image-url-scaled.ref.ui
+++ b/testsuite/reftests/border-image-url-scaled.ref.ui
@@ -1,26 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="has_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="has_focus">1</property>
+        <property name="receives_default">1</property>
         <style>
           <class name="button-not-image"/>
         </style>
         <child>
           <object class="GtkButton" id="button2">
             <property name="name">reference</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="has_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="has_focus">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="button-not-image2"/>
             </style>
@@ -28,10 +24,9 @@
               <object class="GtkButton" id="button3">
                 <property name="name">reference</property>
                 <property name="label" translatable="yes">Hello World</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="has_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="has_focus">1</property>
+                <property name="receives_default">1</property>
                 <style>
                   <class name="button-not-image3"/>
                 </style>
diff --git a/testsuite/reftests/border-image-url-scaled.ui b/testsuite/reftests/border-image-url-scaled.ui
index 483f5031b4..4542d594c8 100644
--- a/testsuite/reftests/border-image-url-scaled.ui
+++ b/testsuite/reftests/border-image-url-scaled.ui
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
         <property name="label" translatable="yes">Hello World</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="has_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="has_focus">1</property>
+        <property name="receives_default">1</property>
         <style>
           <class name="button-image"/>
         </style>
diff --git a/testsuite/reftests/border-image-url.ref.ui b/testsuite/reftests/border-image-url.ref.ui
index e039ffcbd5..b1464c4ac7 100644
--- a/testsuite/reftests/border-image-url.ref.ui
+++ b/testsuite/reftests/border-image-url.ref.ui
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
         <property name="label" translatable="yes">Hello World</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="has_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="has_focus">1</property>
+        <property name="receives_default">1</property>
         <style>
           <class name="button-not-image"/>
         </style>
diff --git a/testsuite/reftests/border-image-url.ui b/testsuite/reftests/border-image-url.ui
index 483f5031b4..4542d594c8 100644
--- a/testsuite/reftests/border-image-url.ui
+++ b/testsuite/reftests/border-image-url.ui
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
         <property name="label" translatable="yes">Hello World</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="has_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="has_focus">1</property>
+        <property name="receives_default">1</property>
         <style>
           <class name="button-image"/>
         </style>
diff --git a/testsuite/reftests/border-radius-clamp.ref.ui b/testsuite/reftests/border-radius-clamp.ref.ui
index c38df4f943..1f3fbc4282 100644
--- a/testsuite/reftests/border-radius-clamp.ref.ui
+++ b/testsuite/reftests/border-radius-clamp.ref.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="name">reference</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkProgressBar" id="progressbar1">
         <property name="width_request">150</property>
         <property name="height_request">20</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="fraction">0.5</property>
       </object>
     </child>
diff --git a/testsuite/reftests/border-radius-clamp.ui b/testsuite/reftests/border-radius-clamp.ui
index 1617d3fa66..481c5508c2 100644
--- a/testsuite/reftests/border-radius-clamp.ui
+++ b/testsuite/reftests/border-radius-clamp.ui
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkProgressBar" id="progressbar1">
         <property name="width_request">150</property>
         <property name="height_request">20</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="fraction">0.5</property>
       </object>
     </child>
diff --git a/testsuite/reftests/border-style-none.ref.ui b/testsuite/reftests/border-style-none.ref.ui
index 9dc4de78f1..ca4bfdeabd 100644
--- a/testsuite/reftests/border-style-none.ref.ui
+++ b/testsuite/reftests/border-style-none.ref.ui
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-	<property name="width_request">144</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
+        <property name="width_request">144</property>
         <property name="height_request">144</property>
       </object>
     </child>
diff --git a/testsuite/reftests/border-style-none.ui b/testsuite/reftests/border-style-none.ui
index 58c2416bf9..fc9d598981 100644
--- a/testsuite/reftests/border-style-none.ui
+++ b/testsuite/reftests/border-style-none.ui
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-	<property name="width_request">144</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
+        <property name="width_request">144</property>
         <property name="height_request">144</property>
       </object>
     </child>
diff --git a/testsuite/reftests/border-style.ref.ui b/testsuite/reftests/border-style.ref.ui
index c4e87381f2..88556a8377 100644
--- a/testsuite/reftests/border-style.ref.ui
+++ b/testsuite/reftests/border-style.ref.ui
@@ -1,30 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkButton" id="button1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="width_request">40</property>
             <property name="height_request">40</property>
             <style>
               <class name="button-border"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/border-style.ui b/testsuite/reftests/border-style.ui
index 46e408b182..e3c08e17a9 100644
--- a/testsuite/reftests/border-style.ui
+++ b/testsuite/reftests/border-style.ui
@@ -1,84 +1,76 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkButton" id="button1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="width_request">20</property>
             <property name="height_request">20</property>
             <style>
               <class name="button-top-left"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button2">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="width_request">20</property>
             <property name="height_request">20</property>
             <style>
               <class name="button-top-right"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button3">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="width_request">20</property>
             <property name="height_request">20</property>
             <style>
               <class name="button-bottom-left"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button4">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="width_request">20</property>
             <property name="height_request">20</property>
             <style>
               <class name="button-bottom-right"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/box-order.ref.ui b/testsuite/reftests/box-order.ref.ui
index 103fb57f03..7b539bfb85 100644
--- a/testsuite/reftests/box-order.ref.ui
+++ b/testsuite/reftests/box-order.ref.ui
@@ -1,308 +1,224 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkBox" id="box1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label5">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label6">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label7">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="label8">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label9">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label10">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label11">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label12">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label13">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label14">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="label15">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label16">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label17">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label18">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label19">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label20">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label21">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="label22">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label23">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label24">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label25">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label26">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label27">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label28">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="label29">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label30">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label31">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label32">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label33">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label34">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label35">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/box-order.ui b/testsuite/reftests/box-order.ui
index 679d3185de..8bf2687da7 100644
--- a/testsuite/reftests/box-order.ui
+++ b/testsuite/reftests/box-order.ui
@@ -1,331 +1,244 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkBox" id="box1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label5">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label16">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label17">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="label6">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label7">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label8">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label9">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label10">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label11">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label12">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="label13">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label14">
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label15">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label18">
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label19">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label22">
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label23">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label27">
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label24">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label25">
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label26">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="label28">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label29">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label30">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label31">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label32">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label33">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label34">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="label35">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label36">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label37">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label38">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label39">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label40">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label41">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> X X X </property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/box-pseudo-classes.ref.ui b/testsuite/reftests/box-pseudo-classes.ref.ui
index fd6986ecc7..acb21faa98 100644
--- a/testsuite/reftests/box-pseudo-classes.ref.ui
+++ b/testsuite/reftests/box-pseudo-classes.ref.ui
@@ -1,60 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkBox" id="box2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkButton" id="button1">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">purple</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button2">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">yellow</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button3">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">red</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button4">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">yellow</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button5">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">purple</property>
               </object>
             </child>
@@ -62,42 +51,36 @@
         </child>
         <child>
           <object class="GtkBox" id="box3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkButton" id="button7">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">purple</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button8">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">yellow</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button9">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">red</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button10">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">green</property>
               </object>
             </child>
@@ -105,33 +88,28 @@
         </child>
         <child>
           <object class="GtkBox" id="box4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkButton" id="button13">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">purple</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button14">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">yellow</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button15">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">purple</property>
               </object>
             </child>
@@ -139,24 +117,20 @@
         </child>
         <child>
           <object class="GtkBox" id="box5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkButton" id="button6">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">purple</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button11">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">green</property>
               </object>
             </child>
@@ -164,15 +138,12 @@
         </child>
         <child>
           <object class="GtkBox" id="box6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkButton" id="button12">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="name">blue</property>
               </object>
             </child>
diff --git a/testsuite/reftests/box-pseudo-classes.ui b/testsuite/reftests/box-pseudo-classes.ui
index 3b34d7596c..f458da2795 100644
--- a/testsuite/reftests/box-pseudo-classes.ui
+++ b/testsuite/reftests/box-pseudo-classes.ui
@@ -1,164 +1,135 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkBox" id="box2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkButton" id="button1">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button2">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button3">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button4">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button5">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkBox" id="box3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkButton" id="button7">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button8">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button9">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button10">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkBox" id="box4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkButton" id="button13">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button14">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button15">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkBox" id="box5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkButton" id="button6">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
             <child>
               <object class="GtkButton" id="button11">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkBox" id="box6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkButton" id="button12">
                 <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
               </object>
             </child>
           </object>
diff --git a/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui b/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui
index 42a62bc250..c18d74d7e6 100644
--- a/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui
+++ b/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <property name="label" translatable="yes">Hello World</property>
diff --git a/testsuite/reftests/box-shadow-changes-modify-clip.ui b/testsuite/reftests/box-shadow-changes-modify-clip.ui
index bb34bb001e..f69a690560 100644
--- a/testsuite/reftests/box-shadow-changes-modify-clip.ui
+++ b/testsuite/reftests/box-shadow-changes-modify-clip.ui
@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <signal name="map" handler="reftest:inhibit_for_3_frames" swapped="no"/>
     <child>
       <object class="GtkBox" id="box2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
             <signal name="map" handler="reftest:add_reference_class_if_no_animation" swapped="no"/>
           </object>
diff --git a/testsuite/reftests/box-shadow-spec-inset.ref.ui b/testsuite/reftests/box-shadow-spec-inset.ref.ui
index 5b67f2981e..9441593c48 100644
--- a/testsuite/reftests/box-shadow-spec-inset.ref.ui
+++ b/testsuite/reftests/box-shadow-spec-inset.ref.ui
@@ -1,328 +1,284 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="row_spacing">20</property>
         <property name="column_spacing">20</property>
         <child>
           <object class="GtkButton" id="widget-1-1">
             <property name="width_request">144</property>
             <property name="height_request">144</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <style>
-              <class name="reference-border" />
-              <class name="reference-background" />
-              <class name="column1" />
+              <class name="reference-border"/>
+              <class name="reference-background"/>
+              <class name="column1"/>
             </style>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="widget-1-2">
             <property name="width_request">144</property>
             <property name="height_request">144</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <style>
-              <class name="reference-border" />
-              <class name="reference-background" />
-              <class name="column2" />
+              <class name="reference-border"/>
+              <class name="reference-background"/>
+              <class name="column2"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkFixed" id="widget-2-1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkButton" id="widget-2-1-1">
                 <property name="width_request">144</property>
                 <property name="height_request">144</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-background" />
-                  <class name="column1" />
+                  <class name="reference-background"/>
+                  <class name="column1"/>
                 </style>
+                <layout>
+                  <property name="x">0</property>
+                  <property name="y">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">0</property>
-                <property name="y">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="widget-2-1-2">
                 <property name="width_request">134</property>
                 <property name="height_request">134</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-shadow" />
-                  <class name="reference-padding-radius" />
+                  <class name="reference-shadow"/>
+                  <class name="reference-padding-radius"/>
                 </style>
+                <layout>
+                  <property name="x">5</property>
+                  <property name="y">5</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">5</property>
-                <property name="y">5</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="widget-2-1-3">
                 <property name="width_request">119</property>
                 <property name="height_request">119</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-background" />
-                  <class name="reference-radii1" />
-                  <class name="column1" />
+                  <class name="reference-background"/>
+                  <class name="reference-radii1"/>
+                  <class name="column1"/>
                 </style>
+                <layout>
+                  <property name="x">20</property>
+                  <property name="y">20</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">20</property>
-                <property name="y">20</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="widget-2-1-4">
                 <property name="width_request">144</property>
                 <property name="height_request">144</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-border" />
-                  <class name="column1" />
+                  <class name="reference-border"/>
+                  <class name="column1"/>
                 </style>
+                <layout>
+                  <property name="x">0</property>
+                  <property name="y">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">0</property>
-                <property name="y">0</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkFixed" id="widget-2-2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkButton" id="widget-2-2-1">
                 <property name="width_request">144</property>
                 <property name="height_request">144</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-border" />
-                  <class name="reference-background" />
-                  <class name="column2" />
+                  <class name="reference-border"/>
+                  <class name="reference-background"/>
+                  <class name="column2"/>
                 </style>
+                <layout>
+                  <property name="x">0</property>
+                  <property name="y">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">0</property>
-                <property name="y">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="widget-2-2-2">
                 <property name="width_request">134</property>
                 <property name="height_request">134</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-shadow" />
-                  <class name="column2" />
+                  <class name="reference-shadow"/>
+                  <class name="column2"/>
                 </style>
+                <layout>
+                  <property name="x">5</property>
+                  <property name="y">5</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">5</property>
-                <property name="y">5</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="widget-2-2-3">
                 <property name="width_request">119</property>
                 <property name="height_request">119</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-background" />
-                  <class name="column2" />
+                  <class name="reference-background"/>
+                  <class name="column2"/>
                 </style>
+                <layout>
+                  <property name="x">20</property>
+                  <property name="y">20</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">20</property>
-                <property name="y">20</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkFixed" id="widget-3-1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkButton" id="widget-3-1-1">
                 <property name="width_request">144</property>
                 <property name="height_request">144</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-background" />
-                  <class name="column1" />
+                  <class name="reference-background"/>
+                  <class name="column1"/>
                 </style>
+                <layout>
+                  <property name="x">0</property>
+                  <property name="y">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">0</property>
-                <property name="y">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="widget-3-1-2">
                 <property name="width_request">134</property>
                 <property name="height_request">134</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-shadow" />
-                  <class name="reference-padding-radius" />
+                  <class name="reference-shadow"/>
+                  <class name="reference-padding-radius"/>
                 </style>
+                <layout>
+                  <property name="x">5</property>
+                  <property name="y">5</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">5</property>
-                <property name="y">5</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="widget-3-1-3">
                 <property name="width_request">109</property>
                 <property name="height_request">109</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-background" />
-                  <class name="reference-radii2" />
-                  <class name="column1" />
+                  <class name="reference-background"/>
+                  <class name="reference-radii2"/>
+                  <class name="column1"/>
                 </style>
+                <layout>
+                  <property name="x">30</property>
+                  <property name="y">30</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">30</property>
-                <property name="y">30</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="widget-3-1-4">
                 <property name="width_request">144</property>
                 <property name="height_request">144</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-border" />
-                  <class name="column1" />
+                  <class name="reference-border"/>
+                  <class name="column1"/>
                 </style>
+                <layout>
+                  <property name="x">0</property>
+                  <property name="y">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">0</property>
-                <property name="y">0</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkFixed" id="widget-3-2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkButton" id="widget-3-2-1">
                 <property name="width_request">144</property>
                 <property name="height_request">144</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-border" />
-                  <class name="reference-background" />
-                  <class name="column2" />
+                  <class name="reference-border"/>
+                  <class name="reference-background"/>
+                  <class name="column2"/>
                 </style>
+                <layout>
+                  <property name="x">0</property>
+                  <property name="y">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">0</property>
-                <property name="y">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="widget-3-2-2">
                 <property name="width_request">134</property>
                 <property name="height_request">134</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-shadow" />
-                  <class name="column2" />
+                  <class name="reference-shadow"/>
+                  <class name="column2"/>
                 </style>
+                <layout>
+                  <property name="x">5</property>
+                  <property name="y">5</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">5</property>
-                <property name="y">5</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="widget-3-2-3">
                 <property name="width_request">109</property>
                 <property name="height_request">109</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <style>
-                  <class name="reference-background" />
-                  <class name="column2" />
+                  <class name="reference-background"/>
+                  <class name="column2"/>
                 </style>
+                <layout>
+                  <property name="x">30</property>
+                  <property name="y">30</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">30</property>
-                <property name="y">30</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/box-shadow-spec-inset.ui b/testsuite/reftests/box-shadow-spec-inset.ui
index 87eedde40a..3d38e4d42d 100644
--- a/testsuite/reftests/box-shadow-spec-inset.ui
+++ b/testsuite/reftests/box-shadow-spec-inset.ui
@@ -1,122 +1,106 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="row_spacing">20</property>
         <property name="column_spacing">20</property>
         <child>
           <object class="GtkButton" id="widget-1-1">
             <property name="width_request">144</property>
             <property name="height_request">144</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <style>
-              <class name="column1" />
-              <class name="row1" />
+              <class name="column1"/>
+              <class name="row1"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="widget-1-2">
             <property name="width_request">144</property>
             <property name="height_request">144</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <style>
-              <class name="column1" />
-              <class name="row2" />
+              <class name="column1"/>
+              <class name="row2"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="widget-1-3">
             <property name="width_request">144</property>
             <property name="height_request">144</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <style>
-              <class name="column1" />
-              <class name="row3" />
+              <class name="column1"/>
+              <class name="row3"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="widget-2-1">
             <property name="width_request">144</property>
             <property name="height_request">144</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <style>
-              <class name="column2" />
-              <class name="row1" />
+              <class name="column2"/>
+              <class name="row1"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="widget-2-2">
             <property name="width_request">144</property>
             <property name="height_request">144</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <style>
-              <class name="column2" />
-              <class name="row2" />
+              <class name="column2"/>
+              <class name="row2"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="widget-2-3">
             <property name="width_request">144</property>
             <property name="height_request">144</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <style>
-              <class name="column2" />
-              <class name="row3" />
+              <class name="column2"/>
+              <class name="row3"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/box-shadow-spread.ref.ui b/testsuite/reftests/box-shadow-spread.ref.ui
index f6894c2b34..826a0dde37 100644
--- a/testsuite/reftests/box-shadow-spread.ref.ui
+++ b/testsuite/reftests/box-shadow-spread.ref.ui
@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="label" translatable="yes">Hi</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="receives_default">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <style>
diff --git a/testsuite/reftests/box-shadow-spread.ui b/testsuite/reftests/box-shadow-spread.ui
index ef4cdea031..9a7384a6a1 100644
--- a/testsuite/reftests/box-shadow-spread.ui
+++ b/testsuite/reftests/box-shadow-spread.ui
@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="label" translatable="yes">Hi</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="receives_default">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <style>
diff --git a/testsuite/reftests/box-shadow-with-blend-mode.ref.ui b/testsuite/reftests/box-shadow-with-blend-mode.ref.ui
index 80d7e50d45..6e81666205 100644
--- a/testsuite/reftests/box-shadow-with-blend-mode.ref.ui
+++ b/testsuite/reftests/box-shadow-with-blend-mode.ref.ui
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="b">
         <property name="name">reference</property>
         <property name="label" translatable="yes">Hello World!</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/box-shadow-with-blend-mode.ui b/testsuite/reftests/box-shadow-with-blend-mode.ui
index 1e5b7cc9fb..0926699a8c 100644
--- a/testsuite/reftests/box-shadow-with-blend-mode.ui
+++ b/testsuite/reftests/box-shadow-with-blend-mode.ui
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="b">
         <property name="label" translatable="yes">Hello World!</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/button-wrapping.ref.ui b/testsuite/reftests/button-wrapping.ref.ui
index 007f26fbcd..44dc22f0cb 100644
--- a/testsuite/reftests/button-wrapping.ref.ui
+++ b/testsuite/reftests/button-wrapping.ref.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="height_request">500</property>
@@ -8,10 +9,8 @@
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkPaned" id="paned1">
-            <property name="shrink-child2">True</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <property name="position_set">1</property>
             <child>
@@ -37,10 +36,8 @@ World</property>
         </child>
         <child>
           <object class="GtkPaned" id="paned2">
-            <property name="shrink-child2">True</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <property name="position_set">1</property>
             <child>
@@ -67,10 +64,8 @@ World</property>
         </child>
         <child>
           <object class="GtkPaned" id="paned3">
-            <property name="shrink-child2">True</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <property name="position_set">1</property>
             <child>
@@ -97,10 +92,8 @@ World</property>
         </child>
         <child>
           <object class="GtkPaned" id="paned4">
-            <property name="shrink-child2">True</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <property name="position_set">1</property>
             <child>
diff --git a/testsuite/reftests/button-wrapping.ui b/testsuite/reftests/button-wrapping.ui
index dbe5a7a542..9e66104984 100644
--- a/testsuite/reftests/button-wrapping.ui
+++ b/testsuite/reftests/button-wrapping.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="height_request">500</property>
@@ -8,10 +9,8 @@
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkPaned" id="paned1">
-            <property name="shrink-child2">True</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <property name="position_set">1</property>
             <child>
@@ -37,10 +36,8 @@
         </child>
         <child>
           <object class="GtkPaned" id="paned2">
-            <property name="shrink-child2">True</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <property name="position_set">1</property>
             <child>
@@ -67,10 +64,8 @@
         </child>
         <child>
           <object class="GtkPaned" id="paned3">
-            <property name="shrink-child2">True</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <property name="position_set">1</property>
             <child>
@@ -97,10 +92,8 @@
         </child>
         <child>
           <object class="GtkPaned" id="paned4">
-            <property name="shrink-child2">True</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <property name="position_set">1</property>
             <child>
diff --git a/testsuite/reftests/color-transition.ref.ui b/testsuite/reftests/color-transition.ref.ui
index fa28350906..331350ef6d 100644
--- a/testsuite/reftests/color-transition.ref.ui
+++ b/testsuite/reftests/color-transition.ref.ui
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/color-transition.ui b/testsuite/reftests/color-transition.ui
index 47e01cb600..715d42c771 100644
--- a/testsuite/reftests/color-transition.ui
+++ b/testsuite/reftests/color-transition.ui
@@ -1,19 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkBox" id="box2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
             <child>
               <placeholder/>
             </child>
diff --git a/testsuite/reftests/css-currentcolor-alpha.ref.ui b/testsuite/reftests/css-currentcolor-alpha.ref.ui
index 9d475c3aaa..5cb0e82ca6 100644
--- a/testsuite/reftests/css-currentcolor-alpha.ref.ui
+++ b/testsuite/reftests/css-currentcolor-alpha.ref.ui
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">reference</property>
     <child>
diff --git a/testsuite/reftests/css-currentcolor-alpha.ui b/testsuite/reftests/css-currentcolor-alpha.ui
index 51595c7894..ec70764dc3 100644
--- a/testsuite/reftests/css-currentcolor-alpha.ui
+++ b/testsuite/reftests/css-currentcolor-alpha.ui
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <placeholder/>
diff --git a/testsuite/reftests/css-em-label-size.ref.ui b/testsuite/reftests/css-em-label-size.ref.ui
index 6c1ea128e7..8dbfeb4d76 100644
--- a/testsuite/reftests/css-em-label-size.ref.ui
+++ b/testsuite/reftests/css-em-label-size.ref.ui
@@ -1,310 +1,250 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="row_homogeneous">True</property>
-        <property name="width-request">300></property>
+        <property name="row_homogeneous">1</property>
+        <property name="width-request">300&gt;</property>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">px</property>
-            <property name="height-request">100></property>
+            <property name="height-request">100&gt;</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">pt</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">in</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">cm</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">mm</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">em</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">ex</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="px-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="12px"/>
+                  <attribute name="font-desc" value="12px"></attribute>
                 </attributes>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="12px"/>
-                  <attribute name="foreground" value="red"/>
+                  <attribute name="font-desc" value="12px"></attribute>
+                  <attribute name="foreground" value="red"></attribute>
                 </attributes>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="pt-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="16px"/>
+                  <attribute name="font-desc" value="16px"></attribute>
                 </attributes>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="16px"/>
-                  <attribute name="foreground" value="red"/>
+                  <attribute name="font-desc" value="16px"></attribute>
+                  <attribute name="foreground" value="red"></attribute>
                 </attributes>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="in-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="24px"/>
+                  <attribute name="font-desc" value="24px"></attribute>
                 </attributes>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="24px"/>
-                  <attribute name="foreground" value="red"/>
+                  <attribute name="font-desc" value="24px"></attribute>
+                  <attribute name="foreground" value="red"></attribute>
                 </attributes>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="cm-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="24px"/>
+                  <attribute name="font-desc" value="24px"></attribute>
                 </attributes>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="24px"/>
-                  <attribute name="foreground" value="red"/>
+                  <attribute name="font-desc" value="24px"></attribute>
+                  <attribute name="foreground" value="red"></attribute>
                 </attributes>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="mm-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="24px"/>
+                  <attribute name="font-desc" value="24px"></attribute>
                 </attributes>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="24px"/>
-                  <attribute name="foreground" value="red"/>
+                  <attribute name="font-desc" value="24px"></attribute>
+                  <attribute name="foreground" value="red"></attribute>
                 </attributes>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="em-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="18px"/>
+                  <attribute name="font-desc" value="18px"></attribute>
                 </attributes>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="18px"/>
-                  <attribute name="foreground" value="red"/>
+                  <attribute name="font-desc" value="18px"></attribute>
+                  <attribute name="foreground" value="red"></attribute>
                 </attributes>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="ex-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="15px"/>
+                  <attribute name="font-desc" value="15px"></attribute>
                 </attributes>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
                 <attributes>
-                  <attribute name="font-desc" value="15px"/>
-                  <attribute name="foreground" value="red"/>
+                  <attribute name="font-desc" value="15px"></attribute>
+                  <attribute name="foreground" value="red"></attribute>
                 </attributes>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/css-em-label-size.ui b/testsuite/reftests/css-em-label-size.ui
index 85ec58680c..66190f6c1b 100644
--- a/testsuite/reftests/css-em-label-size.ui
+++ b/testsuite/reftests/css-em-label-size.ui
@@ -1,282 +1,222 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="row_homogeneous">True</property>
-        <property name="width-request">300></property>
+        <property name="row_homogeneous">1</property>
+        <property name="width-request">300&gt;</property>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">px</property>
-            <property name="height-request">100></property>
+            <property name="height-request">100&gt;</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">pt</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">in</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">cm</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">mm</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">em</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">ex</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="px-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <style>
               <class name="px"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="pt-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <style>
               <class name="pt"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="in-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <style>
               <class name="in"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="cm-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <style>
               <class name="cm"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="mm-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <style>
               <class name="mm"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="em-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <style>
               <class name="em"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="ex-box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">███</property>
               </object>
             </child>
             <style>
               <class name="ex"/>
             </style>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/css-image-aspect-ratio.ref.ui b/testsuite/reftests/css-image-aspect-ratio.ref.ui
index 88fbd72e75..8198b04612 100644
--- a/testsuite/reftests/css-image-aspect-ratio.ref.ui
+++ b/testsuite/reftests/css-image-aspect-ratio.ref.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">48</property>
     <property name="height_request">24</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">reference</property>
   </object>
diff --git a/testsuite/reftests/css-image-aspect-ratio.ui b/testsuite/reftests/css-image-aspect-ratio.ui
index c7f559893b..f9a37b7a61 100644
--- a/testsuite/reftests/css-image-aspect-ratio.ui
+++ b/testsuite/reftests/css-image-aspect-ratio.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">48</property>
     <property name="height_request">24</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/css-image-color-aspect-ratio.ref.ui b/testsuite/reftests/css-image-color-aspect-ratio.ref.ui
index 982e3d8f8d..5e2a51192a 100644
--- a/testsuite/reftests/css-image-color-aspect-ratio.ref.ui
+++ b/testsuite/reftests/css-image-color-aspect-ratio.ref.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">10</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">reference</property>
   </object>
diff --git a/testsuite/reftests/css-image-color-aspect-ratio.ui b/testsuite/reftests/css-image-color-aspect-ratio.ui
index d26485622a..63e8f04846 100644
--- a/testsuite/reftests/css-image-color-aspect-ratio.ui
+++ b/testsuite/reftests/css-image-color-aspect-ratio.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">10</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/css-match-class.ref.ui b/testsuite/reftests/css-match-class.ref.ui
index 65fe67e5f1..e85bbec582 100644
--- a/testsuite/reftests/css-match-class.ref.ui
+++ b/testsuite/reftests/css-match-class.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkPicture">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="paintable">green-20x20.png</property>
       </object>
     </child>
diff --git a/testsuite/reftests/css-match-class.ui b/testsuite/reftests/css-match-class.ui
index ee6db3afc7..ab783b3219 100644
--- a/testsuite/reftests/css-match-class.ui
+++ b/testsuite/reftests/css-match-class.ui
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">20</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">window</property>
     <style>
-      <class name="window" />
+      <class name="window"/>
     </style>
   </object>
 </interface>
diff --git a/testsuite/reftests/css-match-descendant-later.ref.ui b/testsuite/reftests/css-match-descendant-later.ref.ui
index a6a57bedbe..0c8a4b46e0 100644
--- a/testsuite/reftests/css-match-descendant-later.ref.ui
+++ b/testsuite/reftests/css-match-descendant-later.ref.ui
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="width_request">10</property>
         <property name="height_request">10</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <placeholder/>
         </child>
diff --git a/testsuite/reftests/css-match-descendant-later.ui b/testsuite/reftests/css-match-descendant-later.ui
index 97d81708c4..90e3d7a3de 100644
--- a/testsuite/reftests/css-match-descendant-later.ui
+++ b/testsuite/reftests/css-match-descendant-later.ui
@@ -1,41 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkGrid" id="grid2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkBox" id="box1">
                 <property name="width_request">10</property>
                 <property name="height_request">10</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <child>
                   <placeholder/>
                 </child>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/css-match-exact.ref.ui b/testsuite/reftests/css-match-exact.ref.ui
index 2f24fa197b..74b65db8a1 100644
--- a/testsuite/reftests/css-match-exact.ref.ui
+++ b/testsuite/reftests/css-match-exact.ref.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <placeholder/>
diff --git a/testsuite/reftests/css-match-exact.ui b/testsuite/reftests/css-match-exact.ui
index ce2f815a36..7a9389c2d5 100644
--- a/testsuite/reftests/css-match-exact.ui
+++ b/testsuite/reftests/css-match-exact.ui
@@ -1,28 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkBox" id="box1">
             <property name="width_request">10</property>
             <property name="height_request">10</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/css-match-import.ref.ui b/testsuite/reftests/css-match-import.ref.ui
index 03877e3bf3..a2f55c86fd 100644
--- a/testsuite/reftests/css-match-import.ref.ui
+++ b/testsuite/reftests/css-match-import.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="name">purple</property>
         <property name="label" translatable="yes">Purple</property>
       </object>
diff --git a/testsuite/reftests/css-match-import.ui b/testsuite/reftests/css-match-import.ui
index 3a8f869e3b..8ea0858c14 100644
--- a/testsuite/reftests/css-match-import.ui
+++ b/testsuite/reftests/css-match-import.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Purple</property>
       </object>
     </child>
diff --git a/testsuite/reftests/css-match-inherit-different-state.ref.ui b/testsuite/reftests/css-match-inherit-different-state.ref.ui
index e129c9135d..84596a0208 100644
--- a/testsuite/reftests/css-match-inherit-different-state.ref.ui
+++ b/testsuite/reftests/css-match-inherit-different-state.ref.ui
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
         <child>
           <object class="GtkLabel" id="label1">
             <property name="name">reference</property>
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">False</property>
+            <property name="sensitive">0</property>
             <property name="label" translatable="yes">I should be green</property>
           </object>
         </child>
diff --git a/testsuite/reftests/css-match-inherit-different-state.ui b/testsuite/reftests/css-match-inherit-different-state.ui
index c48bae349a..15f803784c 100644
--- a/testsuite/reftests/css-match-inherit-different-state.ui
+++ b/testsuite/reftests/css-match-inherit-different-state.ui
@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">False</property>
+            <property name="sensitive">0</property>
             <property name="label" translatable="yes">I should be green</property>
           </object>
         </child>
diff --git a/testsuite/reftests/css-match-inherit.ref.ui b/testsuite/reftests/css-match-inherit.ref.ui
index da1077170e..d3b58f7432 100644
--- a/testsuite/reftests/css-match-inherit.ref.ui
+++ b/testsuite/reftests/css-match-inherit.ref.ui
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
         <property name="label" translatable="yes">Hello World</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="has_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="has_focus">1</property>
+        <property name="receives_default">1</property>
         <style>
           <class name="testinherit"/>
         </style>
diff --git a/testsuite/reftests/css-match-inherit.ui b/testsuite/reftests/css-match-inherit.ui
index 01f5a84717..8395c51add 100644
--- a/testsuite/reftests/css-match-inherit.ui
+++ b/testsuite/reftests/css-match-inherit.ui
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
         <property name="label" translatable="yes">Hello World</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="has_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="can_focus">1</property>
+        <property name="has_focus">1</property>
+        <property name="receives_default">1</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/css-match-name.ref.ui b/testsuite/reftests/css-match-name.ref.ui
index fea1df7c08..5fc9c823dc 100644
--- a/testsuite/reftests/css-match-name.ref.ui
+++ b/testsuite/reftests/css-match-name.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkPicture">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="paintable">green-20x20.png</property>
       </object>
     </child>
diff --git a/testsuite/reftests/css-match-name.ui b/testsuite/reftests/css-match-name.ui
index ee6db3afc7..ab783b3219 100644
--- a/testsuite/reftests/css-match-name.ui
+++ b/testsuite/reftests/css-match-name.ui
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">20</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">window</property>
     <style>
-      <class name="window" />
+      <class name="window"/>
     </style>
   </object>
 </interface>
diff --git a/testsuite/reftests/css-match-siblings.ref.ui b/testsuite/reftests/css-match-siblings.ref.ui
index 38ff34a71c..cdd1d6730b 100644
--- a/testsuite/reftests/css-match-siblings.ref.ui
+++ b/testsuite/reftests/css-match-siblings.ref.ui
@@ -1,49 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">normal</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Red</property>
             <property name="name">red</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Green</property>
             <property name="name">green</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Blue</property>
             <property name="name">blue</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Purple</property>
             <property name="name">purple</property>
           </object>
diff --git a/testsuite/reftests/css-match-siblings.ui b/testsuite/reftests/css-match-siblings.ui
index 91a2dec80b..5e8dfcae6c 100644
--- a/testsuite/reftests/css-match-siblings.ui
+++ b/testsuite/reftests/css-match-siblings.ui
@@ -1,46 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">normal</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Red</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Green</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Blue</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Purple</property>
           </object>
         </child>
diff --git a/testsuite/reftests/css-match-type.ref.ui b/testsuite/reftests/css-match-type.ref.ui
index fea1df7c08..5fc9c823dc 100644
--- a/testsuite/reftests/css-match-type.ref.ui
+++ b/testsuite/reftests/css-match-type.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkPicture">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="paintable">green-20x20.png</property>
       </object>
     </child>
diff --git a/testsuite/reftests/css-match-type.ui b/testsuite/reftests/css-match-type.ui
index ee6db3afc7..ab783b3219 100644
--- a/testsuite/reftests/css-match-type.ui
+++ b/testsuite/reftests/css-match-type.ui
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">20</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">window</property>
     <style>
-      <class name="window" />
+      <class name="window"/>
     </style>
   </object>
 </interface>
diff --git a/testsuite/reftests/css-multi-state.ref.ui b/testsuite/reftests/css-multi-state.ref.ui
index 5b4e55a936..b99269be6b 100644
--- a/testsuite/reftests/css-multi-state.ref.ui
+++ b/testsuite/reftests/css-multi-state.ref.ui
@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkToggleButton" id="togglebutton1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="active">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
+        <property name="active">1</property>
         <property name="name">reference</property>
-        <property name="sensitive">False</property>
+        <property name="sensitive">0</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">insensitive</property>
           </object>
         </child>
diff --git a/testsuite/reftests/css-multi-state.ui b/testsuite/reftests/css-multi-state.ui
index 1a3aaa6fb9..9f7979e29a 100644
--- a/testsuite/reftests/css-multi-state.ui
+++ b/testsuite/reftests/css-multi-state.ui
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkToggleButton" id="togglebutton1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="active">True</property>
-        <property name="sensitive">False</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
+        <property name="active">1</property>
+        <property name="sensitive">0</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">insensitive</property>
           </object>
         </child>
diff --git a/testsuite/reftests/css-rem-label-size.ref.ui b/testsuite/reftests/css-rem-label-size.ref.ui
index eef675c6ee..aa903fb77d 100644
--- a/testsuite/reftests/css-rem-label-size.ref.ui
+++ b/testsuite/reftests/css-rem-label-size.ref.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">███</property>
       </object>
     </child>
diff --git a/testsuite/reftests/css-rem-label-size.ui b/testsuite/reftests/css-rem-label-size.ui
index 957716ee86..f70bf80600 100644
--- a/testsuite/reftests/css-rem-label-size.ui
+++ b/testsuite/reftests/css-rem-label-size.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">███</property>
       </object>
     </child>
diff --git a/testsuite/reftests/expander.ref.ui b/testsuite/reftests/expander.ref.ui
index 834029fd19..cf55a788dc 100644
--- a/testsuite/reftests/expander.ref.ui
+++ b/testsuite/reftests/expander.ref.ui
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkExpander" id="expander1">
-        <property name="visible">True</property>
-        <property name="expanded">True</property>
+        <property name="expanded">1</property>
         <property name="label">Hello</property>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
             <property name="label">Hello</property>
           </object>
         </child>
diff --git a/testsuite/reftests/expander.ui b/testsuite/reftests/expander.ui
index 21c3c66eed..628d0c60c9 100644
--- a/testsuite/reftests/expander.ui
+++ b/testsuite/reftests/expander.ui
@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkExpander" id="expander1">
-        <property name="visible">True</property>
-        <property name="expanded">False</property>
         <property name="label">Hello</property>
-        <property name="resize_toplevel">True</property>
+        <property name="resize_toplevel">1</property>
         <signal name="map" handler="reftest:expand_expander" swapped="no"/>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
             <property name="label">Hello</property>
           </object>
         </child>
diff --git a/testsuite/reftests/fixed-widget-stacking.ref.ui b/testsuite/reftests/fixed-widget-stacking.ref.ui
index 436c427367..d40e3f0bac 100644
--- a/testsuite/reftests/fixed-widget-stacking.ref.ui
+++ b/testsuite/reftests/fixed-widget-stacking.ref.ui
@@ -1,24 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Tue Feb 25 14:09:41 2014 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkTextBuffer" id="textbuffer1">
     <property name="text" translatable="yes">TEST123
 TEST123</property>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkFixed" id="fixed1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkTextView" id="textview1">
             <property name="width_request">100</property>
             <property name="height_request">100</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="buffer">textbuffer1</property>
           </object>
         </child>
@@ -26,14 +19,13 @@ TEST123</property>
           <object class="GtkTextView" id="textview2">
             <property name="width_request">100</property>
             <property name="height_request">100</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can_focus">1</property>
             <property name="buffer">textbuffer1</property>
+            <layout>
+              <property name="x">50</property>
+              <property name="y">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="x">50</property>
-            <property name="y">50</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/fixed-widget-stacking.ui b/testsuite/reftests/fixed-widget-stacking.ui
index b193343e68..e4737db3d9 100644
--- a/testsuite/reftests/fixed-widget-stacking.ui
+++ b/testsuite/reftests/fixed-widget-stacking.ui
@@ -1,46 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Tue Feb 25 14:09:29 2014 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkTextBuffer" id="textbuffer1">
     <property name="text" translatable="yes">TEST123
 TEST123</property>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkFixed" id="fixed1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkTextView" id="textview1">
             <property name="width_request">100</property>
             <property name="height_request">100</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="buffer">textbuffer1</property>
           </object>
         </child>
         <child>
           <object class="GtkBox" id="box1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkTextView" id="textview2">
                 <property name="width_request">100</property>
                 <property name="height_request">100</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">1</property>
                 <property name="buffer">textbuffer1</property>
               </object>
             </child>
+            <layout>
+              <property name="x">50</property>
+              <property name="y">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="x">50</property>
-            <property name="y">50</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/flipping-icons.ref.ui b/testsuite/reftests/flipping-icons.ref.ui
index 638e528351..a669882851 100644
--- a/testsuite/reftests/flipping-icons.ref.ui
+++ b/testsuite/reftests/flipping-icons.ref.ui
@@ -1,60 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">go-last</property> 
+            <property name="icon-name">go-last</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">go-first</property> 
+            <property name="icon-name">go-first</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">media-skip-backward</property> 
+            <property name="icon-name">media-skip-backward</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">media-skip-forward</property> 
+            <property name="icon-name">media-skip-forward</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">media-seek-backward</property> 
+            <property name="icon-name">media-seek-backward</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">media-seek-forward</property> 
+            <property name="icon-name">media-seek-forward</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">pan-end-symbolic</property> 
+            <property name="icon-name">pan-end-symbolic</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">pan-start-symbolic</property> 
+            <property name="icon-name">pan-start-symbolic</property>
           </object>
         </child>
       </object>
diff --git a/testsuite/reftests/flipping-icons.ui b/testsuite/reftests/flipping-icons.ui
index 94c81ac7ca..3a508cf48e 100644
--- a/testsuite/reftests/flipping-icons.ui
+++ b/testsuite/reftests/flipping-icons.ui
@@ -1,62 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <signal name="map" handler="reftest:switch_default_direction" swapped="no"/>
     <signal name="destroy" handler="reftest:switch_default_direction" swapped="no"/>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">go-first</property> 
+            <property name="icon-name">go-first</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">go-last</property> 
+            <property name="icon-name">go-last</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">media-skip-forward</property> 
+            <property name="icon-name">media-skip-forward</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">media-skip-backward</property> 
+            <property name="icon-name">media-skip-backward</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">media-seek-forward</property> 
+            <property name="icon-name">media-seek-forward</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">media-seek-backward</property> 
+            <property name="icon-name">media-seek-backward</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">pan-start-symbolic</property> 
+            <property name="icon-name">pan-start-symbolic</property>
           </object>
         </child>
         <child>
           <object class="GtkImage">
-            <property name="visible">True</property> 
-            <property name="icon-name">pan-end-symbolic</property> 
+            <property name="icon-name">pan-end-symbolic</property>
           </object>
         </child>
       </object>
diff --git a/testsuite/reftests/font-sizes-names.ref.ui b/testsuite/reftests/font-sizes-names.ref.ui
index bcf2fe8d89..da94ffd4ba 100644
--- a/testsuite/reftests/font-sizes-names.ref.ui
+++ b/testsuite/reftests/font-sizes-names.ref.ui
@@ -1,96 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">reference</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">xx-small</property>
             <property name="name">xx-small</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">x-small</property>
             <property name="name">x-small</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">small</property>
             <property name="name">small</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">medium</property>
             <property name="name">medium</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">large</property>
             <property name="name">large</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">x-large</property>
             <property name="name">x-large</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">xx-large</property>
             <property name="name">xx-large</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">smaller</property>
             <property name="name">smaller</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">larger</property>
             <property name="name">larger</property>
           </object>
         </child>
         <child>
           <object class="GtkBox" id="box-smaller">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkLabel" id="label10">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">smaller smaller</property>
                 <property name="name">smaller-smaller</property>
               </object>
@@ -99,13 +73,9 @@
         </child>
         <child>
           <object class="GtkBox" id="box-larger">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkLabel" id="label11">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">larger larger</property>
                 <property name="name">larger-larger</property>
               </object>
diff --git a/testsuite/reftests/font-sizes-names.ui b/testsuite/reftests/font-sizes-names.ui
index 3789ac48bb..6c396675cf 100644
--- a/testsuite/reftests/font-sizes-names.ui
+++ b/testsuite/reftests/font-sizes-names.ui
@@ -1,96 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">xx-small</property>
             <property name="name">xx-small</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">x-small</property>
             <property name="name">x-small</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">small</property>
             <property name="name">small</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">medium</property>
             <property name="name">medium</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">large</property>
             <property name="name">large</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">x-large</property>
             <property name="name">x-large</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">xx-large</property>
             <property name="name">xx-large</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">smaller</property>
             <property name="name">smaller</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">larger</property>
             <property name="name">larger</property>
           </object>
         </child>
         <child>
           <object class="GtkBox" id="box-smaller">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <property name="name">smaller</property>
             <child>
               <object class="GtkLabel" id="label10">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">smaller smaller</property>
                 <property name="name">smaller</property>
               </object>
@@ -99,14 +73,10 @@
         </child>
         <child>
           <object class="GtkBox" id="box-larger">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <property name="name">larger</property>
             <child>
               <object class="GtkLabel" id="label11">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">larger larger</property>
                 <property name="name">larger</property>
               </object>
diff --git a/testsuite/reftests/grid-empty-with-spacing.ref.ui b/testsuite/reftests/grid-empty-with-spacing.ref.ui
index dccd1b8bfa..aa2b506bf9 100644
--- a/testsuite/reftests/grid-empty-with-spacing.ref.ui
+++ b/testsuite/reftests/grid-empty-with-spacing.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="row_spacing">5</property>
         <property name="column_spacing">5</property>
       </object>
diff --git a/testsuite/reftests/grid-empty-with-spacing.ui b/testsuite/reftests/grid-empty-with-spacing.ui
index 23f0caaf6c..5b9e81e76b 100644
--- a/testsuite/reftests/grid-empty-with-spacing.ui
+++ b/testsuite/reftests/grid-empty-with-spacing.ui
@@ -1,27 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="row_spacing">5</property>
         <property name="column_spacing">5</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">False</property>
-            <property name="can_focus">False</property>
+            <property name="visible">0</property>
             <property name="label" translatable="yes">invisible</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/grid-expand.ref.ui b/testsuite/reftests/grid-expand.ref.ui
index 9139bcdee5..431a73c05f 100644
--- a/testsuite/reftests/grid-expand.ref.ui
+++ b/testsuite/reftests/grid-expand.ref.ui
@@ -1,65 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkBox" id="box1">
             <property name="width_request">45</property>
             <property name="height_request">10</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <placeholder/>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box2">
             <property name="width_request">45</property>
             <property name="height_request">45</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <placeholder/>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box3">
             <property name="width_request">10</property>
             <property name="height_request">45</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <placeholder/>
             </child>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/grid-expand.ui b/testsuite/reftests/grid-expand.ui
index 3819ed6500..c0b33be95f 100644
--- a/testsuite/reftests/grid-expand.ui
+++ b/testsuite/reftests/grid-expand.ui
@@ -1,77 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid0">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkGrid" id="grid1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkBox" id="box1">
                 <property name="width_request">10</property>
                 <property name="height_request">10</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="hexpand-set">True</property>
+                <property name="hexpand">1</property>
+                <property name="hexpand-set">1</property>
                 <child>
                   <placeholder/>
                 </child>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkBox" id="box2">
                 <property name="width_request">10</property>
                 <property name="height_request">10</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="hexpand-set">True</property>
-                <property name="vexpand">True</property>
-                <property name="vexpand-set">True</property>
+                <property name="hexpand">1</property>
+                <property name="hexpand-set">1</property>
+                <property name="vexpand">1</property>
+                <property name="vexpand-set">1</property>
                 <child>
                   <placeholder/>
                 </child>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">1</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkBox" id="box3">
                 <property name="width_request">10</property>
                 <property name="height_request">10</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="vexpand">True</property>
-                <property name="vexpand-set">True</property>
+                <property name="vexpand">1</property>
+                <property name="vexpand-set">1</property>
                 <child>
                   <placeholder/>
                 </child>
+                <layout>
+                  <property name="left_attach">2</property>
+                  <property name="top_attach">2</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
           </object>
         </child>
diff --git a/testsuite/reftests/grid-homogeneous.ref.ui b/testsuite/reftests/grid-homogeneous.ref.ui
index 7b87fef07f..d40f0d620d 100644
--- a/testsuite/reftests/grid-homogeneous.ref.ui
+++ b/testsuite/reftests/grid-homogeneous.ref.ui
@@ -1,133 +1,113 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkBox" id="box1">
             <property name="name">red</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box2">
             <property name="name">green</property>
             <property name="width_request">20</property>
             <property name="height_request">20</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box3">
             <property name="name">red</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box4">
             <property name="name">green</property>
             <property name="width_request">20</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box5">
             <property name="name">red</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box6">
             <property name="name">green</property>
             <property name="width_request">30</property>
             <property name="height_request">20</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox" id="box7">
+            <property name="name">red</property>
+            <property name="width_request">30</property>
+            <property name="height_request">30</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox" id="box8">
+            <property name="name">green</property>
+            <property name="width_request">30</property>
+            <property name="height_request">30</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
-            <child>
-              <object class="GtkBox" id="box7">
-                <property name="name">red</property>
-                <property name="width_request">30</property>
-                <property name="height_request">30</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="box8">
-                <property name="name">green</property>
-                <property name="width_request">30</property>
-                <property name="height_request">30</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="left_attach">3</property>
-                <property name="top_attach">3</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/grid-homogeneous.ui b/testsuite/reftests/grid-homogeneous.ui
index 4e40f2e4b3..43116e11d5 100644
--- a/testsuite/reftests/grid-homogeneous.ui
+++ b/testsuite/reftests/grid-homogeneous.ui
@@ -1,184 +1,156 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkGrid" id="grid2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkBox" id="box1">
                 <property name="name">red</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkBox" id="box2">
                 <property name="name">green</property>
                 <property name="width_request">20</property>
                 <property name="height_request">20</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">1</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkGrid" id="grid3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="row_homogeneous">True</property>
+            <property name="row_homogeneous">1</property>
             <child>
               <object class="GtkBox" id="box3">
                 <property name="name">red</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkBox" id="box4">
                 <property name="name">green</property>
                 <property name="width_request">20</property>
                 <property name="height_request">20</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">1</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkGrid" id="grid4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="column_homogeneous">True</property>
+            <property name="column_homogeneous">1</property>
             <child>
               <object class="GtkBox" id="box5">
                 <property name="name">red</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkBox" id="box6">
                 <property name="name">green</property>
                 <property name="width_request">20</property>
                 <property name="height_request">20</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">1</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkGrid" id="grid5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="row_homogeneous">True</property>
-            <property name="column_homogeneous">True</property>
+            <property name="row_homogeneous">1</property>
+            <property name="column_homogeneous">1</property>
             <child>
               <object class="GtkBox" id="box7">
                 <property name="name">red</property>
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkBox" id="box8">
                 <property name="name">green</property>
                 <property name="width_request">20</property>
                 <property name="height_request">20</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">1</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/grid-spacing1.ref.ui b/testsuite/reftests/grid-spacing1.ref.ui
index 9e9ee1d5d8..2faa9a0117 100644
--- a/testsuite/reftests/grid-spacing1.ref.ui
+++ b/testsuite/reftests/grid-spacing1.ref.ui
@@ -1,99 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box">
         <property name="orientation">vertical</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
-          <!-- spacing -->
           <object class="GtkBox" id="box0">
-            <property name="orientation">horizontal</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="spacing">20</property>
             <child>
               <object class="GtkLabel" id="one">
-                <property name="visible">True</property>
                 <property name="label">One</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="two">
-                <property name="visible">True</property>
                 <property name="label">Two</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="three">
-                <property name="visible">True</property>
                 <property name="label">Three</property>
               </object>
             </child>
           </object>
-          <packing>
-          </packing>
         </child>
-
         <child>
-          <!-- homogeneous -->
           <object class="GtkBox" id="box1">
-            <property name="orientation">horizontal</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">0</property>
-            <property name="homogeneous">True</property>
+            <property name="homogeneous">1</property>
             <child>
               <object class="GtkLabel" id="long">
-                <property name="visible">True</property>
                 <property name="label">Verylongtext</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="short">
-                <property name="visible">True</property>
                 <property name="label">Short</property>
               </object>
             </child>
           </object>
-          <packing>
-          </packing>
         </child>
-
         <child>
-          <!-- expand -->
           <object class="GtkBox" id="box2">
-            <property name="orientation">horizontal</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="a">
-                <property name="visible">True</property>
                 <property name="label">A</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="b">
-                <property name="visible">True</property>
                 <property name="label">B</property>
-                <property name="hexpand">True</property>
+                <property name="hexpand">1</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="c">
-                <property name="visible">True</property>
                 <property name="label">C</property>
               </object>
             </child>
           </object>
-          <packing>
-          </packing>
         </child>
-
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/grid-spacing1.ui b/testsuite/reftests/grid-spacing1.ui
index eda8526a04..004c62ed9d 100644
--- a/testsuite/reftests/grid-spacing1.ui
+++ b/testsuite/reftests/grid-spacing1.ui
@@ -1,122 +1,100 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-
         <child>
           <object class="GtkGrid" id="grid0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="column-spacing">20</property>
             <child>
               <object class="GtkLabel" id="one">
-                <property name="visible">True</property>
                 <property name="label">One</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="two">
-                <property name="visible">True</property>
                 <property name="label">Two</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="three">
-                <property name="visible">True</property>
                 <property name="label">Three</property>
+                <layout>
+                  <property name="left_attach">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">2</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
-
         <child>
           <object class="GtkGrid" id="grid1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="column-homogeneous">True</property>
+            <property name="column-homogeneous">1</property>
             <child>
               <object class="GtkLabel" id="long">
-                <property name="visible">True</property>
                 <property name="label">Verylongtext</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="short">
-                <property name="visible">True</property>
                 <property name="label">Short</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
-
         <child>
           <object class="GtkGrid" id="grid2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="a">
-                <property name="visible">True</property>
                 <property name="label">A</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="b">
-                <property name="visible">True</property>
                 <property name="label">B</property>
-                <property name="hexpand">True</property>
+                <property name="hexpand">1</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="c">
-                <property name="visible">True</property>
                 <property name="label">C</property>
+                <layout>
+                  <property name="left_attach">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">2</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
-
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/grid-spacing2.ref.ui b/testsuite/reftests/grid-spacing2.ref.ui
index df79827b50..c37863a841 100644
--- a/testsuite/reftests/grid-spacing2.ref.ui
+++ b/testsuite/reftests/grid-spacing2.ref.ui
@@ -1,93 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box">
-        <property name="orientation">horizontal</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
-          <!-- spacing -->
           <object class="GtkBox" id="box0">
             <property name="orientation">vertical</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="spacing">20</property>
             <child>
               <object class="GtkLabel" id="one">
-                <property name="visible">True</property>
                 <property name="label">One</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="two">
-                <property name="visible">True</property>
                 <property name="label">Two</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="three">
-                <property name="visible">True</property>
                 <property name="label">Three</property>
               </object>
             </child>
           </object>
         </child>
-
         <child>
-          <!-- homogeneous -->
           <object class="GtkBox" id="box1">
             <property name="orientation">vertical</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">0</property>
-            <property name="homogeneous">True</property>
+            <property name="homogeneous">1</property>
             <child>
               <object class="GtkLabel" id="long">
-                <property name="visible">True</property>
                 <property name="label">Verylongtext</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="short">
-                <property name="visible">True</property>
                 <property name="label">Short</property>
               </object>
             </child>
           </object>
         </child>
-
-       <child>
-          <!-- expand -->
+        <child>
           <object class="GtkBox" id="box2">
             <property name="orientation">vertical</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="a">
-                <property name="visible">True</property>
                 <property name="label">A</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="b">
-                <property name="visible">True</property>
                 <property name="label">B</property>
                 <property name="vexpand">1</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="c">
-                <property name="visible">True</property>
                 <property name="label">C</property>
               </object>
             </child>
           </object>
         </child>
-
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/grid-spacing2.ui b/testsuite/reftests/grid-spacing2.ui
index 7688dc3f2b..4c6fd8259b 100644
--- a/testsuite/reftests/grid-spacing2.ui
+++ b/testsuite/reftests/grid-spacing2.ui
@@ -1,130 +1,108 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-
         <child>
           <object class="GtkGrid" id="grid0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="row-spacing">20</property>
             <child>
               <object class="GtkLabel" id="one">
-                <property name="visible">True</property>
                 <property name="label">One</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="two">
-                <property name="visible">True</property>
                 <property name="label">Two</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="three">
-                <property name="visible">True</property>
                 <property name="label">Three</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
-
         <child>
           <object class="GtkGrid" id="grid1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="row-homogeneous">True</property>
+            <property name="row-homogeneous">1</property>
             <child>
               <object class="GtkLabel" id="long">
-                <property name="visible">True</property>
                 <property name="label">Verylongtext</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="short">
-                <property name="visible">True</property>
                 <property name="label">Short</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
-
         <child>
           <object class="GtkGrid" id="grid3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="a">
-                <property name="visible">True</property>
                 <property name="label">A</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="b">
-                <property name="visible">True</property>
                 <property name="label">B</property>
-                <property name="vexpand">True</property>
+                <property name="vexpand">1</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-              </packing>
-           </child>
+            </child>
             <child>
               <object class="GtkLabel" id="c">
-                <property name="visible">True</property>
                 <property name="label">C</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-              </packing>
             </child>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
-
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/grid-spacing3.ref.ui b/testsuite/reftests/grid-spacing3.ref.ui
index 6638fc5138..9aaba61583 100644
--- a/testsuite/reftests/grid-spacing3.ref.ui
+++ b/testsuite/reftests/grid-spacing3.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="row-spacing">10</property>
         <property name="column-spacing">5</property>
         <child>
@@ -15,60 +11,52 @@
             <property name="name">red</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box2">
             <property name="name">green</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box3">
             <property name="name">green</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box4">
             <property name="name">red</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/grid-spacing3.ui b/testsuite/reftests/grid-spacing3.ui
index 5ddbea17bd..bf6f584ce2 100644
--- a/testsuite/reftests/grid-spacing3.ui
+++ b/testsuite/reftests/grid-spacing3.ui
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
-    <property name="can_focus">False</property>
     <child>
-      <!-- test that empty extra rows/columns don't affect layout -->
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="row-spacing">10</property>
         <property name="column-spacing">5</property>
         <child>
@@ -16,60 +11,52 @@
             <property name="name">red</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box2">
             <property name="name">green</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box3">
             <property name="name">green</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">10</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">10</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box4">
             <property name="name">red</property>
             <property name="width_request">30</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">10</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">10</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/grid-wfh.ref.ui b/testsuite/reftests/grid-wfh.ref.ui
index f01a7d7ea0..ebea05d7e7 100644
--- a/testsuite/reftests/grid-wfh.ref.ui
+++ b/testsuite/reftests/grid-wfh.ref.ui
@@ -1,38 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">GNOME is awesome!</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">GNOME is awesome!</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/grid-wfh.ui b/testsuite/reftests/grid-wfh.ui
index 8b252eabe9..0e5396a7dd 100644
--- a/testsuite/reftests/grid-wfh.ui
+++ b/testsuite/reftests/grid-wfh.ui
@@ -1,39 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">GNOME is awesome!</property>
-            <property name="wrap">True</property>
+            <property name="wrap">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">GNOME is awesome!</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/gtk-icontheme-sizing.ref.ui b/testsuite/reftests/gtk-icontheme-sizing.ref.ui
index 5f99d6bfb9..d93b42a014 100644
--- a/testsuite/reftests/gtk-icontheme-sizing.ref.ui
+++ b/testsuite/reftests/gtk-icontheme-sizing.ref.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkImage" id="image1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="pixel_size">100</property>
         <property name="icon_name">pan-down-symbolic</property>
       </object>
diff --git a/testsuite/reftests/gtk-icontheme-sizing.ui b/testsuite/reftests/gtk-icontheme-sizing.ui
index 0d0015ec3b..c1a1e6014b 100644
--- a/testsuite/reftests/gtk-icontheme-sizing.ui
+++ b/testsuite/reftests/gtk-icontheme-sizing.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <placeholder/>
diff --git a/testsuite/reftests/gtk-image-effect-inherit.ref.ui b/testsuite/reftests/gtk-image-effect-inherit.ref.ui
index 37bb2e2ca0..cc0482913b 100644
--- a/testsuite/reftests/gtk-image-effect-inherit.ref.ui
+++ b/testsuite/reftests/gtk-image-effect-inherit.ref.ui
@@ -1,32 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.15.2 on Sat Sep  7 00:14:31 2013 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkImage" id="image1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">dialog-error</property>
           </object>
         </child>
         <child>
           <object class="GtkImage" id="image2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">dialog-error</property>
           </object>
         </child>
         <child>
           <object class="GtkImage" id="image3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">dialog-error</property>
           </object>
         </child>
diff --git a/testsuite/reftests/gtk-image-effect-inherit.ui b/testsuite/reftests/gtk-image-effect-inherit.ui
index e41a30a6fe..6ef4925023 100644
--- a/testsuite/reftests/gtk-image-effect-inherit.ui
+++ b/testsuite/reftests/gtk-image-effect-inherit.ui
@@ -1,68 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.15.2 on Sat Sep  7 00:18:08 2013 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkGrid" id="grid1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkImage" id="image1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="icon_name">dialog-error</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkGrid" id="grid2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkImage" id="image2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="icon_name">dialog-error</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkGrid" id="grid3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkImage" id="image3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="icon_name">dialog-error</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
           </object>
         </child>
diff --git a/testsuite/reftests/icon-effect-missing.ref.ui b/testsuite/reftests/icon-effect-missing.ref.ui
index 5cf6418e10..9200097442 100644
--- a/testsuite/reftests/icon-effect-missing.ref.ui
+++ b/testsuite/reftests/icon-effect-missing.ref.ui
@@ -1,32 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkImage" id="image1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">image-missing</property>
           </object>
         </child>
         <child>
           <object class="GtkImage" id="image2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">image-missing</property>
           </object>
         </child>
         <child>
           <object class="GtkImage" id="image3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">image-missing</property>
           </object>
         </child>
diff --git a/testsuite/reftests/icon-effect-missing.ui b/testsuite/reftests/icon-effect-missing.ui
index 3ef84e9b07..5d432aec96 100644
--- a/testsuite/reftests/icon-effect-missing.ui
+++ b/testsuite/reftests/icon-effect-missing.ui
@@ -1,32 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkImage" id="image1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">deine-mudda-gibs-hier-nich</property>
           </object>
         </child>
         <child>
           <object class="GtkImage" id="image2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">deine-mudda-gibs-hier-nich</property>
           </object>
         </child>
         <child>
           <object class="GtkImage" id="image3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">deine-mudda-gibs-hier-nich</property>
           </object>
         </child>
diff --git a/testsuite/reftests/icon-shadow-no-transform.ref.ui b/testsuite/reftests/icon-shadow-no-transform.ref.ui
index e8329becdd..b8c3d8157c 100644
--- a/testsuite/reftests/icon-shadow-no-transform.ref.ui
+++ b/testsuite/reftests/icon-shadow-no-transform.ref.ui
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
-      <object class="GtkSpinner" id="spinner1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
+      <object class="GtkSpinner" id="spinner1"/>
     </child>
   </object>
 </interface>
diff --git a/testsuite/reftests/icon-shadow-no-transform.ui b/testsuite/reftests/icon-shadow-no-transform.ui
index c227940284..503a8b0393 100644
--- a/testsuite/reftests/icon-shadow-no-transform.ui
+++ b/testsuite/reftests/icon-shadow-no-transform.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkSpinner" id="spinner1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <style>
           <class name="transformed"/>
         </style>
diff --git a/testsuite/reftests/icon-style-basics.ref.ui b/testsuite/reftests/icon-style-basics.ref.ui
index 7b9fd4516d..edf7842d9a 100644
--- a/testsuite/reftests/icon-style-basics.ref.ui
+++ b/testsuite/reftests/icon-style-basics.ref.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name strings -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -14,108 +12,87 @@
     </data>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkImage" id="image1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">icon name</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">symbolic icon name</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete-symbolic</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete-symbolic</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete-symbolic</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
-            <property name="show_expanders">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection1"/>
             </child>
@@ -129,21 +106,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection3"/>
             </child>
@@ -157,21 +132,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection4"/>
             </child>
@@ -185,21 +158,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection6"/>
             </child>
@@ -213,21 +184,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection8"/>
             </child>
@@ -241,21 +210,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection9"/>
             </child>
@@ -269,197 +236,163 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">GThemedIcon</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">symbolic GThemedIcon</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">GEmeblemedIcon</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">symbolic GEmblemedIcon</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themediconsymbolic</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themedicon</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemedicon</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemediconsymbolic</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themedicon</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themedicon</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemedicon</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemedicon</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themediconsymbolic</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themediconsymbolic</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image17">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemediconsymbolic</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image18">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemediconsymbolic</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection10"/>
             </child>
@@ -473,21 +406,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection11"/>
             </child>
@@ -501,21 +432,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection12"/>
             </child>
@@ -529,21 +458,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection13"/>
             </child>
@@ -557,21 +484,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection15"/>
             </child>
@@ -585,21 +510,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection16"/>
             </child>
@@ -613,21 +536,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection17"/>
             </child>
@@ -641,21 +562,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection18"/>
             </child>
@@ -669,21 +588,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection20"/>
             </child>
@@ -697,21 +614,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection21"/>
             </child>
@@ -725,21 +640,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview17">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection22"/>
             </child>
@@ -753,21 +666,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview18">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection23"/>
             </child>
@@ -781,11 +692,11 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/icon-style-basics.ui b/testsuite/reftests/icon-style-basics.ui
index 689cfab213..1d4c07f6de 100644
--- a/testsuite/reftests/icon-style-basics.ui
+++ b/testsuite/reftests/icon-style-basics.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name strings -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -14,120 +12,99 @@
     </data>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkImage" id="image1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">icon name</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">symbolic icon name</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete</property>
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete</property>
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete-symbolic</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete-symbolic</property>
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete-symbolic</property>
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
-            <property name="show_expanders">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection1"/>
             </child>
@@ -141,21 +118,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection3"/>
             </child>
@@ -172,21 +147,19 @@
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection4"/>
             </child>
@@ -203,21 +176,19 @@
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection6"/>
             </child>
@@ -231,21 +202,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection8"/>
             </child>
@@ -262,21 +231,19 @@
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection9"/>
             </child>
@@ -293,221 +260,187 @@
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">GThemedIcon</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">symbolic GThemedIcon</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">GEmeblemedIcon</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">symbolic GEmblemedIcon</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themediconsymbolic</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themedicon</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemedicon</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemediconsymbolic</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themedicon</property>
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themediconsymbolic</property>
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemedicon</property>
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemediconsymbolic</property>
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themedicon</property>
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">themediconsymbolic</property>
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image17">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemedicon</property>
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image18">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="gicon">emblemediconsymbolic</property>
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection10"/>
             </child>
@@ -521,21 +454,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection11"/>
             </child>
@@ -549,21 +480,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection12"/>
             </child>
@@ -577,21 +506,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection13"/>
             </child>
@@ -605,21 +532,19 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection15"/>
             </child>
@@ -636,21 +561,19 @@
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection16"/>
             </child>
@@ -667,21 +590,19 @@
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection17"/>
             </child>
@@ -698,21 +619,19 @@
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection18"/>
             </child>
@@ -729,21 +648,19 @@
             <style>
               <class name="regular"/>
             </style>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection20"/>
             </child>
@@ -760,21 +677,19 @@
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection21"/>
             </child>
@@ -791,21 +706,19 @@
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview17">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection22"/>
             </child>
@@ -822,21 +735,19 @@
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview18">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="enable_search">False</property>
+            <property name="headers_visible">0</property>
+            <property name="enable_search">0</property>
             <property name="search_column">0</property>
-            <property name="show_expanders">False</property>
+            <property name="show_expanders">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection23"/>
             </child>
@@ -853,11 +764,11 @@
             <style>
               <class name="symbolic"/>
             </style>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/icon-vfuncs.ref.ui b/testsuite/reftests/icon-vfuncs.ref.ui
index eb9e712f32..d0103a01b3 100644
--- a/testsuite/reftests/icon-vfuncs.ref.ui
+++ b/testsuite/reftests/icon-vfuncs.ref.ui
@@ -1,67 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Spinner</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Check</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Option</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Arrow</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Expander</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image1">
@@ -69,13 +55,11 @@
             <property name="height_request">16</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image2">
@@ -83,13 +67,11 @@
             <property name="height_request">16</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image3">
@@ -97,13 +79,11 @@
             <property name="height_request">16</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image4">
@@ -111,13 +91,11 @@
             <property name="height_request">16</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image5">
@@ -125,13 +103,11 @@
             <property name="height_request">16</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/icon-vfuncs.ui b/testsuite/reftests/icon-vfuncs.ui
index f2f215a5d3..bab70ba24a 100644
--- a/testsuite/reftests/icon-vfuncs.ui
+++ b/testsuite/reftests/icon-vfuncs.ui
@@ -1,126 +1,101 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Spinner</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSpinner" id="spinner1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Check</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Option</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Arrow</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Expander</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkCheckButton" id="checkbutton1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="draw_indicator">True</property>
+            <property name="can_focus">1</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRadioButton" id="radiobutton1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="active">True</property>
-            <property name="draw_indicator">True</property>
+            <property name="can_focus">1</property>
+            <property name="active">1</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="arrow1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">pan-down-symbolic</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkExpander" id="expander1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can_focus">1</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <child>
@@ -129,11 +104,11 @@
             <child type="label_item">
               <placeholder/>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/iconview-empty.ref.ui b/testsuite/reftests/iconview-empty.ref.ui
index 9e0c3c580b..2ec7dcb502 100644
--- a/testsuite/reftests/iconview-empty.ref.ui
+++ b/testsuite/reftests/iconview-empty.ref.ui
@@ -1,270 +1,234 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="row_spacing">5</property>
         <property name="column_spacing">5</property>
         <child>
           <object class="GtkPicture" id="picture-0-0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">0</property>
             <property name="height-request">0</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-1-0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">0</property>
             <property name="height-request">0</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-2-0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">0</property>
             <property name="height-request">0</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-3-0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">0</property>
             <property name="height-request">0</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-0-1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">0</property>
             <property name="height-request">0</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-1-1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">0</property>
             <property name="height-request">0</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-2-1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">0</property>
             <property name="height-request">0</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-3-1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">0</property>
             <property name="height-request">0</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-0-2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-1-2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-2-2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-3-2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-0-3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-1-3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-2-3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPicture" id="picture-3-3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/iconview-empty.ui b/testsuite/reftests/iconview-empty.ui
index d86efb44ce..a483b42272 100644
--- a/testsuite/reftests/iconview-empty.ui
+++ b/testsuite/reftests/iconview-empty.ui
@@ -1,57 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="row_spacing">5</property>
         <property name="column_spacing">5</property>
         <child>
           <object class="GtkIconView" id="iconview-0-0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="columns">-1</property>
             <property name="column-spacing">0</property>
             <property name="halign">center</property>
             <property name="item-padding">0</property>
             <property name="margin">0</property>
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-1-0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="columns">-1</property>
             <property name="column-spacing">0</property>
             <property name="halign">center</property>
             <property name="item-padding">5</property>
             <property name="margin">0</property>
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-2-0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="columns">5</property>
             <property name="column-spacing">0</property>
             <property name="halign">center</property>
@@ -59,18 +47,16 @@
             <property name="margin">0</property>
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-3-0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="columns">5</property>
             <property name="column-spacing">0</property>
             <property name="halign">center</property>
@@ -78,56 +64,48 @@
             <property name="margin">0</property>
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-0-1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="columns">-1</property>
             <property name="column-spacing">5</property>
             <property name="halign">center</property>
             <property name="item-padding">0</property>
             <property name="margin">0</property>
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-1-1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="columns">-1</property>
             <property name="column-spacing">5</property>
             <property name="halign">center</property>
             <property name="item-padding">5</property>
             <property name="margin">0</property>
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-2-1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="columns">5</property>
             <property name="column-spacing">5</property>
             <property name="halign">center</property>
@@ -135,18 +113,16 @@
             <property name="margin">0</property>
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-3-1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="columns">5</property>
             <property name="column-spacing">5</property>
             <property name="halign">center</property>
@@ -154,56 +130,48 @@
             <property name="margin">0</property>
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-0-2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="columns">-1</property>
             <property name="column-spacing">0</property>
             <property name="halign">center</property>
             <property name="item-padding">0</property>
             <property name="margin">5</property>
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-1-2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="columns">-1</property>
             <property name="column-spacing">0</property>
             <property name="halign">center</property>
             <property name="item-padding">5</property>
             <property name="margin">5</property>
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-2-2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="columns">5</property>
             <property name="column-spacing">0</property>
             <property name="halign">center</property>
@@ -211,18 +179,16 @@
             <property name="margin">5</property>
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-3-2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="columns">5</property>
             <property name="column-spacing">0</property>
             <property name="halign">center</property>
@@ -230,56 +196,48 @@
             <property name="margin">5</property>
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-0-3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="columns">-1</property>
             <property name="column-spacing">5</property>
             <property name="halign">center</property>
             <property name="item-padding">0</property>
             <property name="margin">5</property>
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-1-3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="columns">-1</property>
             <property name="column-spacing">5</property>
             <property name="halign">center</property>
             <property name="item-padding">5</property>
             <property name="margin">5</property>
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-2-3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="columns">5</property>
             <property name="column-spacing">5</property>
             <property name="halign">center</property>
@@ -287,18 +245,16 @@
             <property name="margin">5</property>
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkIconView" id="iconview-3-3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="columns">5</property>
             <property name="column-spacing">5</property>
             <property name="halign">center</property>
@@ -306,13 +262,13 @@
             <property name="margin">5</property>
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/image-icon-name-use-fallback.ref.ui b/testsuite/reftests/image-icon-name-use-fallback.ref.ui
index 398dc714cc..8ba61ab4bd 100644
--- a/testsuite/reftests/image-icon-name-use-fallback.ref.ui
+++ b/testsuite/reftests/image-icon-name-use-fallback.ref.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkImage" id="image1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="icon_name">edit-delete</property>
-        <property name="use_fallback">True</property>
+        <property name="use_fallback">1</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/image-icon-name-use-fallback.ui b/testsuite/reftests/image-icon-name-use-fallback.ui
index 442664c5ec..10fefbd028 100644
--- a/testsuite/reftests/image-icon-name-use-fallback.ui
+++ b/testsuite/reftests/image-icon-name-use-fallback.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkImage" id="image1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="icon_name">edit-delete-lolwtfbbq</property>
-        <property name="use_fallback">True</property>
+        <property name="use_fallback">1</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/image-icon-shadow-clipping.ref.ui b/testsuite/reftests/image-icon-shadow-clipping.ref.ui
index c670508230..7573765213 100644
--- a/testsuite/reftests/image-icon-shadow-clipping.ref.ui
+++ b/testsuite/reftests/image-icon-shadow-clipping.ref.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkImage" id="image1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="icon_name">edit-delete</property>
       </object>
     </child>
diff --git a/testsuite/reftests/image-icon-shadow-clipping.ui b/testsuite/reftests/image-icon-shadow-clipping.ui
index 161b089d51..4f88c0f0ee 100644
--- a/testsuite/reftests/image-icon-shadow-clipping.ui
+++ b/testsuite/reftests/image-icon-shadow-clipping.ui
@@ -1,23 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkImage" id="image1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">edit-delete</property>
           </object>
         </child>
diff --git a/testsuite/reftests/image-load-from-file.ref.ui b/testsuite/reftests/image-load-from-file.ref.ui
index ca9be604f7..6ebe6b9f90 100644
--- a/testsuite/reftests/image-load-from-file.ref.ui
+++ b/testsuite/reftests/image-load-from-file.ref.ui
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
diff --git a/testsuite/reftests/image-load-from-file.ui b/testsuite/reftests/image-load-from-file.ui
index 2ea571d7e6..8e7a5446ce 100644
--- a/testsuite/reftests/image-load-from-file.ui
+++ b/testsuite/reftests/image-load-from-file.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
     <child>
diff --git a/testsuite/reftests/inherit-and-initial.ref.ui b/testsuite/reftests/inherit-and-initial.ref.ui
index e978c242c8..bf193f0fb1 100644
--- a/testsuite/reftests/inherit-and-initial.ref.ui
+++ b/testsuite/reftests/inherit-and-initial.ref.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">100</property>
@@ -312,55 +313,45 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
             </style>
             <child>
               <object class="GtkToolButton" id="toolbutton2">
+                <property name="homogeneous">1</property>
                 <property name="name">inherit</property>
                 <property name="label" translatable="yes">Save</property>
                 <property name="use_underline">1</property>
                 <property name="icon_name">document-save</property>
               </object>
-              <packing>
-                <property name="homogeneous">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkToolButton" id="toolbutton1">
+                <property name="homogeneous">1</property>
                 <property name="name">inherit</property>
                 <property name="label" translatable="yes">Open</property>
                 <property name="use_underline">1</property>
                 <property name="icon_name">document-open</property>
               </object>
-              <packing>
-                <property name="homogeneous">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkSeparatorToolItem" id="toolbutton3">
+                <property name="homogeneous">1</property>
                 <property name="name">inherit</property>
               </object>
-              <packing>
-                <property name="homogeneous">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkToolButton" id="toolbutton4">
+                <property name="homogeneous">1</property>
                 <property name="name">inherit</property>
                 <property name="label" translatable="yes">Find</property>
                 <property name="use_underline">1</property>
                 <property name="icon_name">edit-find</property>
               </object>
-              <packing>
-                <property name="homogeneous">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkToolItem" id="toolbutton5">
+                <property name="homogeneous">1</property>
                 <property name="name">inherit</property>
                 <child>
                   <placeholder/>
                 </child>
               </object>
-              <packing>
-                <property name="homogeneous">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkToolItem" id="toolbutton6">
@@ -469,22 +460,22 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="name">inherit</property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">0</property>
+                        </layout>
                       </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="name">inherit</property>
                         <property name="can_focus">1</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">1</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton3">
@@ -492,11 +483,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="name">inherit</property>
                         <property name="inconsistent">1</property>
                         <property name="can_focus">1</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">2</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton4">
@@ -505,11 +496,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="sensitive">0</property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">3</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">3</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton5">
@@ -517,11 +508,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="name">inherit</property>
                         <property name="sensitive">0</property>
                         <property name="can_focus">1</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">4</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">4</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton6">
@@ -530,11 +521,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="sensitive">0</property>
                         <property name="inconsistent">1</property>
                         <property name="can_focus">1</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">5</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">5</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton1">
@@ -542,11 +533,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="name">inherit</property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">0</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton2">
@@ -555,11 +546,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
                         <property name="group">radiobutton1</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">1</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton3">
@@ -569,11 +560,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
                         <property name="group">radiobutton1</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">2</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">2</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton4">
@@ -582,11 +573,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="sensitive">0</property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">3</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">3</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton5">
@@ -596,11 +587,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
                         <property name="group">radiobutton3</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">4</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">4</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton6">
@@ -611,30 +602,30 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
                         <property name="group">radiobutton3</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">5</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">5</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkSwitch" id="switch1">
                         <property name="name">inherit</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">6</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">6</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkSwitch" id="switch2">
                         <property name="name">inherit</property>
                         <property name="sensitive">0</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">6</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">6</property>
-                      </packing>
                     </child>
                   </object>
                 </child>
diff --git a/testsuite/reftests/inherit-and-initial.ui b/testsuite/reftests/inherit-and-initial.ui
index c08b2d8a11..9a587ea907 100644
--- a/testsuite/reftests/inherit-and-initial.ui
+++ b/testsuite/reftests/inherit-and-initial.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">100</property>
@@ -272,49 +273,40 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
             </style>
             <child>
               <object class="GtkToolButton" id="toolbutton2">
+                <property name="homogeneous">1</property>
                 <property name="label" translatable="yes">Save</property>
                 <property name="use_underline">1</property>
                 <property name="icon_name">document-save</property>
               </object>
-              <packing>
-                <property name="homogeneous">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkToolButton" id="toolbutton1">
+                <property name="homogeneous">1</property>
                 <property name="label" translatable="yes">Open</property>
                 <property name="use_underline">1</property>
                 <property name="icon_name">document-open</property>
               </object>
-              <packing>
-                <property name="homogeneous">1</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkSeparatorToolItem" id="toolbutton3"/>
-              <packing>
+              <object class="GtkSeparatorToolItem" id="toolbutton3">
                 <property name="homogeneous">1</property>
-              </packing>
+              </object>
             </child>
             <child>
               <object class="GtkToolButton" id="toolbutton4">
+                <property name="homogeneous">1</property>
                 <property name="label" translatable="yes">Find</property>
                 <property name="use_underline">1</property>
                 <property name="icon_name">edit-find</property>
               </object>
-              <packing>
-                <property name="homogeneous">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkToolItem" id="toolbutton5">
+                <property name="homogeneous">1</property>
                 <child>
                   <placeholder/>
                 </child>
               </object>
-              <packing>
-                <property name="homogeneous">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkToolItem" id="toolbutton6">
@@ -408,32 +400,32 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="label" translatable="yes">checkbutton</property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">0</property>
+                        </layout>
                       </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>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">1</property>
+                        </layout>
                       </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>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">2</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton4">
@@ -441,22 +433,22 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="sensitive">0</property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">3</property>
+                        </layout>
                       </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>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">4</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">4</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton6">
@@ -464,22 +456,22 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="sensitive">0</property>
                         <property name="inconsistent">1</property>
                         <property name="can_focus">1</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">5</property>
+                        </layout>
                       </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>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">0</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton2">
@@ -487,11 +479,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
                         <property name="group">radiobutton1</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">1</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton3">
@@ -500,11 +492,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
                         <property name="group">radiobutton1</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">2</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">2</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton4">
@@ -512,11 +504,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="sensitive">0</property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">3</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">3</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton5">
@@ -525,11 +517,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
                         <property name="group">radiobutton3</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">4</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">4</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton6">
@@ -539,27 +531,28 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="can_focus">1</property>
                         <property name="active">1</property>
                         <property name="group">radiobutton3</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">5</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">5</property>
-                      </packing>
                     </child>
                     <child>
-                      <object class="GtkSwitch" id="switch1"/>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">6</property>
-                      </packing>
+                      <object class="GtkSwitch" id="switch1">
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">6</property>
+                        </layout>
+                      </object>
                     </child>
                     <child>
                       <object class="GtkSwitch" id="switch2">
                         <property name="sensitive">0</property>
+                        <layout>
+                          <property name="left_attach">1</property>
+                          <property name="top_attach">6</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">6</property>
-                      </packing>
                     </child>
                   </object>
                 </child>
diff --git a/testsuite/reftests/label-attribute-preference.ref.ui b/testsuite/reftests/label-attribute-preference.ref.ui
index 77f9b28709..2d45923300 100644
--- a/testsuite/reftests/label-attribute-preference.ref.ui
+++ b/testsuite/reftests/label-attribute-preference.ref.ui
@@ -1,22 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello linky World</property>
         <attributes>
-          <attribute name="foreground" value="#000080000000" start="1" end="3"/>
-          <attribute name="foreground" value="#ffff00000000" start="3" end="8"/>
-          <attribute name="foreground" value="#0000ffff0000" start="8" end="9"/>
-          <attribute name="foreground" value="#00000000ffff" start="9" end="10"/>
-          <attribute name="foreground" value="#ffff80008000" start="10" end="14"/>
-          <attribute name="foreground" value="#8000ffff8000" start="14" end="16"/>
-          <attribute name="underline" value="True" start="6" end="11"/>
+          <attribute name="foreground" value="#000080000000" start="1" end="3"></attribute>
+          <attribute name="foreground" value="#ffff00000000" start="3" end="8"></attribute>
+          <attribute name="foreground" value="#0000ffff0000" start="8" end="9"></attribute>
+          <attribute name="foreground" value="#00000000ffff" start="9" end="10"></attribute>
+          <attribute name="foreground" value="#ffff80008000" start="10" end="14"></attribute>
+          <attribute name="foreground" value="#8000ffff8000" start="14" end="16"></attribute>
+          <attribute name="underline" value="True" start="6" end="11"></attribute>
         </attributes>
       </object>
     </child>
diff --git a/testsuite/reftests/label-attribute-preference.ui b/testsuite/reftests/label-attribute-preference.ui
index fb268216cc..ae9fbfe046 100644
--- a/testsuite/reftests/label-attribute-preference.ui
+++ b/testsuite/reftests/label-attribute-preference.ui
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="use-markup">True</property>
-        <property name="label" translatable="yes">H&lt;span color="#008000"&gt;ell&lt;/span&gt;o &lt;a href="http://example.com"&gt;l&lt;span color="#00FF00"&gt;in&lt;/span&gt;ky&lt;/a&gt; &lt;span color="#80FF80"&gt;Worl&lt;/span&gt;d</property>
+        <property name="use-markup">1</property>
+        <property name="label" translatable="yes">H&lt;span color=&quot;#008000&quot;&gt;ell&lt;/span&gt;o &lt;a href=&quot;http://example.com&quot;&gt;l&lt;span color=&quot;#00FF00&quot;&gt;in&lt;/span&gt;ky&lt;/a&gt; &lt;span color=&quot;#80FF80&quot;&gt;Worl&lt;/span&gt;d</property>
         <attributes>
-          <attribute name="foreground" value="#ffff00000000" start="3" end="8"/>
-          <attribute name="foreground" value="#ffff80008000" start="10" end="14"/>
+          <attribute name="foreground" value="#ffff00000000" start="3" end="8"></attribute>
+          <attribute name="foreground" value="#ffff80008000" start="10" end="14"></attribute>
         </attributes>
       </object>
     </child>
diff --git a/testsuite/reftests/label-background.ref.ui b/testsuite/reftests/label-background.ref.ui
index 50522287ea..1bda217d61 100644
--- a/testsuite/reftests/label-background.ref.ui
+++ b/testsuite/reftests/label-background.ref.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World!</property>
       </object>
     </child>
diff --git a/testsuite/reftests/label-background.ui b/testsuite/reftests/label-background.ui
index b79f28e837..3f7117ee31 100644
--- a/testsuite/reftests/label-background.ui
+++ b/testsuite/reftests/label-background.ui
@@ -1,25 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello </property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">World!</property>
           </object>
         </child>
diff --git a/testsuite/reftests/label-box-shadow-clip.ref.ui b/testsuite/reftests/label-box-shadow-clip.ref.ui
index 31f744d3a9..97be53210b 100644
--- a/testsuite/reftests/label-box-shadow-clip.ref.ui
+++ b/testsuite/reftests/label-box-shadow-clip.ref.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <property name="label" translatable="yes">X</property>
diff --git a/testsuite/reftests/label-box-shadow-clip.ui b/testsuite/reftests/label-box-shadow-clip.ui
index 03741621b7..7672f7db14 100644
--- a/testsuite/reftests/label-box-shadow-clip.ui
+++ b/testsuite/reftests/label-box-shadow-clip.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <property name="label" translatable="yes">X</property>
diff --git a/testsuite/reftests/label-clipping.ref.ui b/testsuite/reftests/label-clipping.ref.ui
index 13eba47fc0..905cf05636 100644
--- a/testsuite/reftests/label-clipping.ref.ui
+++ b/testsuite/reftests/label-clipping.ref.ui
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">fffffffff</property>
       </object>
     </child>
diff --git a/testsuite/reftests/label-clipping.ui b/testsuite/reftests/label-clipping.ui
index 56d5ad06d2..058d66b280 100644
--- a/testsuite/reftests/label-clipping.ui
+++ b/testsuite/reftests/label-clipping.ui
@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">fffffffff</property>
           </object>
         </child>
diff --git a/testsuite/reftests/label-ellipsize-small.ref.ui b/testsuite/reftests/label-ellipsize-small.ref.ui
index dd7bb852c5..20c9277b9d 100644
--- a/testsuite/reftests/label-ellipsize-small.ref.ui
+++ b/testsuite/reftests/label-ellipsize-small.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">d</property>
       </object>
     </child>
diff --git a/testsuite/reftests/label-ellipsize-small.ui b/testsuite/reftests/label-ellipsize-small.ui
index c2d4fd0ed7..7b7ca38894 100644
--- a/testsuite/reftests/label-ellipsize-small.ui
+++ b/testsuite/reftests/label-ellipsize-small.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">d</property>
         <property name="ellipsize">end</property>
       </object>
diff --git a/testsuite/reftests/label-ellipsize-with-big.ref.ui b/testsuite/reftests/label-ellipsize-with-big.ref.ui
index 59e21f5020..18dff6e51a 100644
--- a/testsuite/reftests/label-ellipsize-with-big.ref.ui
+++ b/testsuite/reftests/label-ellipsize-with-big.ref.ui
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes"> &lt;big&gt;&lt;b&gt;There's a space in front&lt;/b&gt;&lt;/big&gt;</property>
-        <property name="use_markup">True</property>
+        <property name="label" translatable="yes"> &lt;big&gt;&lt;b&gt;There&apos;s a space in front&lt;/b&gt;&lt;/big&gt;</property>
+        <property name="use_markup">1</property>
         <property name="ellipsize">end</property>
       </object>
     </child>
diff --git a/testsuite/reftests/label-ellipsize-with-big.ui b/testsuite/reftests/label-ellipsize-with-big.ui
index 59e21f5020..18dff6e51a 100644
--- a/testsuite/reftests/label-ellipsize-with-big.ui
+++ b/testsuite/reftests/label-ellipsize-with-big.ui
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes"> &lt;big&gt;&lt;b&gt;There's a space in front&lt;/b&gt;&lt;/big&gt;</property>
-        <property name="use_markup">True</property>
+        <property name="label" translatable="yes"> &lt;big&gt;&lt;b&gt;There&apos;s a space in front&lt;/b&gt;&lt;/big&gt;</property>
+        <property name="use_markup">1</property>
         <property name="ellipsize">end</property>
       </object>
     </child>
diff --git a/testsuite/reftests/label-shadows.ref.ui b/testsuite/reftests/label-shadows.ref.ui
index d94ec4d791..6523efea03 100644
--- a/testsuite/reftests/label-shadows.ref.ui
+++ b/testsuite/reftests/label-shadows.ref.ui
@@ -1,168 +1,140 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkFixed" id="fixed1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="shadow1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">ABC</property>
                 <attributes>
-                  <attribute name="foreground" value="#ffff00000000"/>
+                  <attribute name="foreground" value="#ffff00000000"></attribute>
                 </attributes>
                 <style>
-                  <class name="no-shadow" />
+                  <class name="no-shadow"/>
                 </style>
+                <layout>
+                  <property name="x">2</property>
+                  <property name="y">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">2</property>
-                <property name="y">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">ABC</property>
                 <style>
-                  <class name="no-shadow" />
+                  <class name="no-shadow"/>
                 </style>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkFixed" id="fixed2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="shadow2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">ABC</property>
                 <attributes>
-                  <attribute name="foreground" value="#ffff00000000"/>
+                  <attribute name="foreground" value="#ffff00000000"></attribute>
                 </attributes>
                 <style>
-                  <class name="no-shadow" />
+                  <class name="no-shadow"/>
                 </style>
+                <layout>
+                  <property name="x">2</property>
+                  <property name="y">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">2</property>
-                <property name="y">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">ABC</property>
                 <style>
-                  <class name="no-shadow" />
+                  <class name="no-shadow"/>
                 </style>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkFixed" id="fixed3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="shadow3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">ABC</property>
                 <attributes>
-                  <attribute name="foreground" value="#ffff00000000"/>
+                  <attribute name="foreground" value="#ffff00000000"></attribute>
                 </attributes>
                 <style>
-                  <class name="no-shadow" />
+                  <class name="no-shadow"/>
                 </style>
+                <layout>
+                  <property name="x">0</property>
+                  <property name="y">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">0</property>
-                <property name="y">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">ABC</property>
                 <style>
-                  <class name="no-shadow" />
+                  <class name="no-shadow"/>
                 </style>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkFixed" id="fixed4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkLabel" id="shadow4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">ABC</property>
                 <attributes>
-                  <attribute name="foreground" value="#ffff00000000"/>
+                  <attribute name="foreground" value="#ffff00000000"></attribute>
                 </attributes>
                 <style>
-                  <class name="no-shadow" />
+                  <class name="no-shadow"/>
                 </style>
+                <layout>
+                  <property name="x">0</property>
+                  <property name="y">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="x">0</property>
-                <property name="y">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">ABC</property>
                 <style>
-                  <class name="no-shadow" />
+                  <class name="no-shadow"/>
                 </style>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/label-shadows.ui b/testsuite/reftests/label-shadows.ui
index 0617608184..d3093d6dca 100644
--- a/testsuite/reftests/label-shadows.ui
+++ b/testsuite/reftests/label-shadows.ui
@@ -1,72 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">start</property>
             <property name="valign">start</property>
             <property name="label" translatable="yes">ABC</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">start</property>
             <property name="valign">start</property>
             <property name="label" translatable="yes">ABC</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">start</property>
             <property name="valign">start</property>
             <property name="label" translatable="yes">ABC</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">start</property>
             <property name="valign">start</property>
             <property name="label" translatable="yes">ABC</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <placeholder/>
diff --git a/testsuite/reftests/label-sizing.ref.ui b/testsuite/reftests/label-sizing.ref.ui
index 6e4b0f4c06..d1ac565dc8 100644
--- a/testsuite/reftests/label-sizing.ref.ui
+++ b/testsuite/reftests/label-sizing.ref.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
@@ -10,97 +11,95 @@
         <child>
           <object class="GtkLabel" id="label2">
             <property name="label" translatable="yes">wrap</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
             <property name="label" translatable="yes">ellipsize</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
             <property name="label" translatable="yes">width-chars</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
             <property name="label" translatable="yes">max-width-chars</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
             <property name="label" translatable="yes">results</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap1">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize1">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars1">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars1">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned1">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required1">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -129,10 +128,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural1">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -159,61 +157,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap2">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize2">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars2">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars2">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned2">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required2">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -244,10 +240,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural2">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -274,61 +269,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap3">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize3">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars3">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars3">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned3">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required3">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -357,10 +350,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural3">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -387,61 +379,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap4">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize4">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars4">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars4">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned4">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required4">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -470,10 +460,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural4">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -500,61 +489,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap5">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize5">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars5">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars5">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned5">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required5">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -585,10 +572,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural5">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -617,61 +603,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap6">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize6">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars6">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars6">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned6">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required6">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -704,10 +688,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural6">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -736,61 +719,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap7">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">7</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">7</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize7">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">7</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">7</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars7">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">7</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">7</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars7">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">7</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">7</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned7">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required7">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -821,10 +802,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural7">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -853,61 +833,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">7</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">7</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap8">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">8</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">8</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize8">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">8</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">8</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars8">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">8</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">8</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars8">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">8</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">8</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned8">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required8">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -938,10 +916,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural8">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -970,61 +947,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">8</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">8</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap9">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">9</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">9</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize9">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">9</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">9</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars9">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">9</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">9</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars9">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">9</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">9</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned9">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required9">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1055,10 +1030,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural9">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1087,61 +1061,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">9</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">9</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap10">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">10</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize10">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">10</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars10">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">10</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars10">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">10</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned10">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required10">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1174,10 +1146,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural10">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1206,61 +1177,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">10</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap11">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">11</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">11</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize11">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">11</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">11</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars11">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">11</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">11</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars11">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">11</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">11</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned11">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required11">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1291,10 +1260,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural11">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1323,61 +1291,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">11</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">11</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap12">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">12</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">12</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize12">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">12</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">12</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars12">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">12</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">12</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars12">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">12</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">12</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned12">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required12">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1408,10 +1374,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural12">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1440,61 +1405,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">12</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">12</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap13">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">13</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">13</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize13">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">13</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">13</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars13">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">13</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">13</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars13">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">13</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">13</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned13">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required13">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1525,10 +1488,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural13">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1557,61 +1519,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">13</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">13</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap14">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">14</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">14</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize14">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">14</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">14</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars14">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">14</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">14</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars14">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">14</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">14</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned14">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required14">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1642,10 +1602,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural14">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1674,61 +1633,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">14</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">14</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap15">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">15</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">15</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize15">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">15</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">15</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars15">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">15</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">15</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars15">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">15</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">15</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned15">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required15">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1759,10 +1716,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural15">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1791,61 +1747,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">15</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">15</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap16">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">16</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">16</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize16">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">16</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">16</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars16">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">16</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">16</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars16">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">16</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">16</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned16">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required16">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1876,10 +1830,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural16">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1908,61 +1861,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">16</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">16</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap17">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">17</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">17</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize17">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">17</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">17</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars17">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">17</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">17</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars17">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">17</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">17</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned17">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required17">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1993,10 +1944,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural17">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2025,61 +1975,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">17</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">17</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap18">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">18</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">18</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize18">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">18</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">18</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars18">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">18</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">18</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars18">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">18</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">18</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned18">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required18">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2112,10 +2060,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural18">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2146,61 +2093,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">18</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">18</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap19">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">19</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">19</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize19">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">19</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">19</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars19">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">19</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">19</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars19">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">19</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">19</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned19">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required19">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2231,10 +2176,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural19">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2263,61 +2207,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">19</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">19</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap20">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">20</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">20</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize20">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">20</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">20</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars20">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">20</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">20</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars20">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">20</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">20</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned20">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required20">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2348,10 +2290,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural20">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2380,61 +2321,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">20</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">20</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap21">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">21</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">21</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize21">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">21</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">21</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars21">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">21</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">21</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars21">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">21</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">21</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned21">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required21">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2467,10 +2406,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural21">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2501,61 +2439,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">21</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">21</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap22">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">22</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">22</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize22">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">22</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">22</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars22">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">22</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">22</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars22">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">22</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">22</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned22">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required22">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2590,10 +2526,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural22">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2626,61 +2561,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">22</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">22</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap23">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">23</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">23</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize23">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">23</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">23</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars23">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">23</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">23</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars23">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">23</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">23</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned23">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required23">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2713,10 +2646,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural23">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2747,61 +2679,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">23</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">23</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap24">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">24</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">24</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize24">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">24</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">24</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars24">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">24</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">24</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars24">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">24</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">24</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned24">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required24">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2834,10 +2764,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural24">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2868,61 +2797,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">24</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">24</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap25">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">25</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">25</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize25">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">25</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">25</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars25">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">25</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">25</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars25">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">25</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">25</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned25">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required25">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2955,10 +2882,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural25">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2989,61 +2915,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">25</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">25</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap26">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">26</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">26</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize26">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">26</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">26</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars26">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">26</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">26</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars26">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">26</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">26</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned26">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required26">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3078,10 +3002,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural26">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3114,61 +3037,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">26</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">26</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap27">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">27</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">27</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize27">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">27</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">27</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars27">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">27</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">27</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars27">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">27</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">27</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned27">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required27">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3201,10 +3122,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural27">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3235,61 +3155,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">27</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">27</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap28">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">28</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">28</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize28">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">28</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">28</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars28">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">28</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">28</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars28">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">28</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">28</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned28">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required28">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3322,10 +3240,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural28">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3356,61 +3273,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">28</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">28</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap29">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">29</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">29</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize29">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">29</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">29</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars29">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">29</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">29</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars29">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">29</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">29</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned29">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required29">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3443,10 +3358,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural29">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3477,61 +3391,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">29</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">29</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap30">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">30</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">30</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize30">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">30</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">30</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars30">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">30</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">30</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars30">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">30</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">30</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned30">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required30">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3564,10 +3476,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural30">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3598,61 +3509,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">30</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">30</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap31">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">31</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">31</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize31">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">31</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">31</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars31">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">31</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">31</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars31">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">31</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">31</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned31">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required31">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3685,10 +3594,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural31">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3719,61 +3627,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">31</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">31</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap32">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">32</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">32</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize32">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">32</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">32</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars32">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">32</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">32</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars32">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">32</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">32</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned32">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required32">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3806,10 +3712,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural32">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3840,61 +3745,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">32</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">32</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap33">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">33</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">33</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize33">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">33</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">33</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars33">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">33</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">33</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars33">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">33</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">33</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned33">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required33">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3925,10 +3828,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural33">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3957,61 +3859,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">33</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">33</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap34">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">34</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">34</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize34">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">34</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">34</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars34">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">34</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">34</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars34">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">34</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">34</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned34">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required34">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4044,10 +3944,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural34">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4078,61 +3977,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">34</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">34</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap35">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">35</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">35</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize35">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">35</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">35</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars35">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">35</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">35</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars35">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">35</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">35</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned35">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required35">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4163,10 +4060,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural35">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4195,61 +4091,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">35</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">35</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap36">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">36</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">36</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize36">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">36</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">36</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars36">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">36</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">36</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars36">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">36</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">36</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned36">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required36">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4280,10 +4174,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural36">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4312,61 +4205,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">36</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">36</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap37">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">37</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">37</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize37">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">37</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">37</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars37">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">37</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">37</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars37">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">37</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">37</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned37">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required37">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4399,10 +4290,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural37">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4433,61 +4323,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">37</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">37</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap38">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">38</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">38</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize38">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">38</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">38</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars38">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">38</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">38</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars38">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">38</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">38</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned38">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required38">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4522,10 +4410,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural38">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4558,61 +4445,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">38</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">38</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap39">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">39</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">39</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize39">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">39</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">39</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars39">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">39</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">39</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars39">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">39</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">39</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned39">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required39">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4645,10 +4530,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural39">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4679,61 +4563,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">39</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">39</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap40">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">40</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">40</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize40">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">40</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">40</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars40">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">40</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">40</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars40">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">40</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">40</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned40">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required40">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4766,10 +4648,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural40">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4800,61 +4681,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">40</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">40</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap41">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">41</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">41</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize41">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">41</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">41</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars41">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">41</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">41</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars41">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">41</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">41</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned41">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required41">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4887,10 +4766,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural41">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4921,61 +4799,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">41</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">41</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap42">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">42</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">42</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize42">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">42</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">42</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars42">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">42</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">42</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars42">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">42</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">42</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned42">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required42">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5010,10 +4886,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural42">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5046,61 +4921,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">42</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">42</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap43">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">43</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">43</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize43">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">43</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">43</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars43">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">43</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">43</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars43">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">43</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">43</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned43">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required43">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5133,10 +5006,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural43">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5167,61 +5039,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">43</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">43</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap44">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">44</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">44</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize44">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">44</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">44</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars44">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">44</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">44</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars44">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">44</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">44</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned44">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required44">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5254,10 +5124,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural44">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5288,61 +5157,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">44</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">44</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap45">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">45</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">45</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize45">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">45</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">45</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars45">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">45</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">45</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars45">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">45</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">45</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned45">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required45">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5375,10 +5242,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural45">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5409,61 +5275,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">45</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">45</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap46">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">46</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">46</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize46">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">46</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">46</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars46">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">46</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">46</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars46">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">46</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">46</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned46">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required46">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5496,10 +5360,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural46">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5530,61 +5393,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">46</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">46</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap47">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">47</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">47</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize47">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">47</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">47</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars47">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">47</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">47</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars47">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">47</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">47</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned47">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required47">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5617,10 +5478,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural47">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5651,61 +5511,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">47</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">47</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap48">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">48</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">48</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize48">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">48</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">48</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars48">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">48</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">48</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars48">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">48</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">48</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned48">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required48">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5738,10 +5596,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural48">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5772,61 +5629,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">48</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">48</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap49">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">49</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">49</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize49">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">49</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">49</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars49">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">49</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">49</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars49">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">49</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">49</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned49">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required49">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5857,10 +5712,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural49">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5889,61 +5743,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">49</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">49</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap50">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">50</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize50">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">50</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars50">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">50</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars50">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">50</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned50">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required50">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5976,10 +5828,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural50">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6008,61 +5859,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">50</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap51">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">51</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">51</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize51">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">51</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">51</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars51">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">51</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">51</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars51">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">51</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">51</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned51">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required51">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6093,10 +5942,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural51">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6125,61 +5973,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">51</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">51</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap52">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">52</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">52</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize52">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">52</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">52</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars52">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">52</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">52</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars52">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">52</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">52</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned52">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required52">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6210,10 +6056,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural52">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6242,61 +6087,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">52</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">52</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap53">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">53</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">53</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize53">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">53</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">53</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars53">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">53</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">53</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars53">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">53</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">53</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned53">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required53">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6329,10 +6172,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural53">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6363,61 +6205,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">53</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">53</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap54">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">54</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">54</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize54">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">54</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">54</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars54">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">54</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">54</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars54">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">54</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">54</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned54">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required54">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6452,10 +6292,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural54">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6486,61 +6325,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">54</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">54</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap55">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">55</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">55</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize55">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">55</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">55</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars55">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">55</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">55</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars55">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">55</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">55</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned55">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required55">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6573,10 +6410,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural55">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6607,61 +6443,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">55</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">55</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap56">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">56</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">56</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize56">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">56</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">56</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars56">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">56</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">56</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars56">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">56</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">56</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned56">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required56">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6694,10 +6528,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural56">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6728,61 +6561,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">56</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">56</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap57">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">57</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">57</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize57">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">57</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">57</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars57">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">57</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">57</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars57">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">57</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">57</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned57">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required57">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6815,10 +6646,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural57">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6849,61 +6679,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">57</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">57</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap58">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">58</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">58</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize58">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">58</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">58</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars58">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">58</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">58</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars58">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">58</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">58</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned58">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required58">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6938,10 +6766,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural58">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6972,61 +6799,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">58</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">58</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap59">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">59</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">59</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize59">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">59</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">59</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars59">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">59</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">59</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars59">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">59</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">59</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned59">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required59">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7059,10 +6884,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural59">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7093,61 +6917,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">59</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">59</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap60">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">60</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">60</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize60">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">60</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">60</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars60">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">60</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">60</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars60">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">60</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">60</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned60">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required60">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7180,10 +7002,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural60">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7214,61 +7035,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">60</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">60</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap61">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">61</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">61</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize61">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">61</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">61</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars61">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">61</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">61</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars61">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">61</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">61</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned61">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required61">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7301,10 +7120,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural61">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7335,61 +7153,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">61</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">61</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap62">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">62</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">62</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize62">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">62</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">62</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars62">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">62</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">62</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars62">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">62</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">62</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned62">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required62">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7422,10 +7238,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural62">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7456,61 +7271,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">62</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">62</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap63">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">63</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">63</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize63">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">63</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">63</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars63">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">63</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">63</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars63">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">63</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">63</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned63">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required63">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7543,10 +7356,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural63">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7577,61 +7389,59 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">63</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">63</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap64">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">64</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">64</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize64">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">64</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">64</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars64">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">64</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">64</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars64">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">64</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">64</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned64">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required64">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7664,10 +7474,9 @@ ABCD</property>
             </child>
             <child>
               <object class="GtkPaned" id="natural64">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7698,11 +7507,11 @@ ABCD</property>
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">64</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">64</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/label-sizing.ui b/testsuite/reftests/label-sizing.ui
index b5fea3e15e..69784ba8ee 100644
--- a/testsuite/reftests/label-sizing.ui
+++ b/testsuite/reftests/label-sizing.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
@@ -10,97 +11,95 @@
         <child>
           <object class="GtkLabel" id="label2">
             <property name="label" translatable="yes">wrap</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
             <property name="label" translatable="yes">ellipsize</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
             <property name="label" translatable="yes">width-chars</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
             <property name="label" translatable="yes">max-width-chars</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
             <property name="label" translatable="yes">results</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap1">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize1">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars1">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars1">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned1">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required1">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -129,10 +128,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural1">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -159,61 +157,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap2">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize2">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars2">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars2">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned2">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required2">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -244,10 +240,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural2">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -276,61 +271,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap3">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize3">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars3">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars3">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned3">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required3">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -361,10 +354,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural3">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -393,61 +385,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">3</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap4">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize4">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars4">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars4">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned4">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required4">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -480,10 +470,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural4">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -514,61 +503,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">4</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap5">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize5">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars5">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars5">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned5">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required5">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -599,10 +586,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural5">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -631,61 +617,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">5</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">5</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap6">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize6">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars6">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars6">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned6">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required6">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -718,10 +702,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural6">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -752,61 +735,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">6</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">6</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap7">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">7</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">7</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize7">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">7</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">7</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars7">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">7</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">7</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars7">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">7</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">7</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned7">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required7">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -839,10 +820,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural7">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -873,61 +853,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">7</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">7</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap8">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">8</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">8</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize8">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">8</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">8</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars8">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">8</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">8</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars8">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">8</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">8</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned8">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required8">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -962,10 +940,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural8">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -998,61 +975,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">8</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">8</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap9">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">9</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">9</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize9">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">9</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">9</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars9">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">9</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">9</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars9">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">9</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">9</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned9">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required9">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1083,10 +1058,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural9">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1115,61 +1089,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">9</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">9</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap10">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">10</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize10">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">10</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars10">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">10</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars10">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">10</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned10">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required10">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1202,10 +1174,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural10">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1236,61 +1207,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">10</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">10</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap11">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">11</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">11</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize11">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">11</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">11</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars11">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">11</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">11</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars11">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">11</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">11</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned11">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required11">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1323,10 +1292,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural11">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1357,61 +1325,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">11</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">11</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap12">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">12</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">12</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize12">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">12</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">12</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars12">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">12</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">12</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars12">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">12</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">12</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned12">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required12">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1446,10 +1412,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural12">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1482,61 +1447,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">12</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">12</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap13">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">13</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">13</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize13">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">13</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">13</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars13">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">13</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">13</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars13">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">13</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">13</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned13">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required13">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1567,10 +1530,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural13">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1599,61 +1561,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">13</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">13</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap14">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">14</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">14</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize14">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">14</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">14</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars14">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">14</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">14</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars14">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">14</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">14</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned14">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required14">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1686,10 +1646,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural14">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1720,61 +1679,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">14</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">14</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap15">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">15</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">15</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize15">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">15</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">15</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars15">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">15</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">15</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars15">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">15</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">15</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned15">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required15">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1807,10 +1764,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural15">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1841,61 +1797,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">15</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">15</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap16">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">16</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">16</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize16">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">16</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">16</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars16">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">16</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">16</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars16">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">16</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">16</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned16">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required16">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1930,10 +1884,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural16">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1966,61 +1919,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">16</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">16</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap17">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">17</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">17</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize17">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">17</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">17</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars17">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">17</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">17</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars17">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">17</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">17</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned17">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required17">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2051,10 +2002,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural17">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2083,61 +2033,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">17</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">17</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap18">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">18</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">18</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize18">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">18</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">18</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars18">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">18</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">18</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars18">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">18</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">18</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned18">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required18">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2170,10 +2118,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural18">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2204,61 +2151,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">18</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">18</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap19">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">19</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">19</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize19">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">19</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">19</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars19">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">19</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">19</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars19">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">19</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">19</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned19">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required19">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2291,10 +2236,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural19">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2325,61 +2269,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">19</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">19</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap20">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">20</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">20</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize20">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">20</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">20</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars20">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">20</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">20</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars20">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">20</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">20</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned20">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required20">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2414,10 +2356,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural20">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2450,61 +2391,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">20</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">20</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap21">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">21</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">21</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize21">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">21</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">21</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars21">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">21</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">21</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars21">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">21</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">21</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned21">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required21">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2537,10 +2476,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural21">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2571,61 +2509,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">21</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">21</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap22">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">22</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">22</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize22">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">22</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">22</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars22">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">22</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">22</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars22">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">22</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">22</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned22">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required22">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2660,10 +2596,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural22">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2696,61 +2631,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">22</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">22</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap23">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">23</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">23</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize23">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">23</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">23</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars23">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">23</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">23</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars23">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">23</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">23</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned23">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required23">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2785,10 +2718,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural23">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2821,61 +2753,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">23</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">23</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap24">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">24</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">24</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize24">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">24</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">24</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars24">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">24</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">24</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars24">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">24</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">24</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned24">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required24">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2912,10 +2842,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural24">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -2950,61 +2879,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">24</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">24</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap25">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">25</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">25</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize25">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">25</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">25</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars25">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">25</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">25</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars25">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">25</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">25</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned25">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required25">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3037,10 +2964,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural25">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3071,61 +2997,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">25</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">25</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap26">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">26</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">26</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize26">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">26</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">26</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars26">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">26</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">26</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars26">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">26</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">26</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned26">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required26">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3160,10 +3084,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural26">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3196,61 +3119,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">26</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">26</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap27">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">27</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">27</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize27">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">27</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">27</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars27">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">27</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">27</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars27">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">27</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">27</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned27">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required27">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3285,10 +3206,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural27">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3321,61 +3241,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">27</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">27</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap28">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">28</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">28</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize28">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">28</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">28</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars28">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">28</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">28</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars28">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">28</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">28</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned28">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required28">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3412,10 +3330,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural28">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3450,61 +3367,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">28</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">28</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap29">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">29</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">29</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize29">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">29</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">29</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars29">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">29</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">29</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars29">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">29</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">29</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned29">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required29">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3537,10 +3452,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural29">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3571,61 +3485,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">29</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">29</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap30">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">30</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">30</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize30">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">30</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">30</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars30">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">30</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">30</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars30">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">30</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">30</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned30">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required30">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3660,10 +3572,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural30">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3696,61 +3607,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">30</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">30</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap31">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">31</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">31</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize31">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">31</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">31</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars31">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">31</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">31</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars31">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">31</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">31</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned31">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required31">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3785,10 +3694,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural31">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3821,61 +3729,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">31</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">31</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap32">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">32</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">32</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize32">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">32</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">32</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars32">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">32</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">32</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars32">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">32</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">32</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned32">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required32">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3912,10 +3818,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural32">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -3950,61 +3855,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">32</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">32</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap33">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">33</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">33</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize33">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">33</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">33</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars33">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">33</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">33</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars33">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">33</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">33</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned33">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required33">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4035,10 +3938,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural33">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4067,61 +3969,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">33</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">33</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap34">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">34</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">34</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize34">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">34</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">34</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars34">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">34</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">34</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars34">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">34</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">34</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned34">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required34">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4154,10 +4054,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural34">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4188,61 +4087,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">34</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">34</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap35">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">35</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">35</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize35">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">35</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">35</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars35">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">35</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">35</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars35">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">35</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">35</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned35">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required35">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4275,10 +4172,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural35">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4309,61 +4205,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">35</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">35</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap36">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">36</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">36</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize36">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">36</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">36</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars36">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">36</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">36</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars36">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">36</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">36</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned36">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required36">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4398,10 +4292,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural36">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4434,61 +4327,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">36</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">36</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap37">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">37</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">37</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize37">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">37</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">37</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars37">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">37</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">37</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars37">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">37</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">37</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned37">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required37">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4521,10 +4412,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural37">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4555,61 +4445,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">37</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">37</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap38">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">38</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">38</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize38">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">38</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">38</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars38">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">38</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">38</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars38">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">38</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">38</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned38">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required38">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4644,10 +4532,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural38">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4680,61 +4567,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">38</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">38</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap39">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">39</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">39</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize39">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">39</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">39</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars39">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">39</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">39</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars39">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">39</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">39</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned39">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required39">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4769,10 +4654,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural39">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4805,61 +4689,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">39</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">39</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap40">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">40</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">40</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize40">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">40</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">40</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars40">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">40</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">40</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars40">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">40</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">40</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned40">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required40">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4896,10 +4778,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural40">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -4934,61 +4815,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">40</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">40</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap41">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">41</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">41</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize41">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">41</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">41</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars41">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">41</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">41</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars41">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">41</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">41</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned41">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required41">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5021,10 +4900,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural41">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5055,61 +4933,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">41</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">41</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap42">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">42</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">42</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize42">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">42</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">42</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars42">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">42</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">42</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars42">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">42</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">42</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned42">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required42">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5144,10 +5020,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural42">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5180,61 +5055,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">42</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">42</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap43">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">43</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">43</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize43">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">43</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">43</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars43">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">43</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">43</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars43">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">43</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">43</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned43">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required43">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5269,10 +5142,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural43">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5305,61 +5177,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">43</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">43</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap44">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">44</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">44</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize44">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">44</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">44</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars44">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">44</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">44</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars44">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">44</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">44</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned44">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required44">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5396,10 +5266,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural44">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5434,61 +5303,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">44</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">44</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap45">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">45</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">45</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize45">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">45</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">45</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars45">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">45</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">45</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars45">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">45</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">45</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned45">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required45">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5521,10 +5388,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural45">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5555,61 +5421,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">45</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">45</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap46">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">46</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">46</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize46">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">46</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">46</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars46">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">46</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">46</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars46">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">46</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">46</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned46">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required46">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5644,10 +5508,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural46">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5680,61 +5543,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">46</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">46</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap47">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">47</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">47</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize47">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">47</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">47</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars47">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">47</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">47</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars47">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">47</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">47</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned47">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required47">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5769,10 +5630,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural47">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5805,61 +5665,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">47</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">47</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap48">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">48</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">48</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize48">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">48</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">48</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars48">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">48</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">48</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars48">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">48</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">48</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned48">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required48">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5896,10 +5754,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural48">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -5934,61 +5791,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">48</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">48</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap49">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">49</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">49</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize49">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">49</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">49</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars49">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">49</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">49</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars49">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">49</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">49</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned49">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required49">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6019,10 +5874,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural49">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6051,61 +5905,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">49</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">49</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap50">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">50</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize50">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">50</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars50">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">50</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars50">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">50</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned50">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required50">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6138,10 +5990,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural50">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6172,61 +6023,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">50</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">50</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap51">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">51</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">51</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize51">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">51</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">51</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars51">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">51</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">51</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars51">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">51</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">51</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned51">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required51">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6259,10 +6108,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural51">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6293,61 +6141,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">51</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">51</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap52">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">52</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">52</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize52">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">52</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">52</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars52">
             <property name="label" translatable="yes">-1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">52</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">52</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars52">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">52</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">52</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned52">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required52">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6382,10 +6228,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural52">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6418,61 +6263,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">52</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">52</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap53">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">53</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">53</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize53">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">53</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">53</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars53">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">53</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">53</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars53">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">53</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">53</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned53">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required53">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6505,10 +6348,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural53">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6539,61 +6381,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">53</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">53</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap54">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">54</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">54</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize54">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">54</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">54</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars54">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">54</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">54</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars54">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">54</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">54</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned54">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required54">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6628,10 +6468,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural54">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6664,61 +6503,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">54</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">54</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap55">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">55</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">55</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize55">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">55</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">55</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars55">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">55</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">55</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars55">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">55</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">55</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned55">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required55">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6753,10 +6590,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural55">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6789,61 +6625,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">55</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">55</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap56">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">56</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">56</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize56">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">56</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">56</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars56">
             <property name="label" translatable="yes">4</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">56</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">56</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars56">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">56</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">56</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned56">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required56">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6880,10 +6714,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural56">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -6918,61 +6751,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">56</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">56</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap57">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">57</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">57</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize57">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">57</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">57</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars57">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">57</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">57</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars57">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">57</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">57</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned57">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required57">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7005,10 +6836,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural57">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7039,61 +6869,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">57</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">57</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap58">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">58</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">58</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize58">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">58</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">58</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars58">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">58</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">58</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars58">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">58</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">58</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned58">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required58">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7128,10 +6956,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural58">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7164,61 +6991,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">58</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">58</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap59">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">59</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">59</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize59">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">59</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">59</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars59">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">59</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">59</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars59">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">59</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">59</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned59">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required59">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7253,10 +7078,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural59">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7289,61 +7113,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">59</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">59</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap60">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">60</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">60</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize60">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">60</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">60</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars60">
             <property name="label" translatable="yes">8</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">60</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">60</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars60">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">60</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">60</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned60">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required60">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7380,10 +7202,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural60">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7418,61 +7239,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">60</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">60</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap61">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">61</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">61</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize61">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">61</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">61</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars61">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">61</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">61</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars61">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">61</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">61</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned61">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required61">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7505,10 +7324,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural61">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7539,61 +7357,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">61</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">61</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap62">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">62</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">62</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize62">
             <property name="label" translatable="yes">none</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">62</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">62</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars62">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">62</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">62</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars62">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">62</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">62</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned62">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required62">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7628,10 +7444,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural62">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7664,61 +7479,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">62</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">62</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap63">
             <property name="label" translatable="yes">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">63</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">63</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize63">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">63</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">63</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars63">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">63</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">63</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars63">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">63</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">63</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned63">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required63">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7753,10 +7566,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural63">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7789,61 +7601,59 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">63</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">63</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="wrap64">
             <property name="label" translatable="yes">True</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">64</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">64</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="ellipsize64">
             <property name="label" translatable="yes">end</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">64</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">64</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="width_chars64">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">64</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">64</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="max_width_chars64">
             <property name="label" translatable="yes">12</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">64</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">64</property>
-          </packing>
         </child>
         <child>
           <object class="GtkPaned" id="paned64">
-            <property name="shrink-child2">False</property>
-            <property name="resize-child2">True</property>
-            <property name="shrink-child1">False</property>
-            <property name="resize-child1">False</property>
+            <property name="shrink-child2">0</property>
+            <property name="shrink-child1">0</property>
+            <property name="resize-child1">0</property>
             <property name="can_focus">1</property>
             <child>
               <object class="GtkPaned" id="required64">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7880,10 +7690,9 @@
             </child>
             <child>
               <object class="GtkPaned" id="natural64">
-                <property name="shrink-child2">False</property>
-                <property name="resize-child2">True</property>
-                <property name="shrink-child1">False</property>
-                <property name="resize-child1">False</property>
+                <property name="shrink-child2">0</property>
+                <property name="shrink-child1">0</property>
+                <property name="resize-child1">0</property>
                 <property name="can_focus">1</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -7918,11 +7727,11 @@
                 </child>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">64</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">64</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/label-small-ellipsized.ref.ui b/testsuite/reftests/label-small-ellipsized.ref.ui
index 03285d0664..bb047f0a15 100644
--- a/testsuite/reftests/label-small-ellipsized.ref.ui
+++ b/testsuite/reftests/label-small-ellipsized.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes"> </property>
       </object>
     </child>
diff --git a/testsuite/reftests/label-small-ellipsized.ui b/testsuite/reftests/label-small-ellipsized.ui
index 16f45fc31c..260149d2c1 100644
--- a/testsuite/reftests/label-small-ellipsized.ui
+++ b/testsuite/reftests/label-small-ellipsized.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes"> </property>
         <property name="ellipsize">end</property>
       </object>
diff --git a/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui b/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui
index 85245c16fe..b92d933f48 100644
--- a/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui
+++ b/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World</property>
         <style>
           <class name="reference"/>
diff --git a/testsuite/reftests/label-text-shadow-changes-modify-clip.ui b/testsuite/reftests/label-text-shadow-changes-modify-clip.ui
index bb34bb001e..f69a690560 100644
--- a/testsuite/reftests/label-text-shadow-changes-modify-clip.ui
+++ b/testsuite/reftests/label-text-shadow-changes-modify-clip.ui
@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <signal name="map" handler="reftest:inhibit_for_3_frames" swapped="no"/>
     <child>
       <object class="GtkBox" id="box2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
             <signal name="map" handler="reftest:add_reference_class_if_no_animation" swapped="no"/>
           </object>
diff --git a/testsuite/reftests/label-text-shadow-clipping.ref.ui b/testsuite/reftests/label-text-shadow-clipping.ref.ui
index c8fa838299..1b0ddf015a 100644
--- a/testsuite/reftests/label-text-shadow-clipping.ref.ui
+++ b/testsuite/reftests/label-text-shadow-clipping.ref.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World</property>
       </object>
     </child>
diff --git a/testsuite/reftests/label-text-shadow-clipping.ui b/testsuite/reftests/label-text-shadow-clipping.ui
index 2ff0b4b53d..0e4873a3d0 100644
--- a/testsuite/reftests/label-text-shadow-clipping.ui
+++ b/testsuite/reftests/label-text-shadow-clipping.ui
@@ -1,23 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
           </object>
         </child>
diff --git a/testsuite/reftests/label-width-chars-dont-shrink.ref.ui b/testsuite/reftests/label-width-chars-dont-shrink.ref.ui
index 302efb825c..852813ec0e 100644
--- a/testsuite/reftests/label-width-chars-dont-shrink.ref.ui
+++ b/testsuite/reftests/label-width-chars-dont-shrink.ref.ui
@@ -1,32 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
           </object>
         </child>
diff --git a/testsuite/reftests/label-width-chars-dont-shrink.ui b/testsuite/reftests/label-width-chars-dont-shrink.ui
index d16e4905d2..89f4631e1b 100644
--- a/testsuite/reftests/label-width-chars-dont-shrink.ui
+++ b/testsuite/reftests/label-width-chars-dont-shrink.ui
@@ -1,33 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
             <property name="max_width_chars">5</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
             <property name="width_chars">5</property>
           </object>
diff --git a/testsuite/reftests/label-wrap-justify.ref.ui b/testsuite/reftests/label-wrap-justify.ref.ui
index 8c8dbd9ffe..a52a604f24 100644
--- a/testsuite/reftests/label-wrap-justify.ref.ui
+++ b/testsuite/reftests/label-wrap-justify.ref.ui
@@ -1,71 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;tt&gt;left
 aligning&lt;/tt&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="use_markup">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;tt&gt; center
 aligning&lt;/tt&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="use_markup">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;tt&gt;   right
 aligning&lt;/tt&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="use_markup">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;tt&gt;Make the widget wide enough&lt;/tt&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="use_markup">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/label-wrap-justify.ui b/testsuite/reftests/label-wrap-justify.ui
index 31350a202a..38d0597ac4 100644
--- a/testsuite/reftests/label-wrap-justify.ui
+++ b/testsuite/reftests/label-wrap-justify.ui
@@ -1,76 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;tt&gt;left
 aligning&lt;/tt&gt;</property>
-            <property name="use_markup">True</property>
-            <property name="wrap">True</property>
+            <property name="use_markup">1</property>
+            <property name="wrap">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;tt&gt;center
 aligning&lt;/tt&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="use_markup">1</property>
             <property name="justify">center</property>
-            <property name="wrap">True</property>
+            <property name="wrap">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;tt&gt;right
 aligning&lt;/tt&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="use_markup">1</property>
             <property name="justify">right</property>
-            <property name="wrap">True</property>
+            <property name="wrap">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;tt&gt;Make the widget wide enough&lt;/tt&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="use_markup">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/letter-spacing.ref.ui b/testsuite/reftests/letter-spacing.ref.ui
index f1925ba953..491cecd129 100644
--- a/testsuite/reftests/letter-spacing.ref.ui
+++ b/testsuite/reftests/letter-spacing.ref.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label">abc</property>
         <signal name="map" handler="reftest:set_letter_spacing" swapped="no"/>
       </object>
diff --git a/testsuite/reftests/letter-spacing.ui b/testsuite/reftests/letter-spacing.ui
index f93785fee4..6ab4185af9 100644
--- a/testsuite/reftests/letter-spacing.ui
+++ b/testsuite/reftests/letter-spacing.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="name">spaced</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label">abc</property>
       </object>
     </child>
diff --git a/testsuite/reftests/linear-gradient-transition-to-other.ref.ui b/testsuite/reftests/linear-gradient-transition-to-other.ref.ui
index c4a02a1192..489098df2d 100644
--- a/testsuite/reftests/linear-gradient-transition-to-other.ref.ui
+++ b/testsuite/reftests/linear-gradient-transition-to-other.ref.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">20</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">reference</property>
   </object>
diff --git a/testsuite/reftests/linear-gradient-transition-to-other.ui b/testsuite/reftests/linear-gradient-transition-to-other.ui
index 2c21f60fbf..6fa417228a 100644
--- a/testsuite/reftests/linear-gradient-transition-to-other.ui
+++ b/testsuite/reftests/linear-gradient-transition-to-other.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">20</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/linear-gradient.ref.ui b/testsuite/reftests/linear-gradient.ref.ui
index 62137e8c3c..27f85476a3 100644
--- a/testsuite/reftests/linear-gradient.ref.ui
+++ b/testsuite/reftests/linear-gradient.ref.ui
@@ -1,22 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="name">reference</property>
         <child>
           <object class="GtkButton" id="button1">
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">a</property>
           </object>
         </child>
@@ -24,9 +19,8 @@
           <object class="GtkButton" id="button2">
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">b</property>
           </object>
         </child>
@@ -34,9 +28,8 @@
           <object class="GtkButton" id="button3">
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">c</property>
           </object>
         </child>
@@ -44,9 +37,8 @@
           <object class="GtkButton" id="button4">
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">d</property>
           </object>
         </child>
diff --git a/testsuite/reftests/linear-gradient.ui b/testsuite/reftests/linear-gradient.ui
index 9752754d6d..e2fbdc6949 100644
--- a/testsuite/reftests/linear-gradient.ui
+++ b/testsuite/reftests/linear-gradient.ui
@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkButton" id="button1">
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">a</property>
           </object>
         </child>
@@ -23,9 +18,8 @@
           <object class="GtkButton" id="button2">
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">b</property>
           </object>
         </child>
@@ -33,9 +27,8 @@
           <object class="GtkButton" id="button3">
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">c</property>
           </object>
         </child>
@@ -43,9 +36,8 @@
           <object class="GtkButton" id="button4">
             <property name="width_request">40</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="name">d</property>
           </object>
         </child>
diff --git a/testsuite/reftests/link-coloring.ref.ui b/testsuite/reftests/link-coloring.ref.ui
index 7848a11881..882e737e15 100644
--- a/testsuite/reftests/link-coloring.ref.ui
+++ b/testsuite/reftests/link-coloring.ref.ui
@@ -1,37 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Mon Nov  4 16:28:50 2013 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">A &lt;span color="blue" underline="single"&gt;link&lt;/span&gt; to the &lt;span color="blue" underline="single"&gt;GNOME&lt;/span&gt; website</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">A &lt;span color=&quot;blue&quot; underline=&quot;single&quot;&gt;link&lt;/span&gt; to the &lt;span color=&quot;blue&quot; underline=&quot;single&quot;&gt;GNOME&lt;/span&gt; website</property>
+            <property name="use_markup">1</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">&lt;span color="blue" underline="single"&gt;A normal link&lt;/span&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">&lt;span color=&quot;blue&quot; underline=&quot;single&quot;&gt;A normal link&lt;/span&gt;</property>
+            <property name="use_markup">1</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">&lt;span color="purple" underline="single"&gt;A visited link&lt;/span&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">&lt;span color=&quot;purple&quot; underline=&quot;single&quot;&gt;A visited link&lt;/span&gt;</property>
+            <property name="use_markup">1</property>
           </object>
         </child>
       </object>
diff --git a/testsuite/reftests/link-coloring.ui b/testsuite/reftests/link-coloring.ui
index 610287e9fe..8d6ff5bcd6 100644
--- a/testsuite/reftests/link-coloring.ui
+++ b/testsuite/reftests/link-coloring.ui
@@ -1,29 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Mon Nov  4 13:29:25 2013 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="label" translatable="yes">A &lt;a href="http://www.gnome.org"&gt;link&lt;/a&gt; to the &lt;a href="http://www.gnome.org"&gt;GNOME&lt;/a&gt; website</property>
-            <property name="use_markup">True</property>
+            <property name="can_focus">1</property>
+            <property name="label" translatable="yes">A &lt;a href=&quot;http://www.gnome.org&quot;&gt;link&lt;/a&gt; to the &lt;a href=&quot;http://www.gnome.org&quot;&gt;GNOME&lt;/a&gt; website</property>
+            <property name="use_markup">1</property>
           </object>
         </child>
         <child>
           <object class="GtkLinkButton" id="linkbutton1">
             <property name="label" translatable="yes">A normal link</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="relief">none</property>
             <property name="uri">http://gnome.org</property>
           </object>
@@ -31,12 +24,11 @@
         <child>
           <object class="GtkLinkButton" id="linkbutton2">
             <property name="label" translatable="yes">A visited link</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="relief">none</property>
             <property name="uri">http://gnome.org</property>
-            <property name="visited">True</property>
+            <property name="visited">1</property>
           </object>
         </child>
       </object>
diff --git a/testsuite/reftests/messagedialog-secondarytext.ref.ui b/testsuite/reftests/messagedialog-secondarytext.ref.ui
index a85e7228ec..5856b837fe 100644
--- a/testsuite/reftests/messagedialog-secondarytext.ref.ui
+++ b/testsuite/reftests/messagedialog-secondarytext.ref.ui
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkMessageDialog" id="messagedialog1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_taskbar_hint">1</property>
     <property name="buttons">ok</property>
     <property name="text" translatable="yes">Text</property>
     <property name="secondary_text" translatable="yes">Secondary text #5</property>
diff --git a/testsuite/reftests/messagedialog-secondarytext.ui b/testsuite/reftests/messagedialog-secondarytext.ui
index 7c9be82bdb..f25df31515 100644
--- a/testsuite/reftests/messagedialog-secondarytext.ui
+++ b/testsuite/reftests/messagedialog-secondarytext.ui
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkMessageDialog" id="messagedialog1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_taskbar_hint">1</property>
     <property name="buttons">ok</property>
     <property name="text" translatable="yes">Text</property>
-    <!-- We set the property multiple times on purpose here -->
     <property name="secondary_text" translatable="yes">Secondary text #1</property>
     <property name="secondary_text" translatable="yes">Secondary text #2</property>
     <property name="secondary_text" translatable="yes">Secondary text #3</property>
diff --git a/testsuite/reftests/named-colors.ref.ui b/testsuite/reftests/named-colors.ref.ui
index 3128b25456..6bbb850534 100644
--- a/testsuite/reftests/named-colors.ref.ui
+++ b/testsuite/reftests/named-colors.ref.ui
@@ -1,2262 +1,1958 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid0">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference0</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference10</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label20">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference20</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label30">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference30</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label40">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference40</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label50">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference50</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label60">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference60</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label70">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference70</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label80">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference80</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label90">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference90</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label100">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference100</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label110">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference110</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label120">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference120</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label130">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference130</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label140">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference140</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference11</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label21">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference21</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label31">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference31</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label41">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference41</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label51">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference51</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label61">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference61</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label71">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference71</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label81">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference81</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label91">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference91</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label101">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference101</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label111">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference111</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label121">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference121</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label131">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference131</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label141">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference141</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference2</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference12</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label22">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference22</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label32">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference32</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label42">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference42</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label52">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference52</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label62">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference62</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label72">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference72</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label82">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference82</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label92">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference92</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label102">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference102</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label112">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference112</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label122">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference122</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label132">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference132</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label142">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference142</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference3</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference13</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label23">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference23</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label33">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference33</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label43">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference43</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label53">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference53</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label63">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference63</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label73">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference73</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label83">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference83</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label93">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference93</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label103">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference103</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label113">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference113</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label123">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference123</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label133">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference133</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label143">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference143</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference4</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference14</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label24">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference24</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label34">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference34</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label44">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference44</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label54">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference54</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label64">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference64</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label74">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference74</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label84">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference84</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label94">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference94</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label104">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference104</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label114">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference114</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label124">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference124</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label134">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference134</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label144">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference144</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference5</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference15</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label25">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference25</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label35">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference35</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label45">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference45</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label55">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference55</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label65">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference65</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label75">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference75</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label85">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference85</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label95">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference95</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label105">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference105</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label115">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference115</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label125">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference125</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label135">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference135</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label145">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference145</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference6</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference16</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label26">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference26</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label36">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference36</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label46">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference46</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label56">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference56</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label66">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference66</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label76">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference76</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label86">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference86</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label96">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference96</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label106">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference106</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label116">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference116</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label126">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference126</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label136">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference136</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label146">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference146</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference7</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label17">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference17</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label27">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference27</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label37">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference37</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label47">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference47</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label57">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference57</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label67">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference67</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label77">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference77</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label87">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference87</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label97">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference97</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label107">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference107</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label117">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference117</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label127">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference127</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label137">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference137</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label147">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference147</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference8</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label18">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference18</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label28">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference28</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label38">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference38</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label48">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference48</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label58">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference58</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label68">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference68</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label78">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference78</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label88">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference88</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label98">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference98</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label108">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference108</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label118">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference118</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label128">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference128</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label138">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference138</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label148">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference148</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference9</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label19">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference19</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label29">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference29</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label39">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference39</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label49">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference49</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label59">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference59</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label69">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference69</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label79">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference79</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label89">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference89</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label99">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference99</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label109">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference109</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label119">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference119</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label129">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference129</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label139">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference139</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label149">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference149</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/named-colors.ui b/testsuite/reftests/named-colors.ui
index 3468cf7205..ddc39d742f 100644
--- a/testsuite/reftests/named-colors.ui
+++ b/testsuite/reftests/named-colors.ui
@@ -1,2262 +1,1958 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid0">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label0">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color0</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color10</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label20">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color20</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label30">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color30</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label40">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color40</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label50">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color50</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label60">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color60</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label70">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color70</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label80">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color80</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label90">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color90</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label100">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color100</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label110">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color110</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label120">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color120</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label130">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color130</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label140">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color140</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color11</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label21">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color21</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label31">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color31</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label41">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color41</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label51">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color51</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label61">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color61</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label71">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color71</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label81">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color81</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label91">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color91</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label101">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color101</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label111">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color111</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label121">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color121</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label131">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color131</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label141">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color141</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color2</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color12</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label22">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color22</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label32">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color32</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label42">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color42</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label52">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color52</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label62">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color62</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label72">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color72</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label82">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color82</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label92">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color92</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label102">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color102</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label112">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color112</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label122">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color122</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label132">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color132</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label142">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color142</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color3</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color13</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label23">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color23</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label33">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color33</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label43">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color43</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label53">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color53</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label63">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color63</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label73">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color73</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label83">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color83</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label93">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color93</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label103">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color103</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label113">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color113</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label123">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color123</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label133">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color133</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label143">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color143</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color4</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color14</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label24">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color24</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label34">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color34</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label44">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color44</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label54">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color54</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label64">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color64</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label74">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color74</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label84">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color84</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label94">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color94</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label104">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color104</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label114">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color114</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label124">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color124</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label134">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color134</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label144">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color144</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color5</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color15</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label25">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color25</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label35">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color35</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label45">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color45</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label55">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color55</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label65">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color65</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label75">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color75</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label85">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color85</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label95">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color95</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label105">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color105</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label115">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color115</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label125">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color125</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label135">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color135</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label145">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color145</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color6</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color16</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label26">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color26</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label36">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color36</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label46">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color46</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label56">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color56</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label66">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color66</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label76">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color76</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label86">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color86</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label96">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color96</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label106">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color106</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label116">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color116</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label126">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color126</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label136">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color136</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label146">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color146</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color7</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label17">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color17</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label27">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color27</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label37">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color37</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label47">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color47</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label57">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color57</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label67">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color67</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label77">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color77</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label87">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color87</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label97">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color97</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label107">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color107</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label117">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color117</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label127">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color127</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label137">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color137</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label147">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color147</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color8</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label18">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color18</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label28">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color28</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label38">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color38</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label48">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color48</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label58">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color58</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label68">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color68</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label78">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color78</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label88">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color88</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label98">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color98</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label108">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color108</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label118">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color118</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label128">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color128</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label138">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color138</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label148">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color148</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color9</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label19">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color19</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label29">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color29</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label39">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color39</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label49">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color49</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label59">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color59</property>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label69">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color69</property>
+            <layout>
+              <property name="left_attach">6</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">6</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label79">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color79</property>
+            <layout>
+              <property name="left_attach">7</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">7</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label89">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color89</property>
+            <layout>
+              <property name="left_attach">8</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">8</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label99">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color99</property>
+            <layout>
+              <property name="left_attach">9</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">9</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label109">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color109</property>
+            <layout>
+              <property name="left_attach">10</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">10</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label119">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color119</property>
+            <layout>
+              <property name="left_attach">11</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">11</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label129">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color129</property>
+            <layout>
+              <property name="left_attach">12</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">12</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label139">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color139</property>
+            <layout>
+              <property name="left_attach">13</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">13</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label149">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="ellipsize">end</property>
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color149</property>
+            <layout>
+              <property name="left_attach">14</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">14</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/no-colors.ref.ui b/testsuite/reftests/no-colors.ref.ui
index 696d4d4491..3278c9f53d 100644
--- a/testsuite/reftests/no-colors.ref.ui
+++ b/testsuite/reftests/no-colors.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">no colors for you</property>
       </object>
     </child>
diff --git a/testsuite/reftests/no-colors.ui b/testsuite/reftests/no-colors.ui
index 696d4d4491..3278c9f53d 100644
--- a/testsuite/reftests/no-colors.ui
+++ b/testsuite/reftests/no-colors.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">no colors for you</property>
       </object>
     </child>
diff --git a/testsuite/reftests/nonresizable-size.ref.ui b/testsuite/reftests/nonresizable-size.ref.ui
index 35dd4092f4..56115658fe 100644
--- a/testsuite/reftests/nonresizable-size.ref.ui
+++ b/testsuite/reftests/nonresizable-size.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World</property>
       </object>
     </child>
diff --git a/testsuite/reftests/nonresizable-size.ui b/testsuite/reftests/nonresizable-size.ui
index 0a777f0e7c..532136d282 100644
--- a/testsuite/reftests/nonresizable-size.ui
+++ b/testsuite/reftests/nonresizable-size.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
-    <property name="resizable">False</property>
+    <property name="resizable">0</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World</property>
         <property name="ellipsize">end</property>
       </object>
diff --git a/testsuite/reftests/notebook-tab-position.ref.ui b/testsuite/reftests/notebook-tab-position.ref.ui
index f71c60c584..c536009d68 100644
--- a/testsuite/reftests/notebook-tab-position.ref.ui
+++ b/testsuite/reftests/notebook-tab-position.ref.ui
@@ -1,32 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkNotebook" id="notebook1">
         <property name="width_request">50</property>
         <property name="height_request">50</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <property name="tab_pos">bottom</property>
         <style>
-          <class name="reference" />
+          <class name="reference"/>
         </style>
         <child>
-          <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Contents</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Tab</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkLabel" id="label2">
+                <property name="label" translatable="yes">Contents</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="label1">
+                <property name="label" translatable="yes">Tab</property>
+              </object>
+            </property>
           </object>
         </child>
       </object>
diff --git a/testsuite/reftests/notebook-tab-position.ui b/testsuite/reftests/notebook-tab-position.ui
index 2fdee4c00b..209f3dc272 100644
--- a/testsuite/reftests/notebook-tab-position.ui
+++ b/testsuite/reftests/notebook-tab-position.ui
@@ -1,31 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkNotebook" id="notebook1">
         <property name="width_request">50</property>
         <property name="height_request">50</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <style>
-          <class name="test" />
+          <class name="test"/>
         </style>
         <child>
-          <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Contents</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Tab</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkLabel" id="label2">
+                <property name="label" translatable="yes">Contents</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="label1">
+                <property name="label" translatable="yes">Tab</property>
+              </object>
+            </property>
           </object>
         </child>
       </object>
diff --git a/testsuite/reftests/nth-child.ref.ui b/testsuite/reftests/nth-child.ref.ui
index 0ac156c89d..f8143de95e 100644
--- a/testsuite/reftests/nth-child.ref.ui
+++ b/testsuite/reftests/nth-child.ref.ui
@@ -1,210 +1,156 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">1</property>
             <property name="name">ref1</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">2</property>
             <property name="name">ref2</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">3</property>
             <property name="name">ref3</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">4 = 2 * 2</property>
             <property name="name">ref4</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">5</property>
             <property name="name">ref5</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">6 = 2 * 3</property>
             <property name="name">ref6</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">7</property>
             <property name="name">ref7</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">8 = 2 * 2 * 2</property>
             <property name="name">ref8</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">9 = 3 * 3</property>
             <property name="name">ref9</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">10 = 2 * 5</property>
             <property name="name">ref10</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">11</property>
             <property name="name">ref11</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">12 = 2 * 2 * 3</property>
             <property name="name">ref12</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">13</property>
             <property name="name">ref13</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">14 = 2 * 7</property>
             <property name="name">ref14</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">15 = 3 * 5</property>
             <property name="name">ref15</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label17">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">16 = 2 * 2 * 2 * 2</property>
             <property name="name">ref16</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">17</property>
             <property name="name">ref17</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label18">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">18 = 2 * 3 * 3</property>
             <property name="name">ref18</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label19">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">19</property>
             <property name="name">ref19</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label21">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">20 = 2 * 2 * 5</property>
             <property name="name">ref20</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label20">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">21 = 3 * 7</property>
             <property name="name">ref21</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label22">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">22 = 2 * 11</property>
             <property name="name">ref22</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label23">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">23</property>
             <property name="name">ref23</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label24">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">24 = 2 * 2 * 2 * 3</property>
             <property name="name">ref24</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label25">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">25 = 5 * 5</property>
             <property name="name">ref25</property>
           </object>
diff --git a/testsuite/reftests/nth-child.ui b/testsuite/reftests/nth-child.ui
index e43bfb36f3..b8001fd18c 100644
--- a/testsuite/reftests/nth-child.ui
+++ b/testsuite/reftests/nth-child.ui
@@ -1,186 +1,132 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">1</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">2</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">3</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">4 = 2 * 2</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">5</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">6 = 2 * 3</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">7</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">8 = 2 * 2 * 2</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">9 = 3 * 3</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">10 = 2 * 5</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">11</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label13">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">12 = 2 * 2 * 3</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">13</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">14 = 2 * 7</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">15 = 3 * 5</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label17">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">16 = 2 * 2 * 2 * 2</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">17</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label18">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">18 = 2 * 3 * 3</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label19">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">19</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label21">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">20 = 2 * 2 * 5</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label20">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">21 = 3 * 7</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label22">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">22 = 2 * 11</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label23">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">23</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label24">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">24 = 2 * 2 * 2 * 3</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label25">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">25 = 5 * 5</property>
           </object>
         </child>
diff --git a/testsuite/reftests/opacity-initial.ref.ui b/testsuite/reftests/opacity-initial.ref.ui
index 12403517bd..40232e76a7 100644
--- a/testsuite/reftests/opacity-initial.ref.ui
+++ b/testsuite/reftests/opacity-initial.ref.ui
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">200</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/opacity-initial.ui b/testsuite/reftests/opacity-initial.ui
index 7d8a4b2af8..cc08a18087 100644
--- a/testsuite/reftests/opacity-initial.ui
+++ b/testsuite/reftests/opacity-initial.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
diff --git a/testsuite/reftests/opacity.ref.ui b/testsuite/reftests/opacity.ref.ui
index d810792507..535a35cb4e 100644
--- a/testsuite/reftests/opacity.ref.ui
+++ b/testsuite/reftests/opacity.ref.ui
@@ -1,28 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkBox" id="box2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkBox" id="box3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkButton" id="button1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
                     <property name="name">ref</property>
                   </object>
                 </child>
@@ -32,18 +23,13 @@
         </child>
         <child>
           <object class="GtkBox" id="box4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkBox" id="box5">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkButton" id="button2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
                     <property name="name">ref</property>
                   </object>
                 </child>
diff --git a/testsuite/reftests/opacity.ui b/testsuite/reftests/opacity.ui
index ff290f1a17..69159109ed 100644
--- a/testsuite/reftests/opacity.ui
+++ b/testsuite/reftests/opacity.ui
@@ -1,31 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="name">alpha</property>
         <child>
           <object class="GtkBox" id="box2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <property name="name">alpha</property>
             <child>
               <object class="GtkBox" id="box3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
-		<property name="name">alpha</property>
+                <property name="name">alpha</property>
                 <child>
                   <object class="GtkButton" id="button1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
                   </object>
                 </child>
               </object>
@@ -34,20 +25,15 @@
         </child>
         <child>
           <object class="GtkBox" id="box4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="name">alpha</property>
             <child>
               <object class="GtkBox" id="box5">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
-		<property name="name">alpha</property>
+                <property name="name">alpha</property>
                 <child>
                   <object class="GtkButton" id="button2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
                   </object>
                 </child>
               </object>
diff --git a/testsuite/reftests/overlay-no-main-widget.ref.ui b/testsuite/reftests/overlay-no-main-widget.ref.ui
index 2e5a5abcd0..8327429142 100644
--- a/testsuite/reftests/overlay-no-main-widget.ref.ui
+++ b/testsuite/reftests/overlay-no-main-widget.ref.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
diff --git a/testsuite/reftests/overlay-no-main-widget.ui b/testsuite/reftests/overlay-no-main-widget.ui
index 056026fd58..eaca0f2d0f 100644
--- a/testsuite/reftests/overlay-no-main-widget.ui
+++ b/testsuite/reftests/overlay-no-main-widget.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
diff --git a/testsuite/reftests/paned-undersized.ref.ui b/testsuite/reftests/paned-undersized.ref.ui
index be87576813..7a2ea496c2 100644
--- a/testsuite/reftests/paned-undersized.ref.ui
+++ b/testsuite/reftests/paned-undersized.ref.ui
@@ -1,13 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
     <property name="height_request">120</property>
     <child>
       <object class="GtkPaned" id="paned1">
-        <property name="shrink-child2">True</property>
-        <property name="resize-child2">True</property>
-        <property name="shrink-child1">False</property>
-        <property name="resize-child1">False</property>
+        <property name="shrink-child1">0</property>
+        <property name="resize-child1">0</property>
         <property name="can_focus">1</property>
         <property name="orientation">vertical</property>
         <property name="position">10</property>
diff --git a/testsuite/reftests/paned-undersized.ui b/testsuite/reftests/paned-undersized.ui
index 8c16abff94..aff21c97e7 100644
--- a/testsuite/reftests/paned-undersized.ui
+++ b/testsuite/reftests/paned-undersized.ui
@@ -1,13 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="height_request">120</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkPaned" id="paned1">
-        <property name="shrink-child2">True</property>
-        <property name="resize-child2">True</property>
-        <property name="shrink-child1">True</property>
-        <property name="resize-child1">False</property>
+        <property name="resize-child1">0</property>
         <property name="can_focus">1</property>
         <property name="orientation">vertical</property>
         <property name="position">10</property>
@@ -17,11 +15,11 @@
               <object class="GtkBox" id="box1">
                 <property name="width_request">50</property>
                 <property name="height_request">50</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-              </packing>
             </child>
           </object>
         </child>
diff --git a/testsuite/reftests/picture-load-invalid-file.ref.ui b/testsuite/reftests/picture-load-invalid-file.ref.ui
index 3500931a6b..3ae6f89153 100644
--- a/testsuite/reftests/picture-load-invalid-file.ref.ui
+++ b/testsuite/reftests/picture-load-invalid-file.ref.ui
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
     <child>
-      <object class="GtkPicture">
-      </object>
+      <object class="GtkPicture"/>
     </child>
   </object>
 </interface>
diff --git a/testsuite/reftests/picture-load-invalid-file.ui b/testsuite/reftests/picture-load-invalid-file.ui
index 8ca26cfacf..6b74b8a147 100644
--- a/testsuite/reftests/picture-load-invalid-file.ui
+++ b/testsuite/reftests/picture-load-invalid-file.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
     <child>
diff --git a/testsuite/reftests/pseudoclass-on-box.ref.ui b/testsuite/reftests/pseudoclass-on-box.ref.ui
index f74ac3fde7..15ebb3d267 100644
--- a/testsuite/reftests/pseudoclass-on-box.ref.ui
+++ b/testsuite/reftests/pseudoclass-on-box.ref.ui
@@ -1,28 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkToggleButton" id="togglebutton1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="active">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="active">1</property>
             <child>
               <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">I should be red.</property>
                 <attributes>
-                  <attribute name="foreground" value="#ffff00000000"/>
+                  <attribute name="foreground" value="#ffff00000000"></attribute>
                 </attributes>
               </object>
             </child>
diff --git a/testsuite/reftests/pseudoclass-on-box.ui b/testsuite/reftests/pseudoclass-on-box.ui
index 0a63b5c555..54255546f5 100644
--- a/testsuite/reftests/pseudoclass-on-box.ui
+++ b/testsuite/reftests/pseudoclass-on-box.ui
@@ -1,25 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkToggleButton" id="togglebutton1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="active">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="active">1</property>
             <child>
               <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">I should be red.</property>
               </object>
             </child>
diff --git a/testsuite/reftests/pseudoclass-on-parent.ref.ui b/testsuite/reftests/pseudoclass-on-parent.ref.ui
index 262c5118dd..c60fc8c499 100644
--- a/testsuite/reftests/pseudoclass-on-parent.ref.ui
+++ b/testsuite/reftests/pseudoclass-on-parent.ref.ui
@@ -1,23 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkToggleButton" id="togglebutton1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="active">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
+        <property name="active">1</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">I should be red.</property>
             <attributes>
-              <attribute name="foreground" value="#ffff00000000"/>
+              <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
           </object>
         </child>
diff --git a/testsuite/reftests/pseudoclass-on-parent.ui b/testsuite/reftests/pseudoclass-on-parent.ui
index 9d54b8ef24..829aecc4ec 100644
--- a/testsuite/reftests/pseudoclass-on-parent.ui
+++ b/testsuite/reftests/pseudoclass-on-parent.ui
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkToggleButton" id="togglebutton1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="active">True</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
+        <property name="active">1</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">I should be red.</property>
           </object>
         </child>
diff --git a/testsuite/reftests/quit-mnemonic.ref.ui b/testsuite/reftests/quit-mnemonic.ref.ui
index 3c8ff8c36f..c5509ae0b4 100644
--- a/testsuite/reftests/quit-mnemonic.ref.ui
+++ b/testsuite/reftests/quit-mnemonic.ref.ui
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Quit
 </property>
         <attributes>
-          <attribute name="underline" value="low" start="0" end="1"/>
+          <attribute name="underline" value="low" start="0" end="1"></attribute>
         </attributes>
       </object>
     </child>
diff --git a/testsuite/reftests/quit-mnemonic.ui b/testsuite/reftests/quit-mnemonic.ui
index 128e33a191..b0f30e80a4 100644
--- a/testsuite/reftests/quit-mnemonic.ui
+++ b/testsuite/reftests/quit-mnemonic.ui
@@ -1,41 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Quit</property>
             <attributes>
-              <attribute name="underline" value="low" start="0" end="1"/>
+              <attribute name="underline" value="low" start="0" end="1"></attribute>
             </attributes>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes"> </property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/repeating-radial-gradient-at-beginning.ref.ui b/testsuite/reftests/repeating-radial-gradient-at-beginning.ref.ui
index 3f0f3f1d4a..d3f4a731a4 100644
--- a/testsuite/reftests/repeating-radial-gradient-at-beginning.ref.ui
+++ b/testsuite/reftests/repeating-radial-gradient-at-beginning.ref.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">64</property>
     <property name="height_request">32</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="name">reference</property>
   </object>
diff --git a/testsuite/reftests/repeating-radial-gradient-at-beginning.ui b/testsuite/reftests/repeating-radial-gradient-at-beginning.ui
index a6c83b876a..b91f9285a6 100644
--- a/testsuite/reftests/repeating-radial-gradient-at-beginning.ui
+++ b/testsuite/reftests/repeating-radial-gradient-at-beginning.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">64</property>
     <property name="height_request">32</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/revealer-extra-size.ref.ui b/testsuite/reftests/revealer-extra-size.ref.ui
index 8532cfc787..73ad6e03c6 100644
--- a/testsuite/reftests/revealer-extra-size.ref.ui
+++ b/testsuite/reftests/revealer-extra-size.ref.ui
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Wed Feb 19 21:14:55 2014 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">400</property>
     <property name="height_request">300</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World</property>
       </object>
     </child>
diff --git a/testsuite/reftests/revealer-extra-size.ui b/testsuite/reftests/revealer-extra-size.ui
index 2a8e9006f5..4b121f219c 100644
--- a/testsuite/reftests/revealer-extra-size.ui
+++ b/testsuite/reftests/revealer-extra-size.ui
@@ -1,22 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Wed Feb 19 21:14:30 2014 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">400</property>
     <property name="height_request">300</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkRevealer" id="revealer1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="transition_type">none</property>
-        <property name="reveal_child">True</property>
+        <property name="reveal_child">1</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
           </object>
         </child>
diff --git a/testsuite/reftests/revealer-wrappable-contents.ref.ui b/testsuite/reftests/revealer-wrappable-contents.ref.ui
index 35542f25b2..89b534249d 100644
--- a/testsuite/reftests/revealer-wrappable-contents.ref.ui
+++ b/testsuite/reftests/revealer-wrappable-contents.ref.ui
@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Sun Feb 23 14:45:31 2014 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="default_width">300</property>
     <property name="default_height">200</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World</property>
         <property name="valign">start</property>
-        <property name="wrap">True</property>
+        <property name="wrap">1</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/revealer-wrappable-contents.ui b/testsuite/reftests/revealer-wrappable-contents.ui
index ccfb2c3a89..434d249467 100644
--- a/testsuite/reftests/revealer-wrappable-contents.ui
+++ b/testsuite/reftests/revealer-wrappable-contents.ui
@@ -1,25 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Sun Feb 23 14:45:31 2014 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="default_width">300</property>
     <property name="default_height">200</property>
     <child>
       <object class="GtkRevealer" id="revealer1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="valign">start</property>
         <property name="transition_type">none</property>
-        <property name="reveal_child">True</property>
+        <property name="reveal_child">1</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
-            <property name="wrap">True</property>
+            <property name="wrap">1</property>
           </object>
         </child>
       </object>
diff --git a/testsuite/reftests/rotated-layout.ref.ui b/testsuite/reftests/rotated-layout.ref.ui
index 635bafe201..a6ae7ea6f8 100644
--- a/testsuite/reftests/rotated-layout.ref.ui
+++ b/testsuite/reftests/rotated-layout.ref.ui
@@ -1,38 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">label</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">label</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/rotated-layout.ui b/testsuite/reftests/rotated-layout.ui
index 1dfb8d9b0d..ba9603afbe 100644
--- a/testsuite/reftests/rotated-layout.ui
+++ b/testsuite/reftests/rotated-layout.ui
@@ -1,38 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">label</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">label</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/separator-size.ref.ui b/testsuite/reftests/separator-size.ref.ui
index 1e450d5798..e3cd91644e 100644
--- a/testsuite/reftests/separator-size.ref.ui
+++ b/testsuite/reftests/separator-size.ref.ui
@@ -1,114 +1,94 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkImage" id="image1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">help-about</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">help-about</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">help-about</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="image4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">help-about</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSeparator" id="separator1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSeparator" id="separator2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSeparator" id="separator3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSeparator" id="separator4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/separator-size.ui b/testsuite/reftests/separator-size.ui
index 33df5589a9..8afd8a1b70 100644
--- a/testsuite/reftests/separator-size.ui
+++ b/testsuite/reftests/separator-size.ui
@@ -1,162 +1,118 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkBox" id="box1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkImage" id="image1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
                 <property name="icon_name">help-about</property>
               </object>
             </child>
             <child>
-              <object class="GtkSeparator" id="separator1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
+              <object class="GtkSeparator" id="separator1"/>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">1</property>
+              <property name="row-span">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkImage" id="image2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
                 <property name="icon_name">help-about</property>
               </object>
             </child>
             <child>
               <object class="GtkSeparator" id="separator2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">2</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">2</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
-              <object class="GtkSeparator" id="separator3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
+              <object class="GtkSeparator" id="separator3"/>
             </child>
             <child>
               <object class="GtkImage" id="image3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
                 <property name="icon_name">help-about</property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">1</property>
+              <property name="row-span">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">2</property>
-          </packing>
         </child>
-
-        <!-- BEGIN REMOVE WHEN GRID FIXED -->
-
         <child>
           <object class="GtkNotebook" id="notebook1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="show_tabs">False</property>
-            <property name="show_border">False</property>
+            <property name="can_focus">1</property>
+            <property name="show_tabs">0</property>
+            <property name="show_border">0</property>
             <child>
               <object class="GtkBox" id="box5">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
               </object>
             </child>
             <child>
-              <object class="GtkSeparator" id="separator5">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
+              <object class="GtkSeparator" id="separator5"/>
             </child>
             <child>
               <object class="GtkSeparator" id="separator6">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
-
-        <!-- END REMOVE WHEN GRID FIXED -->
-
         <child>
           <object class="GtkBox" id="box4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkSeparator" id="separator4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
               </object>
             </child>
             <child>
               <object class="GtkImage" id="image4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
                 <property name="icon_name">help-about</property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">2</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">2</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/set-default-direction.ref.ui b/testsuite/reftests/set-default-direction.ref.ui
index c9fe35a463..a64eebe5f3 100644
--- a/testsuite/reftests/set-default-direction.ref.ui
+++ b/testsuite/reftests/set-default-direction.ref.ui
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <signal name="realize" handler="reftest:switch_default_direction" after="yes" swapped="no"/>
     <signal name="map" handler="reftest:swap_child" after="yes" swapped="no"/>
     <signal name="destroy" handler="reftest:switch_default_direction" after="yes" swapped="no"/>
     <child>
       <object class="GtkImage" id="image1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="icon_name">go-next</property>
       </object>
     </child>
diff --git a/testsuite/reftests/set-default-direction.ui b/testsuite/reftests/set-default-direction.ui
index 33cf5ca781..6f379a1f78 100644
--- a/testsuite/reftests/set-default-direction.ui
+++ b/testsuite/reftests/set-default-direction.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <signal name="map" handler="reftest:switch_default_direction" swapped="no"/>
     <signal name="destroy" handler="reftest:switch_default_direction" swapped="no"/>
     <child>
       <object class="GtkImage" id="image1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="icon_name">go-next</property>
       </object>
     </child>
diff --git a/testsuite/reftests/shadow-clip-rounding.ref.ui b/testsuite/reftests/shadow-clip-rounding.ref.ui
index 31f744d3a9..97be53210b 100644
--- a/testsuite/reftests/shadow-clip-rounding.ref.ui
+++ b/testsuite/reftests/shadow-clip-rounding.ref.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <property name="label" translatable="yes">X</property>
diff --git a/testsuite/reftests/shadow-clip-rounding.ui b/testsuite/reftests/shadow-clip-rounding.ui
index 03741621b7..7672f7db14 100644
--- a/testsuite/reftests/shadow-clip-rounding.ui
+++ b/testsuite/reftests/shadow-clip-rounding.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <property name="label" translatable="yes">X</property>
diff --git a/testsuite/reftests/shorthand-entry-border.ref.ui b/testsuite/reftests/shorthand-entry-border.ref.ui
index ea181fe669..bd5c6d34a1 100644
--- a/testsuite/reftests/shorthand-entry-border.ref.ui
+++ b/testsuite/reftests/shorthand-entry-border.ref.ui
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkEntry" id="entry1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <property name="name">reference</property>
       </object>
     </child>
diff --git a/testsuite/reftests/shorthand-entry-border.ui b/testsuite/reftests/shorthand-entry-border.ui
index 91ce522a98..6c5efd2a3e 100644
--- a/testsuite/reftests/shorthand-entry-border.ui
+++ b/testsuite/reftests/shorthand-entry-border.ui
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkEntry" id="entry1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/sibling-pseudoclasses.ref.ui b/testsuite/reftests/sibling-pseudoclasses.ref.ui
index 138c9eeb02..cdf575d44a 100644
--- a/testsuite/reftests/sibling-pseudoclasses.ref.ui
+++ b/testsuite/reftests/sibling-pseudoclasses.ref.ui
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkToggleButton" id="togglebutton1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="active">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="active">1</property>
             <child>
               <placeholder/>
             </child>
@@ -22,11 +17,9 @@
         </child>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">I'm tomato.</property>
+            <property name="label" translatable="yes">I&apos;m tomato.</property>
             <attributes>
-              <attribute name="foreground" value="#ffff63634747"/>
+              <attribute name="foreground" value="#ffff63634747"></attribute>
             </attributes>
           </object>
         </child>
diff --git a/testsuite/reftests/sibling-pseudoclasses.ui b/testsuite/reftests/sibling-pseudoclasses.ui
index d93ff4da9d..45859193f0 100644
--- a/testsuite/reftests/sibling-pseudoclasses.ui
+++ b/testsuite/reftests/sibling-pseudoclasses.ui
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkToggleButton" id="togglebutton1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="active">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="active">1</property>
             <child>
               <placeholder/>
             </child>
@@ -22,9 +17,7 @@
         </child>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">I'm tomato.</property>
+            <property name="label" translatable="yes">I&apos;m tomato.</property>
           </object>
         </child>
       </object>
diff --git a/testsuite/reftests/simple.ref.ui b/testsuite/reftests/simple.ref.ui
index c6c3361585..34efec74e8 100644
--- a/testsuite/reftests/simple.ref.ui
+++ b/testsuite/reftests/simple.ref.ui
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <placeholder/>
         </child>
diff --git a/testsuite/reftests/simple.ui b/testsuite/reftests/simple.ui
index c6c3361585..34efec74e8 100644
--- a/testsuite/reftests/simple.ui
+++ b/testsuite/reftests/simple.ui
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <placeholder/>
         </child>
diff --git a/testsuite/reftests/sizegroups-basics.ref.ui b/testsuite/reftests/sizegroups-basics.ref.ui
index 15c7a01dd3..2dfae31713 100644
--- a/testsuite/reftests/sizegroups-basics.ref.ui
+++ b/testsuite/reftests/sizegroups-basics.ref.ui
@@ -1,54 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
-      <child>
-        <object class="GtkGrid" id="grid1">
-          <property name="visible">True</property>
-          <property name="can_focus">False</property>
-          <property name="orientation">vertical</property>
-          <child>
-            <object class="GtkGrid" id="grid2">
-              <property name="visible">True</property>
-              <property name="can_focus">False</property>
-              <property name="orientation">vertical</property>
-              <property name="row-homogeneous">True</property>
-              <property name="column-homogeneous">True</property>
-              <child>
-                <object class="GtkLabel" id="label1">
-                  <property name="visible">True</property>
-                </object>
-                <packing>
+    <child>
+      <object class="GtkGrid" id="grid1">
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkGrid" id="grid2">
+            <property name="orientation">vertical</property>
+            <property name="row-homogeneous">1</property>
+            <property name="column-homogeneous">1</property>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <layout>
                   <property name="top-attach">0</property>
                   <property name="left-attach">0</property>
-                </packing>
-              </child>
-              <child>
-                <object class="GtkLabel" id="label2">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">medium</property>
-                </object>
-                <packing>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label2">
+                <property name="label" translatable="yes">medium</property>
+                <layout>
                   <property name="top-attach">1</property>
                   <property name="left-attach">1</property>
-                </packing>
-              </child>
-              <child>
-                <object class="GtkLabel" id="label3">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">wrap this very long text please or I'll need to write even more</property>
-                  <property name="wrap">True</property>
-                </object>
-                <packing>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label3">
+                <property name="label" translatable="yes">wrap this very long text please or I&apos;ll need to write even more</property>
+                <property name="wrap">1</property>
+                <layout>
                   <property name="top-attach">2</property>
                   <property name="left-attach">2</property>
-                </packing>
-              </child>
-            </object>
-          </child>
-        </object>
+                </layout>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
     </child>
   </object>
 </interface>
diff --git a/testsuite/reftests/sizegroups-basics.ui b/testsuite/reftests/sizegroups-basics.ui
index 696802cda5..ae2239b426 100644
--- a/testsuite/reftests/sizegroups-basics.ui
+++ b/testsuite/reftests/sizegroups-basics.ui
@@ -1,60 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
-      <child>
-        <object class="GtkGrid" id="grid1">
-          <property name="visible">True</property>
-          <property name="can_focus">False</property>
-          <property name="orientation">vertical</property>
-          <child>
-            <object class="GtkGrid" id="grid2">
-              <property name="visible">True</property>
-              <property name="can_focus">False</property>
-              <property name="orientation">vertical</property>
-              <child>
-                <object class="GtkLabel" id="label1">
-                  <property name="visible">True</property>
-                </object>
-                <packing>
+    <child>
+      <object class="GtkGrid" id="grid1">
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkGrid" id="grid2">
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <layout>
                   <property name="top-attach">0</property>
                   <property name="left-attach">0</property>
-                </packing>
-              </child>
-              <child>
-                <object class="GtkLabel" id="label2">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">medium</property>
-                </object>
-                <packing>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label2">
+                <property name="label" translatable="yes">medium</property>
+                <layout>
                   <property name="top-attach">1</property>
                   <property name="left-attach">1</property>
-                </packing>
-              </child>
-              <child>
-                <object class="GtkLabel" id="label3">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">wrap this very long text please or I'll need to write even more</property>
-                  <property name="wrap">True</property>
-                </object>
-                <packing>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label3">
+                <property name="label" translatable="yes">wrap this very long text please or I&apos;ll need to write even more</property>
+                <property name="wrap">1</property>
+                <layout>
                   <property name="top-attach">2</property>
                   <property name="left-attach">2</property>
-                </packing>
-              </child>
-            </object>
-          </child>
-        </object>
+                </layout>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
     </child>
   </object>
   <object class="GtkSizeGroup" id="sizegroup1">
     <property name="mode">both</property>
     <widgets>
-      <widget name="label1" />
-      <widget name="label2" />
-      <widget name="label3" />
+      <widget name="label1"/>
+      <widget name="label2"/>
+      <widget name="label3"/>
     </widgets>
   </object>
 </interface>
diff --git a/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui b/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui
index f2bbe6b7b4..4f03d91f24 100644
--- a/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui
+++ b/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui
@@ -1,242 +1,213 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="row_spacing">6</property>
         <property name="column_spacing">6</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Please enter your name and email address below. The "optional" fields below do not need to be filled in, unless you wish to include this information in email you send.</property>
-            <property name="wrap">True</property>
+            <property name="label" translatable="yes">Please enter your name and email address below. The &quot;optional&quot; fields below do not need to be filled in, unless you wish to include this information in email you send.</property>
+            <property name="wrap">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+              <property name="column-span">2</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">2</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="xalign">0</property>
             <property name="label" translatable="yes">&lt;b&gt;Account Information&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="use_markup">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+              <property name="column-span">2</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">2</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="xalign">0</property>
             <property name="label" translatable="yes">Type the name by which you would like to refer to this account.
-For example, "Work" or "Personal".</property>
+For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">2</property>
+              <property name="column-span">2</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">2</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="xalign">1</property>
             <property name="label" translatable="yes">_Name:</property>
-            <property name="use_underline">True</property>
+            <property name="use_underline">1</property>
             <property name="mnemonic_widget">entry1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkEntry" id="entry1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hexpand">True</property>
+            <property name="can_focus">1</property>
+            <property name="hexpand">1</property>
             <property name="invisible_char">●</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">3</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="xalign">0</property>
             <property name="label" translatable="yes">&lt;b&gt;Required Information&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="use_markup">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">4</property>
+              <property name="column-span">2</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-            <property name="width">2</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="xalign">1</property>
             <property name="label" translatable="yes">Full Nam_e:</property>
-            <property name="use_underline">True</property>
+            <property name="use_underline">1</property>
             <property name="mnemonic_widget">entry2</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkEntry" id="entry2">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hexpand">True</property>
+            <property name="can_focus">1</property>
+            <property name="hexpand">1</property>
             <property name="invisible_char">●</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">5</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="label" translatable="yes">Email _Address:</property>
-            <property name="use_underline">True</property>
+            <property name="use_underline">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkEntry" id="entry3">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hexpand">True</property>
+            <property name="can_focus">1</property>
+            <property name="hexpand">1</property>
             <property name="invisible_char">●</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">6</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="xalign">0</property>
             <property name="label" translatable="yes">&lt;b&gt;Optional Information&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="use_markup">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">7</property>
+              <property name="column-span">2</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">7</property>
-            <property name="width">2</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="xalign">1</property>
             <property name="label" translatable="yes">Re_ply-To:</property>
-            <property name="use_underline">True</property>
+            <property name="use_underline">1</property>
             <property name="mnemonic_widget">entry4</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkEntry" id="entry4">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hexpand">True</property>
+            <property name="can_focus">1</property>
+            <property name="hexpand">1</property>
             <property name="invisible_char">●</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">8</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="xalign">1</property>
             <property name="label" translatable="yes">Or_ganization:</property>
-            <property name="use_underline">True</property>
+            <property name="use_underline">1</property>
             <property name="mnemonic_widget">entry5</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkEntry" id="entry5">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can_focus">1</property>
             <property name="invisible_char">●</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">9</property>
+              <property name="column-span">1</property>
+              <property name="row-span">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/sizegroups-evolution-identity-page.ui b/testsuite/reftests/sizegroups-evolution-identity-page.ui
index 23b2e4783f..f1525ab882 100644
--- a/testsuite/reftests/sizegroups-evolution-identity-page.ui
+++ b/testsuite/reftests/sizegroups-evolution-identity-page.ui
@@ -1,258 +1,223 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Please enter your name and email address below. The "optional" fields below do not need to be filled in, unless you wish to include this information in email you send.</property>
-            <property name="wrap">True</property>
+            <property name="label" translatable="yes">Please enter your name and email address below. The &quot;optional&quot; fields below do not need to be filled in, unless you wish to include this information in email you send.</property>
+            <property name="wrap">1</property>
           </object>
         </child>
         <child>
           <object class="GtkGrid" id="grid1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">6</property>
             <child>
               <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">&lt;b&gt;Account Information&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="use_markup">1</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">2</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">2</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Type the name by which you would like to refer to this account.
-For example, "Work" or "Personal".</property>
+For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">1</property>
+                  <property name="column-span">2</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-                <property name="width">2</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="xalign">1</property>
                 <property name="label" translatable="yes">_Name:</property>
-                <property name="use_underline">True</property>
+                <property name="use_underline">1</property>
                 <property name="mnemonic_widget">entry1</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">2</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkEntry" id="entry1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
+                <property name="can_focus">1</property>
+                <property name="hexpand">1</property>
                 <property name="invisible_char">●</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">2</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkGrid" id="grid2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">6</property>
             <child>
               <object class="GtkLabel" id="label5">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">&lt;b&gt;Required Information&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="use_markup">1</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">2</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">2</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label6">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="xalign">1</property>
                 <property name="label" translatable="yes">Full Nam_e:</property>
-                <property name="use_underline">True</property>
+                <property name="use_underline">1</property>
                 <property name="mnemonic_widget">entry2</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">1</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkEntry" id="entry2">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
+                <property name="can_focus">1</property>
+                <property name="hexpand">1</property>
                 <property name="invisible_char">●</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">1</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label7">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="label" translatable="yes">Email _Address:</property>
-                <property name="use_underline">True</property>
+                <property name="use_underline">1</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">2</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkEntry" id="entry3">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
+                <property name="can_focus">1</property>
+                <property name="hexpand">1</property>
                 <property name="invisible_char">●</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">2</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkGrid" id="grid3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">6</property>
             <child>
               <object class="GtkLabel" id="label8">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">&lt;b&gt;Optional Information&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="use_markup">1</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">3</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">3</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label9">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="xalign">1</property>
                 <property name="label" translatable="yes">Re_ply-To:</property>
-                <property name="use_underline">True</property>
+                <property name="use_underline">1</property>
                 <property name="mnemonic_widget">entry4</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">1</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkEntry" id="entry4">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
+                <property name="can_focus">1</property>
+                <property name="hexpand">1</property>
                 <property name="invisible_char">●</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">1</property>
+                  <property name="column-span">2</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">2</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label10">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="xalign">1</property>
                 <property name="label" translatable="yes">Or_ganization:</property>
-                <property name="use_underline">True</property>
+                <property name="use_underline">1</property>
                 <property name="mnemonic_widget">entry5</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">2</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkEntry" id="entry5">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">1</property>
                 <property name="invisible_char">●</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">2</property>
+                  <property name="column-span">2</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-                <property name="width">2</property>
-                <property name="height">1</property>
-              </packing>
             </child>
           </object>
         </child>
@@ -260,13 +225,12 @@ For example, "Work" or "Personal".</property>
     </child>
   </object>
   <object class="GtkSizeGroup" id="sizegroup1">
-    <property name="mode">horizontal</property>
     <widgets>
-      <widget name="label4" />
-      <widget name="label6" />
-      <widget name="label7" />
-      <widget name="label9" />
-      <widget name="label10" />
+      <widget name="label4"/>
+      <widget name="label6"/>
+      <widget name="label7"/>
+      <widget name="label9"/>
+      <widget name="label10"/>
     </widgets>
   </object>
 </interface>
diff --git a/testsuite/reftests/sizegroups-get-preferred-null.ref.ui b/testsuite/reftests/sizegroups-get-preferred-null.ref.ui
index 54aa61c4b0..b5151592fa 100644
--- a/testsuite/reftests/sizegroups-get-preferred-null.ref.ui
+++ b/testsuite/reftests/sizegroups-get-preferred-null.ref.ui
@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
-      <child>
-        <object class="GtkFixed" id="grid1">
-          <property name="visible">True</property>
-          <property name="can_focus">False</property>
-          <child>
-            <object class="GtkLabel" id="label1">
-              <property name="visible">True</property>
-              <property name="label" translatable="yes">Check that a container that calls gtk_widget_get_preferred_width/height() with natural or minimum being NULL doesn't cause a crash with size groups.</property>
-              <property name="wrap">True</property>
-            </object>
-          </child>
-        </object>
+    <child>
+      <object class="GtkFixed" id="grid1">
+        <child>
+          <object class="GtkLabel" id="label1">
+            <property name="label" translatable="yes">Check that a container that calls gtk_widget_get_preferred_width/height() with natural or minimum being NULL doesn&apos;t cause a crash with size groups.</property>
+            <property name="wrap">1</property>
+          </object>
+        </child>
+      </object>
     </child>
   </object>
 </interface>
diff --git a/testsuite/reftests/sizegroups-get-preferred-null.ui b/testsuite/reftests/sizegroups-get-preferred-null.ui
index 23b78f95d1..b0f8074c84 100644
--- a/testsuite/reftests/sizegroups-get-preferred-null.ui
+++ b/testsuite/reftests/sizegroups-get-preferred-null.ui
@@ -1,26 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
-      <child>
-        <object class="GtkFixed" id="grid1">
-          <property name="visible">True</property>
-          <property name="can_focus">False</property>
-          <child>
-            <object class="GtkLabel" id="label1">
-              <property name="visible">True</property>
-              <property name="label" translatable="yes">Check that a container that calls gtk_widget_get_preferred_width/height() with natural or minimum being NULL doesn't cause a crash with size groups.</property>
-              <property name="wrap">True</property>
-            </object>
-          </child>
-        </object>
+    <child>
+      <object class="GtkFixed" id="grid1">
+        <child>
+          <object class="GtkLabel" id="label1">
+            <property name="label" translatable="yes">Check that a container that calls gtk_widget_get_preferred_width/height() with natural or minimum being NULL doesn&apos;t cause a crash with size groups.</property>
+            <property name="wrap">1</property>
+          </object>
+        </child>
+      </object>
     </child>
   </object>
   <object class="GtkSizeGroup" id="sizegroup1">
     <widgets>
-      <widget name="label1" />
+      <widget name="label1"/>
     </widgets>
   </object>
 </interface>
diff --git a/testsuite/reftests/statusbar-remove-all.ref.ui b/testsuite/reftests/statusbar-remove-all.ref.ui
index 401c89b0dc..169f08fc43 100644
--- a/testsuite/reftests/statusbar-remove-all.ref.ui
+++ b/testsuite/reftests/statusbar-remove-all.ref.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkStatusbar" id="statusbar1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="margin_start">10</property>
         <property name="margin_end">10</property>
         <property name="margin_top">6</property>
diff --git a/testsuite/reftests/statusbar-remove-all.ui b/testsuite/reftests/statusbar-remove-all.ui
index 76c1a17ae9..26113ca552 100644
--- a/testsuite/reftests/statusbar-remove-all.ui
+++ b/testsuite/reftests/statusbar-remove-all.ui
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkStatusbar" id="statusbar1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="margin_start">10</property>
         <property name="margin_end">10</property>
         <property name="margin_top">6</property>
diff --git a/testsuite/reftests/style-context-save-inheritance.ref.ui b/testsuite/reftests/style-context-save-inheritance.ref.ui
index 09b5af581a..abbb2f709b 100644
--- a/testsuite/reftests/style-context-save-inheritance.ref.ui
+++ b/testsuite/reftests/style-context-save-inheritance.ref.ui
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="name">reference</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">GREEN
-&lt;a href="http://www.gtk.org"&gt;GREEN&lt;/a&gt;</property>
-        <property name="use_markup">True</property>
+&lt;a href=&quot;http://www.gtk.org&quot;&gt;GREEN&lt;/a&gt;</property>
+        <property name="use_markup">1</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/style-context-save-inheritance.ui b/testsuite/reftests/style-context-save-inheritance.ui
index 022033b22c..c8395ae1b6 100644
--- a/testsuite/reftests/style-context-save-inheritance.ui
+++ b/testsuite/reftests/style-context-save-inheritance.ui
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">GREEN
-&lt;a href="http://www.gtk.org"&gt;GREEN&lt;/a&gt;</property>
-        <property name="use_markup">True</property>
+&lt;a href=&quot;http://www.gtk.org&quot;&gt;GREEN&lt;/a&gt;</property>
+        <property name="use_markup">1</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/style-properties-only-child.ref.ui b/testsuite/reftests/style-properties-only-child.ref.ui
index e6e4d3bd39..78bfbf4c79 100644
--- a/testsuite/reftests/style-properties-only-child.ref.ui
+++ b/testsuite/reftests/style-properties-only-child.ref.ui
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="width_request">300</property>
     <property name="height_request">300</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkButton" id="button1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can_focus">1</property>
             <property name="label">Foo</property>
             <style>
               <class name="only-child-ref"/>
diff --git a/testsuite/reftests/style-properties-only-child.ui b/testsuite/reftests/style-properties-only-child.ui
index 46d5a8c695..415b9de3a1 100644
--- a/testsuite/reftests/style-properties-only-child.ui
+++ b/testsuite/reftests/style-properties-only-child.ui
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="width_request">300</property>
     <property name="height_request">300</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkButton" id="button1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can_focus">1</property>
             <property name="label">Foo</property>
             <style>
               <class name="only-child-notref"/>
diff --git a/testsuite/reftests/symbolic-icon-translucent-color.ref.ui b/testsuite/reftests/symbolic-icon-translucent-color.ref.ui
index 0319b38b11..7d86e0b5f5 100644
--- a/testsuite/reftests/symbolic-icon-translucent-color.ref.ui
+++ b/testsuite/reftests/symbolic-icon-translucent-color.ref.ui
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.15.3 on Fri Oct  4 16:19:20 2013 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkImage" id="image1">
         <property name="name">reference</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="icon_name">media-playback-stop-symbolic</property>
       </object>
     </child>
diff --git a/testsuite/reftests/symbolic-icon-translucent-color.ui b/testsuite/reftests/symbolic-icon-translucent-color.ui
index 8d945c498d..138fb2c578 100644
--- a/testsuite/reftests/symbolic-icon-translucent-color.ui
+++ b/testsuite/reftests/symbolic-icon-translucent-color.ui
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.15.3 on Fri Oct  4 16:16:58 2013 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkImage" id="image1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="icon_name">media-playback-stop-symbolic</property>
       </object>
     </child>
diff --git a/testsuite/reftests/textview-border-windows.ref.ui b/testsuite/reftests/textview-border-windows.ref.ui
index 642feb1694..2d6ea088eb 100644
--- a/testsuite/reftests/textview-border-windows.ref.ui
+++ b/testsuite/reftests/textview-border-windows.ref.ui
@@ -1,72 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
             <property name="width_request">100</property>
             <property name="height_request">100</property>
-            <property name="visible">True</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label_n">
             <property name="name">label_n</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label_w">
             <property name="name">label_w</property>
             <property name="width_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label_e">
             <property name="name">label_e</property>
             <property name="width_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label_s">
             <property name="name">label_s</property>
             <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/textview-border-windows.ui b/testsuite/reftests/textview-border-windows.ui
index 5ca2b2e078..711576acec 100644
--- a/testsuite/reftests/textview-border-windows.ui
+++ b/testsuite/reftests/textview-border-windows.ui
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkTextView" id="textview1">
         <property name="width_request">160</property>
         <property name="height_request">160</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <property name="wrap_mode">word</property>
         <signal name="map" handler="reftest:add_border_windows" swapped="no"/>
       </object>
diff --git a/testsuite/reftests/textview-margins.ref.ui b/testsuite/reftests/textview-margins.ref.ui
index 624ba062b7..b9a99288c8 100644
--- a/testsuite/reftests/textview-margins.ref.ui
+++ b/testsuite/reftests/textview-margins.ref.ui
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkTextBuffer" id="textbuffer1">
     <property name="text" translatable="yes">Lorem ipsum dolor sit amet, consectetur adipisci elit, sed eiusmod tempor incidunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquid ex ea commodi consequat. Quis aute iure reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum</property>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="default_width">106</property>
     <property name="resizable">0</property>
     <child>
       <object class="GtkTextView" id="textview1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <property name="wrap_mode">word</property>
         <property name="margin_start">8</property>
         <property name="margin_end">8</property>
diff --git a/testsuite/reftests/textview-margins.ui b/testsuite/reftests/textview-margins.ui
index 34c2d4cc37..275a0ab216 100644
--- a/testsuite/reftests/textview-margins.ui
+++ b/testsuite/reftests/textview-margins.ui
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkTextBuffer" id="textbuffer1">
     <property name="text" translatable="yes">Lorem ipsum dolor sit amet, consectetur adipisci elit, sed eiusmod tempor incidunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquid ex ea commodi consequat. Quis aute iure reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum</property>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="default_width">106</property>
     <property name="resizable">0</property>
     <child>
       <object class="GtkTextView" id="textview1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <property name="wrap_mode">word</property>
         <property name="margin_start">2</property>
         <property name="margin_end">2</property>
diff --git a/testsuite/reftests/textview-tags.ref.ui b/testsuite/reftests/textview-tags.ref.ui
index 97c0896d08..8e6e92e08f 100644
--- a/testsuite/reftests/textview-tags.ref.ui
+++ b/testsuite/reftests/textview-tags.ref.ui
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <object class="GtkTextTagTable" id="texttagtable1">
     <child type="tag">
@@ -36,11 +35,9 @@
     <property name="text" translatable="yes">red or blue or what</property>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkTextView" id="textview1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <property name="buffer">textbuffer1</property>
         <signal name="map" handler="reftest:apply_tags_red_blue" swapped="no"/>
       </object>
diff --git a/testsuite/reftests/textview-tags.ui b/testsuite/reftests/textview-tags.ui
index 622a08a781..c9371c357d 100644
--- a/testsuite/reftests/textview-tags.ui
+++ b/testsuite/reftests/textview-tags.ui
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <object class="GtkTextTagTable" id="texttagtable1">
     <child type="tag">
@@ -36,11 +35,9 @@
     <property name="text" translatable="yes">red or blue or what</property>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkTextView" id="textview1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <property name="buffer">textbuffer1</property>
         <signal name="map" handler="reftest:apply_tags_blue" swapped="no"/>
       </object>
diff --git a/testsuite/reftests/toplevel-vs-popup.ref.ui b/testsuite/reftests/toplevel-vs-popup.ref.ui
index 35dd4092f4..56115658fe 100644
--- a/testsuite/reftests/toplevel-vs-popup.ref.ui
+++ b/testsuite/reftests/toplevel-vs-popup.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World</property>
       </object>
     </child>
diff --git a/testsuite/reftests/toplevel-vs-popup.ui b/testsuite/reftests/toplevel-vs-popup.ui
index 3707d7b654..fdd99a68c9 100644
--- a/testsuite/reftests/toplevel-vs-popup.ui
+++ b/testsuite/reftests/toplevel-vs-popup.ui
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World</property>
       </object>
     </child>
diff --git a/testsuite/reftests/treeview-crash-too-wide.ref.ui b/testsuite/reftests/treeview-crash-too-wide.ref.ui
index a588e83fbc..09315136e4 100644
--- a/testsuite/reftests/treeview-crash-too-wide.ref.ui
+++ b/testsuite/reftests/treeview-crash-too-wide.ref.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name data -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -16,35 +14,32 @@ aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aa
     </data>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="shadow_type">in</property>
+      <object class="GtkScrolledWindow" id="scrolledwindow1">
+        <property name="can_focus">1</property>
+        <property name="shadow_type">in</property>
+        <child>
+          <object class="GtkTreeView" id="treeview1">
+            <property name="can_focus">1</property>
+            <property name="model">liststore1</property>
+            <child internal-child="selection">
+              <object class="GtkTreeSelection" id="treeview-selection1"/>
+            </child>
             <child>
-              <object class="GtkTreeView" id="treeview1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="model">liststore1</property>
-                <child internal-child="selection">
-                  <object class="GtkTreeSelection" id="treeview-selection1"/>
-                </child>
+              <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+                <property name="resizable">1</property>
+                <property name="title" translatable="yes">column</property>
                 <child>
-                  <object class="GtkTreeViewColumn" id="treeviewcolumn1">
-                    <property name="resizable">True</property>
-                    <property name="title" translatable="yes">column</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext1"/>
-                      <attributes>
-                        <attribute name="markup">0</attribute>
-                      </attributes>
-                    </child>
-                  </object>
+                  <object class="GtkCellRendererText" id="cellrenderertext1"/>
+                  <attributes>
+                    <attribute name="markup">0</attribute>
+                  </attributes>
                 </child>
               </object>
             </child>
           </object>
+        </child>
+      </object>
     </child>
   </object>
 </interface>
diff --git a/testsuite/reftests/treeview-crash-too-wide.ui b/testsuite/reftests/treeview-crash-too-wide.ui
index a588e83fbc..09315136e4 100644
--- a/testsuite/reftests/treeview-crash-too-wide.ui
+++ b/testsuite/reftests/treeview-crash-too-wide.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name data -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -16,35 +14,32 @@ aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aaaaa aa
     </data>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="shadow_type">in</property>
+      <object class="GtkScrolledWindow" id="scrolledwindow1">
+        <property name="can_focus">1</property>
+        <property name="shadow_type">in</property>
+        <child>
+          <object class="GtkTreeView" id="treeview1">
+            <property name="can_focus">1</property>
+            <property name="model">liststore1</property>
+            <child internal-child="selection">
+              <object class="GtkTreeSelection" id="treeview-selection1"/>
+            </child>
             <child>
-              <object class="GtkTreeView" id="treeview1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="model">liststore1</property>
-                <child internal-child="selection">
-                  <object class="GtkTreeSelection" id="treeview-selection1"/>
-                </child>
+              <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+                <property name="resizable">1</property>
+                <property name="title" translatable="yes">column</property>
                 <child>
-                  <object class="GtkTreeViewColumn" id="treeviewcolumn1">
-                    <property name="resizable">True</property>
-                    <property name="title" translatable="yes">column</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext1"/>
-                      <attributes>
-                        <attribute name="markup">0</attribute>
-                      </attributes>
-                    </child>
-                  </object>
+                  <object class="GtkCellRendererText" id="cellrenderertext1"/>
+                  <attributes>
+                    <attribute name="markup">0</attribute>
+                  </attributes>
                 </child>
               </object>
             </child>
           </object>
+        </child>
+      </object>
     </child>
   </object>
 </interface>
diff --git a/testsuite/reftests/treeview-fixed-height.ref.ui b/testsuite/reftests/treeview-fixed-height.ref.ui
index 9a244f552f..790665832b 100644
--- a/testsuite/reftests/treeview-fixed-height.ref.ui
+++ b/testsuite/reftests/treeview-fixed-height.ref.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name Cool -->
       <column type="gboolean"/>
-      <!-- column-name Name -->
       <column type="gchararray"/>
-      <!-- column-name Nick -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -24,12 +20,10 @@
     </data>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkTreeView" id="treeview1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <property name="model">liststore1</property>
         <child internal-child="selection">
           <object class="GtkTreeSelection" id="treeview-selection"/>
diff --git a/testsuite/reftests/treeview-fixed-height.ui b/testsuite/reftests/treeview-fixed-height.ui
index 1744f53fa2..db871a56c5 100644
--- a/testsuite/reftests/treeview-fixed-height.ui
+++ b/testsuite/reftests/treeview-fixed-height.ui
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name Cool -->
       <column type="gboolean"/>
-      <!-- column-name Name -->
       <column type="gchararray"/>
-      <!-- column-name Nick -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -24,14 +20,12 @@
     </data>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkTreeView" id="treeview1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <property name="model">liststore1</property>
-        <property name="fixed-height-mode">True</property>
+        <property name="fixed-height-mode">1</property>
         <child internal-child="selection">
           <object class="GtkTreeSelection" id="treeview-selection"/>
         </child>
diff --git a/testsuite/reftests/treeview-headers-hidden.ref.ui b/testsuite/reftests/treeview-headers-hidden.ref.ui
index 6ee254c0d8..9a7b147dfc 100644
--- a/testsuite/reftests/treeview-headers-hidden.ref.ui
+++ b/testsuite/reftests/treeview-headers-hidden.ref.ui
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name Name -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -16,14 +14,12 @@
     </data>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkTreeView" id="treeview1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <property name="model">liststore1</property>
-        <property name="headers-visible">False</property>
+        <property name="headers-visible">0</property>
         <child internal-child="selection">
           <object class="GtkTreeSelection" id="treeview-selection"/>
         </child>
diff --git a/testsuite/reftests/treeview-headers-hidden.ui b/testsuite/reftests/treeview-headers-hidden.ui
index 6ee254c0d8..9a7b147dfc 100644
--- a/testsuite/reftests/treeview-headers-hidden.ui
+++ b/testsuite/reftests/treeview-headers-hidden.ui
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name Name -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -16,14 +14,12 @@
     </data>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkTreeView" id="treeview1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">1</property>
         <property name="model">liststore1</property>
-        <property name="headers-visible">False</property>
+        <property name="headers-visible">0</property>
         <child internal-child="selection">
           <object class="GtkTreeSelection" id="treeview-selection"/>
         </child>
diff --git a/testsuite/reftests/unresolvable.ref.ui b/testsuite/reftests/unresolvable.ref.ui
index ac585215e6..b5ccb79617 100644
--- a/testsuite/reftests/unresolvable.ref.ui
+++ b/testsuite/reftests/unresolvable.ref.ui
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox">
diff --git a/testsuite/reftests/unresolvable.ui b/testsuite/reftests/unresolvable.ui
index 1b46903939..f12da9077d 100644
--- a/testsuite/reftests/unresolvable.ui
+++ b/testsuite/reftests/unresolvable.ui
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox">
diff --git a/testsuite/reftests/window-border-width.ref.ui b/testsuite/reftests/window-border-width.ref.ui
index 4bb19420c4..ea309cc149 100644
--- a/testsuite/reftests/window-border-width.ref.ui
+++ b/testsuite/reftests/window-border-width.ref.ui
@@ -1,19 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window_information_collection">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Hello World</property>
-            <property name="wrap">True</property>
+            <property name="wrap">1</property>
           </object>
         </child>
       </object>
diff --git a/testsuite/reftests/window-border-width.ui b/testsuite/reftests/window-border-width.ui
index 60d234800f..d020f3e40d 100644
--- a/testsuite/reftests/window-border-width.ui
+++ b/testsuite/reftests/window-border-width.ui
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window_information_collection">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Hello World</property>
-        <property name="wrap">True</property>
+        <property name="wrap">1</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/window-default-size.ref.ui b/testsuite/reftests/window-default-size.ref.ui
index 9e6f6d9f82..29b9330844 100644
--- a/testsuite/reftests/window-default-size.ref.ui
+++ b/testsuite/reftests/window-default-size.ref.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
     <property name="width_request">103</property>
     <property name="height_request">97</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <placeholder/>
diff --git a/testsuite/reftests/window-default-size.ui b/testsuite/reftests/window-default-size.ui
index 2dff8cd4c2..143cac3e68 100644
--- a/testsuite/reftests/window-default-size.ui
+++ b/testsuite/reftests/window-default-size.ui
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="default_width">103</property>
     <property name="default_height">97</property>
diff --git a/testsuite/reftests/window-height-for-width.ref.ui b/testsuite/reftests/window-height-for-width.ref.ui
index f6647049af..1aafa7cdc5 100644
--- a/testsuite/reftests/window-height-for-width.ref.ui
+++ b/testsuite/reftests/window-height-for-width.ref.ui
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkDialog" id="window1">
-    <property name="can_focus">False</property>
     <property name="title" translatable="yes">Dubstep</property>
     <property name="type_hint">dialog</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
+    <property name="resizable">0</property>
+    <property name="modal">1</property>
     <property name="use_header_bar">1</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="dialog-vbox2">
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkLabel" id="screen_reader_blurb">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="margin_end">6</property>
             <property name="margin_top">6</property>
@@ -26,8 +22,6 @@ Ts</property>
         </child>
         <child>
           <object class="GtkGrid" id="grid3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="margin_end">6</property>
             <property name="margin_top">12</property>
@@ -36,33 +30,30 @@ Ts</property>
             <property name="column_spacing">6</property>
             <child>
               <object class="GtkLabel" id="screen_reader_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
+                <property name="hexpand">1</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">The _Base</property>
-                <property name="use_underline">True</property>
+                <property name="use_underline">1</property>
                 <property name="mnemonic_widget">screen_reader_switch</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkSwitch" id="screen_reader_switch">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">1</property>
                 <property name="halign">end</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
           </object>
         </child>
diff --git a/testsuite/reftests/window-height-for-width.ui b/testsuite/reftests/window-height-for-width.ui
index 4200e2e6ed..434c55bb78 100644
--- a/testsuite/reftests/window-height-for-width.ui
+++ b/testsuite/reftests/window-height-for-width.ui
@@ -1,34 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkDialog" id="window1">
-    <property name="can_focus">False</property>
     <property name="title" translatable="yes">Dubstep</property>
     <property name="type_hint">dialog</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
+    <property name="resizable">0</property>
+    <property name="modal">1</property>
     <property name="use_header_bar">1</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="dialog-vbox2">
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkLabel" id="screen_reader_blurb">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="margin_end">6</property>
             <property name="margin_top">6</property>
             <property name="xalign">0</property>
             <property name="max-width-chars">1</property>
             <property name="label" translatable="yes">WubWubWubWubWubWubWubWubWubWubWubWubWub Ts</property>
-            <property name="wrap">True</property>
+            <property name="wrap">1</property>
           </object>
         </child>
         <child>
           <object class="GtkGrid" id="grid3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="margin_end">6</property>
             <property name="margin_top">12</property>
@@ -37,33 +31,30 @@
             <property name="column_spacing">6</property>
             <child>
               <object class="GtkLabel" id="screen_reader_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
+                <property name="hexpand">1</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">The _Base</property>
-                <property name="use_underline">True</property>
+                <property name="use_underline">1</property>
                 <property name="mnemonic_widget">screen_reader_switch</property>
+                <layout>
+                  <property name="left_attach">0</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkSwitch" id="screen_reader_switch">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">1</property>
                 <property name="halign">end</property>
+                <layout>
+                  <property name="left_attach">1</property>
+                  <property name="top_attach">0</property>
+                  <property name="column-span">1</property>
+                  <property name="row-span">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
             </child>
           </object>
         </child>
diff --git a/testsuite/reftests/window-show-contents-on-map.ref.ui b/testsuite/reftests/window-show-contents-on-map.ref.ui
index d96ec68e95..897580cc48 100644
--- a/testsuite/reftests/window-show-contents-on-map.ref.ui
+++ b/testsuite/reftests/window-show-contents-on-map.ref.ui
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">200</property>
     <property name="height_request">200</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">This label is only shown when the window is mapped. So the window does its first size allocation without the label being visible and has to resize.</property>
-        <property name="wrap">True</property>
+        <property name="wrap">1</property>
         <property name="width_chars">20</property>
         <property name="max_width_chars">20</property>
       </object>
diff --git a/testsuite/reftests/window-show-contents-on-map.ui b/testsuite/reftests/window-show-contents-on-map.ui
index def0bf9ccf..3285b5f05a 100644
--- a/testsuite/reftests/window-show-contents-on-map.ui
+++ b/testsuite/reftests/window-show-contents-on-map.ui
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <signal name="map" handler="gtk_widget_show" object="label1" after="yes" swapped="yes"/>
     <child>
       <object class="GtkLabel" id="label1">
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">This label is only shown when the window is mapped. So the window does its first size allocation without the label being visible and has to resize.</property>
         <property name="width_chars">20</property>
-        <property name="wrap">True</property>
+        <property name="wrap">1</property>
       </object>
     </child>
   </object>