[gtk+] Simplify all ui files again



commit 351559fcfae1996143e4c1702aa9fc174c6c345f
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Jan 18 17:46:58 2018 -0500

    Simplify all ui files again
    
    Now even simpler!

 demos/gtk-demo/application.ui          |   13 +-
 demos/gtk-demo/blendmodes.ui           |  205 +++++--------
 demos/gtk-demo/cursors.ui              |  419 ++++++++++++--------------
 demos/gtk-demo/demo.ui                 |   33 +--
 demos/gtk-demo/filtermodel.ui          |   53 ++--
 demos/gtk-demo/fishbowl.ui             |   22 +-
 demos/gtk-demo/font-features.ui        |   45 +--
 demos/gtk-demo/listbox.ui              |  127 +++-----
 demos/gtk-demo/main.ui                 |   66 ++---
 demos/gtk-demo/modelbutton.ui          |   24 --
 demos/gtk-demo/popover.ui              |   22 +-
 demos/gtk-demo/revealer.ui             |   23 +--
 demos/gtk-demo/scale.ui                |   43 ++--
 demos/gtk-demo/shortcuts-boxes.ui      |   39 ---
 demos/gtk-demo/shortcuts-builder.ui    |   91 +------
 demos/gtk-demo/shortcuts-clocks.ui     |   24 --
 demos/gtk-demo/shortcuts-gedit.ui      |   26 --
 demos/gtk-demo/shortcuts.ui            |    9 -
 demos/gtk-demo/spinbutton.ui           |  113 +++----
 demos/gtk-demo/stack.ui                |   19 +-
 demos/gtk-demo/theming.ui              |  106 +++----
 demos/icon-browser/window.ui           |   55 +---
 demos/widget-factory/help-overlay.ui   |   13 -
 demos/widget-factory/widget-factory.ui |  514 +++++++++++++++-----------------
 gtk/inspector/actions.ui               |   11 +-
 gtk/inspector/css-editor.ui            |   21 +-
 gtk/inspector/css-node-tree.ui         |    7 -
 gtk/inspector/data-list.ui             |   14 +-
 gtk/inspector/general.ui               |  178 ++---------
 gtk/inspector/magnifier.ui             |    6 +-
 gtk/inspector/menu.ui                  |   22 +-
 gtk/inspector/misc-info.ui             |  195 ++----------
 gtk/inspector/object-hierarchy.ui      |   11 +-
 gtk/inspector/object-tree.ui           |   24 +-
 gtk/inspector/prop-list.ui             |   17 +-
 gtk/inspector/recorder.ui              |   17 -
 gtk/inspector/resource-list.ui         |   51 +---
 gtk/inspector/selector.ui              |   11 +-
 gtk/inspector/signals-list.ui          |   17 +-
 gtk/inspector/statistics.ui            |   25 +--
 gtk/inspector/visual.ui                |  167 ++---------
 gtk/inspector/window.ui                |   63 ++---
 gtk/ui/gtkassistant.ui                 |    3 +-
 gtk/ui/gtkmessagedialog.ui             |    3 +-
 gtk/ui/gtkpagesetupunixdialog.ui       |    3 +-
 gtk/ui/gtkprintunixdialog.ui           |   33 +--
 46 files changed, 942 insertions(+), 2061 deletions(-)
---
diff --git a/demos/gtk-demo/application.ui b/demos/gtk-demo/application.ui
index fa6798d..c083881 100644
--- a/demos/gtk-demo/application.ui
+++ b/demos/gtk-demo/application.ui
@@ -7,35 +7,29 @@
     <property name="icon-name">document-open</property>
     <child>
       <object class="GtkGrid">
-        <property name="visible">1</property>
         <child>
           <object class="GtkToolbar">
-            <property name="visible">1</property>
             <property name="hexpand">1</property>
             <style>
               <class name="primary-toolbar"/>
             </style>
             <child>
               <object class="GtkMenuToolButton" id="menutool">
-                <property name="visible">1</property>
                 <property name="icon-name">document-open</property>
               </object>
             </child>
             <child>
               <object class="GtkToolButton">
-                <property name="visible">1</property>
                 <property name="icon-name">application-exit</property>
                 <property name="action-name">app.quit</property>
               </object>
             </child>
             <child>
               <object class="GtkSeparatorToolItem">
-                <property name="visible">1</property>
               </object>
             </child>
             <child>
               <object class="GtkToolButton">
-                <property name="visible">1</property>
                 <property name="icon-name">applications-other</property>
                 <property name="action-name">win.logo</property>
               </object>
@@ -54,7 +48,6 @@
               <object class="GtkBox" id="content_area">
                 <child>
                   <object class="GtkLabel" id="message">
-                    <property name="visible">1</property>
                     <property name="hexpand">1</property>
                   </object>
                 </child>
@@ -64,10 +57,9 @@
               <object class="GtkBox">
                 <child>
                   <object class="GtkButton">
-                    <property name="visible">1</property>
                     <property name="valign">center</property>
                     <property name="label" translatable="yes">_OK</property>
-                    <property name="use_underline">1</property>
+                    <property name="use-underline">1</property>
                     <signal name="clicked" handler="clicked_cb"/>
                   </object>
                 </child>
@@ -81,11 +73,9 @@
         </child>
         <child>
           <object class="GtkScrolledWindow">
-            <property name="visible">1</property>
             <property name="shadow-type">in</property>
             <child>
               <object class="GtkTextView">
-                <property name="visible">1</property>
                 <property name="hexpand">1</property>
                 <property name="vexpand">1</property>
                 <property name="buffer">buffer</property>
@@ -100,7 +90,6 @@
         <child>
           <object class="GtkStatusbar" id="status">
             <property name="hexpand">1</property>
-            <property name="visible">1</property>
           </object>
           <packing>
             <property name="left-attach">0</property>
diff --git a/demos/gtk-demo/blendmodes.ui b/demos/gtk-demo/blendmodes.ui
index fb5b5b7..168b4b2 100644
--- a/demos/gtk-demo/blendmodes.ui
+++ b/demos/gtk-demo/blendmodes.ui
@@ -2,21 +2,16 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
-    <property name="resizable">False</property>
+    <property name="resizable">0</property>
     <property name="title">CSS Blend Modes</property>
-    <property name="default_width">400</property>
-    <property name="default_height">300</property>
+    <property name="default-width">400</property>
+    <property name="default-height">300</property>
     <child>
       <object class="GtkGrid">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="row_spacing">12</property>
-        <property name="column_spacing">12</property>
+        <property name="row-spacing">12</property>
+        <property name="column-spacing">12</property>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Blend mode:</property>
             <property name="xalign">0</property>
             <style>
@@ -24,128 +19,108 @@
             </style>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="vexpand">True</property>
-            <property name="shadow_type">in</property>
-            <property name="min_content_width">150</property>
+            <property name="can-focus">1</property>
+            <property name="vexpand">1</property>
+            <property name="shadow-type">in</property>
+            <property name="min-content-width">150</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkStackSwitcher">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
-            <property name="hexpand">True</property>
+            <property name="hexpand">1</property>
             <property name="stack">stack</property>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkStack" id="stack">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="hhomogeneous">False</property>
-            <property name="vhomogeneous">False</property>
-            <property name="transition_type">crossfade</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
+            <property name="hhomogeneous">0</property>
+            <property name="vhomogeneous">0</property>
+            <property name="transition-type">crossfade</property>
             <child>
               <object class="GtkGrid">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="hexpand">False</property>
-                <property name="vexpand">True</property>
-                <property name="row_spacing">12</property>
-                <property name="column_spacing">12</property>
+                <property name="vexpand">1</property>
+                <property name="row-spacing">12</property>
+                <property name="column-spacing">12</property>
                 <child>
                   <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Duck</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <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">Background</property>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <style>
                       <class name="duck"/>
                     </style>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <style>
                       <class name="gradient"/>
                     </style>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">1</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">
 Blended picture</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">2</property>
                     <property name="width">2</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="halign">center</property>
                     <style>
                       <class name="blend0"/>
                     </style>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">3</property>
                     <property name="width">2</property>
                   </packing>
                 </child>
@@ -157,87 +132,72 @@ Blended picture</property>
             </child>
             <child>
               <object class="GtkGrid">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="hexpand">False</property>
-                <property name="vexpand">True</property>
-                <property name="row_spacing">12</property>
-                <property name="column_spacing">12</property>
+                <property name="vexpand">1</property>
+                <property name="row-spacing">12</property>
+                <property name="column-spacing">12</property>
                 <child>
                   <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Red</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <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">Blue</property>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <style>
                       <class name="red"/>
                     </style>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <style>
                       <class name="blue"/>
                     </style>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">1</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">
 Blended picture</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">2</property>
                     <property name="width">2</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="halign">center</property>
                     <style>
                       <class name="blend1"/>
                     </style>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">3</property>
                     <property name="width">2</property>
                   </packing>
                 </child>
@@ -249,71 +209,59 @@ Blended picture</property>
             </child>
             <child>
               <object class="GtkGrid">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="row_spacing">6</property>
-                <property name="column_spacing">12</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
+                <property name="row-spacing">6</property>
+                <property name="column-spacing">12</property>
                 <child>
                   <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <style>
                       <class name="cyan"/>
                     </style>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <style>
                       <class name="magenta"/>
                     </style>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <style>
                       <class name="yellow"/>
                     </style>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">3</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="halign">center</property>
                     <style>
                       <class name="blend2"/>
                     </style>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">3</property>
+                    <property name="left-attach">1</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">Cyan</property>
                     <property name="xalign">0</property>
                     <style>
@@ -321,14 +269,12 @@ Blended picture</property>
                     </style>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <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">Magenta</property>
                     <property name="xalign">0</property>
                     <style>
@@ -336,14 +282,12 @@ Blended picture</property>
                     </style>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">1</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">Yellow</property>
                     <property name="xalign">0</property>
                     <style>
@@ -351,14 +295,12 @@ Blended picture</property>
                     </style>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
+                    <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">Blended picture</property>
                     <property name="xalign">0</property>
                     <attributes>
@@ -366,8 +308,8 @@ Blended picture</property>
                     </attributes>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">2</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">2</property>
                   </packing>
                 </child>
               </object>
@@ -378,14 +320,13 @@ Blended picture</property>
             </child>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
       </object>
     </child>
     <child type="titlebar">
-      <placeholder/>
     </child>
   </object>
 </interface>
diff --git a/demos/gtk-demo/cursors.ui b/demos/gtk-demo/cursors.ui
index df2a030..9a78fa4 100644
--- a/demos/gtk-demo/cursors.ui
+++ b/demos/gtk-demo/cursors.ui
@@ -24,8 +24,6 @@
   </object>
   <object class="GdkCursor" id="none_cursor_image">
     <property name="texture">resource:///cursors/none_cursor.png</property>
-    <property name="hotspot-x">0</property>
-    <property name="hotspot-y">0</property>
   </object>
   <object class="GdkCursor" id="none_cursor_fallback">
     <property name="name">none</property>
@@ -33,8 +31,6 @@
   </object>
   <object class="GdkCursor" id="none_cursor_image_fallback">
     <property name="texture">resource:///cursors/none_cursor.png</property>
-    <property name="hotspot-x">0</property>
-    <property name="hotspot-y">0</property>
     <property name="fallback">none_cursor</property>
   </object>
   <object class="GdkCursor" id="gtk-logo_cursor">
@@ -650,15 +646,14 @@
     <property name="fallback">zoom-out_cursor</property>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="default_width">300</property>
-    <property name="default_height">300</property>
+    <property name="default-width">300</property>
+    <property name="default-height">300</property>
     <property name="title">Cursors</property>
     <child>
       <object class="GtkScrolledWindow">
         <property name="hscrollbar-policy">never</property>
-        <property name="vscrollbar-policy">automatic</property>
-        <property name="propagate-natural-height">True</property>
-        <property name="hexpand">True</property>
+        <property name="propagate-natural-height">1</property>
+        <property name="hexpand">1</property>
         <child>
           <object class="GtkBox">
             <property name="orientation">vertical</property>
@@ -675,10 +670,9 @@
                     </style>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -692,7 +686,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -700,7 +694,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">default_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "default" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;default&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -716,7 +710,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">default_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "default" named cursor 
falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;default&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -724,7 +718,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">default_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "default" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;default&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -733,10 +727,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -750,7 +743,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -758,7 +751,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">none_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "none" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;none&quot; named 
cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -774,7 +767,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">none_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "none" named cursor 
falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;none&quot; named 
cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -782,7 +775,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">none_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "none" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;none&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -791,10 +784,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -808,7 +800,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -816,7 +808,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">gtk-logo_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "gtk-logo" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;gtk-logo&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -832,7 +824,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">gtk-logo_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "gtk-logo" named cursor 
falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;gtk-logo&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -840,7 +832,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">gtk-logo_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "gtk-logo" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;gtk-logo&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -853,7 +845,7 @@
             </child>
             <child>
               <object class="GtkFrame">
-                <property name="hexpand">True</property>
+                <property name="hexpand">1</property>
                 <child>
                   <object class="GtkListBox">
                     <property name="selection-mode">none</property>
@@ -862,10 +854,9 @@
                     </style>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -879,7 +870,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -887,7 +878,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">context-menu_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "context-menu" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The 
&quot;context-menu&quot; named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -903,7 +894,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">context-menu_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "context-menu" named 
cursor falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The 
&quot;context-menu&quot; named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -911,7 +902,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">context-menu_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "context-menu" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;context-menu&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -920,10 +911,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -937,7 +927,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -945,7 +935,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">help_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "help" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;help&quot; named 
cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -961,7 +951,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">help_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "help" named cursor 
falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;help&quot; named 
cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -969,7 +959,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">help_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "help" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;help&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -978,10 +968,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -995,7 +984,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -1003,7 +992,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">pointer_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "pointer" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;pointer&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1019,7 +1008,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">pointer_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "pointer" named cursor 
falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;pointer&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1027,7 +1016,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">pointer_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "pointer" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;pointer&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -1036,10 +1025,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -1053,7 +1041,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -1061,7 +1049,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">progress_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "progress" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;progress&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1077,7 +1065,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">progress_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "progress" named cursor 
falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;progress&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1085,7 +1073,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">progress_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "progress" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;progress&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -1094,10 +1082,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -1111,7 +1098,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -1119,7 +1106,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">wait_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "wait" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;wait&quot; named 
cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1135,7 +1122,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">wait_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "wait" named cursor 
falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;wait&quot; named 
cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1143,7 +1130,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">wait_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "wait" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;wait&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -1156,7 +1143,7 @@
             </child>
             <child>
               <object class="GtkFrame">
-                <property name="hexpand">True</property>
+                <property name="hexpand">1</property>
                 <child>
                   <object class="GtkListBox">
                     <property name="selection-mode">none</property>
@@ -1165,10 +1152,9 @@
                     </style>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -1182,7 +1168,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -1190,7 +1176,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">cell_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "cell" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;cell&quot; named 
cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1206,7 +1192,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">cell_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "cell" named cursor 
falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;cell&quot; named 
cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1214,7 +1200,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">cell_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "cell" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;cell&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -1223,10 +1209,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -1240,7 +1225,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -1248,7 +1233,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">crosshair_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "crosshair" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;crosshair&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1264,7 +1249,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">crosshair_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "crosshair" named 
cursor falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;crosshair&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1272,7 +1257,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">crosshair_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "crosshair" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;crosshair&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -1281,10 +1266,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -1298,7 +1282,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -1306,7 +1290,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">text_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "text" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;text&quot; named 
cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1322,7 +1306,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">text_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "text" named cursor 
falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;text&quot; named 
cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1330,7 +1314,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">text_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "text" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;text&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -1339,10 +1323,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -1356,7 +1339,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -1364,7 +1347,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">vertical-text_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "vertical-text" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The 
&quot;vertical-text&quot; named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1380,7 +1363,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">vertical-text_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "vertical-text" named 
cursor falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The 
&quot;vertical-text&quot; named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1388,7 +1371,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">vertical-text_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "vertical-text" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;vertical-text&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -1401,7 +1384,7 @@
             </child>
             <child>
               <object class="GtkFrame">
-                <property name="hexpand">True</property>
+                <property name="hexpand">1</property>
                 <child>
                   <object class="GtkListBox">
                     <property name="selection-mode">none</property>
@@ -1410,10 +1393,9 @@
                     </style>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -1427,7 +1409,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -1435,7 +1417,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">alias_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "alias" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;alias&quot; named 
cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1451,7 +1433,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">alias_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "alias" named cursor 
falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;alias&quot; named 
cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1459,7 +1441,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">alias_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "alias" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;alias&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -1468,10 +1450,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -1485,7 +1466,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -1493,7 +1474,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">copy_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "copy" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;copy&quot; named 
cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1509,7 +1490,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">copy_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "copy" named cursor 
falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;copy&quot; named 
cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1517,7 +1498,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">copy_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "copy" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;copy&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -1526,10 +1507,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -1543,7 +1523,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -1551,7 +1531,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">move_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "move" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;move&quot; named 
cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1567,7 +1547,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">move_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "move" named cursor 
falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;move&quot; named 
cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1575,7 +1555,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">move_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "move" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;move&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -1584,10 +1564,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -1601,7 +1580,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -1609,7 +1588,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">no-drop_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "no-drop" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;no-drop&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1625,7 +1604,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">no-drop_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "no-drop" named cursor 
falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;no-drop&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1633,7 +1612,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">no-drop_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "no-drop" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;no-drop&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -1642,10 +1621,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -1659,7 +1637,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -1667,7 +1645,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">not-allowed_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "not-allowed" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;not-allowed&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1683,7 +1661,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">not-allowed_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "not-allowed" named 
cursor falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;not-allowed&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1691,7 +1669,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">not-allowed_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "not-allowed" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;not-allowed&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -1700,10 +1678,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -1717,7 +1694,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -1725,7 +1702,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">grab_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "grab" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;grab&quot; named 
cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1741,7 +1718,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">grab_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "grab" named cursor 
falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;grab&quot; named 
cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1749,7 +1726,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">grab_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "grab" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;grab&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -1758,10 +1735,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -1775,7 +1751,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -1783,7 +1759,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">grabbing_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "grabbing" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;grabbing&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1799,7 +1775,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">grabbing_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "grabbing" named cursor 
falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;grabbing&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1807,7 +1783,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">grabbing_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "grabbing" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;grabbing&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -1820,7 +1796,7 @@
             </child>
             <child>
               <object class="GtkFrame">
-                <property name="hexpand">True</property>
+                <property name="hexpand">1</property>
                 <child>
                   <object class="GtkListBox">
                     <property name="selection-mode">none</property>
@@ -1829,10 +1805,9 @@
                     </style>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -1846,7 +1821,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -1854,7 +1829,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">all-scroll_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "all-scroll" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;all-scroll&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1870,7 +1845,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">all-scroll_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "all-scroll" named 
cursor falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;all-scroll&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1878,7 +1853,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">all-scroll_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "all-scroll" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;all-scroll&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -1887,10 +1862,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -1904,7 +1878,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -1912,7 +1886,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">col-resize_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "col-resize" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;col-resize&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1928,7 +1902,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">col-resize_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "col-resize" named 
cursor falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;col-resize&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1936,7 +1910,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">col-resize_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "col-resize" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;col-resize&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -1945,10 +1919,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -1962,7 +1935,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -1970,7 +1943,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">row-resize_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "row-resize" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;row-resize&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1986,7 +1959,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">row-resize_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "row-resize" named 
cursor falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;row-resize&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -1994,7 +1967,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">row-resize_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "row-resize" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;row-resize&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -2003,10 +1976,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -2020,7 +1992,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -2028,7 +2000,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">n-resize_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "n-resize" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;n-resize&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2044,7 +2016,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">n-resize_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "n-resize" named cursor 
falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;n-resize&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2052,7 +2024,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">n-resize_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "n-resize" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;n-resize&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -2061,10 +2033,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -2078,7 +2049,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -2086,7 +2057,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">e-resize_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "e-resize" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;e-resize&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2102,7 +2073,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">e-resize_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "e-resize" named cursor 
falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;e-resize&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2110,7 +2081,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">e-resize_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "e-resize" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;e-resize&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -2119,10 +2090,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -2136,7 +2106,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -2144,7 +2114,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">s-resize_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "s-resize" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;s-resize&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2160,7 +2130,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">s-resize_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "s-resize" named cursor 
falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;s-resize&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2168,7 +2138,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">s-resize_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "s-resize" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;s-resize&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -2177,10 +2147,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -2194,7 +2163,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -2202,7 +2171,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">w-resize_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "w-resize" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;w-resize&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2218,7 +2187,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">w-resize_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "w-resize" named cursor 
falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;w-resize&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2226,7 +2195,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">w-resize_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "w-resize" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;w-resize&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -2235,10 +2204,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -2252,7 +2220,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -2260,7 +2228,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">ne-resize_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "ne-resize" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;ne-resize&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2276,7 +2244,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">ne-resize_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "ne-resize" named 
cursor falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;ne-resize&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2284,7 +2252,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">ne-resize_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "ne-resize" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;ne-resize&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -2293,10 +2261,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -2310,7 +2277,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -2318,7 +2285,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">nw-resize_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "nw-resize" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;nw-resize&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2334,7 +2301,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">nw-resize_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "nw-resize" named 
cursor falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;nw-resize&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2342,7 +2309,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">nw-resize_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "nw-resize" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;nw-resize&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -2351,10 +2318,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -2368,7 +2334,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -2376,7 +2342,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">sw-resize_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "sw-resize" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;sw-resize&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2392,7 +2358,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">sw-resize_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "sw-resize" named 
cursor falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;sw-resize&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2400,7 +2366,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">sw-resize_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "sw-resize" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;sw-resize&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -2409,10 +2375,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -2426,7 +2391,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -2434,7 +2399,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">se-resize_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "se-resize" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;se-resize&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2450,7 +2415,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">se-resize_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "se-resize" named 
cursor falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;se-resize&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2458,7 +2423,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">se-resize_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "se-resize" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;se-resize&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -2467,10 +2432,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -2484,7 +2448,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -2492,7 +2456,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">ew-resize_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "ew-resize" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;ew-resize&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2508,7 +2472,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">ew-resize_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "ew-resize" named 
cursor falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;ew-resize&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2516,7 +2480,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">ew-resize_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "ew-resize" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;ew-resize&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -2525,10 +2489,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -2542,7 +2505,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -2550,7 +2513,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">ns-resize_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "ns-resize" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;ns-resize&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2566,7 +2529,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">ns-resize_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "ns-resize" named 
cursor falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;ns-resize&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2574,7 +2537,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">ns-resize_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "ns-resize" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;ns-resize&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -2583,10 +2546,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -2600,7 +2562,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -2608,7 +2570,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">nesw-resize_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "nesw-resize" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;nesw-resize&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2624,7 +2586,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">nesw-resize_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "nesw-resize" named 
cursor falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;nesw-resize&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2632,7 +2594,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">nesw-resize_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "nesw-resize" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;nesw-resize&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -2641,10 +2603,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -2658,7 +2619,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -2666,7 +2627,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">nwse-resize_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "nwse-resize" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;nwse-resize&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2682,7 +2643,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">nwse-resize_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "nwse-resize" named 
cursor falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;nwse-resize&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2690,7 +2651,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">nwse-resize_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "nwse-resize" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;nwse-resize&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -2703,7 +2664,7 @@
             </child>
             <child>
               <object class="GtkFrame">
-                <property name="hexpand">True</property>
+                <property name="hexpand">1</property>
                 <child>
                   <object class="GtkListBox">
                     <property name="selection-mode">none</property>
@@ -2712,10 +2673,9 @@
                     </style>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -2729,7 +2689,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -2737,7 +2697,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">zoom-in_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "zoom-in" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;zoom-in&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2753,7 +2713,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">zoom-in_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "zoom-in" named cursor 
falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;zoom-in&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2761,7 +2721,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">zoom-in_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "zoom-in" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;zoom-in&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
@@ -2770,10 +2730,9 @@
                     </child>
                     <child>
                       <object class="GtkListBoxRow">
-                        <property name="activatable">False</property>
+                        <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
                             <property name="margin">10</property>
                             <property name="spacing">10</property>
                             <child>
@@ -2787,7 +2746,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">baseline</property>
                                 <property name="xalign">0.0</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
@@ -2795,7 +2754,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">zoom-out_cursor</property>
-                                <property name="tooltip-text" translatable="yes">The "zoom-out" named 
cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;zoom-out&quot; 
named cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2811,7 +2770,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">zoom-out_cursor_fallback</property>
-                                <property name="tooltip-text" translatable="yes">The "zoom-out" named cursor 
falling back to an image cursor.</property>
+                                <property name="tooltip-text" translatable="yes">The &quot;zoom-out&quot; 
named cursor falling back to an image cursor.</property>
                               </object>
                             </child>
                             <child>
@@ -2819,7 +2778,7 @@
                                 <property name="width-request">32</property>
                                 <property name="height-request">32</property>
                                 <property name="cursor">zoom-out_cursor_image_fallback</property>
-                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the "zoom-out" cursor.</property>
+                                <property name="tooltip-text" translatable="yes">An image cursor falling 
back to the &quot;zoom-out&quot; cursor.</property>
                               </object>
                             </child>
                           </object>
diff --git a/demos/gtk-demo/demo.ui b/demos/gtk-demo/demo.ui
index fd08164..0413a53 100644
--- a/demos/gtk-demo/demo.ui
+++ b/demos/gtk-demo/demo.ui
@@ -31,16 +31,14 @@
     </accessibility>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="default_height">250</property>
-    <property name="default_width">440</property>
+    <property name="default-height">250</property>
+    <property name="default-width">440</property>
     <property name="title" translatable="yes">Builder</property>
     <child>
       <object class="GtkBox" id="vbox1">
-        <property name="visible">1</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkMenuBar" id="menubar1">
-            <property name="visible">1</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="a11y-menubar">
                 <property name="AtkObject::accessible-name">The menubar</property>
@@ -48,35 +46,30 @@
             </child>
             <child>
               <object class="GtkMenuItem">
-                <property name="visible">1</property>
                 <property name="label" translatable="yes">_File</property>
                 <property name="use-underline">1</property>
                 <child type="submenu">
                   <object class="GtkMenu">
                     <child>
                       <object class="GtkMenuItem" id="new_item">
-                        <property name="visible">1</property>
                         <property name="label" translatable="yes">_New</property>
                         <property name="use-underline">1</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="open_item">
-                        <property name="visible">1</property>
                         <property name="label" translatable="yes">_Open</property>
                         <property name="use-underline">1</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="save_item">
-                        <property name="visible">1</property>
                         <property name="label" translatable="yes">_Save</property>
                         <property name="use-underline">1</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="save_as_item">
-                        <property name="visible">1</property>
                         <property name="label" translatable="yes">Save _As</property>
                         <property name="use-underline">1</property>
                         <accelerator key="s" modifiers="primary | shift-mask" signal="activate"/>
@@ -84,12 +77,10 @@
                     </child>
                     <child>
                       <object class="GtkSeparatorMenuItem">
-                        <property name="visible">1</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="quit_item">
-                        <property name="visible">1</property>
                         <property name="label" translatable="yes">_Quit</property>
                         <property name="use-underline">1</property>
                         <property name="action-name">win.quit</property>
@@ -101,28 +92,24 @@
             </child>
             <child>
               <object class="GtkMenuItem">
-                <property name="visible">1</property>
                 <property name="label" translatable="yes">_Edit</property>
                 <property name="use-underline">1</property>
                 <child type="submenu">
                   <object class="GtkMenu">
                     <child>
                       <object class="GtkMenuItem" id="copy_item">
-                        <property name="visible">1</property>
                         <property name="label" translatable="yes">_Copy</property>
                         <property name="use-underline">1</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="cut_item">
-                        <property name="visible">1</property>
                         <property name="label" translatable="yes">_Cut</property>
                         <property name="use-underline">1</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="paste_item">
-                        <property name="visible">1</property>
                         <property name="label" translatable="yes">_Paste</property>
                         <property name="use-underline">1</property>
                       </object>
@@ -133,14 +120,12 @@
             </child>
             <child>
               <object class="GtkMenuItem">
-                <property name="visible">1</property>
                 <property name="label" translatable="yes">_Help</property>
                 <property name="use-underline">1</property>
                 <child type="submenu">
                   <object class="GtkMenu">
                     <child>
                       <object class="GtkMenuItem" id="help_item">
-                        <property name="visible">1</property>
                         <property name="label" translatable="yes">_Help</property>
                         <property name="use-underline">1</property>
                         <property name="action-name">win.help</property>
@@ -148,7 +133,6 @@
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="about_item">
-                        <property name="visible">1</property>
                         <property name="label" translatable="yes">_About</property>
                         <property name="use-underline">1</property>
                         <property name="action-name">win.about</property>
@@ -162,7 +146,6 @@
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar1">
-            <property name="visible">1</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="a11y-toolbar">
                 <property name="AtkObject::accessible-name">The toolbar</property>
@@ -170,7 +153,6 @@
             </child>
             <child>
               <object class="GtkToolButton">
-                <property name="visible">1</property>
                 <property name="label" translatable="yes">New</property>
                 <property name="tooltip-text" translatable="yes">Create a new file</property>
                 <property name="icon-name">document-new</property>
@@ -178,7 +160,6 @@
             </child>
             <child>
               <object class="GtkToolButton">
-                <property name="visible">1</property>
                 <property name="label" translatable="yes">Open</property>
                 <property name="tooltip-text" translatable="yes">Open a file</property>
                 <property name="icon-name">document-open</property>
@@ -186,7 +167,6 @@
             </child>
             <child>
               <object class="GtkToolButton">
-                <property name="visible">1</property>
                 <property name="label" translatable="yes">Save</property>
                 <property name="tooltip-text" translatable="yes">Save a file</property>
                 <property name="icon-name">document-save</property>
@@ -195,12 +175,10 @@
             </child>
             <child>
               <object class="GtkSeparatorToolItem">
-                <property name="visible">1</property>
               </object>
             </child>
             <child>
               <object class="GtkToolButton">
-                <property name="visible">1</property>
                 <property name="label" translatable="yes">Copy</property>
                 <property name="tooltip-text" translatable="yes">Copy selected object into the 
clipboard</property>
                 <property name="icon-name">edit-copy</property>
@@ -208,7 +186,6 @@
             </child>
             <child>
               <object class="GtkToolButton">
-                <property name="visible">1</property>
                 <property name="label" translatable="yes">Cut</property>
                 <property name="tooltip-text" translatable="yes">Cut selected object into the 
clipboard</property>
                 <property name="icon-name">edit-cut</property>
@@ -216,7 +193,6 @@
             </child>
             <child>
               <object class="GtkToolButton">
-                <property name="visible">1</property>
                 <property name="label" translatable="yes">Paste</property>
                 <property name="tooltip-text" translatable="yes">Paste object from the clipboard</property>
                 <property name="icon-name">edit-paste</property>
@@ -229,12 +205,10 @@
         </child>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="shadow_type">in</property>
-            <property name="visible">1</property>
+            <property name="shadow-type">in</property>
             <property name="expand">1</property>
             <child>
               <object class="GtkTreeView" id="treeview1">
-                <property name="visible">1</property>
                 <property name="model">liststore1</property>
                 <property name="tooltip-column">3</property>
                 <child internal-child="accessible">
@@ -287,7 +261,6 @@
         </child>
         <child>
           <object class="GtkStatusbar" id="statusbar1">
-            <property name="visible">1</property>
           </object>
           <packing>
             <property name="position">3</property>
diff --git a/demos/gtk-demo/filtermodel.ui b/demos/gtk-demo/filtermodel.ui
index 83db91e..8d7d3ac 100644
--- a/demos/gtk-demo/filtermodel.ui
+++ b/demos/gtk-demo/filtermodel.ui
@@ -34,14 +34,12 @@
     <property name="title" translatable="yes">Filter Model</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">1</property>
         <property name="margin">10</property>
-        <property name="row_spacing">10</property>
-        <property name="column_spacing">10</property>
-        <property name="column_homogeneous">1</property>
+        <property name="row-spacing">10</property>
+        <property name="column-spacing">10</property>
+        <property name="column-homogeneous">1</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">1</property>
             <property name="label" translatable="yes">Original</property>
             <property name="xalign">0</property>
             <attributes>
@@ -49,16 +47,15 @@
             </attributes>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview1">
-            <property name="visible">1</property>
-            <property name="can_focus">1</property>
+            <property name="can-focus">1</property>
             <property name="model">liststore1</property>
-            <property name="headers_clickable">0</property>
+            <property name="headers-clickable">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection1"/>
             </child>
@@ -86,16 +83,15 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview2">
-            <property name="visible">1</property>
-            <property name="can_focus">1</property>
-            <property name="headers_clickable">0</property>
-            <property name="search_column">0</property>
+            <property name="can-focus">1</property>
+            <property name="headers-clickable">0</property>
+            <property name="search-column">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection3"/>
             </child>
@@ -135,13 +131,12 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">1</property>
             <property name="label" translatable="yes">Computed Columns</property>
             <property name="xalign">0</property>
             <attributes>
@@ -149,13 +144,12 @@
             </attributes>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">1</property>
             <property name="label" translatable="yes">Filtered</property>
             <property name="xalign">0</property>
             <attributes>
@@ -163,16 +157,15 @@
             </attributes>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">2</property>
           </packing>
         </child>
         <child>
           <object class="GtkTreeView" id="treeview3">
-            <property name="visible">1</property>
-            <property name="can_focus">1</property>
-            <property name="headers_clickable">0</property>
-            <property name="search_column">0</property>
+            <property name="can-focus">1</property>
+            <property name="headers-clickable">0</property>
+            <property name="search-column">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection5"/>
             </child>
@@ -194,8 +187,8 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">3</property>
           </packing>
         </child>
       </object>
diff --git a/demos/gtk-demo/fishbowl.ui b/demos/gtk-demo/fishbowl.ui
index 2579fc7..fca1d6f 100644
--- a/demos/gtk-demo/fishbowl.ui
+++ b/demos/gtk-demo/fishbowl.ui
@@ -5,45 +5,41 @@
     <property name="title" translatable="yes">Fishbowl</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="">
-        <property name="visible">True</property>
-        <property name="show-title-buttons">True</property>
+        <property name="show-title-buttons">1</property>
         <child>
           <object class="GtkLabel" id="info_label">
-            <property name="visible">True</property>
           </object>
           <packing>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="label" bind-source="bowl" bind-property="count">0</property>
+            <property name="label" bind-source="bowl" bind-property="count"/>
           </object>
           <packing>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
           </packing>
         </child>
         <child>
           <object class="GtkToggleButton" id="changes_allow">
-            <property name="active">False</property>
-            <property name="visible" bind-source="changes_allow" bind-property="active" 
bind-flags="invert-boolean">True</property>
+            <property name="visible" bind-source="changes_allow" bind-property="active" 
bind-flags="invert-boolean"/>
             <property name="icon-name">changes-allow</property>
             <property name="relief">none</property>
           </object>
           <packing>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
           </packing>
         </child>
         <child>
           <object class="GtkToggleButton" id="changes_prevent">
-            <property name="active" bind-source="changes_allow" bind-property="active" 
bind-flags="bidirectional|invert-boolean">True</property>
-            <property name="visible" bind-source="changes_prevent" bind-property="active" 
bind-flags="invert-boolean">False</property>
+            <property name="active" bind-source="changes_allow" bind-property="active" 
bind-flags="bidirectional|invert-boolean"/>
+            <property name="visible" bind-source="changes_prevent" bind-property="active" 
bind-flags="invert-boolean"/>
             <property name="icon-name">changes-prevent</property>
             <property name="relief">none</property>
           </object>
           <packing>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
           </packing>
         </child>
       </object>
diff --git a/demos/gtk-demo/font-features.ui b/demos/gtk-demo/font-features.ui
index 3a88e76..2cc89c9 100644
--- a/demos/gtk-demo/font-features.ui
+++ b/demos/gtk-demo/font-features.ui
@@ -7,19 +7,16 @@
     <property name="default-height">500</property>
     <child type="titlebar">
       <object class="GtkHeaderBar">
-        <property name="visible">1</property>
         <property name="show-title-buttons">1</property>
         <property name="title">Font Explorer</property>
         <child>
           <object class="GtkButton" id="reset">
-            <property name="visible">1</property>
             <property name="can-focus">1</property>
             <property name="receives-default">1</property>
             <property name="tooltip-text">Reset</property>
             <signal name="clicked" handler="reset" swapped="no"/>
             <child>
               <object class="GtkImage">
-                <property name="visible">1</property>
                 <property name="icon-name">view-refresh-symbolic</property>
               </object>
             </child>
@@ -29,24 +26,19 @@
     </child>
     <child>
       <object class="GtkBox">
-        <property name="visible">1</property>
         <child>
           <object class="GtkScrolledWindow">
-            <property name="visible">1</property>
             <property name="can-focus">1</property>
             <property name="hscrollbar-policy">never</property>
             <child>
               <object class="GtkViewport">
-                <property name="visible">1</property>
                 <child>
                   <object class="GtkBox">
-                    <property name="visible">1</property>
                     <property name="margin">10</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkFontButton" id="font">
-                        <property name="visible">1</property>
                         <property name="can-focus">1</property>
                         <property name="receives-default">1</property>
                         <property name="font">Sans 12</property>
@@ -57,7 +49,6 @@
                       <object class="GtkExpander">
                         <child type="label">
                           <object class="GtkLabel">
-                            <property name="visible">1</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Font Features</property>
                             <attributes>
@@ -87,10 +78,8 @@
                     </child>
                     <child>
                       <object class="GtkExpander">
-                        <property name="visible">1</property>
                         <child type="label">
                           <object class="GtkLabel" id="variations_heading">
-                            <property name="visible">1</property>
                             <property name="label" translatable="yes">Font Variations</property>
                             <property name="xalign">0</property>
                             <attributes>
@@ -100,7 +89,6 @@
                         </child>
                         <child>
                           <object class="GtkGrid" id="variations_grid">
-                            <property name="visible">1</property>
                             <property name="column-spacing">10</property>
                             <property name="row-spacing">10</property>
                           </object>
@@ -118,7 +106,6 @@
         </child>
         <child>
           <object class="GtkBox">
-            <property name="visible">1</property>
             <property name="orientation">vertical</property>
             <property name="hexpand">1</property>
             <property name="vexpand">1</property>
@@ -126,10 +113,8 @@
             <property name="spacing">20</property>
             <child>
               <object class="GtkStack" id="stack">
-                <property name="visible">1</property>
                 <child>
                   <object class="GtkLabel" id="label">
-                    <property name="visible">1</property>
                     <property name="wrap">1</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
@@ -142,7 +127,6 @@
                 </child>
                 <child>
                   <object class="GtkEntry" id="entry">
-                    <property name="visible">1</property>
                     <property name="text">Grumpy wizards make toxic brew for the evil Queen and Jack. A 
quick movement of the enemy will jeopardize six gunboats. The job of waxing linoleum frequently peeves 
chintzy kids. My girl wove six dozen plaid jackets before she quit. Twelve ziggurats quickly jumped a finch 
box.
 
 Разъяренный чтец эгоистично бьёт пятью жердями шустрого фехтовальщика. Наш банк вчера же выплатил Ф.Я. 
Эйхгольду комиссию за ценные вещи. Эх, чужак, общий съём цен шляп (юфть) – вдрызг! В чащах юга жил бы цитрус? 
Да, но фальшивый экземпляр!
@@ -161,7 +145,6 @@
             </child>
             <child>
               <object class="GtkLabel" id="settings">
-                <property name="visible">1</property>
                 <property name="wrap">1</property>
                 <property name="xalign">0</property>
                 <property name="valign">end</property>
@@ -176,22 +159,20 @@
             </child>
             <child>
               <object class="GtkBox">
-                <property name="orientation">horizontal</property>
                 <property name="spacing">10</property>
-            <child>
-              <object class="GtkLabel" id="description">
-                <property name="visible">1</property>
-                <property name="wrap">1</property>
-                <property name="xalign">0</property>
-                <property name="valign">end</property>
-                <property name="width-chars">50</property>
-                <property name="max-width-chars">50</property>
-                <property name="hexpand">1</property>
-                <style>
-                  <class name="monospace"/>
-                </style>
-              </object>
-            </child>
+                <child>
+                  <object class="GtkLabel" id="description">
+                    <property name="wrap">1</property>
+                    <property name="xalign">0</property>
+                    <property name="valign">end</property>
+                    <property name="width-chars">50</property>
+                    <property name="max-width-chars">50</property>
+                    <property name="hexpand">1</property>
+                    <style>
+                      <class name="monospace"/>
+                    </style>
+                  </object>
+                </child>
                 <child>
                   <object class="GtkToggleButton" id="edit_toggle">
                     <property name="icon-name">document-edit-symbolic</property>
diff --git a/demos/gtk-demo/listbox.ui b/demos/gtk-demo/listbox.ui
index d9b6677..76b49b2 100644
--- a/demos/gtk-demo/listbox.ui
+++ b/demos/gtk-demo/listbox.ui
@@ -3,61 +3,53 @@
   <!-- interface-requires gtk+ 3.10 -->
   <!-- interface-requires gtkdemo 3.10 -->
   <object class="GtkMenu" id="menu1">
-    <property name="visible">1</property>
     <child>
       <object class="GtkMenuItem" id="menuitem1">
-        <property name="visible">1</property>
         <property name="label" translatable="yes">Email message</property>
-        <property name="use_underline">1</property>
+        <property name="use-underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem2">
-        <property name="visible">1</property>
         <property name="label" translatable="yes">Embed message</property>
-        <property name="use_underline">1</property>
+        <property name="use-underline">1</property>
       </object>
     </child>
   </object>
   <template class="GtkMessageRow" parent="GtkListBoxRow">
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">1</property>
         <property name="hexpand">1</property>
         <child>
           <object class="GtkImage" id="avatar_image">
-            <property name="width_request">32</property>
-            <property name="height_request">32</property>
-            <property name="visible">1</property>
+            <property name="width-request">32</property>
+            <property name="height-request">32</property>
             <property name="halign">center</property>
             <property name="valign">start</property>
-            <property name="margin_top">8</property>
-            <property name="margin_bottom">8</property>
-            <property name="margin_start">8</property>
-            <property name="margin_end">8</property>
+            <property name="margin-top">8</property>
+            <property name="margin-bottom">8</property>
+            <property name="margin-start">8</property>
+            <property name="margin-end">8</property>
             <property name="icon-name">image-missing</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
             <property name="height">5</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox" id="box1">
-            <property name="visible">1</property>
             <property name="hexpand">1</property>
-            <property name="baseline_position">top</property>
+            <property name="baseline-position">top</property>
             <child>
               <object class="GtkButton" id="button2">
-                <property name="visible">1</property>
-                <property name="can_focus">1</property>
-                <property name="receives_default">1</property>
+                <property name="can-focus">1</property>
+                <property name="receives-default">1</property>
                 <property name="valign">baseline</property>
                 <property name="relief">none</property>
                 <child>
                   <object class="GtkLabel" id="source_name">
-                    <property name="visible">1</property>
                     <property name="valign">baseline</property>
                     <property name="label" translatable="0">Username</property>
                     <attributes>
@@ -69,7 +61,6 @@
             </child>
             <child>
               <object class="GtkLabel" id="source_nick">
-                <property name="visible">1</property>
                 <property name="valign">baseline</property>
                 <property name="label" translatable="0">@nick</property>
                 <style>
@@ -82,7 +73,6 @@
             </child>
             <child>
               <object class="GtkLabel" id="short_time_label">
-                <property name="visible">1</property>
                 <property name="valign">baseline</property>
                 <property name="label" translatable="yes">38m</property>
                 <style>
@@ -90,19 +80,18 @@
                 </style>
               </object>
               <packing>
-                <property name="pack_type">end</property>
+                <property name="pack-type">end</property>
                 <property name="position">2</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="content_label">
-            <property name="visible">1</property>
             <property name="halign">start</property>
             <property name="valign">start</property>
             <property name="xalign">0</property>
@@ -111,21 +100,19 @@
             <property name="wrap">1</property>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox" id="resent_box">
             <child>
               <object class="GtkImage" id="image2">
-                <property name="visible">1</property>
-                <property name="icon_name">media-playlist-repeat</property>
+                <property name="icon-name">media-playlist-repeat</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label4">
-                <property name="visible">1</property>
                 <property name="label" translatable="yes">Resent by</property>
               </object>
               <packing>
@@ -135,9 +122,8 @@
             <child>
               <object class="GtkLinkButton" id="resent_by_button">
                 <property name="label" translatable="0">reshareer</property>
-                <property name="visible">1</property>
-                <property name="can_focus">1</property>
-                <property name="receives_default">1</property>
+                <property name="can-focus">1</property>
+                <property name="receives-default">1</property>
                 <property name="relief">none</property>
                 <property name="uri">http://www.gtk.org</property>
               </object>
@@ -147,20 +133,18 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">2</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox" id="box3">
-            <property name="visible">1</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkButton" id="expand_button">
                 <property name="label" translatable="yes">Expand</property>
-                <property name="visible">1</property>
-                <property name="can_focus">1</property>
-                <property name="receives_default">1</property>
+                <property name="can-focus">1</property>
+                <property name="receives-default">1</property>
                 <property name="relief">none</property>
                 <signal name="clicked" handler="expand_clicked" swapped="yes"/>
               </object>
@@ -171,18 +155,16 @@
                 <child>
                   <object class="GtkButton" id="reply-button">
                     <property name="label" translatable="yes">Reply</property>
-                    <property name="visible">1</property>
-                    <property name="can_focus">1</property>
-                    <property name="receives_default">1</property>
+                    <property name="can-focus">1</property>
+                    <property name="receives-default">1</property>
                     <property name="relief">none</property>
                   </object>
                 </child>
                 <child>
                   <object class="GtkButton" id="reshare-button">
                     <property name="label" translatable="yes">Reshare</property>
-                    <property name="visible">1</property>
-                    <property name="can_focus">1</property>
-                    <property name="receives_default">1</property>
+                    <property name="can-focus">1</property>
+                    <property name="receives-default">1</property>
                     <property name="relief">none</property>
                     <signal name="clicked" handler="reshare_clicked" swapped="yes"/>
                   </object>
@@ -193,9 +175,8 @@
                 <child>
                   <object class="GtkButton" id="favorite-buttton">
                     <property name="label" translatable="yes">Favorite</property>
-                    <property name="visible">1</property>
-                    <property name="can_focus">1</property>
-                    <property name="receives_default">1</property>
+                    <property name="can-focus">1</property>
+                    <property name="receives-default">1</property>
                     <property name="relief">none</property>
                     <signal name="clicked" handler="favorite_clicked" swapped="yes"/>
                   </object>
@@ -205,14 +186,12 @@
                 </child>
                 <child>
                   <object class="GtkMenuButton" id="more-button">
-                    <property name="visible">1</property>
-                    <property name="can_focus">1</property>
-                    <property name="receives_default">1</property>
+                    <property name="can-focus">1</property>
+                    <property name="receives-default">1</property>
                     <property name="relief">none</property>
                     <property name="popup">menu1</property>
                     <child>
                       <object class="GtkLabel" id="label7">
-                        <property name="visible">1</property>
                         <property name="label" translatable="yes">More...</property>
                       </object>
                     </child>
@@ -228,53 +207,44 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">3</property>
           </packing>
         </child>
         <child>
           <object class="GtkRevealer" id="details_revealer">
-            <property name="visible">1</property>
             <child>
               <object class="GtkBox" id="box5">
-                <property name="visible">1</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkBox" id="box7">
-                    <property name="visible">1</property>
-                    <property name="margin_top">2</property>
-                    <property name="margin_bottom">2</property>
+                    <property name="margin-top">2</property>
+                    <property name="margin-bottom">2</property>
                     <property name="spacing">8</property>
                     <child>
                       <object class="GtkFrame" id="frame1">
-                        <property name="visible">1</property>
-                        <property name="shadow_type">none</property>
+                        <property name="shadow-type">none</property>
                         <child>
                           <object class="GtkLabel" id="n_reshares_label">
-                            <property name="visible">1</property>
                             <property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
 Reshares</property>
-                            <property name="use_markup">1</property>
+                            <property name="use-markup">1</property>
                           </object>
                         </child>
-                        <child type="label_item">
-                        </child>
+                        <child type="label_item"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkFrame" id="frame2">
-                        <property name="visible">1</property>
-                        <property name="shadow_type">none</property>
+                        <property name="shadow-type">none</property>
                         <child>
                           <object class="GtkLabel" id="n_favorites_label">
-                            <property name="visible">1</property>
                             <property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
 FAVORITES</property>
-                            <property name="use_markup">1</property>
+                            <property name="use-markup">1</property>
                           </object>
                         </child>
-                        <child type="label_item">
-                        </child>
+                        <child type="label_item"/>
                       </object>
                       <packing>
                         <property name="position">1</property>
@@ -287,10 +257,8 @@ FAVORITES</property>
                 </child>
                 <child>
                   <object class="GtkBox" id="box6">
-                    <property name="visible">1</property>
                     <child>
                       <object class="GtkLabel" id="detailed_time_label">
-                        <property name="visible">1</property>
                         <property name="label" translatable="0">4:25 AM - 14 Jun 13 </property>
                         <style>
                           <class name="dim-label"/>
@@ -300,9 +268,8 @@ FAVORITES</property>
                     <child>
                       <object class="GtkButton" id="button5">
                         <property name="label" translatable="yes">Details</property>
-                        <property name="visible">1</property>
-                        <property name="can_focus">1</property>
-                        <property name="receives_default">1</property>
+                        <property name="can-focus">1</property>
+                        <property name="receives-default">1</property>
                         <property name="relief">none</property>
                         <style>
                           <class name="dim-label"/>
@@ -321,8 +288,8 @@ FAVORITES</property>
             </child>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">4</property>
           </packing>
         </child>
       </object>
diff --git a/demos/gtk-demo/main.ui b/demos/gtk-demo/main.ui
index e02808c..086420a 100644
--- a/demos/gtk-demo/main.ui
+++ b/demos/gtk-demo/main.ui
@@ -22,20 +22,17 @@
     <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
-        <property name="visible">1</property>
         <property name="show-title-buttons">1</property>
         <child>
           <object class="GtkButton">
-            <property name="visible">1</property>
             <property name="valign">center</property>
-            <property name="can_focus">1</property>
-            <property name="action_name">win.run</property>
+            <property name="can-focus">1</property>
+            <property name="action-name">win.run</property>
             <style>
               <class name="text-button"/>
             </style>
             <child>
               <object class="GtkLabel">
-                <property name="visible">1</property>
                 <property name="label" translatable="yes">Run</property>
               </object>
             </child>
@@ -45,23 +42,19 @@
     </child>
     <child>
       <object class="GtkBox">
-        <property name="visible">1</property>
         <child>
           <object class="GtkFrame">
-            <property name="visible">1</property>
             <child>
               <object class="GtkScrolledWindow">
-                <property name="width_request">120</property>
-                <property name="visible">1</property>
-                <property name="can_focus">1</property>
-                <property name="hscrollbar_policy">never</property>
-                <property name="min_content_width">150</property>
+                <property name="width-request">120</property>
+                <property name="can-focus">1</property>
+                <property name="hscrollbar-policy">never</property>
+                <property name="min-content-width">150</property>
                 <child>
                   <object class="GtkTreeView" id="treeview">
-                    <property name="visible">1</property>
-                    <property name="can_focus">1</property>
+                    <property name="can-focus">1</property>
                     <property name="model">treestore</property>
-                    <property name="headers_visible">0</property>
+                    <property name="headers-visible">0</property>
                     <child internal-child="selection">
                       <object class="GtkTreeSelection" id="treeview-selection">
                         <property name="mode">browse</property>
@@ -91,77 +84,70 @@
         </child>
         <child>
           <object class="GtkNotebook" id="notebook">
-            <property name="visible">1</property>
-            <property name="can_focus">1</property>
+            <property name="can-focus">1</property>
             <property name="scrollable">1</property>
-            <property name="enable_popup">1</property>
-            <property name="show_border">0</property>
+            <property name="enable-popup">1</property>
+            <property name="show-border">0</property>
             <property name="expand">1</property>
             <child>
               <object class="GtkScrolledWindow">
-                <property name="visible">1</property>
-                <property name="can_focus">1</property>
+                <property name="can-focus">1</property>
                 <child>
                   <object class="GtkTextView" id="info-textview">
-                    <property name="visible">1</property>
-                    <property name="can_focus">1</property>
+                    <property name="can-focus">1</property>
                     <property name="left-margin">20</property>
                     <property name="right-margin">20</property>
                     <property name="top-margin">20</property>
                     <property name="bottom-margin">20</property>
-                    <property name="pixels_above_lines">2</property>
-                    <property name="pixels_below_lines">2</property>
+                    <property name="pixels-above-lines">2</property>
+                    <property name="pixels-below-lines">2</property>
                     <property name="editable">0</property>
-                    <property name="wrap_mode">word</property>
-                    <property name="cursor_visible">0</property>
+                    <property name="wrap-mode">word</property>
+                    <property name="cursor-visible">0</property>
                   </object>
                 </child>
               </object>
               <packing>
-                <property name="tab_expand">1</property>
+                <property name="tab-expand">1</property>
               </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel">
-                <property name="visible">1</property>
                 <property name="label" translatable="yes">_Info</property>
-                <property name="use_underline">1</property>
+                <property name="use-underline">1</property>
               </object>
               <packing>
-                <property name="tab_expand">1</property>
-                <property name="tab_fill">0</property>
+                <property name="tab-expand">1</property>
+                <property name="tab-fill">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkScrolledWindow" id="source-scrolledwindow">
-                <property name="visible">1</property>
-                <property name="can_focus">1</property>
+                <property name="can-focus">1</property>
                 <child>
                   <object class="GtkTextView" id="source-textview">
-                    <property name="visible">1</property>
-                    <property name="can_focus">1</property>
+                    <property name="can-focus">1</property>
                     <property name="left-margin">20</property>
                     <property name="right-margin">20</property>
                     <property name="top-margin">20</property>
                     <property name="bottom-margin">20</property>
                     <property name="editable">0</property>
-                    <property name="cursor_visible">0</property>
+                    <property name="cursor-visible">0</property>
                   </object>
                 </child>
               </object>
               <packing>
                 <property name="position">1</property>
-                <property name="tab_expand">1</property>
+                <property name="tab-expand">1</property>
               </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel">
-                <property name="visible">1</property>
                 <property name="label" translatable="yes">Source</property>
               </object>
               <packing>
                 <property name="position">1</property>
-                <property name="tab_fill">0</property>
+                <property name="tab-fill">0</property>
               </packing>
             </child>
           </object>
diff --git a/demos/gtk-demo/modelbutton.ui b/demos/gtk-demo/modelbutton.ui
index ead3da1..7130905 100644
--- a/demos/gtk-demo/modelbutton.ui
+++ b/demos/gtk-demo/modelbutton.ui
@@ -4,23 +4,19 @@
   <object class="GtkWindow" id="window1">
     <child type="titlebar">
       <object class="GtkHeaderBar">
-        <property name="visible">1</property>
         <property name="show-title-buttons">1</property>
         <property name="title" translatable="yes">Model Button</property>
       </object>
     </child>
     <child>
       <object class="GtkBox">
-        <property name="visible">1</property>
         <property name="orientation">vertical</property>
         <property name="margin">80</property>
         <child>
           <object class="GtkMenuButton">
-            <property name="visible">1</property>
             <property name="popover">thing_a</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">1</property>
                 <property name="label">Color</property>
                 <property name="hexpand">1</property>
               </object>
@@ -29,11 +25,9 @@
         </child>
         <child>
           <object class="GtkMenuButton">
-            <property name="visible">1</property>
             <property name="popover">thing_b</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">1</property>
                 <property name="label">Flavors</property>
                 <property name="hexpand">1</property>
               </object>
@@ -42,11 +36,9 @@
         </child>
         <child>
           <object class="GtkMenuButton">
-            <property name="visible">1</property>
             <property name="popover">thing_c</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">1</property>
                 <property name="label">Tools</property>
                 <property name="hexpand">1</property>
               </object>
@@ -59,32 +51,25 @@
   <object class="GtkPopover" id="thing_a">
     <child>
       <object class="GtkBox">
-        <property name="visible">1</property>
         <property name="margin">10</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">1</property>
             <property name="action-name">win.color</property>
-            <property name="action-target">'red'</property>
             <property name="text">Red</property>
             <property name="inverted">1</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">1</property>
             <property name="action-name">win.color</property>
-            <property name="action-target">'green'</property>
             <property name="text">Green</property>
             <property name="inverted">1</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">1</property>
             <property name="action-name">win.color</property>
-            <property name="action-target">'blue'</property>
             <property name="text">Blue</property>
             <property name="inverted">1</property>
           </object>
@@ -95,32 +80,27 @@
   <object class="GtkPopover" id="thing_b">
     <child>
       <object class="GtkBox">
-        <property name="visible">1</property>
         <property name="margin">10</property>
         <property name="orientation">vertical</property>
         <property name="spacing">10</property>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">1</property>
             <property name="action-name">win.chocolate</property>
             <property name="text">Chocolate</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">1</property>
             <property name="action-name">win.vanilla</property>
             <property name="text">Vanilla</property>
           </object>
         </child>
         <child>
           <object class="GtkSeparator">
-            <property name="visible">1</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">1</property>
             <property name="action-name">win.sprinkles</property>
             <property name="text">Add Sprinkles</property>
           </object>
@@ -131,13 +111,11 @@
   <object class="GtkPopover" id="thing_c">
     <child>
       <object class="GtkBox">
-        <property name="visible">1</property>
         <property name="margin">10</property>
         <property name="orientation">vertical</property>
         <property name="spacing">10</property>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">1</property>
             <property name="text">Hammer</property>
             <property name="role">check</property>
             <signal name="clicked" handler="tool_clicked"/>
@@ -145,7 +123,6 @@
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">1</property>
             <property name="text">Screwdriver</property>
             <property name="role">check</property>
             <signal name="clicked" handler="tool_clicked"/>
@@ -153,7 +130,6 @@
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">1</property>
             <property name="text">Drill</property>
             <property name="role">check</property>
             <signal name="clicked" handler="tool_clicked"/>
diff --git a/demos/gtk-demo/popover.ui b/demos/gtk-demo/popover.ui
index eee014b..f6ba75f 100644
--- a/demos/gtk-demo/popover.ui
+++ b/demos/gtk-demo/popover.ui
@@ -43,32 +43,28 @@
   <object class="GtkWindow" id="window">
     <child>
       <object class="GtkBox" id="box">
-        <property name="visible">1</property>
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkEntry" id="entry1">
-            <property name="visible">1</property>
-            <property name="can_focus">1</property>
-            <property name="primary_icon_name">edit-find</property>
-            <property name="secondary_icon_name">edit-clear</property>
+            <property name="can-focus">1</property>
+            <property name="primary-icon-name">edit-find</property>
+            <property name="secondary-icon-name">edit-clear</property>
           </object>
         </child>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="visible">1</property>
-            <property name="can_focus">1</property>
-            <property name="shadow_type">in</property>
+            <property name="can-focus">1</property>
+            <property name="shadow-type">in</property>
             <property name="max-content-height">100</property>
             <child>
               <object class="GtkTreeView" id="treeview1">
-                <property name="visible">1</property>
-                <property name="can_focus">1</property>
+                <property name="can-focus">1</property>
                 <property name="vexpand">1</property>
                 <property name="model">liststore1</property>
-                <property name="headers_visible">0</property>
-                <property name="enable_search">0</property>
-                <property name="search_column">2</property>
+                <property name="headers-visible">0</property>
+                <property name="enable-search">0</property>
+                <property name="search-column">2</property>
                 <child internal-child="selection">
                   <object class="GtkTreeSelection" id="treeview-selection1"/>
                 </child>
diff --git a/demos/gtk-demo/revealer.ui b/demos/gtk-demo/revealer.ui
index 1c0e342..3805569 100644
--- a/demos/gtk-demo/revealer.ui
+++ b/demos/gtk-demo/revealer.ui
@@ -2,22 +2,19 @@
 <interface>
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkWindow" id="window">
-    <property name="default_width">300</property>
-    <property name="default_height">300</property>
+    <property name="default-width">300</property>
+    <property name="default-height">300</property>
     <property name="title">Revealer</property>
     <child>
       <object class="GtkGrid">
-        <property name="visible">1</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <child>
           <object class="GtkRevealer" id="revealer0">
-            <property name="visible">1</property>
             <property name="transition-duration">2000</property>
             <property name="transition-type">crossfade</property>
             <child>
               <object class="GtkImage">
-                <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
                 <property name="icon-size">large</property>
               </object>
@@ -30,12 +27,10 @@
         </child>
         <child>
           <object class="GtkRevealer" id="revealer1">
-            <property name="visible">1</property>
             <property name="transition-duration">2000</property>
             <property name="transition-type">slide-up</property>
             <child>
               <object class="GtkImage">
-                <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
                 <property name="icon-size">large</property>
               </object>
@@ -48,12 +43,10 @@
         </child>
         <child>
           <object class="GtkRevealer" id="revealer2">
-            <property name="visible">1</property>
             <property name="transition-duration">2000</property>
             <property name="transition-type">slide-right</property>
             <child>
               <object class="GtkImage">
-                <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
                 <property name="icon-size">large</property>
               </object>
@@ -66,11 +59,9 @@
         </child>
         <child>
           <object class="GtkRevealer" id="revealer3">
-            <property name="visible">1</property>
             <property name="transition-duration">2000</property>
             <child>
               <object class="GtkImage">
-                <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
                 <property name="icon-size">large</property>
               </object>
@@ -83,12 +74,10 @@
         </child>
         <child>
           <object class="GtkRevealer" id="revealer4">
-            <property name="visible">1</property>
             <property name="transition-duration">2000</property>
             <property name="transition-type">slide-left</property>
             <child>
               <object class="GtkImage">
-                <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
                 <property name="icon-size">large</property>
               </object>
@@ -101,12 +90,10 @@
         </child>
         <child>
           <object class="GtkRevealer" id="revealer5">
-            <property name="visible">1</property>
             <property name="transition-duration">2000</property>
             <property name="transition-type">slide-up</property>
             <child>
               <object class="GtkImage">
-                <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
                 <property name="icon-size">large</property>
               </object>
@@ -119,12 +106,10 @@
         </child>
         <child>
           <object class="GtkRevealer" id="revealer6">
-            <property name="visible">1</property>
             <property name="transition-duration">2000</property>
             <property name="transition-type">slide-right</property>
             <child>
               <object class="GtkImage">
-                <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
                 <property name="icon-size">large</property>
               </object>
@@ -137,11 +122,9 @@
         </child>
         <child>
           <object class="GtkRevealer" id="revealer7">
-            <property name="visible">1</property>
             <property name="transition-duration">2000</property>
             <child>
               <object class="GtkImage">
-                <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
                 <property name="icon-size">large</property>
               </object>
@@ -154,12 +137,10 @@
         </child>
         <child>
           <object class="GtkRevealer" id="revealer8">
-            <property name="visible">1</property>
             <property name="transition-duration">2000</property>
             <property name="transition-type">slide-left</property>
             <child>
               <object class="GtkImage">
-                <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
                 <property name="icon-size">large</property>
               </object>
diff --git a/demos/gtk-demo/scale.ui b/demos/gtk-demo/scale.ui
index b9e8ea8..7d4329d 100644
--- a/demos/gtk-demo/scale.ui
+++ b/demos/gtk-demo/scale.ui
@@ -23,52 +23,47 @@
     <property name="title" translatable="yes">Scales</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">1</property>
         <property name="row-spacing">10</property>
         <property name="column-spacing">10</property>
         <property name="margin">20</property>
         <child>
           <object class="GtkLabel">
-            <property name="visible">1</property>
             <property name="label">Plain</property>
             <property name="xalign">0</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkScale">
-            <property name="visible">1</property>
-            <property name="can_focus">1</property>
+            <property name="can-focus">1</property>
             <property name="width-request">200</property>
-            <property name="draw_value">0</property>
+            <property name="draw-value">0</property>
             <property name="adjustment">adjustment1</property>
             <property name="hexpand">1</property>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">1</property>
             <property name="label">Marks</property>
             <property name="xalign">0</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkScale">
-            <property name="visible">1</property>
-            <property name="can_focus">1</property>
+            <property name="can-focus">1</property>
             <property name="width-request">200</property>
-            <property name="draw_value">0</property>
+            <property name="draw-value">0</property>
             <property name="adjustment">adjustment2</property>
             <property name="hexpand">1</property>
             <marks>
@@ -80,28 +75,26 @@
             </marks>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">1</property>
             <property name="label">Discrete</property>
             <property name="xalign">0</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">2</property>
           </packing>
         </child>
         <child>
           <object class="GtkScale">
-            <property name="visible">1</property>
-            <property name="can_focus">1</property>
+            <property name="can-focus">1</property>
             <property name="width-request">200</property>
             <property name="round-digits">0</property>
-            <property name="draw_value">0</property>
+            <property name="draw-value">0</property>
             <property name="adjustment">adjustment3</property>
             <property name="hexpand">1</property>
             <marks>
@@ -113,8 +106,8 @@
             </marks>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">2</property>
           </packing>
         </child>
       </object>
diff --git a/demos/gtk-demo/shortcuts-boxes.ui b/demos/gtk-demo/shortcuts-boxes.ui
index 6bcaf8a..f7d3c5c 100644
--- a/demos/gtk-demo/shortcuts-boxes.ui
+++ b/demos/gtk-demo/shortcuts-boxes.ui
@@ -1,104 +1,79 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.17 -->
-
   <object class="GtkShortcutsWindow" id="shortcuts-boxes">
     <property name="modal">1</property>
-    
     <child>
       <object class="GtkShortcutsSection">
-        <property name="visible">1</property>
         <property name="section-name">shortcuts</property>
         <property name="max-height">12</property>
-
         <!-- Overview shortcuts -->
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Overview</property>
             <property name="view">overview</property>
-
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">F1</property>
                 <property name="title" translatable="yes">Help</property>
               </object>
             </child>
-
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;Ctrl&gt;n</property>
                 <property name="title" translatable="yes">Create a new box</property>
               </object>
             </child>
-
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;Ctrl&gt;f</property>
                 <property name="title" translatable="yes">Search</property>
               </object>
             </child>
-
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;Ctrl&gt;k</property>
                 <property name="title" translatable="yes">Keyboard shortcuts</property>
               </object>
             </child>
-
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;Ctrl&gt;q</property>
                 <property name="title" translatable="yes">Close Window/Quit Boxes</property>
               </object>
             </child>
           </object>
         </child>
-
         <!-- Wizard and Properties shortcuts -->
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Box Creation and Properties</property>
             <property name="view">wizard</property>
-
             <!-- LTR -->
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="direction">ltr</property>
                 <property name="accelerator">&lt;Alt&gt;Right</property>
                 <property name="title" translatable="yes">Switch to the next page</property>
               </object>
             </child>
-
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="direction">ltr</property>
                 <property name="accelerator">&lt;Alt&gt;Left</property>
                 <property name="title" translatable="yes">Switch to the previous page</property>
               </object>
             </child>
-
             <!-- RTL -->
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="direction">rtl</property>
                 <property name="accelerator">&lt;Alt&gt;Left</property>
                 <property name="title" translatable="yes">Switch to the next page</property>
               </object>
             </child>
-
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="direction">rtl</property>
                 <property name="accelerator">&lt;Alt&gt;Right</property>
                 <property name="title" translatable="yes">Switch to the previous page</property>
@@ -106,62 +81,48 @@
             </child>
           </object>
         </child>
-
         <!-- Display shortcuts -->
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Box Display</property>
             <property name="view">display</property>
-
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">Control_L+Alt_L</property>
                 <property name="title" translatable="yes">Grab/Ungrab keyboard</property>
               </object>
             </child>
-
             <!-- LTR -->
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="direction">ltr</property>
                 <property name="accelerator">&lt;Alt&gt;Left</property>
                 <property name="title" translatable="yes">Back to overview</property>
               </object>
             </child>
-
             <!-- RTL -->
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="direction">rtl</property>
                 <property name="accelerator">&lt;Alt&gt;Right</property>
                 <property name="title" translatable="yes">Back to overview</property>
               </object>
             </child>
-
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;Ctrl&gt;q</property>
                 <property name="title" translatable="yes">Close window/Quit Boxes</property>
               </object>
             </child>
-
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">F11</property>
                 <property name="title" translatable="yes">Fullscreen/Restore from fullscreen</property>
               </object>
             </child>
           </object>
         </child>
-
       </object>
     </child>
   </object>
-
 </interface>
diff --git a/demos/gtk-demo/shortcuts-builder.ui b/demos/gtk-demo/shortcuts-builder.ui
index 58607fc..6ae6646 100644
--- a/demos/gtk-demo/shortcuts-builder.ui
+++ b/demos/gtk-demo/shortcuts-builder.ui
@@ -1,49 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.17 -->
-
   <object class="GtkShortcutsWindow" id="shortcuts-builder">
     <property name="modal">1</property>
     <child>
       <object class="GtkShortcutsSection">
-        <property name="visible">1</property>
         <property name="section-name">editor</property>
         <property name="title" translatable="yes">Editor Shortcuts</property>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">General</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="title" translatable="yes">Global Search</property>
                 <property name="accelerator">&lt;ctrl&gt;period</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="title" translatable="yes">Preferences</property>
                 <property name="accelerator">&lt;ctrl&gt;comma</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="title" translatable="yes">Command Bar</property>
                 <property name="accelerator">&lt;ctrl&gt;Return</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="title" translatable="yes">Terminal</property>
                 <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;t</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="title" translatable="yes">Keyboard Shortcuts</property>
                 <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;question</property>
               </object>
@@ -52,25 +44,21 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Panels</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="title" translatable="yes">Toggle left panel</property>
                 <property name="accelerator">F9</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="title" translatable="yes">Toggle right panel</property>
                 <property name="accelerator">&lt;shift&gt;F9</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="title" translatable="yes">Toggle bottom panel</property>
                 <property name="accelerator">&lt;ctrl&gt;F9</property>
               </object>
@@ -79,18 +67,15 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Touchpad gestures</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="shortcut-type">gesture-two-finger-swipe-right</property>
                 <property name="title" translatable="yes">Switch to the next document</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="shortcut-type">gesture-two-finger-swipe-left</property>
                 <property name="title" translatable="yes">Switch to the previous document</property>
               </object>
@@ -99,46 +84,39 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Files</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;n</property>
                 <property name="title" translatable="yes">Create new document</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;o</property>
                 <property name="title" translatable="yes">Open a document</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;s</property>
                 <property name="title" translatable="yes">Save the document</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;w</property>
                 <property name="title" translatable="yes">Close the document</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;&lt;alt&gt;Page_Down</property>
                 <property name="title" translatable="yes">Switch to the next document</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;&lt;alt&gt;Page_Up</property>
                 <property name="title" translatable="yes">Switch to the previous document</property>
               </object>
@@ -147,32 +125,27 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Find and replace</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;f</property>
                 <property name="title" translatable="yes">Find</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;g</property>
                 <property name="title" translatable="yes">Find the next match</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;g</property>
                 <property name="title" translatable="yes">Find the previous match</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;k</property>
                 <property name="title" translatable="yes">Clear highlight</property>
               </object>
@@ -181,25 +154,21 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Copy and Paste</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;c</property>
                 <property name="title" translatable="yes">Copy selected text to clipboard</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;x</property>
                 <property name="title" translatable="yes">Cut selected text to clipboard</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;v</property>
                 <property name="title" translatable="yes">Paste text from clipboard</property>
               </object>
@@ -208,18 +177,15 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Undo and Redo</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;z</property>
                 <property name="title" translatable="yes">Undo previous command</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;z</property>
                 <property name="title" translatable="yes">Redo previous command</property>
               </object>
@@ -228,46 +194,39 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Editing</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;a</property>
                 <property name="title" translatable="yes">Increment number at cursor</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;x</property>
                 <property name="title" translatable="yes">Decrement number at cursor</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;j</property>
                 <property name="title" translatable="yes">Join selected lines</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;space</property>
                 <property name="title" translatable="yes">Show completion window</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">Insert</property>
                 <property name="title" translatable="yes">Toggle overwrite</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;&lt;alt&gt;i</property>
                 <property name="title" translatable="yes">Reindent line</property>
               </object>
@@ -276,74 +235,63 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Navigation</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;alt&gt;n</property>
                 <property name="title" translatable="yes">Move to next error in file</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;alt&gt;p</property>
                 <property name="title" translatable="yes">Move to previous error in file</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;shift&gt;&lt;alt&gt;Left</property>
                 <property name="title" translatable="yes">Move to previous edit location</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;shift&gt;&lt;alt&gt;Right</property>
                 <property name="title" translatable="yes">Move to next edit location</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;alt&gt;period</property>
                 <property name="title" translatable="yes">Jump to definition of symbol</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;alt&gt;&lt;shift&gt;Up</property>
                 <property name="title" translatable="yes">Move sectionport up within the file</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;alt&gt;&lt;shift&gt;Down</property>
                 <property name="title" translatable="yes">Move sectionport down within the file</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;alt&gt;&lt;shift&gt;End</property>
                 <property name="title" translatable="yes">Move sectionport to end of file</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;alt&gt;&lt;shift&gt;Home</property>
                 <property name="title" translatable="yes">Move sectionport to beginning of file</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;percent</property>
                 <property name="title" translatable="yes">Move to matching bracket</property>
               </object>
@@ -352,18 +300,15 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Selections</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;a</property>
                 <property name="title" translatable="yes">Select all</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;backslash</property>
                 <property name="title" translatable="yes">Unselect all</property>
               </object>
@@ -374,45 +319,38 @@
     </child>
     <child>
       <object class="GtkShortcutsSection">
-        <property name="visible">1</property>
         <property name="max-height">16</property>
         <property name="section-name">terminal</property>
         <property name="title" translatable="yes">Terminal Shortcuts</property>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">General</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="title" translatable="yes">Global Search</property>
                 <property name="accelerator">&lt;ctrl&gt;period</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="title" translatable="yes">Preferences</property>
                 <property name="accelerator">&lt;ctrl&gt;comma</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="title" translatable="yes">Command Bar</property>
                 <property name="accelerator">&lt;ctrl&gt;Return</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="title" translatable="yes">Terminal</property>
                 <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;t</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="title" translatable="yes">Keyboard Shortcuts</property>
                 <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;question</property>
               </object>
@@ -421,18 +359,15 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Copy and Paste</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;c</property>
                 <property name="title" translatable="yes">Copy selected text to clipboard</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;v</property>
                 <property name="title" translatable="yes">Paste text from clipboard</property>
               </object>
@@ -441,122 +376,98 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Switching</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;alt&gt;1...9</property>
                 <property name="title" translatable="yes">Switch to n-th tab</property>
               </object>
             </child>
           </object>
         </child>
-
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">'Special' combinations</property>
-
+            <property name="title" translatable="yes">&apos;Special&apos; combinations</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">t+t</property>
                 <property name="title" translatable="yes">You want tea ?</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;shift&gt;&lt;ctrl&gt;</property>
                 <property name="title" translatable="yes">Shift Control</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;&amp;&lt;ctrl&gt;</property>
                 <property name="title" translatable="yes">Control Control</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">Control_L&amp;Control_R</property>
                 <property name="title" translatable="yes">Left and right control</property>
               </object>
             </child>
-
           </object>
         </child>
-
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">All gestures</property>
-
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="shortcut-type">gesture-pinch</property>
                 <property name="title" translatable="yes">A stock pinch gesture</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="shortcut-type">gesture-stretch</property>
                 <property name="title" translatable="yes">A stock stretch gesture</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="shortcut-type">gesture-rotate-clockwise</property>
                 <property name="title" translatable="yes">A stock rotation gesture</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="shortcut-type">gesture-rotate-counterclockwise</property>
                 <property name="title" translatable="yes">A stock rotation gesture</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="shortcut-type">gesture-two-finger-swipe-left</property>
                 <property name="title" translatable="yes">A stock swipe gesture</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="shortcut-type">gesture-two-finger-swipe-right</property>
                 <property name="title" translatable="yes">A stock swipe gesture</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="shortcut-type">gesture-swipe-left</property>
                 <property name="title" translatable="yes">A stock swipe gesture</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="shortcut-type">gesture-swipe-right</property>
                 <property name="title" translatable="yes">A stock swipe gesture</property>
               </object>
             </child>
-
           </object>
         </child>
-
       </object>
     </child>
   </object>
-
 </interface>
diff --git a/demos/gtk-demo/shortcuts-clocks.ui b/demos/gtk-demo/shortcuts-clocks.ui
index 5d31a9b..f8ba305 100644
--- a/demos/gtk-demo/shortcuts-clocks.ui
+++ b/demos/gtk-demo/shortcuts-clocks.ui
@@ -1,42 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.17 -->
-
   <object class="GtkShortcutsWindow" id="shortcuts-clocks">
     <property name="modal">1</property>
     <child>
       <object class="GtkShortcutsSection">
-        <property name="visible">1</property>
         <property name="section-name">shortcuts</property>
         <property name="max-height">10</property>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">General</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;Page_Down</property>
                 <property name="title" translatable="yes">Go to the next section</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;Page_Up</property>
                 <property name="title" translatable="yes">Go to the previous section</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;alt&gt;Q</property>
                 <property name="title" translatable="yes">Quit</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;alt&gt;Right</property>
                 <property name="direction">ltr</property>
                 <property name="title" translatable="yes">Forward</property>
@@ -44,7 +37,6 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;Left</property>
                 <property name="direction">ltr</property>
                 <property name="title" translatable="yes">Back</property>
@@ -52,7 +44,6 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;alt&gt;Left</property>
                 <property name="direction">rtl</property>
                 <property name="title" translatable="yes">Forward</property>
@@ -60,7 +51,6 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;Right</property>
                 <property name="direction">rtl</property>
                 <property name="title" translatable="yes">Back</property>
@@ -70,19 +60,16 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="view">world</property>
             <property name="title" translatable="yes">World Clocks</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;N</property>
                 <property name="title" translatable="yes">Add a world clock</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;S</property>
                 <property name="title" translatable="yes">Select world clocks</property>
               </object>
@@ -91,19 +78,16 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="view">alarm</property>
             <property name="title" translatable="yes">Alarm</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;N</property>
                 <property name="title" translatable="yes">Add an alarm</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;S</property>
                 <property name="title" translatable="yes">Select alarms</property>
               </object>
@@ -112,26 +96,22 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="view">stopwatch</property>
             <property name="title" translatable="yes">Stopwatch</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">Return space</property>
                 <property name="title" translatable="yes">Start / Stop / Continue</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">L</property>
                 <property name="title" translatable="yes">Lap</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">Delete</property>
                 <property name="title" translatable="yes">Reset</property>
               </object>
@@ -140,19 +120,16 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="view">timer</property>
             <property name="title" translatable="yes">Timer</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">Return space</property>
                 <property name="title" translatable="yes">Start / Stop / Pause</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">Delete</property>
                 <property name="title" translatable="yes">Reset</property>
               </object>
@@ -162,5 +139,4 @@
       </object>
     </child>
   </object>
-
 </interface>
diff --git a/demos/gtk-demo/shortcuts-gedit.ui b/demos/gtk-demo/shortcuts-gedit.ui
index acb30d0..f0ffa19 100644
--- a/demos/gtk-demo/shortcuts-gedit.ui
+++ b/demos/gtk-demo/shortcuts-gedit.ui
@@ -1,28 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.17 -->
-
   <object class="GtkShortcutsWindow" id="shortcuts-gedit">
     <property name="modal">1</property>
     <child>
       <object class="GtkShortcutsSection">
-        <property name="visible">1</property>
         <property name="section-name">shortcuts</property>
         <property name="max-height">12</property>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Touchpad gestures</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="shortcut-type">gesture-two-finger-swipe-right</property>
                 <property name="title" translatable="yes">Switch to the next document</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="shortcut-type">gesture-two-finger-swipe-left</property>
                 <property name="title" translatable="yes">Switch to the previous document</property>
               </object>
@@ -31,46 +26,39 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Documents</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;N</property>
                 <property name="title" translatable="yes">Create new document</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;O</property>
                 <property name="title" translatable="yes">Open a document</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;S</property>
                 <property name="title" translatable="yes">Save the document</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;W</property>
                 <property name="title" translatable="yes">Close the document</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;&lt;Alt&gt;Page_Down</property>
                 <property name="title" translatable="yes">Switch to the next document</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;&lt;Alt&gt;Page_Up</property>
                 <property name="title" translatable="yes">Switch to the previous document</property>
               </object>
@@ -79,46 +67,39 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Find and Replace</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;F</property>
                 <property name="title" translatable="yes">Find</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;G</property>
                 <property name="title" translatable="yes">Find the next match</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;&lt;Shift&gt;G</property>
                 <property name="title" translatable="yes">Find the previous match</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;H</property>
                 <property name="title" translatable="yes">Find and Replace</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;&lt;Shift&gt;K</property>
                 <property name="title" translatable="yes">Clear highlight</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;I</property>
                 <property name="title" translatable="yes">Go to line</property>
               </object>
@@ -127,11 +108,9 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Tools</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;shift&gt;F7</property>
                 <property name="title" translatable="yes">Check spelling</property>
               </object>
@@ -140,25 +119,21 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Miscellaneous</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">F11</property>
                 <property name="title" translatable="yes">Fullscreen on / off</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;P</property>
                 <property name="title" translatable="yes">Print the document</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">Insert</property>
                 <property name="title" translatable="yes">Toggle insert / overwrite</property>
               </object>
@@ -168,5 +143,4 @@
       </object>
     </child>
   </object>
-
 </interface>
diff --git a/demos/gtk-demo/shortcuts.ui b/demos/gtk-demo/shortcuts.ui
index cb64e1e..f846c2c 100644
--- a/demos/gtk-demo/shortcuts.ui
+++ b/demos/gtk-demo/shortcuts.ui
@@ -1,60 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.17 -->
-
   <object class="GtkWindow" id="window1">
     <property name="title" translatable="yes">Shortcuts</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">1</property>
         <property name="orientation">vertical</property>
         <property name="margin">50</property>
         <property name="spacing">10</property>
         <child>
           <object class="GtkButton">
-            <property name="visible">1</property>
             <property name="label">Builder</property>
             <signal name="clicked" handler="builder_shortcuts" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
-            <property name="visible">1</property>
             <property name="label">GEdit</property>
             <signal name="clicked" handler="gedit_shortcuts" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
-            <property name="visible">1</property>
             <property name="label">Clocks - All</property>
             <signal name="clicked" handler="clocks_shortcuts" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
-            <property name="visible">1</property>
             <property name="label">Clocks - Stopwatch</property>
             <signal name="clicked" handler="clocks_shortcuts_stopwatch" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
-            <property name="visible">1</property>
             <property name="label">Boxes</property>
             <signal name="clicked" handler="boxes_shortcuts" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
-            <property name="visible">1</property>
             <property name="label">Boxes - Wizard</property>
             <signal name="clicked" handler="boxes_shortcuts_wizard" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
-            <property name="visible">1</property>
             <property name="label">Boxes - Display</property>
             <signal name="clicked" handler="boxes_shortcuts_display" swapped="1" object="window1"/>
           </object>
diff --git a/demos/gtk-demo/spinbutton.ui b/demos/gtk-demo/spinbutton.ui
index 808c2d5..384f786 100644
--- a/demos/gtk-demo/spinbutton.ui
+++ b/demos/gtk-demo/spinbutton.ui
@@ -3,189 +3,176 @@
   <object class="GtkAdjustment" id="basic_adjustment">
     <property name="lower">-10000</property>
     <property name="upper">10000</property>
-    <property name="step_increment">0.5</property>
-    <property name="page_increment">100</property>
+    <property name="step-increment">0.5</property>
+    <property name="page-increment">100</property>
   </object>
   <object class="GtkAdjustment" id="hex_adjustment">
     <property name="upper">255</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">16</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">16</property>
   </object>
   <object class="GtkAdjustment" id="time_adjustment">
     <property name="upper">1410</property>
-    <property name="step_increment">30</property>
-    <property name="page_increment">60</property>
+    <property name="step-increment">30</property>
+    <property name="page-increment">60</property>
   </object>
   <object class="GtkAdjustment" id="month_adjustment">
     <property name="lower">1</property>
     <property name="upper">12</property>
     <property name="value">1</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">5</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">5</property>
   </object>
   <object class="GtkWindow" id="window">
     <property name="title" translatable="yes">Spin Button</property>
     <child>
       <object class="GtkGrid">
-        <property name="visible">1</property>
         <property name="margin">20</property>
         <property name="row-spacing">10</property>
         <property name="column-spacing">10</property>
         <child>
           <object class="GtkLabel">
-            <property name="visible">1</property>
             <property name="label">_Numeric</property>
-            <property name="use_underline">1</property>
-            <property name="mnemonic_widget">basic_spin</property>
+            <property name="use-underline">1</property>
+            <property name="mnemonic-widget">basic_spin</property>
             <property name="xalign">1</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkSpinButton" id="basic_spin">
-            <property name="visible">1</property>
             <property name="halign">start</property>
-            <property name="width_chars">5</property>
+            <property name="width-chars">5</property>
             <property name="adjustment">basic_adjustment</property>
-            <property name="climb_rate">1</property>
+            <property name="climb-rate">1</property>
             <property name="digits">2</property>
             <property name="numeric">1</property>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="basic_label">
-            <property name="visible">1</property>
-            <property name="width_chars">10</property>
+            <property name="width-chars">10</property>
             <property name="xalign">1</property>
           </object>
           <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">2</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">1</property>
             <property name="label">_Hexadecimal</property>
-            <property name="use_underline">1</property>
-            <property name="mnemonic_widget">hex_spin</property>
+            <property name="use-underline">1</property>
+            <property name="mnemonic-widget">hex_spin</property>
             <property name="xalign">1</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkSpinButton" id="hex_spin">
-            <property name="visible">1</property>
             <property name="halign">start</property>
-            <property name="width_chars">4</property>
+            <property name="width-chars">4</property>
             <property name="adjustment">hex_adjustment</property>
             <signal name="input" handler="hex_spin_input"/>
             <signal name="output" handler="hex_spin_output"/>
             <property name="wrap">1</property>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="hex_label">
-            <property name="visible">1</property>
-            <property name="width_chars">10</property>
+            <property name="width-chars">10</property>
             <property name="xalign">1</property>
           </object>
           <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
+            <property name="left-attach">2</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">1</property>
             <property name="label">_Time</property>
-            <property name="use_underline">1</property>
-            <property name="mnemonic_widget">time_spin</property>
+            <property name="use-underline">1</property>
+            <property name="mnemonic-widget">time_spin</property>
             <property name="xalign">1</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">2</property>
           </packing>
         </child>
         <child>
           <object class="GtkSpinButton" id="time_spin">
-            <property name="visible">1</property>
             <property name="halign">start</property>
-            <property name="width_chars">5</property>
+            <property name="width-chars">5</property>
             <property name="adjustment">time_adjustment</property>
             <signal name="input" handler="time_spin_input"/>
             <signal name="output" handler="time_spin_output"/>
             <property name="wrap">1</property>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">2</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="time_label">
-            <property name="visible">1</property>
-            <property name="width_chars">10</property>
+            <property name="width-chars">10</property>
             <property name="xalign">1</property>
           </object>
           <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
+            <property name="left-attach">2</property>
+            <property name="top-attach">2</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">1</property>
             <property name="label">_Month</property>
-            <property name="use_underline">1</property>
-            <property name="mnemonic_widget">month_spin</property>
+            <property name="use-underline">1</property>
+            <property name="mnemonic-widget">month_spin</property>
             <property name="xalign">1</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">3</property>
           </packing>
         </child>
         <child>
           <object class="GtkSpinButton" id="month_spin">
-            <property name="visible">1</property>
             <property name="halign">start</property>
-            <property name="width_chars">9</property>
+            <property name="width-chars">9</property>
             <signal name="input" handler="month_spin_input"/>
             <signal name="output" handler="month_spin_output"/>
             <property name="adjustment">month_adjustment</property>
             <property name="wrap">1</property>
-            <property name="update_policy">if-valid</property>
+            <property name="update-policy">if-valid</property>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">3</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="month_label">
-            <property name="visible">1</property>
-            <property name="width_chars">10</property>
+            <property name="width-chars">10</property>
             <property name="xalign">1</property>
           </object>
           <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
+            <property name="left-attach">2</property>
+            <property name="top-attach">3</property>
           </packing>
         </child>
       </object>
diff --git a/demos/gtk-demo/stack.ui b/demos/gtk-demo/stack.ui
index 1383f41..e395182 100644
--- a/demos/gtk-demo/stack.ui
+++ b/demos/gtk-demo/stack.ui
@@ -5,26 +5,22 @@
     <property name="title" translatable="yes">Stack</property>
     <child>
       <object class="GtkGrid">
-        <property name="visible">1</property>
         <child>
           <object class="GtkStackSwitcher">
-            <property name="visible">1</property>
             <property name="stack">stack</property>
             <property name="halign">center</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkStack" id="stack">
-            <property name="visible">1</property>
-            <property name="can_focus">1</property>
+            <property name="can-focus">1</property>
             <property name="transition-type">crossfade</property>
             <child>
               <object class="GtkImage">
-                <property name="visible">1</property>
                 <property name="margin-top">20</property>
                 <property name="margin-bottom">20</property>
                 <property name="icon-name">gtk3-demo</property>
@@ -37,9 +33,7 @@
             <child>
               <object class="GtkCheckButton">
                 <property name="label" translatable="yes">Page 2</property>
-                <property name="visible">1</property>
-                <property name="can_focus">1</property>
-                <property name="draw_indicator">1</property>
+                <property name="can-focus">1</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
               </object>
@@ -50,7 +44,6 @@
             </child>
             <child>
               <object class="GtkSpinner">
-                <property name="visible">1</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
                 <property name="active">1</property>
@@ -62,8 +55,8 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
       </object>
diff --git a/demos/gtk-demo/theming.ui b/demos/gtk-demo/theming.ui
index 22fcece..864a29f 100644
--- a/demos/gtk-demo/theming.ui
+++ b/demos/gtk-demo/theming.ui
@@ -5,7 +5,6 @@
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkToolbar">
-        <property name="visible">1</property>
         <property name="hexpand">1</property>
         <property name="show-arrow">0</property>
         <style>
@@ -13,11 +12,10 @@
         </style>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="visible">1</property>
             <property name="label" translatable="yes">Normal</property>
-            <property name="use_underline">1</property>
-            <property name="is_important">1</property>
-            <property name="icon_name">edit-find</property>
+            <property name="use-underline">1</property>
+            <property name="is-important">1</property>
+            <property name="icon-name">edit-find</property>
           </object>
           <packing>
             <property name="homogeneous">1</property>
@@ -25,11 +23,10 @@
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="visible">1</property>
             <property name="label" translatable="yes">Active</property>
-            <property name="use_underline">1</property>
-            <property name="is_important">1</property>
-            <property name="icon_name">edit-find</property>
+            <property name="use-underline">1</property>
+            <property name="is-important">1</property>
+            <property name="icon-name">edit-find</property>
             <property name="active">1</property>
           </object>
           <packing>
@@ -38,12 +35,11 @@
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="visible">1</property>
             <property name="sensitive">0</property>
             <property name="label" translatable="yes">Insensitive</property>
-            <property name="use_underline">1</property>
-            <property name="is_important">1</property>
-            <property name="icon_name">edit-find</property>
+            <property name="use-underline">1</property>
+            <property name="is-important">1</property>
+            <property name="icon-name">edit-find</property>
           </object>
           <packing>
             <property name="homogeneous">1</property>
@@ -51,11 +47,10 @@
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="visible">1</property>
             <property name="label" translatable="yes">Raised</property>
-            <property name="use_underline">1</property>
-            <property name="is_important">1</property>
-            <property name="icon_name">edit-find</property>
+            <property name="use-underline">1</property>
+            <property name="is-important">1</property>
+            <property name="icon-name">edit-find</property>
             <style>
               <class name="raised"/>
             </style>
@@ -66,11 +61,10 @@
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="visible">1</property>
             <property name="label" translatable="yes">Raised Active</property>
-            <property name="use_underline">1</property>
-            <property name="is_important">1</property>
-            <property name="icon_name">edit-find</property>
+            <property name="use-underline">1</property>
+            <property name="is-important">1</property>
+            <property name="icon-name">edit-find</property>
             <property name="active">1</property>
             <style>
               <class name="raised"/>
@@ -82,12 +76,11 @@
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="visible">1</property>
             <property name="sensitive">0</property>
             <property name="label" translatable="yes">Insensitive Active</property>
-            <property name="use_underline">1</property>
-            <property name="icon_name">edit-find</property>
-            <property name="is_important">1</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">edit-find</property>
+            <property name="is-important">1</property>
             <property name="active">1</property>
           </object>
           <packing>
@@ -96,12 +89,10 @@
         </child>
         <child>
           <object class="GtkToolItem">
-            <property name="visible">1</property>
             <child>
               <object class="GtkEntry" id="entry1">
-                <property name="visible">1</property>
-                <property name="can_focus">1</property>
-                <property name="invisible_char">•</property>
+                <property name="can-focus">1</property>
+                <property name="invisible-char">•</property>
                 <property name="placeholder-text" translatable="yes">Search...</property>
                 <property name="secondary-icon-name">edit-find-symbolic</property>
               </object>
@@ -110,11 +101,9 @@
         </child>
         <child>
           <object class="GtkToolItem">
-            <property name="visible">1</property>
             <child>
               <object class="GtkSwitch" id="switch1">
-                <property name="visible">1</property>
-                <property name="can_focus">1</property>
+                <property name="can-focus">1</property>
               </object>
             </child>
           </object>
@@ -123,7 +112,6 @@
     </child>
     <child>
       <object class="GtkBox">
-        <property name="visible">1</property>
         <property name="valign">center</property>
         <property name="halign">center</property>
         <style>
@@ -132,17 +120,15 @@
         <child>
           <object class="GtkButton">
             <property name="label" translatable="yes">Hi, I am a button</property>
-            <property name="visible">1</property>
-            <property name="can_focus">1</property>
-            <property name="receives_default">1</property>
+            <property name="can-focus">1</property>
+            <property name="receives-default">1</property>
           </object>
         </child>
         <child>
           <object class="GtkButton">
-            <property name="label" translatable="yes">And I'm another button</property>
-            <property name="visible">1</property>
-            <property name="can_focus">1</property>
-            <property name="receives_default">1</property>
+            <property name="label" translatable="yes">And I&apos;m another button</property>
+            <property name="can-focus">1</property>
+            <property name="receives-default">1</property>
           </object>
           <packing>
             <property name="position">1</property>
@@ -151,9 +137,8 @@
         <child>
           <object class="GtkButton">
             <property name="label" translatable="yes">This is a button party!</property>
-            <property name="visible">1</property>
-            <property name="can_focus">1</property>
-            <property name="receives_default">1</property>
+            <property name="can-focus">1</property>
+            <property name="receives-default">1</property>
           </object>
           <packing>
             <property name="position">2</property>
@@ -163,7 +148,6 @@
     </child>
     <child>
       <object class="GtkToolbar">
-        <property name="visible">1</property>
         <property name="hexpand">1</property>
         <property name="toolbar-style">icons</property>
         <style>
@@ -171,10 +155,9 @@
         </style>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="visible">1</property>
             <property name="label" translatable="yes">Normal</property>
-            <property name="use_underline">1</property>
-            <property name="icon_name">list-add-symbolic</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">list-add-symbolic</property>
           </object>
           <packing>
             <property name="homogeneous">1</property>
@@ -182,10 +165,9 @@
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="visible">1</property>
             <property name="label" translatable="yes">Normal</property>
-            <property name="use_underline">1</property>
-            <property name="icon_name">list-add-symbolic</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">list-add-symbolic</property>
           </object>
           <packing>
             <property name="homogeneous">1</property>
@@ -194,8 +176,8 @@
         <child>
           <object class="GtkToggleToolButton">
             <property name="label" translatable="yes">Active</property>
-            <property name="use_underline">1</property>
-            <property name="icon_name">list-remove-symbolic</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">list-remove-symbolic</property>
             <property name="active">1</property>
           </object>
           <packing>
@@ -204,10 +186,9 @@
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="visible">1</property>
             <property name="label" translatable="yes">Active</property>
-            <property name="use_underline">1</property>
-            <property name="icon_name">list-remove-symbolic</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">list-remove-symbolic</property>
             <property name="active">1</property>
           </object>
           <packing>
@@ -216,11 +197,10 @@
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="visible">1</property>
             <property name="sensitive">0</property>
             <property name="label" translatable="yes">Insensitive</property>
-            <property name="use_underline">1</property>
-            <property name="icon_name">edit-find-symbolic</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">edit-find-symbolic</property>
           </object>
           <packing>
             <property name="homogeneous">1</property>
@@ -228,11 +208,10 @@
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="visible">1</property>
             <property name="sensitive">0</property>
             <property name="label" translatable="yes">Insensitive Active</property>
-            <property name="use_underline">1</property>
-            <property name="icon_name">go-up-symbolic</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">go-up-symbolic</property>
             <property name="active">1</property>
           </object>
           <packing>
@@ -243,12 +222,9 @@
     </child>
     <child>
       <object class="GtkBox">
-        <property name="visible">1</property>
         <property name="spacing">10</property>
-        <property name="orientation">horizontal</property>
         <child>
           <object class="GtkButton">
-            <property name="visible">1</property>
             <property name="label">Plain</property>
             <property name="halign">end</property>
             <property name="hexpand">1</property>
@@ -257,7 +233,6 @@
         </child>
         <child>
           <object class="GtkButton">
-            <property name="visible">1</property>
             <property name="label">Destructive</property>
             <style>
               <class name="destructive-action"/>
@@ -266,7 +241,6 @@
         </child>
         <child>
           <object class="GtkButton">
-            <property name="visible">1</property>
             <property name="label">Suggested</property>
             <style>
               <class name="suggested-action"/>
diff --git a/demos/icon-browser/window.ui b/demos/icon-browser/window.ui
index a3ed292..330532e 100644
--- a/demos/icon-browser/window.ui
+++ b/demos/icon-browser/window.ui
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.8 -->
-  <object class="IconStore" id="store">
-  </object>
+  <object class="IconStore" id="store"/>
   <object class="GtkTreeModelFilter" id="filter_model">
-    <property name="child_model">store</property>
+    <property name="child-model">store</property>
   </object>
   <template class="IconBrowserWindow" parent="GtkApplicationWindow">
     <property name="title" translatable="yes">Icon Browser</property>
@@ -13,26 +12,22 @@
     <signal name="key-press-event" handler="key_press_event_cb"/>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header">
-        <property name="visible">True</property>
         <property name="title" translatable="yes">Icon Browser</property>
-        <property name="show-title-buttons">True</property>
+        <property name="show-title-buttons">1</property>
         <child type="title">
           <object class="GtkBox">
-            <property name="visible">True</property>
             <style>
               <class name="linked"/>
             </style>
             <child>
               <object class="GtkRadioButton" id="normal_radio">
-                <property name="visible">True</property>
-                <property name="draw_indicator">False</property>
+                <property name="draw-indicator">0</property>
                 <property name="label" translatable="yes">Normal</property>
               </object>
             </child>
             <child>
               <object class="GtkRadioButton" id="symbolic_radio">
-                <property name="visible">True</property>
-                <property name="draw_indicator">False</property>
+                <property name="draw-indicator">0</property>
                 <property name="label" translatable="yes">Symbolic</property>
                 <property name="group">normal_radio</property>
                 <signal name="toggled" handler="symbolic_toggled"/>
@@ -42,13 +37,11 @@
         </child>
         <child>
           <object class="GtkToggleButton" id="search">
-            <property name="visible">True</property>
             <style>
               <class name="image-button"/>
             </style>
             <child>
               <object class="GtkImage" id="search-icon">
-                <property name="visible">True</property>
                 <property name="icon-name">edit-find-symbolic</property>
               </object>
             </child>
@@ -61,32 +54,24 @@
     </child>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="orientation">horizontal</property>
         <child>
           <object class="GtkListBox" id="context_list">
-            <property name="visible">True</property>
-            <property name="selection_mode">single</property>
             <signal name="selected-rows-changed" handler="selected_context_changed"/>
           </object>
         </child>
         <child>
           <object class="GtkSeparator">
-            <property name="visible">True</property>
             <property name="orientation">vertical</property>
           </object>
         </child>
         <child>
           <object class="GtkBox" id="content_box">
-            <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkSearchBar" id="searchbar">
-                <property name="visible">True</property>
                 <property name="search-mode-enabled" bind-source="search" bind-property="active" 
bind-flags="bidirectional"/>
                 <child>
                   <object class="GtkSearchEntry" id="searchentry">
-                    <property name="visible">True</property>
                     <signal name="search-changed" handler="search_text_changed"/>
                   </object>
                 </child>
@@ -94,16 +79,13 @@
             </child>
             <child>
               <object class="GtkScrolledWindow" id="sw">
-                <property name="visible">True</property>
-                <property name="expand">True</property>
+                <property name="expand">1</property>
                 <property name="hscrollbar-policy">never</property>
-                <property name="vscrollbar-policy">automatic</property>
                 <child>
                   <object class="GtkIconView" id="list">
-                    <property name="visible">True</property>
                     <property name="model">filter_model</property>
                     <property name="selection-mode">none</property>
-                    <property name="activate-on-single-click">True</property>
+                    <property name="activate-on-single-click">1</property>
                     <signal name="item_activated" handler="item_activated"/>
                     <child>
                       <object class="GtkCellRendererPixbuf" id="cell">
@@ -116,7 +98,6 @@
                       <object class="GtkCellRendererText" id="text_cell">
                         <property name="xpad">10</property>
                         <property name="ypad">10</property>
-                        <property name="xalign">0.5</property>
                       </object>
                     </child>
                   </object>
@@ -137,22 +118,20 @@
     </widgets>
   </object>
   <object class="GtkDialog" id="details">
-    <property name="modal">True</property>
+    <property name="modal">1</property>
     <property name="use-header-bar">1</property>
-    <property name="resizable">False</property>
+    <property name="resizable">0</property>
     <property name="hide-on-close">1</property>
     <child internal-child="vbox">
       <object class="GtkBox">
         <child>
           <object class="GtkGrid">
-            <property name="visible">True</property>
             <property name="margin">10</property>
             <property name="row-spacing">18</property>
             <property name="column-spacing">18</property>
             <property name="halign">center</property>
             <child>
               <object class="GtkImage" id="image1">
-                <property name="visible">True</property>
                 <property name="halign">center</property>
                 <property name="valign">end</property>
               </object>
@@ -163,7 +142,6 @@
             </child>
             <child>
               <object class="GtkImage" id="image2">
-                <property name="visible">True</property>
                 <property name="halign">center</property>
                 <property name="valign">end</property>
               </object>
@@ -174,7 +152,6 @@
             </child>
             <child>
               <object class="GtkImage" id="image3">
-                <property name="visible">True</property>
                 <property name="halign">center</property>
                 <property name="valign">end</property>
               </object>
@@ -185,7 +162,6 @@
             </child>
             <child>
               <object class="GtkImage" id="image4">
-                <property name="visible">True</property>
                 <property name="halign">center</property>
                 <property name="valign">end</property>
               </object>
@@ -196,7 +172,6 @@
             </child>
             <child>
               <object class="GtkImage" id="image5">
-                <property name="visible">True</property>
                 <property name="halign">center</property>
                 <property name="valign">end</property>
               </object>
@@ -207,7 +182,6 @@
             </child>
             <child>
               <object class="GtkImage" id="image6">
-                <property name="visible">True</property>
                 <property name="halign">center</property>
                 <property name="valign">end</property>
               </object>
@@ -216,10 +190,8 @@
                 <property name="top-attach">1</property>
               </packing>
             </child>
-
             <child>
               <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
                 <property name="halign">center</property>
                 <property name="valign">baseline</property>
                 <property name="label">16×16</property>
@@ -234,7 +206,6 @@
             </child>
             <child>
               <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
                 <property name="halign">center</property>
                 <property name="valign">baseline</property>
                 <property name="label">24×24</property>
@@ -249,7 +220,6 @@
             </child>
             <child>
               <object class="GtkLabel" id="label3">
-                <property name="visible">True</property>
                 <property name="halign">center</property>
                 <property name="valign">baseline</property>
                 <property name="label">32×32</property>
@@ -264,7 +234,6 @@
             </child>
             <child>
               <object class="GtkLabel" id="label4">
-                <property name="visible">True</property>
                 <property name="halign">center</property>
                 <property name="valign">baseline</property>
                 <property name="label">48×48</property>
@@ -279,7 +248,6 @@
             </child>
             <child>
               <object class="GtkLabel" id="label5">
-                <property name="visible">True</property>
                 <property name="halign">center</property>
                 <property name="valign">baseline</property>
                 <property name="label">64×64</property>
@@ -294,7 +262,6 @@
             </child>
             <child>
               <object class="GtkLabel" id="label6">
-                <property name="visible">True</property>
                 <property name="halign">center</property>
                 <property name="valign">baseline</property>
                 <property name="label">scalable</property>
@@ -311,7 +278,6 @@
         </child>
         <child>
           <object class="GtkButton">
-            <property name="visible">True</property>
             <property name="label" translatable="yes">Copy to Clipboard</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
@@ -322,8 +288,7 @@
         <child>
           <object class="GtkLabel" id="description">
             <property name="margin">10</property>
-            <property name="visible">True</property>
-            <property name="wrap">True</property>
+            <property name="wrap">1</property>
             <property name="max-width-chars">60</property>
             <property name="valign">start</property>
           </object>
diff --git a/demos/widget-factory/help-overlay.ui b/demos/widget-factory/help-overlay.ui
index 5f2d99f..0e4bbff 100644
--- a/demos/widget-factory/help-overlay.ui
+++ b/demos/widget-factory/help-overlay.ui
@@ -2,28 +2,23 @@
   <object class="GtkShortcutsWindow" id="help_overlay">
     <child>
       <object class="GtkShortcutsSection">
-        <property name="visible">1</property>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title">General</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">F1</property>
                 <property name="title">Show About Dialog</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;Primary&gt;q</property>
                 <property name="title">Quit</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;Primary&gt;d</property>
                 <property name="title">Switch to dark theme</property>
               </object>
@@ -32,26 +27,22 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title">Traditional</property>
             <property name="view">page2</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;Primary&gt;s</property>
                 <property name="title">Search</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">Delete</property>
                 <property name="title">Delete</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;Primary&gt;b</property>
                 <property name="title">Set background</property>
               </object>
@@ -60,26 +51,22 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title">Modern</property>
             <property name="view">page3</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;Primary&gt;o</property>
                 <property name="title">Open a file</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;Primary&gt;r</property>
                 <property name="title">Start recording</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;Primary&gt;l</property>
                 <property name="title">Lock or unlock</property>
               </object>
diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index 34d8813..f45bda7 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -92,36 +92,35 @@
     <property name="upper">100</property>
     <property name="lower">1</property>
     <property name="value">50</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment2">
     <property name="upper">1000</property>
     <property name="lower">1</property>
     <property name="value">50</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment3">
-    <property name="lower">0</property>
     <property name="upper">4</property>
     <property name="value">2</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">1</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">1</property>
   </object>
   <object class="GtkAdjustment" id="pg_adjustment">
     <property name="upper">99</property>
     <property name="lower">1</property>
     <property name="value">2</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkAdjustment" id="pg_adjustment2">
     <property name="upper">99</property>
     <property name="lower">1</property>
     <property name="value">4</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkListStore" id="liststore1">
     <columns>
@@ -409,11 +408,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
         <child>
           <object class="GtkMenuButton" id="gear_menu_button">
             <property name="valign">center</property>
-            <property name="menu_model">gear_menu</property>
+            <property name="menu-model">gear_menu</property>
             <property name="icon-name">open-menu-symbolic</property>
           </object>
           <packing>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
           </packing>
         </child>
       </object>
@@ -438,7 +437,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         <property name="spacing">10</property>
                         <child>
                           <object class="GtkComboBoxText" id="comboboxtext1">
-                            <property name="has_entry">1</property>
+                            <property name="has-entry">1</property>
                             <child internal-child="entry">
                               <object class="GtkEntry" id="comboboxtext-entry">
                                 <property name="text" translatable="yes">comboboxentry</property>
@@ -454,10 +453,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         <child>
                           <object class="GtkComboBoxText" id="comboboxtext2">
                             <property name="sensitive">0</property>
-                            <property name="has_entry">1</property>
+                            <property name="has-entry">1</property>
                             <child internal-child="entry">
                               <object class="GtkEntry" id="comboboxtext-entry2">
-                                <property name="invisible_char">•</property>
+                                <property name="invisible-char">•</property>
                                 <property name="text" translatable="yes">comboboxentry</property>
                               </object>
                             </child>
@@ -468,11 +467,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                         <child>
                           <object class="GtkEntry" id="entry1">
-                            <property name="can_focus">1</property>
-                            <property name="invisible_char">•</property>
+                            <property name="can-focus">1</property>
+                            <property name="invisible-char">•</property>
                             <property name="placeholder-text" translatable="yes">Click icon to change 
mode</property>
-                            <property name="secondary_icon_name">view-refresh-symbolic</property>
-                            <property name="secondary_icon_tooltip_text">Change mode</property>
+                            <property name="secondary-icon-name">view-refresh-symbolic</property>
+                            <property name="secondary-icon-tooltip-text">Change mode</property>
                             <signal name="icon-release" handler="on_entry_icon_release" swapped="no"/>
                           </object>
                           <packing>
@@ -482,8 +481,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         <child>
                           <object class="GtkEntry" id="entry2">
                             <property name="sensitive">0</property>
-                            <property name="can_focus">1</property>
-                            <property name="invisible_char">•</property>
+                            <property name="can-focus">1</property>
+                            <property name="invisible-char">•</property>
                             <property name="text" translatable="yes">entry</property>
                           </object>
                           <packing>
@@ -492,21 +491,20 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                         <child>
                           <object class="GtkBox" id="box223">
-                            <property name="hexpand">0</property>
                             <style>
                               <class name="linked"/>
                             </style>
                             <child>
                               <object class="GtkEntry" id="entry24">
-                                <property name="can_focus">1</property>
-                                <property name="invisible_char">•</property>
+                                <property name="can-focus">1</property>
+                                <property name="invisible-char">•</property>
                                 <property name="text" translatable="yes">entry</property>
                                 <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
                               <object class="GtkButton" id="button224">
-                                <property name="can_focus">1</property>
+                                <property name="can-focus">1</property>
                                 <property name="icon-name">window-close-symbolic</property>
                               </object>
                               <packing>
@@ -520,7 +518,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                         <child>
                           <object class="GtkBox">
-                            <property name="hexpand">0</property>
                             <style>
                               <class name="linked"/>
                             </style>
@@ -584,7 +581,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </child>
                             <child>
                               <object class="GtkSpinButton" id="spinbutton1">
-                                <property name="can_focus">1</property>
+                                <property name="can-focus">1</property>
                                 <property name="width-chars">2</property>
                                 <property name="max-width-chars">2</property>
                                 <property name="adjustment">adjustment2</property>
@@ -594,8 +591,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               </packing>
                             </child>
                             <child>
-                                <object class="GtkSpinButton" id="spinbutton2">
-                                <property name="can_focus">1</property>
+                              <object class="GtkSpinButton" id="spinbutton2">
+                                <property name="can-focus">1</property>
                                 <property name="sensitive">0</property>
                                 <property name="width-chars">2</property>
                                 <property name="max-width-chars">2</property>
@@ -608,62 +605,62 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                         <child>
                           <object class="GtkGrid" id="grid1">
-                            <property name="row_homogeneous">1</property>
-                            <property name="column_spacing">18</property>
-                            <property name="row_spacing">6</property>
+                            <property name="row-homogeneous">1</property>
+                            <property name="column-spacing">18</property>
+                            <property name="row-spacing">6</property>
                             <child>
                               <object class="GtkCheckButton" id="checkbutton1">
                                 <property name="label" translatable="yes">checkbutton</property>
-                                <property name="can_focus">1</property>
+                                <property name="can-focus">1</property>
                                 <property name="active">1</property>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
+                                <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>
+                                <property name="can-focus">1</property>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
+                                <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>
+                                <property name="can-focus">1</property>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">2</property>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">2</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="checkbutton4">
                                 <property name="label" translatable="yes">checkbutton</property>
                                 <property name="sensitive">0</property>
-                                <property name="can_focus">1</property>
+                                <property name="can-focus">1</property>
                                 <property name="active">1</property>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">3</property>
+                                <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>
+                                <property name="can-focus">1</property>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">4</property>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">4</property>
                               </packing>
                             </child>
                             <child>
@@ -671,72 +668,72 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="label" translatable="yes">checkbutton</property>
                                 <property name="sensitive">0</property>
                                 <property name="inconsistent">1</property>
-                                <property name="can_focus">1</property>
+                                <property name="can-focus">1</property>
                               </object>
                               <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">5</property>
+                                <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="can-focus">1</property>
                                 <property name="active">1</property>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
+                                <property name="left-attach">1</property>
+                                <property name="top-attach">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="radiobutton2">
                                 <property name="label" translatable="yes">radiobutton</property>
-                                <property name="can_focus">1</property>
+                                <property name="can-focus">1</property>
                                 <property name="active">1</property>
                                 <property name="group">radiobutton1</property>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
+                                <property name="left-attach">1</property>
+                                <property name="top-attach">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="radiobutton3">
                                 <property name="label" translatable="yes">radiobutton</property>
                                 <property name="inconsistent">1</property>
-                                <property name="can_focus">1</property>
+                                <property name="can-focus">1</property>
                                 <property name="active">1</property>
                                 <property name="group">radiobutton1</property>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">2</property>
+                                <property name="left-attach">1</property>
+                                <property name="top-attach">2</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="radiobutton4">
                                 <property name="label" translatable="yes">radiobutton</property>
                                 <property name="sensitive">0</property>
-                                <property name="can_focus">1</property>
+                                <property name="can-focus">1</property>
                                 <property name="active">1</property>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">3</property>
+                                <property name="left-attach">1</property>
+                                <property name="top-attach">3</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="radiobutton5">
                                 <property name="label" translatable="yes">radiobutton</property>
                                 <property name="sensitive">0</property>
-                                <property name="can_focus">1</property>
+                                <property name="can-focus">1</property>
                                 <property name="active">1</property>
                                 <property name="group">radiobutton3</property>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">4</property>
+                                <property name="left-attach">1</property>
+                                <property name="top-attach">4</property>
                               </packing>
                             </child>
                             <child>
@@ -744,13 +741,13 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="label" translatable="yes">radiobutton</property>
                                 <property name="sensitive">0</property>
                                 <property name="inconsistent">1</property>
-                                <property name="can_focus">1</property>
+                                <property name="can-focus">1</property>
                                 <property name="active">1</property>
                                 <property name="group">radiobutton3</property>
                               </object>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">5</property>
+                                <property name="left-attach">1</property>
+                                <property name="top-attach">5</property>
                               </packing>
                             </child>
                             <child>
@@ -758,16 +755,15 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="active">1</property>
                               </object>
                               <packing>
-                                <property name="left_attach">2</property>
-                                <property name="top_attach">0</property>
+                                <property name="left-attach">2</property>
+                                <property name="top-attach">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkSpinner" id="spinner2">
-                              </object>
+                              <object class="GtkSpinner" id="spinner2"/>
                               <packing>
-                                <property name="left_attach">2</property>
-                                <property name="top_attach">1</property>
+                                <property name="left-attach">2</property>
+                                <property name="top-attach">1</property>
                               </packing>
                             </child>
                             <child>
@@ -776,8 +772,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="sensitive">0</property>
                               </object>
                               <packing>
-                                <property name="left_attach">2</property>
-                                <property name="top_attach">3</property>
+                                <property name="left-attach">2</property>
+                                <property name="top-attach">3</property>
                               </packing>
                             </child>
                             <child>
@@ -785,8 +781,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="sensitive">0</property>
                               </object>
                               <packing>
-                                <property name="left_attach">2</property>
-                                <property name="top_attach">4</property>
+                                <property name="left-attach">2</property>
+                                <property name="top-attach">4</property>
                               </packing>
                             </child>
                           </object>
@@ -808,16 +804,16 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         <child>
                           <object class="GtkToggleButton" id="togglebutton1">
                             <property name="label" translatable="yes">togglebutton</property>
-                            <property name="can_focus">1</property>
-                            <property name="receives_default">1</property>
+                            <property name="can-focus">1</property>
+                            <property name="receives-default">1</property>
                           </object>
                         </child>
                         <child>
                           <object class="GtkToggleButton" id="togglebutton2">
                             <property name="label" translatable="yes">togglebutton</property>
                             <property name="sensitive">0</property>
-                            <property name="can_focus">1</property>
-                            <property name="receives_default">1</property>
+                            <property name="can-focus">1</property>
+                            <property name="receives-default">1</property>
                           </object>
                           <packing>
                             <property name="position">1</property>
@@ -826,8 +822,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         <child>
                           <object class="GtkToggleButton" id="togglebutton3">
                             <property name="label" translatable="yes">togglebutton</property>
-                            <property name="can_focus">1</property>
-                            <property name="receives_default">1</property>
+                            <property name="can-focus">1</property>
+                            <property name="receives-default">1</property>
                             <property name="active">1</property>
                           </object>
                           <packing>
@@ -838,8 +834,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                           <object class="GtkToggleButton" id="togglebutton4">
                             <property name="label" translatable="yes">togglebutton</property>
                             <property name="sensitive">0</property>
-                            <property name="can_focus">1</property>
-                            <property name="receives_default">1</property>
+                            <property name="can-focus">1</property>
+                            <property name="receives-default">1</property>
                             <property name="active">1</property>
                           </object>
                           <packing>
@@ -879,8 +875,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                         <child>
                           <object class="GtkFontButton" id="fontbutton1">
-                            <property name="can_focus">1</property>
-                            <property name="receives_default">1</property>
+                            <property name="can-focus">1</property>
+                            <property name="receives-default">1</property>
                           </object>
                           <packing>
                             <property name="position">6</property>
@@ -888,10 +884,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                         <child>
                           <object class="GtkColorButton" id="colorbutton1">
-                            <property name="can_focus">1</property>
-                            <property name="receives_default">1</property>
+                            <property name="can-focus">1</property>
+                            <property name="receives-default">1</property>
                             <property name="rgba">#31316867a09f</property>
-                            <property name="use_alpha">1</property>
+                            <property name="use-alpha">1</property>
                           </object>
                           <packing>
                             <property name="position">8</property>
@@ -899,7 +895,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                         <child>
                           <object class="GtkFileChooserButton" id="filechooserbutton1">
-                            <property name="local_only">0</property>
                           </object>
                           <packing>
                             <property name="position">8</property>
@@ -908,9 +903,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         <child>
                           <object class="GtkLinkButton" id="linkbutton1">
                             <property name="label" translatable="yes">link button</property>
-                            <property name="can_focus">1</property>
-                            <property name="receives_default">1</property>
-                            <property name="has_tooltip">1</property>
+                            <property name="can-focus">1</property>
+                            <property name="receives-default">1</property>
+                            <property name="has-tooltip">1</property>
                             <property name="relief">none</property>
                             <property name="uri">http://www.gtk.org</property>
                           </object>
@@ -954,7 +949,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         <property name="spacing">6</property>
                         <property name="hexpand">1</property>
                         <child>
-                            <object class="GtkBox" id="box21">
+                          <object class="GtkBox" id="box21">
                             <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
@@ -974,7 +969,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child>
                               <object class="GtkProgressBar" id="progressbar3">
                                 <property name="fraction">0.5</property>
-                                <property name="show_text">1</property>
+                                <property name="show-text">1</property>
                               </object>
                               <packing>
                                 <property name="position">2</property>
@@ -1014,21 +1009,21 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="homogeneous">1</property>
                                 <child>
                                   <object class="GtkScale" id="scale1">
-                                    <property name="can_focus">1</property>
+                                    <property name="can-focus">1</property>
                                     <property name="adjustment">adjustment1</property>
-                                    <property name="restrict_to_fill_level">0</property>
-                                    <property name="fill_level">75</property>
-                                    <property name="draw_value">0</property>
+                                    <property name="restrict-to-fill-level">0</property>
+                                    <property name="fill-level">75</property>
+                                    <property name="draw-value">0</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkScale" id="scale2">
                                     <property name="sensitive">0</property>
-                                    <property name="can_focus">1</property>
+                                    <property name="can-focus">1</property>
                                     <property name="adjustment">adjustment1</property>
-                                    <property name="restrict_to_fill_level">0</property>
-                                    <property name="fill_level">75</property>
-                                    <property name="draw_value">0</property>
+                                    <property name="restrict-to-fill-level">0</property>
+                                    <property name="fill-level">75</property>
+                                    <property name="draw-value">0</property>
                                   </object>
                                   <packing>
                                     <property name="position">1</property>
@@ -1043,12 +1038,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                         <child>
                           <object class="GtkScale" id="scale5">
-                            <property name="can_focus">1</property>
-                            <property name="draw_value">0</property>
-                            <property name="has_origin">0</property>
-                            <property name="round_digits">0</property>
+                            <property name="can-focus">1</property>
+                            <property name="draw-value">0</property>
+                            <property name="has-origin">0</property>
+                            <property name="round-digits">0</property>
                             <property name="adjustment">adjustment3</property>
-                            <property name="restrict_to_fill_level">0</property>
+                            <property name="restrict-to-fill-level">0</property>
                             <marks>
                               <mark value="0" position="bottom"></mark>
                               <mark value="1" position="bottom"></mark>
@@ -1096,13 +1091,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="homogeneous">1</property>
                                 <child>
                                   <object class="GtkScale" id="scale3">
-                                    <property name="height_request">100</property>
-                                    <property name="can_focus">1</property>
+                                    <property name="height-request">100</property>
+                                    <property name="can-focus">1</property>
                                     <property name="orientation">vertical</property>
                                     <property name="adjustment">adjustment1</property>
-                                    <property name="restrict_to_fill_level">0</property>
-                                    <property name="fill_level">75</property>
-                                    <property name="draw_value">1</property>
+                                    <property name="restrict-to-fill-level">0</property>
+                                    <property name="fill-level">75</property>
                                     <property name="digits">-1</property>
                                     <property name="halign">end</property>
                                     <signal name="format-value" handler="scale_format_value"/>
@@ -1110,14 +1104,13 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 </child>
                                 <child>
                                   <object class="GtkScale" id="scale4">
-                                    <property name="height_request">100</property>
+                                    <property name="height-request">100</property>
                                     <property name="sensitive">0</property>
-                                    <property name="can_focus">1</property>
+                                    <property name="can-focus">1</property>
                                     <property name="orientation">vertical</property>
                                     <property name="adjustment">adjustment1</property>
-                                    <property name="restrict_to_fill_level">0</property>
-                                    <property name="fill_level">75</property>
-                                    <property name="draw_value">1</property>
+                                    <property name="restrict-to-fill-level">0</property>
+                                    <property name="fill-level">75</property>
                                     <property name="digits">-1</property>
                                     <property name="halign">start</property>
                                     <signal name="format-value" handler="scale_format_value_blank"/>
@@ -1163,7 +1156,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child type="label">
                               <object class="GtkLabel" id="label1">
                                 <property name="label" translatable="yes">&lt;b&gt;Inset&lt;/b&gt;</property>
-                                <property name="use_markup">1</property>
+                                <property name="use-markup">1</property>
                               </object>
                             </child>
                           </object>
@@ -1176,7 +1169,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child type="label">
                               <object class="GtkLabel" id="label2">
                                 <property name="label" 
translatable="yes">&lt;b&gt;Outset&lt;/b&gt;</property>
-                                <property name="use_markup">1</property>
+                                <property name="use-markup">1</property>
                               </object>
                             </child>
                           </object>
@@ -1192,7 +1185,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child type="label">
                               <object class="GtkLabel" id="label17">
                                 <property name="label" 
translatable="yes">&lt;b&gt;Groove&lt;/b&gt;</property>
-                                <property name="use_markup">1</property>
+                                <property name="use-markup">1</property>
                               </object>
                             </child>
                           </object>
@@ -1208,7 +1201,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child type="label">
                               <object class="GtkLabel" id="label18">
                                 <property name="label" translatable="yes">&lt;b&gt;Ridge&lt;/b&gt;</property>
-                                <property name="use_markup">1</property>
+                                <property name="use-markup">1</property>
                               </object>
                             </child>
                           </object>
@@ -1236,17 +1229,17 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         <property name="hexpand">1</property>
                         <child>
                           <object class="GtkScrolledWindow" id="scrolledwindow1">
-                            <property name="width_request">150</property>
-                            <property name="can_focus">1</property>
-                            <property name="vscrollbar_policy">always</property>
-                            <property name="shadow_type">in</property>
+                            <property name="width-request">150</property>
+                            <property name="can-focus">1</property>
+                            <property name="vscrollbar-policy">always</property>
+                            <property name="shadow-type">in</property>
                             <property name="vexpand">1</property>
                             <child>
                               <object class="GtkTreeView" id="treeview1">
-                                <property name="can_focus">1</property>
+                                <property name="can-focus">1</property>
                                 <property name="model">liststore1</property>
-                                <property name="headers_clickable">0</property>
-                                <property name="search_column">0</property>
+                                <property name="headers-clickable">0</property>
+                                <property name="search-column">0</property>
                                 <child internal-child="selection">
                                   <object class="GtkTreeSelection" id="treeview-selection"/>
                                 </child>
@@ -1314,17 +1307,17 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                         <child>
                           <object class="GtkScrolledWindow" id="scrolledwindow2">
-                            <property name="can_focus">1</property>
-                            <property name="shadow_type">in</property>
+                            <property name="can-focus">1</property>
+                            <property name="shadow-type">in</property>
                             <property name="vexpand">1</property>
                             <child>
                               <object class="GtkTextView" id="textview1">
-                                <property name="can_focus">1</property>
+                                <property name="can-focus">1</property>
                                 <property name="buffer">textbuffer1</property>
-                                <property name="wrap_mode">2</property>
-                                <property name="left_margin">10</property>
-                                <property name="right_margin">10</property>
-                                <property name="populate_all">1</property>
+                                <property name="wrap-mode">2</property>
+                                <property name="left-margin">10</property>
+                                <property name="right-margin">10</property>
+                                <property name="populate-all">1</property>
                               </object>
                             </child>
                           </object>
@@ -1343,8 +1336,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkSeparator" id="separator5">
-                  </object>
+                  <object class="GtkSeparator" id="separator5"/>
                   <packing>
                     <property name="position">3</property>
                   </packing>
@@ -1355,7 +1347,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                     <property name="homogeneous">1</property>
                     <child>
                       <object class="GtkNotebook" id="notebook1">
-                        <property name="can_focus">1</property>
+                        <property name="can-focus">1</property>
                         <child>
                           <object class="GtkBox" id="box6">
                             <property name="orientation">vertical</property>
@@ -1366,7 +1358,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <property name="label" translatable="yes">page 1</property>
                           </object>
                           <packing>
-                            <property name="tab_fill">0</property>
+                            <property name="tab-fill">0</property>
                           </packing>
                         </child>
                         <child>
@@ -1383,7 +1375,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                           </object>
                           <packing>
                             <property name="position">1</property>
-                            <property name="tab_fill">0</property>
+                            <property name="tab-fill">0</property>
                           </packing>
                         </child>
                         <child>
@@ -1400,15 +1392,15 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                           </object>
                           <packing>
                             <property name="position">2</property>
-                            <property name="tab_fill">0</property>
+                            <property name="tab-fill">0</property>
                           </packing>
                         </child>
                       </object>
                     </child>
                     <child>
                       <object class="GtkNotebook" id="notebook2">
-                        <property name="can_focus">1</property>
-                        <property name="tab_pos">right</property>
+                        <property name="can-focus">1</property>
+                        <property name="tab-pos">right</property>
                         <child>
                           <object class="GtkBox" id="box9">
                             <property name="orientation">vertical</property>
@@ -1419,7 +1411,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <property name="label" translatable="yes">page 1</property>
                           </object>
                           <packing>
-                            <property name="tab_fill">0</property>
+                            <property name="tab-fill">0</property>
                           </packing>
                         </child>
                         <child>
@@ -1436,7 +1428,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                           </object>
                           <packing>
                             <property name="position">1</property>
-                            <property name="tab_fill">0</property>
+                            <property name="tab-fill">0</property>
                           </packing>
                         </child>
                         <child>
@@ -1453,7 +1445,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                           </object>
                           <packing>
                             <property name="position">2</property>
-                            <property name="tab_fill">0</property>
+                            <property name="tab-fill">0</property>
                           </packing>
                         </child>
                       </object>
@@ -1463,8 +1455,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                     </child>
                     <child>
                       <object class="GtkNotebook" id="notebook3">
-                        <property name="can_focus">1</property>
-                        <property name="tab_pos">bottom</property>
+                        <property name="can-focus">1</property>
+                        <property name="tab-pos">bottom</property>
                         <child>
                           <object class="GtkBox" id="box12">
                             <property name="orientation">vertical</property>
@@ -1475,7 +1467,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <property name="label" translatable="yes">page 1</property>
                           </object>
                           <packing>
-                            <property name="tab_fill">0</property>
+                            <property name="tab-fill">0</property>
                           </packing>
                         </child>
                         <child>
@@ -1492,7 +1484,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                           </object>
                           <packing>
                             <property name="position">1</property>
-                            <property name="tab_fill">0</property>
+                            <property name="tab-fill">0</property>
                           </packing>
                         </child>
                         <child>
@@ -1509,7 +1501,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                           </object>
                           <packing>
                             <property name="position">2</property>
-                            <property name="tab_fill">0</property>
+                            <property name="tab-fill">0</property>
                           </packing>
                         </child>
                       </object>
@@ -1519,8 +1511,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                     </child>
                     <child>
                       <object class="GtkNotebook" id="notebook4">
-                        <property name="can_focus">1</property>
-                        <property name="tab_pos">left</property>
+                        <property name="can-focus">1</property>
+                        <property name="tab-pos">left</property>
                         <child>
                           <object class="GtkBox" id="box15">
                             <property name="orientation">vertical</property>
@@ -1531,7 +1523,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <property name="label" translatable="yes">page 1</property>
                           </object>
                           <packing>
-                            <property name="tab_fill">0</property>
+                            <property name="tab-fill">0</property>
                           </packing>
                         </child>
                         <child>
@@ -1548,7 +1540,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                           </object>
                           <packing>
                             <property name="position">1</property>
-                            <property name="tab_fill">0</property>
+                            <property name="tab-fill">0</property>
                           </packing>
                         </child>
                         <child>
@@ -1565,7 +1557,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                           </object>
                           <packing>
                             <property name="position">2</property>
-                            <property name="tab_fill">0</property>
+                            <property name="tab-fill">0</property>
                           </packing>
                         </child>
                       </object>
@@ -1689,8 +1681,7 @@ microphone-sensitivity-medium-symbolic</property>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkSeparator">
-                          </object>
+                          <object class="GtkSeparator"/>
                         </child>
                         <child>
                           <object class="GtkFrame" id="page2frame1">
@@ -1703,13 +1694,13 @@ microphone-sensitivity-medium-symbolic</property>
                                     <property name="transition-duration">1000</property>
                                     <child>
                                       <object class="GtkScrolledWindow" id="swo">
-                                        <property name="hscrollbar_policy">never</property>
+                                        <property name="hscrollbar-policy">never</property>
                                         <child>
                                           <object class="GtkTextView" id="tvo">
-                                            <property name="can_focus">1</property>
+                                            <property name="can-focus">1</property>
                                             <property name="buffer">textbuffer2</property>
-                                            <property name="left_margin">10</property>
-                                            <property name="right_margin">10</property>
+                                            <property name="left-margin">10</property>
+                                            <property name="right-margin">10</property>
                                           </object>
                                         </child>
                                       </object>
@@ -1748,7 +1739,7 @@ microphone-sensitivity-medium-symbolic</property>
                                         <property name="icon-name">emblem-system-symbolic</property>
                                       </object>
                                       <packing>
-                                        <property name="pack_type">end</property>
+                                        <property name="pack-type">end</property>
                                       </packing>
                                     </child>
                                   </object>
@@ -1758,15 +1749,13 @@ microphone-sensitivity-medium-symbolic</property>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkSeparator">
-                          </object>
+                          <object class="GtkSeparator"/>
                         </child>
                         <child>
                           <object class="GtkScrolledWindow">
                             <property name="shadow-type">in</property>
                             <property name="hscrollbar-policy">never</property>
                             <property name="min-content-height">200</property>
-                            <property name="hexpand">0</property>
                             <child>
                               <object class="GtkListBox" id="listbox">
                                 <property name="selection-mode">none</property>
@@ -1975,42 +1964,41 @@ microphone-sensitivity-medium-symbolic</property>
                                     <child>
                                       <object class="GtkMenuItem" id="menuitem1">
                                         <property name="label" translatable="yes">_File</property>
-                                        <property name="use_underline">1</property>
+                                        <property name="use-underline">1</property>
                                         <child type="submenu">
                                           <object class="GtkMenu" id="menu1">
                                             <child>
                                               <object class="GtkMenuItem" id="menuitem101">
                                                 <property name="label" translatable="yes">_New</property>
-                                                <property name="use_underline">1</property>
+                                                <property name="use-underline">1</property>
                                               </object>
                                             </child>
                                             <child>
                                               <object class="GtkMenuItem" id="menuitem102">
                                                 <property name="label" translatable="yes">_Open</property>
-                                                <property name="use_underline">1</property>
+                                                <property name="use-underline">1</property>
                                               </object>
                                             </child>
                                             <child>
                                               <object class="GtkMenuItem" id="menuitem103">
                                                 <property name="label" translatable="yes">_Save</property>
-                                                <property name="use_underline">1</property>
+                                                <property name="use-underline">1</property>
                                               </object>
                                             </child>
                                             <child>
                                               <object class="GtkMenuItem" id="menuitem104">
                                                 <property name="label" translatable="yes">Save _As</property>
-                                                <property name="use_underline">1</property>
+                                                <property name="use-underline">1</property>
                                               </object>
                                             </child>
                                             <child>
-                                              <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
-                                              </object>
+                                              <object class="GtkSeparatorMenuItem" id="separatormenuitem1"/>
                                             </child>
                                             <child>
                                               <object class="GtkMenuItem" id="quitmenuitem">
                                                 <property name="label" translatable="yes">_Quit</property>
-                                                <property name="use_underline">1</property>
-                                                <property name="action_name">app.quit</property>
+                                                <property name="use-underline">1</property>
+                                                <property name="action-name">app.quit</property>
                                               </object>
                                             </child>
                                           </object>
@@ -2020,53 +2008,53 @@ microphone-sensitivity-medium-symbolic</property>
                                     <child>
                                       <object class="GtkMenuItem" id="menuitem2">
                                         <property name="label" translatable="yes">_Edit</property>
-                                        <property name="use_underline">1</property>
+                                        <property name="use-underline">1</property>
                                         <child type="submenu">
                                           <object class="GtkMenu" id="menu2">
                                             <child>
                                               <object class="GtkMenuItem" id="menuitem106">
                                                 <property name="label" translatable="yes">Cu_t</property>
-                                                <property name="can_focus">1</property>
-                                                <property name="use_underline">1</property>
+                                                <property name="can-focus">1</property>
+                                                <property name="use-underline">1</property>
                                               </object>
                                             </child>
                                             <child>
                                               <object class="GtkMenuItem" id="menuitem107">
                                                 <property name="label" translatable="yes">_Copy</property>
-                                                <property name="use_underline">1</property>
+                                                <property name="use-underline">1</property>
                                               </object>
                                             </child>
                                             <child>
                                               <object class="GtkMenuItem" id="menuitem108">
                                                 <property name="label" translatable="yes">_Paste</property>
-                                                <property name="use_underline">1</property>
+                                                <property name="use-underline">1</property>
                                               </object>
                                             </child>
                                             <child>
                                               <object class="GtkMenuItem" id="deletemenuitem">
                                                 <property name="label" translatable="yes">_Delete</property>
-                                                <property name="use_underline">1</property>
-                                                <property name="action_name">win.delete</property>
+                                                <property name="use-underline">1</property>
+                                                <property name="action-name">win.delete</property>
                                               </object>
                                             </child>
                                             <child>
                                               <object class="GtkMenuItem" id="searchmenuitem">
                                                 <property name="label" translatable="yes">_Search</property>
-                                                <property name="use_underline">1</property>
-                                                <property name="action_name">win.search</property>
+                                                <property name="use-underline">1</property>
+                                                <property name="action-name">win.search</property>
                                               </object>
                                             </child>
                                             <child>
                                               <object class="GtkMenuItem" id="togglesmenuitem">
                                                 <property name="label">Checks &amp; Radios</property>
-                                                <property name="use_underline">1</property>
+                                                <property name="use-underline">1</property>
                                                 <child type="submenu">
                                                   <object class="GtkMenu" id="togglessubmenu">
                                                     <child>
                                                       <object class="GtkCheckMenuItem" id="checkmenuitem1">
                                                         <property name="label">_Check</property>
                                                         <property name="active">1</property>
-                                                        <property name="use_underline">1</property>
+                                                        <property name="use-underline">1</property>
                                                       </object>
                                                     </child>
                                                     <child>
@@ -2074,27 +2062,27 @@ microphone-sensitivity-medium-symbolic</property>
                                                         <property name="label">_Check</property>
                                                         <property name="active">1</property>
                                                         <property name="sensitive">0</property>
-                                                        <property name="use_underline">1</property>
+                                                        <property name="use-underline">1</property>
                                                       </object>
                                                     </child>
                                                     <child>
                                                       <object class="GtkCheckMenuItem" id="checkmenuitem3">
                                                         <property name="label">_Check</property>
                                                         <property name="inconsistent">1</property>
-                                                        <property name="use_underline">1</property>
+                                                        <property name="use-underline">1</property>
                                                       </object>
                                                     </child>
                                                     <child>
                                                       <object class="GtkCheckMenuItem" id="checkmenuitem4">
                                                         <property name="label">_Check</property>
-                                                        <property name="use_underline">1</property>
+                                                        <property name="use-underline">1</property>
                                                       </object>
                                                     </child>
                                                     <child>
                                                       <object class="GtkCheckMenuItem" id="checkmenuitem5">
                                                         <property name="label">_Check</property>
                                                         <property name="sensitive">0</property>
-                                                        <property name="use_underline">1</property>
+                                                        <property name="use-underline">1</property>
                                                       </object>
                                                     </child>
                                                     <child>
@@ -2102,18 +2090,17 @@ microphone-sensitivity-medium-symbolic</property>
                                                         <property name="label">_Check</property>
                                                         <property name="inconsistent">1</property>
                                                         <property name="sensitive">0</property>
-                                                        <property name="use_underline">1</property>
+                                                        <property name="use-underline">1</property>
                                                       </object>
                                                     </child>
                                                     <child>
-                                                      <object class="GtkSeparatorMenuItem" 
id="separatormenuitem">
-                                                      </object>
+                                                      <object class="GtkSeparatorMenuItem" 
id="separatormenuitem"/>
                                                     </child>
                                                     <child>
                                                       <object class="GtkRadioMenuItem" id="radiomenuitem1">
                                                         <property name="label">_Radio</property>
                                                         <property name="active">1</property>
-                                                        <property name="use_underline">1</property>
+                                                        <property name="use-underline">1</property>
                                                       </object>
                                                     </child>
                                                     <child>
@@ -2121,27 +2108,27 @@ microphone-sensitivity-medium-symbolic</property>
                                                         <property name="label">_Radio</property>
                                                         <property name="active">1</property>
                                                         <property name="sensitive">0</property>
-                                                        <property name="use_underline">1</property>
+                                                        <property name="use-underline">1</property>
                                                       </object>
                                                     </child>
                                                     <child>
                                                       <object class="GtkRadioMenuItem" id="radiomenuitem3">
                                                         <property name="label">_Radio</property>
                                                         <property name="inconsistent">1</property>
-                                                        <property name="use_underline">1</property>
+                                                        <property name="use-underline">1</property>
                                                       </object>
                                                     </child>
                                                     <child>
                                                       <object class="GtkRadioMenuItem" id="radiomenuitem4">
                                                         <property name="label">_Radio</property>
-                                                        <property name="use_underline">1</property>
+                                                        <property name="use-underline">1</property>
                                                       </object>
                                                     </child>
                                                     <child>
                                                       <object class="GtkRadioMenuItem" id="radiomenuitem5">
                                                         <property name="label">_Radio</property>
                                                         <property name="sensitive">0</property>
-                                                        <property name="use_underline">1</property>
+                                                        <property name="use-underline">1</property>
                                                       </object>
                                                     </child>
                                                     <child>
@@ -2149,7 +2136,7 @@ microphone-sensitivity-medium-symbolic</property>
                                                         <property name="label">_Radio</property>
                                                         <property name="inconsistent">1</property>
                                                         <property name="sensitive">0</property>
-                                                        <property name="use_underline">1</property>
+                                                        <property name="use-underline">1</property>
                                                       </object>
                                                     </child>
                                                   </object>
@@ -2163,37 +2150,37 @@ microphone-sensitivity-medium-symbolic</property>
                                     <child>
                                       <object class="GtkMenuItem" id="menuitem3">
                                         <property name="label" translatable="yes">_View</property>
-                                        <property name="use_underline">1</property>
+                                        <property name="use-underline">1</property>
                                         <child type="submenu">
                                           <object class="GtkMenu" id="view-menu">
                                             <child>
                                               <object class="GtkCheckMenuItem" id="darkmenuitem">
                                                 <property name="label">_Dark theme</property>
-                                                <property name="use_underline">1</property>
-                                                <property name="action_name">win.dark</property>
+                                                <property name="use-underline">1</property>
+                                                <property name="action-name">win.dark</property>
                                               </object>
                                             </child>
                                             <child>
                                               <object class="GtkCheckMenuItem" id="toolbarmenuitem">
                                                 <property name="label">_Toolbar</property>
                                                 <property name="active">1</property>
-                                                <property name="use_underline">1</property>
-                                                <property name="action_name">win.toolbar</property>
+                                                <property name="use-underline">1</property>
+                                                <property name="action-name">win.toolbar</property>
                                               </object>
                                             </child>
                                             <child>
                                               <object class="GtkCheckMenuItem" id="statusbarmenuitem">
                                                 <property name="label">_Statusbar</property>
                                                 <property name="active">1</property>
-                                                <property name="use_underline">1</property>
-                                                <property name="action_name">win.statusbar</property>
+                                                <property name="use-underline">1</property>
+                                                <property name="action-name">win.statusbar</property>
                                               </object>
                                             </child>
                                             <child>
                                               <object class="GtkMenuItem" id="bgmenuitem">
                                                 <property name="label">_Select Background</property>
-                                                <property name="use_underline">1</property>
-                                                <property name="action_name">win.background</property>
+                                                <property name="use-underline">1</property>
+                                                <property name="action-name">win.background</property>
                                               </object>
                                             </child>
                                           </object>
@@ -2203,14 +2190,14 @@ microphone-sensitivity-medium-symbolic</property>
                                     <child>
                                       <object class="GtkMenuItem" id="menuitem4">
                                         <property name="label" translatable="yes">_Help</property>
-                                        <property name="use_underline">1</property>
+                                        <property name="use-underline">1</property>
                                         <child type="submenu">
                                           <object class="GtkMenu" id="menu3">
                                             <child>
                                               <object class="GtkMenuItem" id="aboutmenuitem">
                                                 <property name="label" translatable="yes">_About</property>
-                                                <property name="use_underline">1</property>
-                                                <property name="action_name">app.about</property>
+                                                <property name="use-underline">1</property>
+                                                <property name="action-name">app.about</property>
                                               </object>
                                             </child>
                                           </object>
@@ -2256,8 +2243,7 @@ microphone-sensitivity-medium-symbolic</property>
                                 <child>
                                   <object class="GtkSearchBar" id="searchbar">
                                     <child>
-                                      <object class="GtkSearchEntry">
-                                      </object>
+                                      <object class="GtkSearchEntry"/>
                                     </child>
                                   </object>
                                 </child>
@@ -2278,23 +2264,22 @@ microphone-sensitivity-medium-symbolic</property>
                                 </child>
                                 <child>
                                   <object class="GtkScrolledWindow">
-                                    <property name="shadow_type">in</property>
+                                    <property name="shadow-type">in</property>
                                     <property name="vexpand">1</property>
                                     <child>
                                       <object class="MyTextView" id="text3">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
+                                        <property name="can-focus">True</property>
                                         <property name="buffer">textbuffer1</property>
-                                        <property name="wrap_mode">2</property>
-                                        <property name="left_margin">10</property>
-                                        <property name="right_margin">10</property>
+                                        <property name="wrap-mode">2</property>
+                                        <property name="left-margin">10</property>
+                                        <property name="right-margin">10</property>
                                       </object>
                                     </child>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkStatusbar" id="statusbar">
-                                    <property name="visible">1</property>
                                   </object>
                                 </child>
                               </object>
@@ -2302,8 +2287,7 @@ microphone-sensitivity-medium-symbolic</property>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkSeparator">
-                          </object>
+                          <object class="GtkSeparator"/>
                         </child>
                         <child>
                           <object class="GtkBox">
@@ -2377,30 +2361,28 @@ microphone-sensitivity-medium-symbolic</property>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkSeparator">
-                          </object>
+                          <object class="GtkSeparator"/>
                         </child>
                         <child>
                           <object class="GtkExpander" id="expander1">
-                            <property name="can_focus">1</property>
+                            <property name="can-focus">1</property>
                             <property name="expanded">1</property>
                             <child>
                               <object class="GtkBox">
                                 <property name="orientation">vertical</property>
                                 <child>
                                   <object class="GtkScrolledWindow" id="scrolledwindow3">
-                                    <property name="can_focus">1</property>
-                                    <property name="shadow_type">in</property>
+                                    <property name="can-focus">1</property>
+                                    <property name="shadow-type">in</property>
                                     <property name="margin-top">6</property>
-                                    <property name="height_request">226</property>
+                                    <property name="height-request">226</property>
                                     <child>
                                       <object class="GtkIconView" id="iconview1">
-                                        <property name="can_focus">1</property>
-                                        <property name="selection_mode">multiple</property>
+                                        <property name="can-focus">1</property>
+                                        <property name="selection-mode">multiple</property>
                                         <property name="model">iconsmodel</property>
                                         <child>
-                                          <object class="GtkCellRendererPixbuf" id="iconviewcell">
-                                          </object>
+                                          <object class="GtkCellRendererPixbuf" id="iconviewcell"/>
                                           <attributes>
                                             <attribute name="icon-name">0</attribute>
                                           </attributes>
@@ -2450,25 +2432,25 @@ microphone-sensitivity-medium-symbolic</property>
                         <child>
                           <object class="GtkButton" id="info_dialog_button">
                             <property name="label" translatable="yes">_Inform</property>
-                            <property name="use_underline">1</property>
+                            <property name="use-underline">1</property>
                           </object>
                         </child>
                         <child>
                           <object class="GtkButton" id="action_dialog_button">
                             <property name="label" translatable="yes">_Act</property>
-                            <property name="use_underline">1</property>
+                            <property name="use-underline">1</property>
                           </object>
                         </child>
                         <child>
                           <object class="GtkButton" id="preference_dialog_button">
                             <property name="label" translatable="yes">_Configure</property>
-                            <property name="use_underline">1</property>
+                            <property name="use-underline">1</property>
                           </object>
                         </child>
                         <child>
                           <object class="GtkButton" id="selection_dialog_button">
                             <property name="label" translatable="yes">_Select</property>
-                            <property name="use_underline">1</property>
+                            <property name="use-underline">1</property>
                           </object>
                         </child>
                       </object>
@@ -2499,7 +2481,6 @@ microphone-sensitivity-medium-symbolic</property>
                             <property name="height-request">300</property>
                             <property name="halign">start</property>
                             <property name="shadow-type">in</property>
-                            <property name="hexpand">0</property>
                             <child>
                               <object class="GtkTreeView" id="charletree">
                                 <property name="enable-grid-lines">vertical</property>
@@ -2559,8 +2540,7 @@ microphone-sensitivity-medium-symbolic</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkSeparator">
-                      </object>
+                      <object class="GtkSeparator"/>
                     </child>
                     <child>
                       <object class="GtkScrolledWindow">
@@ -2571,7 +2551,6 @@ microphone-sensitivity-medium-symbolic</property>
                           <object class="GtkListBox" id="munsell">
                             <property name="selection-mode">multiple</property>
                             <property name="activate-on-single-click">0</property>
-                            <property name="hexpand">0</property>
                           </object>
                         </child>
                       </object>
@@ -2615,7 +2594,7 @@ microphone-sensitivity-medium-symbolic</property>
                                     <child>
                                       <object class="GtkImage">
                                         <property name="valign">baseline</property>
-                                        <property name="icon_name">pan-down-symbolic</property>
+                                        <property name="icon-name">pan-down-symbolic</property>
                                       </object>
                                     </child>
                                   </object>
@@ -2637,7 +2616,7 @@ microphone-sensitivity-medium-symbolic</property>
                                     <child>
                                       <object class="GtkImage">
                                         <property name="valign">baseline</property>
-                                        <property name="icon_name">media-record-symbolic</property>
+                                        <property name="icon-name">media-record-symbolic</property>
                                       </object>
                                     </child>
                                     <child>
@@ -2683,14 +2662,12 @@ microphone-sensitivity-medium-symbolic</property>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkLockButton" id="lockbutton">
-                          </object>
+                          <object class="GtkLockButton" id="lockbutton"/>
                         </child>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkSeparator">
-                      </object>
+                      <object class="GtkSeparator"/>
                     </child>
                     <child>
                       <object class="GtkFrame">
@@ -2891,7 +2868,6 @@ microphone-sensitivity-medium-symbolic</property>
                       <object class="GtkFrame">
                         <child>
                           <object class="GtkBox">
-                            <property name="hexpand">0</property>
                             <child>
                               <object class="GtkToolbar">
                                 <property name="orientation">vertical</property>
@@ -2922,8 +2898,7 @@ microphone-sensitivity-medium-symbolic</property>
                               <object class="GtkScrolledWindow">
                                 <property name="hexpand">1</property>
                                 <child>
-                                  <object class="GtkTextView" id="tooltextview">
-                                  </object>
+                                  <object class="GtkTextView" id="tooltextview"/>
                                 </child>
                               </object>
                             </child>
@@ -3143,16 +3118,16 @@ microphone-sensitivity-medium-symbolic</property>
                         <property name="halign">center</property>
                         <child>
                           <object class="GtkEntry">
-                            <property name="can_focus">1</property>
-                            <property name="placeholder_text" translatable="yes">Name…</property>
+                            <property name="can-focus">1</property>
+                            <property name="placeholder-text" translatable="yes">Name…</property>
                             <property name="completion">name_completion</property>
                           </object>
                         </child>
                         <child>
                           <object class="GtkEntry">
-                            <property name="can_focus">1</property>
-                            <property name="show_emoji_icon">1</property>
-                            <property name="placeholder_text" translatable="yes">Age…</property>
+                            <property name="can-focus">1</property>
+                            <property name="show-emoji-icon">1</property>
+                            <property name="placeholder-text" translatable="yes">Age…</property>
                           </object>
                           <packing>
                             <property name="position">1</property>
@@ -3165,7 +3140,6 @@ microphone-sensitivity-medium-symbolic</property>
                     </child>
                     <child>
                       <object class="GtkSeparator">
-                        <property name="orientation">horizontal</property>
                       </object>
                     </child>
                     <child>
@@ -3209,8 +3183,7 @@ microphone-sensitivity-medium-symbolic</property>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkBox">
-                          </object>
+                          <object class="GtkBox"/>
                           <packing>
                             <property name="tab-expand">1</property>
                           </packing>
@@ -3221,8 +3194,7 @@ microphone-sensitivity-medium-symbolic</property>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkBox">
-                          </object>
+                          <object class="GtkBox"/>
                           <packing>
                             <property name="tab-expand">1</property>
                           </packing>
@@ -3233,8 +3205,7 @@ microphone-sensitivity-medium-symbolic</property>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkBox">
-                          </object>
+                          <object class="GtkBox"/>
                           <packing>
                             <property name="tab-expand">1</property>
                           </packing>
@@ -3275,13 +3246,13 @@ bad things might happen.</property>
     <child type="action">
       <object class="GtkButton" id="cancel_info_dialog">
         <property name="label" translatable="yes">_Cancel</property>
-        <property name="use_underline">1</property>
+        <property name="use-underline">1</property>
       </object>
     </child>
     <child type="action">
       <object class="GtkButton" id="doit_info_dialog">
         <property name="label" translatable="yes">_Do It</property>
-        <property name="use_underline">1</property>
+        <property name="use-underline">1</property>
       </object>
     </child>
     <action-widgets>
@@ -3309,7 +3280,7 @@ bad things might happen.</property>
     <child type="action">
       <object class="GtkButton" id="cancel_action_dialog">
         <property name="label" translatable="yes">_Run</property>
-        <property name="use_underline">1</property>
+        <property name="use-underline">1</property>
       </object>
     </child>
     <child type="action">
@@ -3317,7 +3288,7 @@ bad things might happen.</property>
         <property name="can-default">1</property>
         <property name="has-default">1</property>
         <property name="label" translatable="yes">_Act</property>
-        <property name="use_underline">1</property>
+        <property name="use-underline">1</property>
       </object>
     </child>
     <action-widgets>
@@ -3469,7 +3440,7 @@ bad things might happen.</property>
     <child type="action">
       <object class="GtkButton" id="cancel_selection_dialog">
         <property name="label" translatable="yes">_Cancel</property>
-        <property name="use_underline">1</property>
+        <property name="use-underline">1</property>
       </object>
     </child>
     <child type="action">
@@ -3477,7 +3448,7 @@ bad things might happen.</property>
         <property name="can-default">1</property>
         <property name="has-default">1</property>
         <property name="label" translatable="yes">_Select</property>
-        <property name="use_underline">1</property>
+        <property name="use-underline">1</property>
       </object>
     </child>
     <action-widgets>
@@ -3521,8 +3492,7 @@ bad things might happen.</property>
             <property name="min-content-width">100</property>
             <property name="max-content-width">100</property>
             <child>
-              <object class="GtkTextView" id="open_popover_textview">
-              </object>
+              <object class="GtkTextView" id="open_popover_textview"/>
             </child>
           </object>
           <packing>
diff --git a/gtk/inspector/actions.ui b/gtk/inspector/actions.ui
index aa33bc0..eb958c8 100644
--- a/gtk/inspector/actions.ui
+++ b/gtk/inspector/actions.ui
@@ -14,16 +14,13 @@
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkScrolledWindow">
-        <property name="visible">True</property>
-        <property name="expand">True</property>
+        <property name="expand">1</property>
         <property name="hscrollbar-policy">never</property>
-        <property name="vscrollbar-policy">automatic</property>
         <child>
-          <object class= "GtkTreeView">
-            <property name="visible">True</property>
+          <object class="GtkTreeView">
             <property name="model">model</property>
-            <property name="enable-search">False</property>
-            <property name="activate-on-single-click">True</property>
+            <property name="enable-search">0</property>
+            <property name="activate-on-single-click">1</property>
             <signal name="row-activated" handler="row_activated"/>
             <child>
               <object class="GtkTreeViewColumn">
diff --git a/gtk/inspector/css-editor.ui b/gtk/inspector/css-editor.ui
index bb195cb..e1b661e 100644
--- a/gtk/inspector/css-editor.ui
+++ b/gtk/inspector/css-editor.ui
@@ -23,52 +23,39 @@
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="orientation">horizontal</property>
         <property name="spacing">6</property>
         <property name="margin">6</property>
         <child>
           <object class="GtkToggleButton" id="disable_button">
-            <property name="visible">True</property>
             <property name="relief">none</property>
             <property name="tooltip-text" translatable="yes">Disable this custom CSS</property>
             <property name="icon-name">media-playback-pause-symbolic</property>
             <signal name="toggled" handler="disable_toggled"/>
           </object>
-          <packing>
-            <property name="pack-type">start</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="save_button">
-            <property name="visible">True</property>
             <property name="relief">none</property>
             <property name="tooltip-text" translatable="yes">Save the current CSS</property>
             <property name="icon-name">document-save-symbolic</property>
             <signal name="clicked" handler="save_clicked"/>
           </object>
-          <packing>
-            <property name="pack-type">start</property>
-          </packing>
         </child>
       </object>
     </child>
     <child>
       <object class="GtkScrolledWindow">
-        <property name="visible">True</property>
         <property name="hscrollbar-policy">never</property>
-        <property name="vscrollbar-policy">automatic</property>
-        <property name="expand">True</property>
+        <property name="expand">1</property>
         <child>
           <object class="GtkTextView" id="view">
-            <property name="visible">True</property>
             <property name="buffer">text</property>
             <property name="wrap-mode">word</property>
-            <property name="monospace">True</property>
-            <property name="has-focus">True</property>
+            <property name="monospace">1</property>
+            <property name="has-focus">1</property>
             <property name="left-margin">6</property>
             <property name="right-margin">6</property>
-            <property name="has-tooltip">True</property>
+            <property name="has-tooltip">1</property>
             <signal name="query-tooltip" handler="query_tooltip_cb"/>
           </object>
         </child>
diff --git a/gtk/inspector/css-node-tree.ui b/gtk/inspector/css-node-tree.ui
index 851bfbc..fcc97d6 100644
--- a/gtk/inspector/css-node-tree.ui
+++ b/gtk/inspector/css-node-tree.ui
@@ -12,18 +12,14 @@
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkPaned" id="paned">
-        <property name="visible">1</property>
         <property name="wide-handle">1</property>
-        <property name="orientation">horizontal</property>
         <property name="position">400</property>
         <child>
           <object class="GtkScrolledWindow">
-            <property name="visible">1</property>
             <property name="expand">1</property>
             <property name="min-content-height">100</property>
             <child>
               <object class="GtkTreeView" id="node_tree">
-                <property name="visible">1</property>
                 <property name="search-column">0</property>
                 <property name="enable-search">0</property>
                 <property name="enable-grid-lines">vertical</property>
@@ -91,16 +87,13 @@
         </child>
         <child>
           <object class="GtkBox">
-            <property name="visible">1</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkScrolledWindow">
-                <property name="visible">1</property>
                 <property name="expand">1</property>
                 <property name="min-content-height">100</property>
                 <child>
                   <object class="GtkTreeView" id="prop_tree">
-                    <property name="visible">1</property>
                     <property name="model">prop_model</property>
                     <property name="search-column">0</property>
                     <property name="enable-search">0</property>
diff --git a/gtk/inspector/data-list.ui b/gtk/inspector/data-list.ui
index 3acd716..b2ed65a 100644
--- a/gtk/inspector/data-list.ui
+++ b/gtk/inspector/data-list.ui
@@ -4,25 +4,18 @@
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="orientation">horizontal</property>
         <property name="spacing">6</property>
         <property name="margin">6</property>
         <child>
           <object class="GtkToggleButton" id="show_button">
-            <property name="visible">True</property>
             <property name="relief">none</property>
             <property name="tooltip-text" translatable="yes">Show data</property>
             <property name="icon-name">view-refresh-symbolic</property>
             <signal name="toggled" handler="toggle_show"/>
           </object>
-          <packing>
-            <property name="pack-type">start</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="object_title">
-            <property name="visible">True</property>
             <property name="hexpand">1</property>
             <property name="halign">center</property>
           </object>
@@ -31,13 +24,10 @@
     </child>
     <child>
       <object class="GtkScrolledWindow">
-        <property name="visible">True</property>
-        <property name="expand">True</property>
-        <property name="hscrollbar-policy">automatic</property>
+        <property name="expand">1</property>
         <property name="vscrollbar-policy">always</property>
         <child>
-          <object class= "GtkTreeView" id="view">
-            <property name="visible">True</property>
+          <object class="GtkTreeView" id="view">
           </object>
         </child>
       </object>
diff --git a/gtk/inspector/general.ui b/gtk/inspector/general.ui
index 0188cb0..7a9ba39 100644
--- a/gtk/inspector/general.ui
+++ b/gtk/inspector/general.ui
@@ -6,32 +6,24 @@
     <property name="expand">0</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <property name="margin">60</property>
         <property name="spacing">10</property>
-
         <child>
           <object class="GtkFrame" id="version_frame">
-            <property name="visible">True</property>
             <property name="halign">center</property>
             <child>
               <object class="GtkListBox" id="version_box">
-                <property name="visible">True</property>
                 <property name="selection-mode">none</property>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="gtk_version_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">GTK+ Version</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -40,8 +32,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="gtk_version">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="hexpand">1</property>
@@ -53,17 +44,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="gdk_backend_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">GDK Backend</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -72,8 +59,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="gdk_backend">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="hexpand">1</property>
@@ -85,17 +71,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="gsk_renderer_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">GSK Renderer</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -104,8 +86,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="gsk_renderer">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="hexpand">1</property>
@@ -119,28 +100,21 @@
             </child>
           </object>
         </child>
-
         <child>
           <object class="GtkFrame" id="env_frame">
-            <property name="visible">True</property>
             <property name="halign">center</property>
             <child>
               <object class="GtkListBox" id="env_box">
-                <property name="visible">True</property>
                 <property name="selection-mode">none</property>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="prefix_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Prefix</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -149,8 +123,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="prefix">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
@@ -163,17 +136,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="xdg_data_home_label">
-                            <property name="visible">True</property>
                             <property name="label">XDG_DATA_HOME</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -182,8 +151,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="xdg_data_home">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
@@ -196,17 +164,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="xdg_data_dirs_label">
-                            <property name="visible">True</property>
                             <property name="label">XDG_DATA_DIRS</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -215,8 +179,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="xdg_data_dirs">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
@@ -229,17 +192,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="gtk_path_label">
-                            <property name="visible">True</property>
                             <property name="label">GTK_PATH</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -248,8 +207,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="gtk_path">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
@@ -262,17 +220,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="gtk_exe_prefix_label">
-                            <property name="visible">True</property>
                             <property name="label">GTK_EXE_PREFIX</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -281,8 +235,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="gtk_exe_prefix">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
@@ -295,17 +248,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="gtk_data_prefix_label">
-                            <property name="visible">True</property>
                             <property name="label">GTK_DATA_PREFIX</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -314,8 +263,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="gtk_data_prefix">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
@@ -328,17 +276,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="gsettings_schema_dir_label">
-                            <property name="visible">True</property>
                             <property name="label">GSETTINGS_SCHEMA_DIR</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -347,8 +291,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="gsettings_schema_dir">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
@@ -363,28 +306,21 @@
             </child>
           </object>
         </child>
-
         <child>
           <object class="GtkFrame" id="display_frame">
-            <property name="visible">True</property>
             <property name="halign">center</property>
             <child>
               <object class="GtkListBox" id="display_box">
-                <property name="visible">True</property>
                 <property name="selection-mode">none</property>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="display_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Display</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -393,8 +329,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="display_name">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
@@ -407,17 +342,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="display_rgba_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">RGBA Visual</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -438,17 +369,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="display_composited_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Composited</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -471,28 +398,21 @@
             </child>
           </object>
         </child>
-
         <child>
           <object class="GtkFrame" id="gl_frame">
-            <property name="visible">True</property>
             <property name="halign">center</property>
             <child>
               <object class="GtkListBox" id="gl_box">
-                <property name="visible">True</property>
                 <property name="selection-mode">none</property>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="gl_version_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">GL Version</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -501,8 +421,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="gl_version">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
@@ -515,17 +434,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="gl_vendor_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">GL Vendor</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -534,8 +449,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="gl_vendor">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
@@ -550,28 +464,21 @@
             </child>
           </object>
         </child>
-
         <child>
           <object class="GtkFrame" id="vulkan_frame">
-            <property name="visible">True</property>
             <property name="halign">center</property>
             <child>
               <object class="GtkListBox" id="vulkan_box">
-                <property name="visible">True</property>
                 <property name="selection-mode">none</property>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="vk_device_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Vulkan Device</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -580,8 +487,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="vk_device">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
@@ -594,17 +500,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="vk_api_version_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Vulkan API version</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -613,8 +515,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="vk_api_version">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
@@ -627,17 +528,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="vk_driver_version_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Vulkan driver version</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -646,8 +543,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="vk_driver_version">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
@@ -662,25 +558,20 @@
             </child>
           </object>
         </child>
-
         <child>
           <object class="GtkFrame" id="device_frame">
-            <property name="visible">True</property>
             <property name="halign">center</property>
             <child>
               <object class="GtkListBox" id="device_box">
-                <property name="visible">True</property>
                 <property name="selection-mode">none</property>
               </object>
             </child>
           </object>
         </child>
-
       </object>
     </child>
   </template>
   <object class="GtkSizeGroup" id="labels">
-    <property name="mode">horizontal</property>
     <widgets>
       <widget name="gtk_version_label"/>
       <widget name="gdk_backend_label"/>
@@ -703,7 +594,6 @@
     </widgets>
   </object>
   <object class="GtkSizeGroup">
-    <property name="mode">horizontal</property>
     <widgets>
       <widget name="version_frame"/>
       <widget name="gl_frame"/>
diff --git a/gtk/inspector/magnifier.ui b/gtk/inspector/magnifier.ui
index 8bf7f62..528f106 100644
--- a/gtk/inspector/magnifier.ui
+++ b/gtk/inspector/magnifier.ui
@@ -4,11 +4,7 @@
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkScrolledWindow">
-        <property name="visible">True</property>
-        <property name="hscrollbar-policy">automatic</property>
-        <property name="vscrollbar-policy">automatic</property>
-        <property name="expand">True</property>
-        <property name="shadow-type">none</property>
+        <property name="expand">1</property>
         <child>
           <object class="GtkMagnifier" id="magnifier">
             <property name="visible">True</property>
diff --git a/gtk/inspector/menu.ui b/gtk/inspector/menu.ui
index 51cbf99..62e9e8f 100644
--- a/gtk/inspector/menu.ui
+++ b/gtk/inspector/menu.ui
@@ -2,24 +2,26 @@
 <interface domain="gtk40">
   <object class="GtkTreeStore" id="model">
     <columns>
-      <column type="gchararray"/> <!-- type -->
-      <column type="gchararray"/> <!-- label -->
-      <column type="gchararray"/> <!-- action -->
-      <column type="gchararray"/> <!-- target -->
-      <column type="gchararray"/> <!-- icon -->
+      <column type="gchararray"/>
+      <!-- type -->
+      <column type="gchararray"/>
+      <!-- label -->
+      <column type="gchararray"/>
+      <!-- action -->
+      <column type="gchararray"/>
+      <!-- target -->
+      <column type="gchararray"/>
+      <!-- icon -->
     </columns>
   </object>
   <template class="GtkInspectorMenu" parent="GtkBox">
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkScrolledWindow">
-        <property name="visible">True</property>
-        <property name="expand">True</property>
-        <property name="hscrollbar-policy">automatic</property>
+        <property name="expand">1</property>
         <property name="vscrollbar-policy">always</property>
         <child>
-          <object class= "GtkTreeView">
-            <property name="visible">True</property>
+          <object class="GtkTreeView">
             <property name="model">model</property>
             <child>
               <object class="GtkTreeViewColumn">
diff --git a/gtk/inspector/misc-info.ui b/gtk/inspector/misc-info.ui
index 4d6526c..c3c1206 100644
--- a/gtk/inspector/misc-info.ui
+++ b/gtk/inspector/misc-info.ui
@@ -4,7 +4,6 @@
     <property name="expand">0</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">true</property>
         <property name="orientation">vertical</property>
         <property name="margin-start">60</property>
         <property name="margin-end">60</property>
@@ -13,25 +12,19 @@
         <property name="spacing">10</property>
         <child>
           <object class="GtkFrame">
-            <property name="visible">True</property>
             <property name="halign">center</property>
             <child>
               <object class="GtkListBox">
-                <property name="visible">True</property>
                 <property name="selection-mode">none</property>
                 <child>
                   <object class="GtkListBoxRow" id="address_row">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="address_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Address</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -41,8 +34,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="address">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                           </object>
@@ -53,17 +45,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow" id="refcount_row">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="refcount_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Reference Count</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -73,8 +61,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="refcount">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                           </object>
@@ -85,17 +72,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow" id="state_row">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="state_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">State</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -105,8 +88,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="state">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                           </object>
@@ -117,17 +99,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow" id="buildable_id_row">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="buildable_id_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Buildable ID</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -137,8 +115,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="buildable_id">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                           </object>
@@ -149,17 +126,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow" id="default_widget_row">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="default_widget_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Default Widget</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -169,15 +142,13 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="default_widget">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                           </object>
                         </child>
                         <child>
                           <object class="GtkButton" id="default_widget_button">
-                            <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="label" translatable="yes">Properties</property>
@@ -188,20 +159,15 @@
                     </child>
                   </object>
                 </child>
-
                 <child>
                   <object class="GtkListBoxRow" id="focus_widget_row">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="focus_widget_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Focus Widget</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -211,8 +177,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="focus_widget">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
@@ -220,7 +185,6 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="focus_widget_button">
-                            <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="label" translatable="yes">Properties</property>
@@ -231,20 +195,15 @@
                     </child>
                   </object>
                 </child>
-
                 <child>
                   <object class="GtkListBoxRow" id="mnemonic_label_row">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Mnemonic Label</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -254,8 +213,6 @@
                         </child>
                         <child>
                           <object class="GtkBox" id="mnemonic_label">
-                            <property name="visible">True</property>
-                            <property name="orientation">horizontal</property>
                             <property name="spacing">10</property>
                             <property name="halign">end</property>
                           </object>
@@ -264,20 +221,15 @@
                     </child>
                   </object>
                 </child>
-
                 <child>
                   <object class="GtkListBoxRow" id="request_mode_row">
-                    <property name="visible">true</property>
-                    <property name="activatable">false</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">true</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel">
-                            <property name="visible">true</property>
                             <property name="label" translatable="yes">Request Mode</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -287,7 +239,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="request_mode">
-                            <property name="visible">true</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                           </object>
@@ -296,20 +247,15 @@
                     </child>
                   </object>
                 </child>
-
                 <child>
                   <object class="GtkListBoxRow" id="allocated_size_row">
-                    <property name="visible">true</property>
-                    <property name="activatable">false</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">true</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel">
-                            <property name="visible">true</property>
                             <property name="label" translatable="yes">Allocation</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -319,7 +265,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="allocated_size">
-                            <property name="visible">true</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                           </object>
@@ -328,20 +273,15 @@
                     </child>
                   </object>
                 </child>
-
                 <child>
                   <object class="GtkListBoxRow" id="baseline_row">
-                    <property name="visible">true</property>
-                    <property name="activatable">false</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">true</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel">
-                            <property name="visible">true</property>
                             <property name="label" translatable="yes">Baseline</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -351,7 +291,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="baseline">
-                            <property name="visible">true</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                           </object>
@@ -360,20 +299,15 @@
                     </child>
                   </object>
                 </child>
-
                 <child>
                   <object class="GtkListBoxRow" id="clip_area_row">
-                    <property name="visible">true</property>
-                    <property name="activatable">false</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">true</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel">
-                            <property name="visible">true</property>
                             <property name="label" translatable="yes">Clip Area</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -383,7 +317,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="clip_area">
-                            <property name="visible">true</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                           </object>
@@ -392,20 +325,15 @@
                     </child>
                   </object>
                 </child>
-
                 <child>
                   <object class="GtkListBoxRow" id="frame_clock_row">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="frame_clock_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Frame Clock</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -415,8 +343,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="frame_clock">
-                            <property name="visible">True</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
@@ -424,7 +351,6 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="frame_clock_button">
-                            <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="label" translatable="yes">Properties</property>
@@ -435,20 +361,15 @@
                     </child>
                   </object>
                 </child>
-
                 <child>
                   <object class="GtkListBoxRow" id="tick_callback_row">
-                    <property name="visible">true</property>
-                    <property name="activatable">false</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">true</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel">
-                            <property name="visible">true</property>
                             <property name="label" translatable="yes">Tick Callback</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -458,7 +379,6 @@
                         </child>
                         <child>
                           <object class="GtkImage" id="tick_callback">
-                            <property name="visible">true</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="icon-name">object-select-symbolic</property>
@@ -468,20 +388,15 @@
                     </child>
                   </object>
                 </child>
-
                 <child>
                   <object class="GtkListBoxRow" id="framecount_row">
-                    <property name="visible">true</property>
-                    <property name="activatable">false</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">true</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel">
-                            <property name="visible">true</property>
                             <property name="label" translatable="yes">Frame Count</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -491,7 +406,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="framecount">
-                            <property name="visible">true</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                           </object>
@@ -500,20 +414,15 @@
                     </child>
                   </object>
                 </child>
-
                 <child>
                   <object class="GtkListBoxRow" id="framerate_row">
-                    <property name="visible">true</property>
-                    <property name="activatable">false</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">true</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel">
-                            <property name="visible">true</property>
                             <property name="label" translatable="yes">Frame Rate</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -523,7 +432,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="framerate">
-                            <property name="visible">true</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                           </object>
@@ -532,20 +440,15 @@
                     </child>
                   </object>
                 </child>
-
                 <child>
                   <object class="GtkListBoxRow" id="accessible_role_row">
-                    <property name="visible">true</property>
-                    <property name="activatable">false</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">true</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel">
-                            <property name="visible">true</property>
                             <property name="label" translatable="yes">Accessible Role</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -555,7 +458,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="accessible_role">
-                            <property name="visible">true</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                           </object>
@@ -564,20 +466,15 @@
                     </child>
                   </object>
                 </child>
-
                 <child>
                   <object class="GtkListBoxRow" id="accessible_name_row">
-                    <property name="visible">true</property>
-                    <property name="activatable">false</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">true</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel">
-                            <property name="visible">true</property>
                             <property name="label" translatable="yes">Accessible Name</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -587,7 +484,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="accessible_name">
-                            <property name="visible">true</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
@@ -598,20 +494,15 @@
                     </child>
                   </object>
                 </child>
-
                 <child>
                   <object class="GtkListBoxRow" id="accessible_description_row">
-                    <property name="visible">true</property>
-                    <property name="activatable">false</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">true</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel">
-                            <property name="visible">true</property>
                             <property name="label" translatable="yes">Accessible Description</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -621,7 +512,6 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="accessible_description">
-                            <property name="visible">true</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
@@ -632,20 +522,15 @@
                     </child>
                   </object>
                 </child>
-
                 <child>
                   <object class="GtkListBoxRow" id="mapped_row">
-                    <property name="visible">true</property>
-                    <property name="activatable">false</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">true</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel">
-                            <property name="visible">true</property>
                             <property name="label" translatable="yes">Mapped</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -655,7 +540,6 @@
                         </child>
                         <child>
                           <object class="GtkImage" id="mapped">
-                            <property name="visible">true</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="icon-name">object-select-symbolic</property>
@@ -665,20 +549,15 @@
                     </child>
                   </object>
                 </child>
-
                 <child>
                   <object class="GtkListBoxRow" id="realized_row">
-                    <property name="visible">true</property>
-                    <property name="activatable">false</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">true</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel">
-                            <property name="visible">true</property>
                             <property name="label" translatable="yes">Realized</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -688,7 +567,6 @@
                         </child>
                         <child>
                           <object class="GtkImage" id="realized">
-                            <property name="visible">true</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="icon-name">object-select-symbolic</property>
@@ -698,20 +576,15 @@
                     </child>
                   </object>
                 </child>
-
                 <child>
                   <object class="GtkListBoxRow" id="is_toplevel_row">
-                    <property name="visible">true</property>
-                    <property name="activatable">false</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">true</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel">
-                            <property name="visible">true</property>
                             <property name="label" translatable="yes">Is Toplevel</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -721,7 +594,6 @@
                         </child>
                         <child>
                           <object class="GtkImage" id="is_toplevel">
-                            <property name="visible">true</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="icon-name">object-select-symbolic</property>
@@ -731,20 +603,15 @@
                     </child>
                   </object>
                 </child>
-
                 <child>
                   <object class="GtkListBoxRow" id="child_visible_row">
-                    <property name="visible">true</property>
-                    <property name="activatable">false</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">true</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel">
-                            <property name="visible">true</property>
                             <property name="label" translatable="yes">Child Visible</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -754,7 +621,6 @@
                         </child>
                         <child>
                           <object class="GtkImage" id="child_visible">
-                            <property name="visible">true</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="icon-name">object-select-symbolic</property>
@@ -764,7 +630,6 @@
                     </child>
                   </object>
                 </child>
-
               </object>
             </child>
           </object>
@@ -773,7 +638,6 @@
     </child>
   </template>
   <object class="GtkSizeGroup">
-    <property name="mode">horizontal</property>
     <widgets>
       <widget name="address_label"/>
       <widget name="refcount_label"/>
@@ -785,4 +649,3 @@
     </widgets>
   </object>
 </interface>
-
diff --git a/gtk/inspector/object-hierarchy.ui b/gtk/inspector/object-hierarchy.ui
index 8afcb5c..9b96c77 100644
--- a/gtk/inspector/object-hierarchy.ui
+++ b/gtk/inspector/object-hierarchy.ui
@@ -9,20 +9,17 @@
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkScrolledWindow">
-        <property name="visible">True</property>
         <property name="hscrollbar-policy">never</property>
-        <property name="vscrollbar-policy">automatic</property>
-        <property name="expand">True</property>
+        <property name="expand">1</property>
         <child>
           <object class="GtkTreeView" id="tree">
-            <property name="visible">True</property>
             <property name="model">model</property>
-            <property name="enable-search">False</property>
-            <property name="headers-visible">False</property>
+            <property name="enable-search">0</property>
+            <property name="headers-visible">0</property>
             <property name="enable-tree-lines">1</property>
             <property name="show-expanders">0</property>
             <property name="level-indentation">18</property>
-           <child internal-child="selection">
+            <child internal-child="selection">
               <object class="GtkTreeSelection">
                 <property name="mode">none</property>
               </object>
diff --git a/gtk/inspector/object-tree.ui b/gtk/inspector/object-tree.ui
index e68b3d6..07d85d2 100644
--- a/gtk/inspector/object-tree.ui
+++ b/gtk/inspector/object-tree.ui
@@ -16,18 +16,14 @@
     <signal name="hierarchy-changed" handler="on_hierarchy_changed"/>
     <child>
       <object class="GtkSearchBar" id="search_bar">
-        <property name="visible">True</property>
-        <property name="show-close-button">True</property>
+        <property name="show-close-button">1</property>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="orientation">horizontal</property>
             <style>
               <class name="linked"/>
             </style>
             <child>
               <object class="GtkSearchEntry" id="search_entry">
-                <property name="visible">True</property>
                 <property name="max-width-chars">40</property>
                 <signal name="search-changed" handler="on_search_changed"/>
                 <signal name="next-match" handler="next_match"/>
@@ -37,14 +33,12 @@
             </child>
             <child>
               <object class="GtkButton">
-                <property name="visible">True</property>
                 <property name="icon-name">go-down-symbolic</property>
                 <signal name="clicked" handler="next_match"/>
               </object>
             </child>
             <child>
               <object class="GtkButton">
-                <property name="visible">True</property>
                 <property name="icon-name">go-up-symbolic</property>
                 <signal name="clicked" handler="previous_match"/>
               </object>
@@ -55,27 +49,23 @@
     </child>
     <child>
       <object class="GtkScrolledWindow">
-        <property name="visible">True</property>
         <property name="hscrollbar-policy">never</property>
-        <property name="vscrollbar-policy">automatic</property>
-        <property name="expand">True</property>
+        <property name="expand">1</property>
         <child>
           <object class="GtkTreeView" id="tree">
-            <property name="visible">True</property>
             <property name="model">model</property>
-            <property name="enable-search">False</property>
+            <property name="enable-search">0</property>
             <property name="enable-grid-lines">vertical</property>
             <signal name="row-activated" handler="on_row_activated"/>
             <child internal-child="selection">
               <object class="GtkTreeSelection">
-                <property name="mode">single</property>
                 <signal name="changed" handler="on_selection_changed"/>
               </object>
             </child>
             <child>
               <object class="GtkTreeViewColumn" id="object_column">
                 <property name="title" translatable="yes">Object</property>
-                <property name="resizable">True</property>
+                <property name="resizable">1</property>
                 <child>
                   <object class="GtkCellRendererText">
                     <property name="scale">0.8</property>
@@ -90,7 +80,7 @@
             <child>
               <object class="GtkTreeViewColumn">
                 <property name="title" translatable="yes">Name</property>
-                <property name="resizable">True</property>
+                <property name="resizable">1</property>
                 <child>
                   <object class="GtkCellRendererText">
                     <property name="scale">0.8</property>
@@ -105,7 +95,7 @@
             <child>
               <object class="GtkTreeViewColumn">
                 <property name="title" translatable="yes">Label</property>
-                <property name="resizable">True</property>
+                <property name="resizable">1</property>
                 <child>
                   <object class="GtkCellRendererText">
                     <property name="scale">0.8</property>
@@ -122,7 +112,7 @@
             <child>
               <object class="GtkTreeViewColumn">
                 <property name="title" translatable="yes">Style Classes</property>
-                <property name="resizable">True</property>
+                <property name="resizable">1</property>
                 <child>
                   <object class="GtkCellRendererText">
                     <property name="scale">0.8</property>
diff --git a/gtk/inspector/prop-list.ui b/gtk/inspector/prop-list.ui
index c1475a1..046f25d 100644
--- a/gtk/inspector/prop-list.ui
+++ b/gtk/inspector/prop-list.ui
@@ -16,23 +16,19 @@
     <signal name="hierarchy-changed" handler="hierarchy_changed"/>
     <child>
       <object class="GtkScrolledWindow">
-        <property name="visible">True</property>
-        <property name="expand">True</property>
+        <property name="expand">1</property>
         <property name="hscrollbar-policy">never</property>
-        <property name="vscrollbar-policy">automatic</property>
         <child>
           <object class="GtkTreeView" id="tree">
-            <property name="visible">True</property>
             <property name="model">model</property>
             <property name="tooltip-column">4</property>
             <property name="search-column">0</property>
-            <property name="enable-search">True</property>
             <property name="enable-grid-lines">vertical</property>
             <signal name="row-activated" handler="row_activated"/>
             <child>
               <object class="GtkTreeViewColumn">
                 <property name="title" translatable="yes">Property</property>
-                <property name="resizable">True</property>
+                <property name="resizable">1</property>
                 <property name="sort-column-id">0</property>
                 <child>
                   <object class="GtkCellRendererText">
@@ -48,11 +44,10 @@
             <child>
               <object class="GtkTreeViewColumn">
                 <property name="title" translatable="yes">Value</property>
-                <property name="resizable">True</property>
+                <property name="resizable">1</property>
                 <child>
                   <object class="GtkCellRendererText">
                     <property name="scale">0.8</property>
-                    <property name="editable">False</property>
                     <property name="width-chars">20</property>
                     <property name="ellipsize">end</property>
                   </object>
@@ -66,11 +61,10 @@
             <child>
               <object class="GtkTreeViewColumn">
                 <property name="title" translatable="yes">Type</property>
-                <property name="resizable">True</property>
+                <property name="resizable">1</property>
                 <child>
                   <object class="GtkCellRendererText">
                     <property name="scale">0.8</property>
-                    <property name="editable">False</property>
                     <property name="width-chars">20</property>
                     <property name="ellipsize">end</property>
                   </object>
@@ -84,11 +78,10 @@
             <child>
               <object class="GtkTreeViewColumn" id="attribute_column">
                 <property name="title" translatable="yes">Attribute</property>
-                <property name="resizable">True</property>
+                <property name="resizable">1</property>
                 <child>
                   <object class="GtkCellRendererText">
                     <property name="scale">0.8</property>
-                    <property name="editable">False</property>
                   </object>
                   <attributes>
                     <attribute name="text">6</attribute>
diff --git a/gtk/inspector/recorder.ui b/gtk/inspector/recorder.ui
index 75c591a..e506d93 100644
--- a/gtk/inspector/recorder.ui
+++ b/gtk/inspector/recorder.ui
@@ -4,16 +4,13 @@
   <template class="GtkInspectorRecorder" parent="GtkBin">
     <child>
       <object class="GtkBox">
-        <property name="visible">1</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkBox">
-            <property name="visible">1</property>
             <property name="spacing">6</property>
             <property name="margin">6</property>
             <child>
               <object class="GtkToggleButton">
-                <property name="visible">1</property>
                 <property name="relief">none</property>
                 <property name="icon-name">media-record-symbolic</property>
                 <property name="tooltip-text" translatable="yes">Record frames</property>
@@ -22,7 +19,6 @@
             </child>
             <child>
               <object class="GtkButton">
-                <property name="visible">1</property>
                 <property name="relief">none</property>
                 <property name="icon-name">edit-clear-all-symbolic</property>
                 <property name="tooltip-text" translatable="yes">Clear recorded frames</property>
@@ -31,7 +27,6 @@
             </child>
             <child>
               <object class="GtkToggleButton">
-                <property name="visible">1</property>
                 <property name="relief">none</property>
                 <property name="icon-name">insert-object-symbolic</property>
                 <property name="tooltip-text" translatable="yes">Add debug nodes</property>
@@ -40,7 +35,6 @@
             </child>
             <child>
               <object class="GtkButton" id="render_node_save_button">
-                <property name="visible">1</property>
                 <property name="relief">none</property>
                 <property name="sensitive">0</property>
                 <property name="icon-name">document-save-as-symbolic</property>
@@ -55,16 +49,13 @@
         </child>
         <child>
           <object class="GtkBox">
-            <property name="visible">1</property>
             <style>
               <class name="view"/>
             </style>
             <child>
               <object class="GtkFrame">
-                <property name="visible">1</property>
                 <child>
                   <object class="GtkScrolledWindow">
-                    <property name="visible">1</property>
                     <property name="hscrollbar-policy">never</property>
                     <property name="propagate-natural-width">1</property>
                     <style>
@@ -72,7 +63,6 @@
                     </style>
                     <child>
                       <object class="GtkListBox" id="recordings_list">
-                        <property name="visible">1</property>
                         <property name="vexpand">1</property>
                         <signal name="row-selected" handler="recordings_list_row_selected"/>
                       </object>
@@ -83,10 +73,8 @@
             </child>
             <child>
               <object class="GtkFrame">
-                <property name="visible">1</property>
                 <child>
                   <object class="GtkScrolledWindow">
-                    <property name="visible">1</property>
                     <property name="hscrollbar-policy">never</property>
                     <property name="propagate-natural-width">1</property>
                     <style>
@@ -94,7 +82,6 @@
                     </style>
                     <child>
                       <object class="GtkTreeView" id="render_node_tree">
-                        <property name="visible">1</property>
                         <property name="vexpand">1</property>
                         <property name="search-column">0</property>
                         <property name="enable-search">0</property>
@@ -123,19 +110,15 @@
             </child>
             <child>
               <object class="GtkFrame">
-                <property name="visible">1</property>
                 <child>
                   <object class="GtkPaned" id="render_paned">
-                    <property name="visible">1</property>
                     <property name="orientation">vertical</property>
                     <property name="position">300</property>
                     <property name="wide-handle">1</property>
                     <child>
                       <object class="GtkScrolledWindow">
-                        <property name="visible">1</property>
                         <child>
                           <object class="GtkTreeView" id="node_property_tree">
-                            <property name="visible">1</property>
                             <property name="activate-on-single-click">1</property>
                             <signal name="row-activated" handler="node_property_activated"/>
                             <child>
diff --git a/gtk/inspector/resource-list.ui b/gtk/inspector/resource-list.ui
index 7e4182a..5d13ce0 100644
--- a/gtk/inspector/resource-list.ui
+++ b/gtk/inspector/resource-list.ui
@@ -9,47 +9,37 @@
     </columns>
   </object>
   <object class="GtkTextBuffer" id="buffer">
-    <property name="text"/>
   </object>
   <template class="GtkInspectorResourceList" parent="GtkBox">
     <property name="orientation">horizontal</property>
     <signal name="hierarchy-changed" handler="on_hierarchy_changed"/>
     <child>
       <object class="GtkStack" id="stack">
-        <property name="visible">True</property>
-        <property name="transition-type">none</property>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkSearchBar" id="search_bar">
-                <property name="visible">True</property>
-                <property name="show-close-button">True</property>
+                <property name="show-close-button">1</property>
                 <child>
                   <object class="GtkBox">
-                    <property name="visible">True</property>
-                    <property name="orientation">horizontal</property>
                     <style>
                       <class name="linked"/>
                     </style>
                     <child>
                       <object class="GtkSearchEntry" id="search_entry">
-                        <property name="visible">True</property>
                         <property name="max-width-chars">40</property>
                         <signal name="search-changed" handler="on_search_changed"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkButton">
-                        <property name="visible">True</property>
                         <property name="icon-name">go-down-symbolic</property>
                         <signal name="clicked" handler="next_match"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkButton">
-                        <property name="visible">True</property>
                         <property name="icon-name">go-up-symbolic</property>
                         <signal name="clicked" handler="previous_match"/>
                       </object>
@@ -60,27 +50,23 @@
             </child>
             <child>
               <object class="GtkScrolledWindow">
-                <property name="visible">True</property>
-                <property name="expand">True</property>
+                <property name="expand">1</property>
                 <property name="hscrollbar-policy">never</property>
-                <property name="vscrollbar-policy">automatic</property>
                 <child>
                   <object class="GtkTreeView" id="tree">
-                    <property name="visible">True</property>
                     <property name="model">model</property>
-                    <property name="enable-search">False</property>
+                    <property name="enable-search">0</property>
                     <property name="enable-grid-lines">vertical</property>
                     <signal name="row-activated" handler="row_activated"/>
                     <child internal-child="selection">
                       <object class="GtkTreeSelection">
-                        <property name="mode">single</property>
                         <signal name="changed" handler="on_selection_changed"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn" id="path_column">
                         <property name="title" translatable="yes">Path</property>
-                        <property name="resizable">True</property>
+                        <property name="resizable">1</property>
                         <property name="sort-column-id">0</property>
                         <child>
                           <object class="GtkCellRendererText">
@@ -98,7 +84,7 @@
                     <child>
                       <object class="GtkTreeViewColumn" id="count_column">
                         <property name="title" translatable="yes">Count</property>
-                        <property name="resizable">True</property>
+                        <property name="resizable">1</property>
                         <property name="sort-column-id">1</property>
                         <child>
                           <object class="GtkCellRendererText" id="count_renderer">
@@ -110,7 +96,7 @@
                     <child>
                       <object class="GtkTreeViewColumn" id="size_column">
                         <property name="title" translatable="yes">Size</property>
-                        <property name="resizable">True</property>
+                        <property name="resizable">1</property>
                         <property name="sort-column-id">2</property>
                         <child>
                           <object class="GtkCellRendererText" id="size_renderer">
@@ -130,18 +116,15 @@
         </child>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkGrid" id="info_grid">
-                <property name="visible">True</property>
                 <property name="row-spacing">10</property>
                 <property name="column-spacing">10</property>
                 <property name="margin">10</property>
                 <property name="halign">center</property>
                 <child>
                   <object class="GtkLabel" id="name">
-                    <property name="visible">True</property>
                     <property name="label" translatable="yes">Name:</property>
                     <property name="halign">end</property>
                     <property name="valign">baseline</property>
@@ -153,10 +136,9 @@
                 </child>
                 <child>
                   <object class="GtkLabel" id="name_label">
-                    <property name="visible">True</property>
                     <property name="halign">start</property>
                     <property name="valign">baseline</property>
-                    <property name="selectable">True</property>
+                    <property name="selectable">1</property>
                   </object>
                   <packing>
                     <property name="left-attach">1</property>
@@ -165,7 +147,6 @@
                 </child>
                 <child>
                   <object class="GtkLabel" id="type">
-                    <property name="visible">True</property>
                     <property name="label" translatable="yes">Type:</property>
                     <property name="halign">end</property>
                     <property name="valign">baseline</property>
@@ -177,7 +158,6 @@
                 </child>
                 <child>
                   <object class="GtkLabel" id="type_label">
-                    <property name="visible">True</property>
                     <property name="halign">start</property>
                     <property name="valign">baseline</property>
                   </object>
@@ -188,7 +168,6 @@
                 </child>
                 <child>
                   <object class="GtkLabel">
-                    <property name="visible">True</property>
                     <property name="label" translatable="yes">Size:</property>
                     <property name="halign">end</property>
                     <property name="valign">baseline</property>
@@ -200,7 +179,6 @@
                 </child>
                 <child>
                   <object class="GtkLabel" id="size_label">
-                    <property name="visible">True</property>
                     <property name="halign">start</property>
                     <property name="valign">baseline</property>
                   </object>
@@ -213,21 +191,16 @@
             </child>
             <child>
               <object class="GtkStack" id="content">
-                <property name="visible">True</property>
                 <child>
                   <object class="GtkScrolledWindow">
-                    <property name="visible">True</property>
-                    <property name="expand">True</property>
-                    <property name="hscrollbar-policy">automatic</property>
-                    <property name="vscrollbar-policy">automatic</property>
+                    <property name="expand">1</property>
                     <property name="shadow-type">in</property>
                     <style>
                       <class name="view"/>
                     </style>
                     <child>
                       <object class="GtkTextView">
-                        <property name="visible">True</property>
-                        <property name="editable">False</property>
+                        <property name="editable">0</property>
                         <property name="buffer">buffer</property>
                       </object>
                     </child>
@@ -238,17 +211,13 @@
                 </child>
                 <child>
                   <object class="GtkScrolledWindow">
-                    <property name="visible">True</property>
-                    <property name="expand">True</property>
-                    <property name="hscrollbar-policy">automatic</property>
-                    <property name="vscrollbar-policy">automatic</property>
+                    <property name="expand">1</property>
                     <property name="shadow-type">in</property>
                     <style>
                       <class name="view"/>
                     </style>
                     <child>
                       <object class="GtkImage" id="image">
-                        <property name="visible">True</property>
                         <property name="halign">center</property>
                         <property name="valign">center</property>
                       </object>
diff --git a/gtk/inspector/selector.ui b/gtk/inspector/selector.ui
index 02278fa..ef3a5e3 100644
--- a/gtk/inspector/selector.ui
+++ b/gtk/inspector/selector.ui
@@ -9,17 +9,14 @@
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkScrolledWindow">
-        <property name="visible">True</property>
         <property name="hscrollbar-policy">never</property>
-        <property name="vscrollbar-policy">automatic</property>
-        <property name="expand">True</property>
+        <property name="expand">1</property>
         <child>
           <object class="GtkTreeView" id="tree">
-            <property name="visible">True</property>
             <property name="model">model</property>
-            <property name="enable-search">False</property>
-            <property name="headers-visible">False</property>
-            <property name="show-expanders">False</property>
+            <property name="enable-search">0</property>
+            <property name="headers-visible">0</property>
+            <property name="show-expanders">0</property>
             <property name="level-indentation">18</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection">
diff --git a/gtk/inspector/signals-list.ui b/gtk/inspector/signals-list.ui
index 5710a6b..eb4ee5d 100644
--- a/gtk/inspector/signals-list.ui
+++ b/gtk/inspector/signals-list.ui
@@ -11,25 +11,20 @@
       <column type="gulong"/>
     </columns>
   </object>
-  <object class="GtkTextBuffer" id="text">
-  </object>
+  <object class="GtkTextBuffer" id="text"/>
   <template class="GtkInspectorSignalsList" parent="GtkPaned">
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkBox">
         <property name="orientation">vertical</property>
-        <property name="visible">True</property>
         <child>
           <object class="GtkScrolledWindow">
-            <property name="visible">True</property>
-            <property name="expand">True</property>
+            <property name="expand">1</property>
             <property name="hscrollbar-policy">never</property>
-            <property name="vscrollbar-policy">automatic</property>
             <child>
               <object class="GtkTreeView" id="view">
-                <property name="visible">True</property>
                 <property name="model">model</property>
-                <property name="enable-search">False</property>
+                <property name="enable-search">0</property>
                 <property name="enable-grid-lines">vertical</property>
                 <child>
                   <object class="GtkTreeViewColumn">
@@ -90,15 +85,13 @@
     </child>
     <child>
       <object class="GtkScrolledWindow" id="log_win">
-        <property name="expand">True</property>
-        <property name="hscrollbar-policy">automatic</property>
+        <property name="expand">1</property>
         <property name="vscrollbar-policy">always</property>
         <property name="shadow-type">in</property>
         <child>
           <object class="GtkTextView">
-            <property name="visible">True</property>
             <property name="buffer">text</property>
-            <property name="editable">False</property>
+            <property name="editable">0</property>
           </object>
         </child>
       </object>
diff --git a/gtk/inspector/statistics.ui b/gtk/inspector/statistics.ui
index 20e6261..fd94174 100644
--- a/gtk/inspector/statistics.ui
+++ b/gtk/inspector/statistics.ui
@@ -17,18 +17,14 @@
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkStack" id="stack">
-        <property name="visible">True</property>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkSearchBar" id="search_bar">
-                <property name="visible">True</property>
-                <property name="show-close-button">True</property>
+                <property name="show-close-button">1</property>
                 <child>
                   <object class="GtkSearchEntry" id="search_entry">
-                    <property name="visible">True</property>
                     <property name="max-width-chars">40</property>
                   </object>
                 </child>
@@ -36,19 +32,14 @@
             </child>
             <child>
               <object class="GtkScrolledWindow">
-                <property name="visible">True</property>
-                <property name="expand">True</property>
-                <property name="hscrollbar-policy">automatic</property>
+                <property name="expand">1</property>
                 <property name="vscrollbar-policy">always</property>
                 <child>
                   <object class="GtkTreeView" id="view">
-                    <property name="visible">True</property>
                     <property name="model">model</property>
                     <property name="search-column">1</property>
-                    <property name="enable-search">True</property>
                     <child>
                       <object class="GtkTreeViewColumn">
-                        <property name="visible">True</property>
                         <property name="sort-column-id">1</property>
                         <property name="title" translatable="yes">Type</property>
                         <child>
@@ -63,7 +54,6 @@
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn" id="column_self1">
-                        <property name="visible">True</property>
                         <property name="sort-column-id">2</property>
                         <property name="title" translatable="yes">Self 1</property>
                         <child>
@@ -75,7 +65,6 @@
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn" id="column_cumulative1">
-                        <property name="visible">True</property>
                         <property name="sort-column-id">3</property>
                         <property name="title" translatable="yes">Cumulative 1</property>
                         <child>
@@ -87,7 +76,6 @@
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn" id="column_self2">
-                        <property name="visible">True</property>
                         <property name="sort-column-id">4</property>
                         <property name="title" translatable="yes">Self 2</property>
                         <child>
@@ -99,7 +87,6 @@
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn" id="column_cumulative2">
-                        <property name="visible">True</property>
                         <property name="sort-column-id">5</property>
                         <property name="title" translatable="yes">Cumulative 2</property>
                         <child>
@@ -111,7 +98,6 @@
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn" id="column_self_graph">
-                        <property name="visible">True</property>
                         <property name="sort-column-id">4</property>
                         <property name="title" translatable="yes">Self</property>
                         <child>
@@ -128,7 +114,6 @@
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn" id="column_cumulative_graph">
-                        <property name="visible">True</property>
                         <property name="sort-column-id">5</property>
                         <property name="title" translatable="yes">Cumulative</property>
                         <child>
@@ -154,14 +139,12 @@
         </child>
         <child>
           <object class="GtkBox">
-            <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>
               <object class="GtkLabel" id="excuse">
-                <property name="visible">True</property>
-                <property name="selectable">True</property>
+                <property name="selectable">1</property>
                 <property name="label" translatable="yes">Enable statistics with 
GOBJECT_DEBUG=instance-count</property>
               </object>
             </child>
diff --git a/gtk/inspector/visual.ui b/gtk/inspector/visual.ui
index 246ae56..1443375 100644
--- a/gtk/inspector/visual.ui
+++ b/gtk/inspector/visual.ui
@@ -23,7 +23,6 @@
     <property name="upper">128</property>
     <property name="step-increment">8</property>
     <property name="page-increment">8</property>
-    <property name="page-size">0</property>
   </object>
   <template class="GtkInspectorVisual" parent="GtkScrolledWindow">
     <property name="hscrollbar-policy">never</property>
@@ -31,34 +30,27 @@
     <property name="expand">0</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <property name="margin">60</property>
         <property name="spacing">10</property>
         <child>
           <object class="GtkFrame" id="visual_frame">
-            <property name="visible">True</property>
             <property name="halign">center</property>
             <child>
               <object class="GtkListBox" id="visual_box">
-                <property name="visible">True</property>
                 <property name="selection-mode">none</property>
                 <style>
                   <class name="view"/>
                 </style>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="theme_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">GTK+ Theme</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -67,7 +59,6 @@
                         </child>
                         <child>
                           <object class="GtkComboBoxText" id="theme_combo">
-                            <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="hexpand">1</property>
@@ -79,17 +70,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="dark_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Dark Variant</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -98,7 +85,6 @@
                         </child>
                         <child>
                           <object class="GtkSwitch" id="dark_switch">
-                            <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="hexpand">1</property>
@@ -110,17 +96,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="cursor_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Cursor Theme</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -129,7 +111,6 @@
                         </child>
                         <child>
                           <object class="GtkComboBoxText" id="cursor_combo">
-                            <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="hexpand">1</property>
@@ -141,17 +122,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="cursor_size_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Cursor Size</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -160,13 +137,12 @@
                         </child>
                         <child>
                           <object class="GtkSpinButton" id="cursor_size_spin">
-                            <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="max-width-chars">2</property>
                             <property name="width-chars">2</property>
                             <property name="adjustment">cursor_size_adjustment</property>
-                            <property name="snap-to-ticks">True</property>
+                            <property name="snap-to-ticks">1</property>
                             <property name="hexpand">1</property>
                           </object>
                         </child>
@@ -176,17 +152,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="icon_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Icon Theme</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -195,7 +167,6 @@
                         </child>
                         <child>
                           <object class="GtkComboBoxText" id="icon_combo">
-                            <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="hexpand">1</property>
@@ -207,17 +178,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="font_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Font</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -226,7 +193,6 @@
                         </child>
                         <child>
                           <object class="GtkFontButton" id="font_button">
-                            <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="hexpand">1</property>
@@ -238,17 +204,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">20</property>
                         <child>
                           <object class="GtkLabel" id="font_scale_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Font Scale</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -257,19 +219,17 @@
                         </child>
                         <child>
                           <object class="GtkScale" id="font_scale_scale">
-                            <property name="visible">True</property>
                             <property name="valign">baseline</property>
                             <property name="adjustment">font_scale_adjustment</property>
-                            <property name="draw_value">0</property>
+                            <property name="draw-value">0</property>
                             <property name="hexpand">1</property>
                             <marks>
-                              <mark value="1.0" position="top"/>
+                              <mark value="1.0" position="top"></mark>
                             </marks>
                           </object>
                         </child>
                         <child>
                           <object class="GtkEntry" id="font_scale_entry">
-                            <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="width-chars">4</property>
@@ -282,17 +242,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="direction_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Text Direction</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -301,7 +257,6 @@
                         </child>
                         <child>
                           <object class="GtkComboBoxText" id="direction_combo">
-                            <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="hexpand">1</property>
@@ -318,17 +273,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="hidpi_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Window Scaling</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -337,11 +288,10 @@
                         </child>
                         <child>
                           <object class="GtkSpinButton" id="hidpi_spin">
-                            <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="adjustment">scale_adjustment</property>
-                            <property name="snap-to-ticks">True</property>
+                            <property name="snap-to-ticks">1</property>
                             <property name="hexpand">1</property>
                           </object>
                         </child>
@@ -351,17 +301,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="animation_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Animations</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -370,7 +316,6 @@
                         </child>
                         <child>
                           <object class="GtkSwitch" id="animation_switch">
-                            <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="hexpand">1</property>
@@ -382,17 +327,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">20</property>
                         <child>
                           <object class="GtkLabel" id="slowdown_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Slowdown</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -401,20 +342,18 @@
                         </child>
                         <child>
                           <object class="GtkScale" id="slowdown_scale">
-                            <property name="visible">1</property>
-                            <property name="can_focus">1</property>
+                            <property name="can-focus">1</property>
                             <property name="adjustment">slowdown_adjustment</property>
                             <property name="valign">baseline</property>
-                            <property name="draw_value">0</property>
+                            <property name="draw-value">0</property>
                             <property name="hexpand">1</property>
                             <marks>
-                              <mark value="0.0" position="top"/>
+                              <mark value="0.0" position="top"></mark>
                             </marks>
                           </object>
                         </child>
                         <child>
                           <object class="GtkEntry" id="slowdown_entry">
-                            <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="width-chars">4</property>
@@ -431,25 +370,19 @@
         </child>
         <child>
           <object class="GtkFrame" id="debug_frame">
-            <property name="visible">True</property>
             <property name="halign">center</property>
             <child>
               <object class="GtkListBox" id="debug_box">
-                <property name="visible">True</property>
                 <property name="selection-mode">none</property>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="rendering_mode_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Rendering Mode</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -458,7 +391,6 @@
                         </child>
                         <child>
                           <object class="GtkComboBoxText" id="rendering_mode_combo">
-                            <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="hexpand">1</property>
@@ -475,17 +407,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="updates_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Show Graphic Updates</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -494,7 +422,6 @@
                         </child>
                         <child>
                           <object class="GtkSwitch" id="updates_switch">
-                            <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="hexpand">1</property>
@@ -507,17 +434,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="baselines_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Show Baselines</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -526,7 +449,6 @@
                         </child>
                         <child>
                           <object class="GtkSwitch" id="baselines_switch">
-                            <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="hexpand">1</property>
@@ -539,17 +461,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="layout_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Show Layout Borders</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -558,7 +476,6 @@
                         </child>
                         <child>
                           <object class="GtkSwitch" id="layout_switch">
-                            <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="hexpand">1</property>
@@ -571,17 +488,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Show Widget Resizes</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -590,7 +503,6 @@
                         </child>
                         <child>
                           <object class="GtkSwitch" id="widget_resize_switch">
-                            <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="hexpand">1</property>
@@ -603,17 +515,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="touchscreen_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Simulate Touchscreen</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -622,7 +530,6 @@
                         </child>
                         <child>
                           <object class="GtkSwitch" id="touchscreen_switch">
-                            <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="hexpand">1</property>
@@ -638,25 +545,19 @@
         </child>
         <child>
           <object class="GtkFrame" id="gl_frame">
-            <property name="visible">True</property>
             <property name="halign">center</property>
             <child>
               <object class="GtkListBox" id="gl_box">
-                <property name="visible">True</property>
                 <property name="selection-mode">none</property>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="gl_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">GL Rendering</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -665,7 +566,6 @@
                         </child>
                         <child>
                           <object class="GtkComboBoxText" id="gl_combo">
-                            <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="hexpand">1</property>
@@ -681,17 +581,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="software_gl_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Software GL</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -700,7 +596,6 @@
                         </child>
                         <child>
                           <object class="GtkSwitch" id="software_gl_switch">
-                            <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="hexpand">1</property>
@@ -713,17 +608,13 @@
                 </child>
                 <child>
                   <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
+                    <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
                         <property name="margin">10</property>
                         <property name="spacing">40</property>
                         <child>
                           <object class="GtkLabel" id="texture_rectangle_label">
-                            <property name="visible">True</property>
                             <property name="label" translatable="yes">Texture Rectangle Extension</property>
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
@@ -732,7 +623,6 @@
                         </child>
                         <child>
                           <object class="GtkSwitch" id="texture_rectangle_switch">
-                            <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="hexpand">1</property>
@@ -751,7 +641,6 @@
     </child>
   </template>
   <object class="GtkSizeGroup">
-    <property name="mode">horizontal</property>
     <widgets>
       <widget name="theme_label"/>
       <widget name="dark_label"/>
@@ -773,7 +662,6 @@
     </widgets>
   </object>
   <object class="GtkSizeGroup">
-    <property name="mode">horizontal</property>
     <widgets>
       <widget name="theme_combo"/>
       <widget name="icon_combo"/>
@@ -785,7 +673,6 @@
     </widgets>
   </object>
   <object class="GtkSizeGroup">
-    <property name="mode">horizontal</property>
     <widgets>
       <widget name="visual_frame"/>
       <widget name="debug_frame"/>
diff --git a/gtk/inspector/window.ui b/gtk/inspector/window.ui
index b138bc9..bd2d8d3 100644
--- a/gtk/inspector/window.ui
+++ b/gtk/inspector/window.ui
@@ -3,7 +3,6 @@
   <object class="GtkAdjustment" id="magnification_adjustment">
     <property name="lower">1.0</property>
     <property name="upper">5.0</property>
-    <property name="page-size">0.0</property>
     <property name="page-increment">0.1</property>
     <property name="step-increment">0.1</property>
     <property name="value">2.0</property>
@@ -70,15 +69,13 @@
               <object class="GtkStack" id="global_button_stack">
                 <property name="visible-child-name" bind-source="global_stack" 
bind-property="visible-child-name"/>
                 <child>
-                  <object class="GtkBox">
-                  </object>
+                  <object class="GtkBox"/>
                   <packing>
                     <property name="name">general</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkBox">
-                  </object>
+                  <object class="GtkBox"/>
                   <packing>
                     <property name="name">visual</property>
                   </packing>
@@ -129,8 +126,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkBox">
-                  </object>
+                  <object class="GtkBox"/>
                   <packing>
                     <property name="name">logs</property>
                   </packing>
@@ -141,15 +137,13 @@
               </packing>
             </child>
             <child>
-              <object class="GtkBox">
-              </object>
+              <object class="GtkBox"/>
               <packing>
                 <property name="name">css</property>
               </packing>
             </child>
             <child>
-              <object class="GtkBox">
-              </object>
+              <object class="GtkBox"/>
               <packing>
                 <property name="name">recorder</property>
               </packing>
@@ -195,15 +189,13 @@
                         <child>
                           <object class="GtkStack" id="object_start_stack">
                             <child>
-                              <object class="GtkBox">
-                              </object>
+                              <object class="GtkBox"/>
                               <packing>
                                 <property name="name">empty</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="orientation">horizontal</property>
                                 <property name="spacing">6</property>
                                 <property name="margin">6</property>
                                 <child>
@@ -227,16 +219,15 @@
                             </child>
                             <child>
                               <object class="GtkScale">
-                                <property name="orientation">horizontal</property>
                                 <property name="width-request">150</property>
-                                <property name="draw-value">False</property>
+                                <property name="draw-value">0</property>
                                 <property name="adjustment">magnification_adjustment</property>
                                 <marks>
-                                  <mark value="1.0" position="bottom"/>
-                                  <mark value="2.0" position="bottom"/>
-                                  <mark value="3.0" position="bottom"/>
-                                  <mark value="4.0" position="bottom"/>
-                                  <mark value="5.0" position="bottom"/>
+                                  <mark value="1.0" position="bottom"></mark>
+                                  <mark value="2.0" position="bottom"></mark>
+                                  <mark value="3.0" position="bottom"></mark>
+                                  <mark value="4.0" position="bottom"></mark>
+                                  <mark value="5.0" position="bottom"></mark>
                                 </marks>
                               </object>
                               <packing>
@@ -247,16 +238,13 @@
                         </child>
                       </object>
                     </child>
-
-
                     <child type="center">
                       <object class="GtkStack" id="object_center_stack">
                         <property name="transition-type">crossfade</property>
                         <property name="hexpand">1</property>
                         <property name="halign">center</property>
                         <child>
-                          <object class="GtkLabel" id="object_title">
-                          </object>
+                          <object class="GtkLabel" id="object_title"/>
                           <packing>
                             <property name="name">title</property>
                           </packing>
@@ -328,24 +316,21 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkInspectorObjectHierarchy" id="object_hierarchy">
-                      </object>
+                      <object class="GtkInspectorObjectHierarchy" id="object_hierarchy"/>
                       <packing>
                         <property name="name">hierarchy</property>
                         <property name="title" translatable="yes">Class Hierarchy</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkInspectorSelector" id="selector">
-                      </object>
+                      <object class="GtkInspectorSelector" id="selector"/>
                       <packing>
                         <property name="name">selector</property>
                         <property name="title" translatable="yes">CSS Selector</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkInspectorCssNodeTree" id="widget_css_node_tree">
-                      </object>
+                      <object class="GtkInspectorCssNodeTree" id="widget_css_node_tree"/>
                       <packing>
                         <property name="name">css-nodes</property>
                         <property name="title" translatable="yes">CSS Nodes</property>
@@ -412,7 +397,6 @@
         </child>
         <child>
           <object class="GtkBox">
-            <property name="orientation">horizontal</property>
             <child>
               <object class="GtkStackSidebar">
                 <property name="stack">global_stack</property>
@@ -421,16 +405,14 @@
             <child>
               <object class="GtkStack" id="global_stack">
                 <child>
-                  <object class="GtkInspectorGeneral">
-                  </object>
+                  <object class="GtkInspectorGeneral"/>
                   <packing>
                     <property name="name">general</property>
                     <property name="title" translatable="yes">General</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkInspectorVisual">
-                  </object>
+                  <object class="GtkInspectorVisual"/>
                   <packing>
                     <property name="name">visual</property>
                     <property name="title" translatable="yes">Visual</property>
@@ -455,8 +437,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkInspectorLogs">
-                  </object>
+                  <object class="GtkInspectorLogs"/>
                   <packing>
                     <property name="name">logs</property>
                     <property name="title" translatable="yes">Logging</property>
@@ -471,16 +452,14 @@
           </packing>
         </child>
         <child>
-          <object class="GtkInspectorCssEditor">
-          </object>
+          <object class="GtkInspectorCssEditor"/>
           <packing>
             <property name="name">css</property>
             <property name="title" translatable="yes">CSS</property>
           </packing>
         </child>
         <child>
-          <object class="GtkInspectorRecorder" id="widget_recorder">
-          </object>
+          <object class="GtkInspectorRecorder" id="widget_recorder"/>
           <packing>
             <property name="name">recorder</property>
             <property name="title" translatable="yes">Recorder</property>
diff --git a/gtk/ui/gtkassistant.ui b/gtk/ui/gtkassistant.ui
index fc7af80..920071d 100644
--- a/gtk/ui/gtkassistant.ui
+++ b/gtk/ui/gtkassistant.ui
@@ -3,8 +3,7 @@
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkAssistant" parent="GtkWindow">
     <child type="titlebar">
-      <object class="GtkHeaderBar" id="headerbar">
-      </object>
+      <object class="GtkHeaderBar" id="headerbar"/>
     </child>
     <child>
       <object class="GtkBox" id="main_box">
diff --git a/gtk/ui/gtkmessagedialog.ui b/gtk/ui/gtkmessagedialog.ui
index 4097a2a..35834d9 100644
--- a/gtk/ui/gtkmessagedialog.ui
+++ b/gtk/ui/gtkmessagedialog.ui
@@ -7,8 +7,7 @@
     <property name="type-hint">dialog</property>
     <property name="skip-taskbar-hint">1</property>
     <child internal-child="headerbar">
-      <object class="GtkHeaderBar" id="headerbar1">
-      </object>
+      <object class="GtkHeaderBar" id="headerbar1"/>
     </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
diff --git a/gtk/ui/gtkpagesetupunixdialog.ui b/gtk/ui/gtkpagesetupunixdialog.ui
index 373aa5f..4b0b948 100644
--- a/gtk/ui/gtkpagesetupunixdialog.ui
+++ b/gtk/ui/gtkpagesetupunixdialog.ui
@@ -24,8 +24,7 @@
     </columns>
   </object>
   <template class="GtkPageSetupUnixDialog" parent="GtkDialog">
-    <property name="can-focus">False</property>
-    <property name="resizable">False</property>
+    <property name="resizable">0</property>
     <property name="type-hint">dialog</property>
     <property name="title" translatable="yes">Page Setup</property>
     <child internal-child="vbox">
diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui
index 59c82b0..ad005f4 100644
--- a/gtk/ui/gtkprintunixdialog.ui
+++ b/gtk/ui/gtkprintunixdialog.ui
@@ -48,7 +48,6 @@
     <property name="step-increment">1</property>
   </object>
   <template class="GtkPrintUnixDialog" parent="GtkDialog">
-    <property name="can-focus">False</property>
     <property name="type-hint">dialog</property>
     <signal name="notify::page-setup" handler="redraw_page_layout_preview" swapped="no"/>
     <signal name="response" handler="error_dialogs" swapped="no"/>
@@ -425,8 +424,6 @@
                                 </child>
                                 <child>
                                   <object class="GtkPrinterOptionWidget" id="duplex">
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
                                     <property name="valign">baseline</property>
                                   </object>
                                   <packing>
@@ -449,8 +446,6 @@
                                 </child>
                                 <child>
                                   <object class="GtkPrinterOptionWidget" id="pages_per_sheet">
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
                                     <property name="valign">baseline</property>
                                     <signal name="changed" handler="redraw_page_layout_preview" 
object="GtkPrintUnixDialog" swapped="yes"/>
                                     <signal name="changed" handler="update_number_up_layout" 
object="GtkPrintUnixDialog" swapped="yes"/>
@@ -475,8 +470,6 @@
                                 </child>
                                 <child>
                                   <object class="GtkPrinterOptionWidget" id="number_up_layout">
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
                                     <property name="valign">baseline</property>
                                     <signal name="changed" handler="redraw_page_layout_preview" 
object="GtkPrintUnixDialog" swapped="yes"/>
                                   </object>
@@ -603,8 +596,6 @@
                                 </child>
                                 <child>
                                   <object class="GtkPrinterOptionWidget" id="paper_type">
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
                                     <property name="valign">baseline</property>
                                   </object>
                                   <packing>
@@ -627,8 +618,6 @@
                                 </child>
                                 <child>
                                   <object class="GtkPrinterOptionWidget" id="paper_source">
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
                                     <property name="valign">baseline</property>
                                   </object>
                                   <packing>
@@ -651,8 +640,6 @@
                                 </child>
                                 <child>
                                   <object class="GtkPrinterOptionWidget" id="output_tray">
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
                                     <property name="valign">baseline</property>
                                   </object>
                                   <packing>
@@ -803,10 +790,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkPrinterOptionWidget" id="job_prio">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                              </object>
+                              <object class="GtkPrinterOptionWidget" id="job_prio"/>
                               <packing>
                                 <property name="left-attach">1</property>
                                 <property name="top-attach">0</property>
@@ -826,10 +810,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkPrinterOptionWidget" id="billing_info">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                              </object>
+                              <object class="GtkPrinterOptionWidget" id="billing_info"/>
                               <packing>
                                 <property name="left-attach">1</property>
                                 <property name="top-attach">1</property>
@@ -997,10 +978,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkPrinterOptionWidget" id="cover_before">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                              </object>
+                              <object class="GtkPrinterOptionWidget" id="cover_before"/>
                               <packing>
                                 <property name="left-attach">1</property>
                                 <property name="top-attach">0</property>
@@ -1020,10 +998,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkPrinterOptionWidget" id="cover_after">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                              </object>
+                              <object class="GtkPrinterOptionWidget" id="cover_after"/>
                               <packing>
                                 <property name="left-attach">1</property>
                                 <property name="top-attach">1</property>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]