[gtk/wip/ebassi/grid-layout: 4/5] testsuite/reftests: Update UI files



commit 5d778175ee4598780bb4abfe92075880a392bde9
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Fri Apr 5 00:33:12 2019 +0100

    testsuite/reftests: Update UI files
    
    Run the UI files through `gtk-builder-tool simplify --3to4` to update
    the layout properties.

 testsuite/reftests/721800-0px-dotted-border.ref.ui |    5 -
 testsuite/reftests/721800-0px-dotted-border.ui     |    5 -
 testsuite/reftests/actionbar.ref.ui                |   19 +-
 testsuite/reftests/actionbar.ui                    |    5 +-
 testsuite/reftests/animation-direction.ref.ui      |  388 +-
 testsuite/reftests/animation-direction.ui          |  324 +-
 .../animation-fill-mode-iteration-count.ref.ui     |  644 ++--
 .../animation-fill-mode-iteration-count.ui         |  644 ++--
 testsuite/reftests/background-area.ref.ui          |   70 +-
 testsuite/reftests/background-area.ui              |   55 +-
 .../background-blend-mode-clip-interaction.ref.ui  |    7 +-
 .../background-blend-mode-clip-interaction.ui      |    7 +-
 .../reftests/background-color-transparent.ref.ui   |   40 +-
 testsuite/reftests/background-color-transparent.ui |   40 +-
 .../reftests/background-image-multiple.ref.ui      |  155 +-
 testsuite/reftests/background-image-multiple.ui    |   89 +-
 testsuite/reftests/background-origin.ref.ui        |    9 +-
 testsuite/reftests/background-origin.ui            |  157 +-
 .../reftests/background-position-repeat.ref.ui     |    7 +-
 testsuite/reftests/background-position-repeat.ui   |    7 +-
 .../reftests/background-position-simple.ref.ui     |    2 -
 testsuite/reftests/background-position-simple.ui   |    2 -
 testsuite/reftests/background-position.ref.ui      |  125 +-
 testsuite/reftests/background-position.ui          |  159 +-
 .../background-positioning-area-empty.ref.ui       |    6 +-
 .../reftests/background-positioning-area-empty.ui  |    6 +-
 testsuite/reftests/background-repeat.ref.ui        |   60 +-
 testsuite/reftests/background-repeat.ui            |   46 +-
 testsuite/reftests/background-size-keywords.ref.ui |  208 +-
 testsuite/reftests/background-size-keywords.ui     |  208 +-
 testsuite/reftests/background-size-zero.ref.ui     |    2 -
 testsuite/reftests/background-size-zero.ui         |    2 -
 testsuite/reftests/background-size.ref.ui          |  208 +-
 testsuite/reftests/background-size.ui              |  208 +-
 .../reftests/background-window-transparent.ref.ui  |    5 +-
 .../reftests/background-window-transparent.ui      |    5 +-
 testsuite/reftests/bad-color-names.ref.ui          |    2 -
 testsuite/reftests/bad-color-names.ui              |    2 -
 testsuite/reftests/border-color-default.ref.ui     |    7 +-
 testsuite/reftests/border-color-default.ui         |    7 +-
 .../border-corner-zero-width-rendering.ref.ui      |  212 +-
 .../reftests/border-corner-zero-width-rendering.ui |  212 +-
 testsuite/reftests/border-half-pixel.ref.ui        |    7 +-
 testsuite/reftests/border-half-pixel.ui            |    7 +-
 testsuite/reftests/border-image-excess-size.ref.ui |   72 +-
 testsuite/reftests/border-image-excess-size.ui     |    7 +-
 testsuite/reftests/border-image-url-scaled.ref.ui  |   23 +-
 testsuite/reftests/border-image-url-scaled.ui      |    9 +-
 testsuite/reftests/border-image-url.ref.ui         |    9 +-
 testsuite/reftests/border-image-url.ui             |    9 +-
 testsuite/reftests/border-radius-clamp.ref.ui      |    4 -
 testsuite/reftests/border-radius-clamp.ui          |    4 -
 testsuite/reftests/border-style-none.ref.ui        |    9 +-
 testsuite/reftests/border-style-none.ui            |    9 +-
 testsuite/reftests/border-style.ref.ui             |   21 +-
 testsuite/reftests/border-style.ui                 |   72 +-
 testsuite/reftests/box-order.ref.ui                |  124 +-
 testsuite/reftests/box-order.ui                    |  127 +-
 testsuite/reftests/box-pseudo-classes.ref.ui       |   89 +-
 testsuite/reftests/box-pseudo-classes.ui           |   89 +-
 .../reftests/box-shadow-changes-modify-clip.ref.ui |    4 -
 .../reftests/box-shadow-changes-modify-clip.ui     |    6 -
 testsuite/reftests/box-shadow-spec-inset.ref.ui    |  304 +-
 testsuite/reftests/box-shadow-spec-inset.ui        |  112 +-
 testsuite/reftests/box-shadow-spread.ref.ui        |    5 -
 testsuite/reftests/box-shadow-spread.ui            |    5 -
 .../reftests/box-shadow-with-blend-mode.ref.ui     |    7 +-
 testsuite/reftests/box-shadow-with-blend-mode.ui   |    7 +-
 testsuite/reftests/button-wrapping.ref.ui          |   25 +-
 testsuite/reftests/button-wrapping.ui              |   25 +-
 testsuite/reftests/color-transition.ref.ui         |    2 -
 testsuite/reftests/color-transition.ui             |   10 +-
 testsuite/reftests/css-currentcolor-alpha.ref.ui   |    2 -
 testsuite/reftests/css-currentcolor-alpha.ui       |    2 -
 testsuite/reftests/css-em-label-size.ref.ui        |  220 +-
 testsuite/reftests/css-em-label-size.ui            |  178 +-
 testsuite/reftests/css-image-aspect-ratio.ref.ui   |    2 -
 testsuite/reftests/css-image-aspect-ratio.ui       |    2 -
 .../reftests/css-image-color-aspect-ratio.ref.ui   |    2 -
 testsuite/reftests/css-image-color-aspect-ratio.ui |    2 -
 testsuite/reftests/css-match-class.ref.ui          |    4 -
 testsuite/reftests/css-match-class.ui              |    4 +-
 .../reftests/css-match-descendant-later.ref.ui     |    4 -
 testsuite/reftests/css-match-descendant-later.ui   |   32 +-
 testsuite/reftests/css-match-exact.ref.ui          |    2 -
 testsuite/reftests/css-match-exact.ui              |   18 +-
 testsuite/reftests/css-match-import.ref.ui         |    4 -
 testsuite/reftests/css-match-import.ui             |    4 -
 .../css-match-inherit-different-state.ref.ui       |   11 +-
 .../reftests/css-match-inherit-different-state.ui  |   11 +-
 testsuite/reftests/css-match-inherit.ref.ui        |    9 +-
 testsuite/reftests/css-match-inherit.ui            |    9 +-
 testsuite/reftests/css-match-name.ref.ui           |    4 -
 testsuite/reftests/css-match-name.ui               |    4 +-
 testsuite/reftests/css-match-siblings.ref.ui       |   14 -
 testsuite/reftests/css-match-siblings.ui           |   14 -
 testsuite/reftests/css-match-type.ref.ui           |    4 -
 testsuite/reftests/css-match-type.ui               |    4 +-
 testsuite/reftests/css-multi-state.ref.ui          |   13 +-
 testsuite/reftests/css-multi-state.ui              |   13 +-
 testsuite/reftests/css-rem-label-size.ref.ui       |    4 -
 testsuite/reftests/css-rem-label-size.ui           |    4 -
 testsuite/reftests/expander.ref.ui                 |    6 +-
 testsuite/reftests/expander.ui                     |    7 +-
 testsuite/reftests/fixed-widget-stacking.ref.ui    |   18 +-
 testsuite/reftests/fixed-widget-stacking.ui        |   20 +-
 testsuite/reftests/flipping-icons.ref.ui           |   27 +-
 testsuite/reftests/flipping-icons.ui               |   27 +-
 testsuite/reftests/font-sizes-names.ref.ui         |   30 -
 testsuite/reftests/font-sizes-names.ui             |   30 -
 testsuite/reftests/grid-empty-with-spacing.ref.ui  |    4 -
 testsuite/reftests/grid-empty-with-spacing.ui      |   19 +-
 testsuite/reftests/grid-expand.ref.ui              |   46 +-
 testsuite/reftests/grid-expand.ui                  |   64 +-
 testsuite/reftests/grid-homogeneous.ref.ui         |  144 +-
 testsuite/reftests/grid-homogeneous.ui             |  180 +-
 testsuite/reftests/grid-spacing1.ref.ui            |   38 +-
 testsuite/reftests/grid-spacing1.ui                |   98 +-
 testsuite/reftests/grid-spacing2.ref.ui            |   30 +-
 testsuite/reftests/grid-spacing2.ui                |  116 +-
 testsuite/reftests/grid-spacing3.ref.ui            |   60 +-
 testsuite/reftests/grid-spacing3.ui                |   61 +-
 testsuite/reftests/grid-wfh.ref.ui                 |   32 +-
 testsuite/reftests/grid-wfh.ui                     |   34 +-
 testsuite/reftests/gtk-icontheme-sizing.ref.ui     |    4 -
 testsuite/reftests/gtk-icontheme-sizing.ui         |    4 -
 testsuite/reftests/gtk-image-effect-inherit.ref.ui |   11 -
 testsuite/reftests/gtk-image-effect-inherit.ui     |   53 +-
 testsuite/reftests/icon-effect-missing.ref.ui      |   10 -
 testsuite/reftests/icon-effect-missing.ui          |   10 -
 testsuite/reftests/icon-shadow-no-transform.ref.ui |    7 +-
 testsuite/reftests/icon-shadow-no-transform.ui     |    4 -
 testsuite/reftests/icon-style-basics.ref.ui        |  533 ++-
 testsuite/reftests/icon-style-basics.ui            |  533 ++-
 testsuite/reftests/icon-vfuncs.ref.ui              |  104 +-
 testsuite/reftests/icon-vfuncs.ui                  |  113 +-
 testsuite/reftests/iconview-empty.ref.ui           |  228 +-
 testsuite/reftests/iconview-empty.ui               |  236 +-
 .../reftests/image-icon-name-use-fallback.ref.ui   |    6 +-
 testsuite/reftests/image-icon-name-use-fallback.ui |    6 +-
 .../reftests/image-icon-shadow-clipping.ref.ui     |    4 -
 testsuite/reftests/image-icon-shadow-clipping.ui   |    6 -
 testsuite/reftests/image-load-from-file.ref.ui     |    2 -
 testsuite/reftests/image-load-from-file.ui         |    1 -
 testsuite/reftests/inherit-and-initial.ref.ui      |  133 +-
 testsuite/reftests/inherit-and-initial.ui          |  137 +-
 .../reftests/label-attribute-preference.ref.ui     |   18 +-
 testsuite/reftests/label-attribute-preference.ui   |   12 +-
 testsuite/reftests/label-background.ref.ui         |    4 -
 testsuite/reftests/label-background.ui             |    8 -
 testsuite/reftests/label-box-shadow-clip.ref.ui    |    4 -
 testsuite/reftests/label-box-shadow-clip.ui        |    4 -
 testsuite/reftests/label-clipping.ref.ui           |    4 -
 testsuite/reftests/label-clipping.ui               |    6 -
 testsuite/reftests/label-ellipsize-small.ref.ui    |    4 -
 testsuite/reftests/label-ellipsize-small.ui        |    4 -
 testsuite/reftests/label-ellipsize-with-big.ref.ui |    8 +-
 testsuite/reftests/label-ellipsize-with-big.ui     |    8 +-
 testsuite/reftests/label-shadows.ref.ui            |  132 +-
 testsuite/reftests/label-shadows.ui                |   60 +-
 testsuite/reftests/label-sizing.ref.ui             | 3945 ++++++++++----------
 testsuite/reftests/label-sizing.ui                 | 3945 ++++++++++----------
 testsuite/reftests/label-small-ellipsized.ref.ui   |    4 -
 testsuite/reftests/label-small-ellipsized.ui       |    4 -
 .../label-text-shadow-changes-modify-clip.ref.ui   |    4 -
 .../label-text-shadow-changes-modify-clip.ui       |    6 -
 .../reftests/label-text-shadow-clipping.ref.ui     |    4 -
 testsuite/reftests/label-text-shadow-clipping.ui   |    6 -
 .../reftests/label-width-chars-dont-shrink.ref.ui  |   10 -
 .../reftests/label-width-chars-dont-shrink.ui      |   10 -
 testsuite/reftests/label-wrap-justify.ref.ui       |   68 +-
 testsuite/reftests/label-wrap-justify.ui           |   74 +-
 testsuite/reftests/letter-spacing.ref.ui           |    4 -
 testsuite/reftests/letter-spacing.ui               |    4 -
 .../linear-gradient-transition-to-other.ref.ui     |    2 -
 .../linear-gradient-transition-to-other.ui         |    2 -
 testsuite/reftests/linear-gradient.ref.ui          |   24 +-
 testsuite/reftests/linear-gradient.ui              |   24 +-
 testsuite/reftests/link-coloring.ref.ui            |   23 +-
 testsuite/reftests/link-coloring.ui                |   24 +-
 .../reftests/messagedialog-secondarytext.ref.ui    |    4 +-
 testsuite/reftests/messagedialog-secondarytext.ui  |    5 +-
 testsuite/reftests/named-colors.ref.ui             | 2104 +++++------
 testsuite/reftests/named-colors.ui                 | 2104 +++++------
 testsuite/reftests/no-colors.ref.ui                |    4 -
 testsuite/reftests/no-colors.ui                    |    4 -
 testsuite/reftests/nonresizable-size.ref.ui        |    4 -
 testsuite/reftests/nonresizable-size.ui            |    6 +-
 testsuite/reftests/notebook-tab-position.ref.ui    |   29 +-
 testsuite/reftests/notebook-tab-position.ui        |   29 +-
 testsuite/reftests/nth-child.ref.ui                |   54 -
 testsuite/reftests/nth-child.ui                    |   54 -
 testsuite/reftests/opacity-initial.ref.ui          |    2 -
 testsuite/reftests/opacity-initial.ui              |    1 +
 testsuite/reftests/opacity.ref.ui                  |   22 +-
 testsuite/reftests/opacity.ui                      |   26 +-
 testsuite/reftests/overlay-no-main-widget.ref.ui   |    1 +
 testsuite/reftests/overlay-no-main-widget.ui       |    1 +
 testsuite/reftests/paned-undersized.ref.ui         |    7 +-
 testsuite/reftests/paned-undersized.ui             |   14 +-
 .../reftests/picture-load-invalid-file.ref.ui      |    4 +-
 testsuite/reftests/picture-load-invalid-file.ui    |    1 -
 testsuite/reftests/pseudoclass-on-box.ref.ui       |   15 +-
 testsuite/reftests/pseudoclass-on-box.ui           |   13 +-
 testsuite/reftests/pseudoclass-on-parent.ref.ui    |   13 +-
 testsuite/reftests/pseudoclass-on-parent.ui        |   11 +-
 testsuite/reftests/quit-mnemonic.ref.ui            |    6 +-
 testsuite/reftests/quit-mnemonic.ui                |   34 +-
 .../repeating-radial-gradient-at-beginning.ref.ui  |    2 -
 .../repeating-radial-gradient-at-beginning.ui      |    2 -
 testsuite/reftests/revealer-extra-size.ref.ui      |    5 -
 testsuite/reftests/revealer-extra-size.ui          |    9 +-
 .../reftests/revealer-wrappable-contents.ref.ui    |    7 +-
 testsuite/reftests/revealer-wrappable-contents.ui  |   11 +-
 testsuite/reftests/rotated-layout.ref.ui           |   32 +-
 testsuite/reftests/rotated-layout.ui               |   32 +-
 testsuite/reftests/separator-size.ref.ui           |  116 +-
 testsuite/reftests/separator-size.ui               |  128 +-
 testsuite/reftests/set-default-direction.ref.ui    |    4 -
 testsuite/reftests/set-default-direction.ui        |    4 -
 testsuite/reftests/shadow-clip-rounding.ref.ui     |    4 -
 testsuite/reftests/shadow-clip-rounding.ui         |    4 -
 testsuite/reftests/shorthand-entry-border.ref.ui   |    5 +-
 testsuite/reftests/shorthand-entry-border.ui       |    5 +-
 testsuite/reftests/sibling-pseudoclasses.ref.ui    |   17 +-
 testsuite/reftests/sibling-pseudoclasses.ui        |   15 +-
 testsuite/reftests/simple.ref.ui                   |    4 -
 testsuite/reftests/simple.ui                       |    4 -
 testsuite/reftests/sizegroups-basics.ref.ui        |   73 +-
 testsuite/reftests/sizegroups-basics.ui            |   75 +-
 .../sizegroups-evolution-identity-page.ref.ui      |  249 +-
 .../reftests/sizegroups-evolution-identity-page.ui |  254 +-
 .../reftests/sizegroups-get-preferred-null.ref.ui  |   23 +-
 .../reftests/sizegroups-get-preferred-null.ui      |   25 +-
 testsuite/reftests/statusbar-remove-all.ref.ui     |    4 -
 testsuite/reftests/statusbar-remove-all.ui         |    4 -
 .../reftests/style-context-save-inheritance.ref.ui |    8 +-
 .../reftests/style-context-save-inheritance.ui     |    8 +-
 .../reftests/style-properties-only-child.ref.ui    |    7 +-
 testsuite/reftests/style-properties-only-child.ui  |    7 +-
 .../symbolic-icon-translucent-color.ref.ui         |    5 -
 .../reftests/symbolic-icon-translucent-color.ui    |    5 -
 testsuite/reftests/textview-border-windows.ref.ui  |   53 +-
 testsuite/reftests/textview-border-windows.ui      |    5 +-
 testsuite/reftests/textview-margins.ref.ui         |    5 +-
 testsuite/reftests/textview-margins.ui             |    5 +-
 testsuite/reftests/textview-tags.ref.ui            |    5 +-
 testsuite/reftests/textview-tags.ui                |    5 +-
 testsuite/reftests/toplevel-vs-popup.ref.ui        |    4 -
 testsuite/reftests/toplevel-vs-popup.ui            |    4 -
 testsuite/reftests/treeview-crash-too-wide.ref.ui  |   43 +-
 testsuite/reftests/treeview-crash-too-wide.ui      |   43 +-
 testsuite/reftests/treeview-fixed-height.ref.ui    |    8 +-
 testsuite/reftests/treeview-fixed-height.ui        |   10 +-
 testsuite/reftests/treeview-headers-hidden.ref.ui  |    8 +-
 testsuite/reftests/treeview-headers-hidden.ui      |    8 +-
 testsuite/reftests/unresolvable.ref.ui             |    2 -
 testsuite/reftests/unresolvable.ui                 |    2 -
 testsuite/reftests/window-border-width.ref.ui      |    8 +-
 testsuite/reftests/window-border-width.ui          |    6 +-
 testsuite/reftests/window-default-size.ref.ui      |    2 -
 testsuite/reftests/window-default-size.ui          |    2 -
 testsuite/reftests/window-height-for-width.ref.ui  |   43 +-
 testsuite/reftests/window-height-for-width.ui      |   45 +-
 .../reftests/window-show-contents-on-map.ref.ui    |    6 +-
 testsuite/reftests/window-show-contents-on-map.ui  |    5 +-
 266 files changed, 10034 insertions(+), 13895 deletions(-)
---
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>
                     </