[gtk+/wip/baedert/visible-widgets] demos: Simplify ui files



commit 42998fcd4c9c8016b95b30ac305e47a7d7944651
Author: Timm Bäder <mail baedert org>
Date:   Thu Jan 19 11:20:55 2017 +0100

    demos: Simplify ui files

 demos/gtk-demo/application.ui          |   13 +-
 demos/gtk-demo/blendmodes.ui           |  205 ++++-------
 demos/gtk-demo/demo.ui                 |   38 +--
 demos/gtk-demo/filtermodel.ui          |   53 ++--
 demos/gtk-demo/fishbowl.ui             |   22 +-
 demos/gtk-demo/font-features.ui        |  628 +++++++++++---------------------
 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                |   20 +-
 demos/gtk-demo/theming.ui              |  108 ++----
 demos/icon-browser/window.ui           |   57 +---
 demos/widget-factory/help-overlay.ui   |   13 -
 demos/widget-factory/widget-factory.ui |  506 ++++++++++++--------------
 23 files changed, 772 insertions(+), 1498 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/demo.ui b/demos/gtk-demo/demo.ui
index cfd0650..f849572 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>
@@ -159,13 +143,9 @@
               </object>
             </child>
           </object>
-          <packing>
-            <property name="expand">0</property>
-          </packing>
         </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>
@@ -173,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>
@@ -181,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>
@@ -189,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>
@@ -198,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>
@@ -211,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>
@@ -219,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>
@@ -227,17 +200,14 @@
             </child>
           </object>
           <packing>
-            <property name="expand">0</property>
             <property name="position">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="shadow_type">in</property>
-            <property name="visible">1</property>
+            <property name="shadow-type">in</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">
@@ -291,11 +261,9 @@
         </child>
         <child>
           <object class="GtkStatusbar" id="statusbar1">
-            <property name="visible">1</property>
           </object>
           <packing>
             <property name="position">3</property>
-            <property name="expand">0</property>
           </packing>
         </child>
       </object>
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 538f9ba..98d1eac 100644
--- a/demos/gtk-demo/fishbowl.ui
+++ b/demos/gtk-demo/fishbowl.ui
@@ -5,46 +5,42 @@
     <property name="title" translatable="yes">Fishbowl</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="">
-        <property name="visible">True</property>
-        <property name="show-close-button">True</property>
+        <property name="show-close-button">1</property>
         <child>
           <object class="GtkLabel" id="info_label">
-            <property name="visible">True</property>
             <property name="label">icons - 0 fps</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 3906b8c..314be90 100644
--- a/demos/gtk-demo/font-features.ui
+++ b/demos/gtk-demo/font-features.ui
@@ -7,20 +7,17 @@
     <property name="default-height">500</property>
     <child type="titlebar">
       <object class="GtkHeaderBar">
-        <property name="visible">1</property>
-        <property name="show_close_button">1</property>
+        <property name="show-close-button">1</property>
         <property name="title">Font Features</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="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>
+                <property name="icon-name">view-refresh-symbolic</property>
               </object>
             </child>
           </object>
@@ -29,34 +26,28 @@
     </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>
+            <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="can-focus">1</property>
+                        <property name="receives-default">1</property>
                         <property name="font">Sans 12</property>
                         <signal name="font-set" handler="font_changed" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkComboBox" id="script_lang">
-                        <property name="visible">1</property>
-                        <property name="can_focus">1</property>
+                        <property name="can-focus">1</property>
                         <signal name="changed" handler="script_changed" swapped="no"/>
                         <child>
                           <object class="GtkCellRendererText"/>
@@ -68,30 +59,25 @@
                     </child>
                     <child>
                       <object class="GtkExpander">
-                        <property name="visible">1</property>
-                        <property name="can_focus">1</property>
+                        <property name="can-focus">1</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="visible">1</property>
-                            <property name="margin_start">10</property>
-                            <property name="margin_end">10</property>
-                            <property name="margin_top">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="kern_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="kern_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -99,9 +85,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="kern">
                                     <property name="label" translatable="yes">Enabled</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="kern_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -113,7 +98,6 @@
                         </child>
                         <child type="label">
                           <object class="GtkLabel">
-                            <property name="visible">1</property>
                             <property name="label" translatable="yes">Kerning</property>
                           </object>
                         </child>
@@ -121,30 +105,25 @@
                     </child>
                     <child>
                       <object class="GtkExpander">
-                        <property name="visible">1</property>
-                        <property name="can_focus">1</property>
+                        <property name="can-focus">1</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="visible">1</property>
-                            <property name="margin_start">10</property>
-                            <property name="margin_end">10</property>
-                            <property name="margin_top">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="liga_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="liga_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -152,9 +131,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="liga">
                                     <property name="label" translatable="yes">Common Ligatures</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="liga_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -164,19 +142,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="dlig_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="dlig_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -184,9 +159,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="dlig">
                                     <property name="label" translatable="yes">Discretionary 
Ligatures</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="dlig_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -196,19 +170,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="hlig_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="hlig_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -216,9 +187,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="hlig">
                                     <property name="label" translatable="yes">Historical Ligatures</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="hlig_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -228,19 +198,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="clig_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="clig_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -248,9 +215,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="clig">
                                     <property name="label" translatable="yes">Contextual Ligatures</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="clig_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -262,7 +228,6 @@
                         </child>
                         <child type="label">
                           <object class="GtkLabel">
-                            <property name="visible">1</property>
                             <property name="label" translatable="yes">Ligatures</property>
                           </object>
                         </child>
@@ -270,30 +235,25 @@
                     </child>
                     <child>
                       <object class="GtkExpander">
-                        <property name="visible">1</property>
-                        <property name="can_focus">1</property>
+                        <property name="can-focus">1</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="visible">1</property>
-                            <property name="margin_start">10</property>
-                            <property name="margin_end">10</property>
-                            <property name="margin_top">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="smcp_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="smcp_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -301,9 +261,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="smcp">
                                     <property name="label" translatable="yes">Small Caps</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="draw-indicator">1</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="valign">baseline</property>
                                     <property name="sensitive" bind-source="smcp_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -313,19 +272,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="c2sc_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="c2sc_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -333,9 +289,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="c2sc">
                                     <property name="label" translatable="yes">Small Caps from Caps</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="c2sc_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -345,19 +300,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="pcap_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="pcap_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -365,9 +317,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="pcap">
                                     <property name="label" translatable="yes">Petite Caps</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="pcap_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -377,19 +328,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="c2pc_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="c2pc_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -397,9 +345,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="c2pc">
                                     <property name="label" translatable="yes">Caps to Petite Caps</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="c2pc_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -409,19 +356,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="unic_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="unic_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -429,9 +373,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="unic">
                                     <property name="label" translatable="yes">Unicase</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="unic_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -441,19 +384,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="cpsp_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="cpsp_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -461,9 +401,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="cpsp">
                                     <property name="label" translatable="yes">Capital Spacing</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="cpsp_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -473,19 +412,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="case_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="case_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -493,9 +429,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="case">
                                     <property name="label" translatable="yes">Case-sensitive Forms</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="case_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -507,7 +442,6 @@
                         </child>
                         <child type="label">
                           <object class="GtkLabel">
-                            <property name="visible">1</property>
                             <property name="label" translatable="yes">Letter Case</property>
                           </object>
                         </child>
@@ -515,21 +449,17 @@
                     </child>
                     <child>
                       <object class="GtkExpander">
-                        <property name="visible">1</property>
-                        <property name="can_focus">1</property>
+                        <property name="can-focus">1</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="visible">1</property>
-                            <property name="margin_start">10</property>
-                            <property name="margin_end">10</property>
-                            <property name="margin_top">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="numcasedefault_pres">
-                                    <property name="visible">1</property>
                                     <property name="opacity">0</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
@@ -538,10 +468,9 @@
                                 <child>
                                   <object class="GtkRadioButton" id="numcasedefault">
                                     <property name="label" translatable="yes">Default</property>
-                                    <property name="visible">1</property>
-                                    <property name="can_focus">1</property>
+                                    <property name="can-focus">1</property>
                                     <property name="active">1</property>
-                                    <property name="draw_indicator">1</property>
+                                    <property name="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -550,10 +479,8 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="lnum_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
@@ -561,10 +488,9 @@
                                 <child>
                                   <object class="GtkRadioButton" id="lnum">
                                     <property name="label" translatable="yes">Lining</property>
-                                    <property name="visible">1</property>
-                                    <property name="can_focus">1</property>
+                                    <property name="can-focus">1</property>
                                     <property name="active">1</property>
-                                    <property name="draw_indicator">1</property>
+                                    <property name="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <property name="group">numcasedefault</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
@@ -574,10 +500,8 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="onum_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
@@ -585,11 +509,10 @@
                                 <child>
                                   <object class="GtkRadioButton" id="onum">
                                     <property name="label" translatable="yes">Old-Style</property>
-                                    <property name="visible">1</property>
-                                    <property name="can_focus">1</property>
+                                    <property name="can-focus">1</property>
                                     <property name="active">1</property>
                                     <property name="valign">baseline</property>
-                                    <property name="draw_indicator">1</property>
+                                    <property name="draw-indicator">1</property>
                                     <property name="group">numcasedefault</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -600,7 +523,6 @@
                         </child>
                         <child type="label">
                           <object class="GtkLabel">
-                            <property name="visible">1</property>
                             <property name="label" translatable="yes">Number Case</property>
                           </object>
                         </child>
@@ -608,21 +530,17 @@
                     </child>
                     <child>
                       <object class="GtkExpander">
-                        <property name="visible">1</property>
-                        <property name="can_focus">1</property>
+                        <property name="can-focus">1</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="visible">1</property>
-                            <property name="margin_start">10</property>
-                            <property name="margin_end">10</property>
-                            <property name="margin_top">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="numspacedefault_pres">
-                                    <property name="visible">1</property>
                                     <property name="opacity">0</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
@@ -631,10 +549,9 @@
                                 <child>
                                   <object class="GtkRadioButton" id="numspacedefault">
                                     <property name="label" translatable="yes">Default</property>
-                                    <property name="visible">1</property>
-                                    <property name="can_focus">1</property>
+                                    <property name="can-focus">1</property>
                                     <property name="active">1</property>
-                                    <property name="draw_indicator">1</property>
+                                    <property name="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -643,10 +560,8 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="pnum_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
@@ -654,10 +569,9 @@
                                 <child>
                                   <object class="GtkRadioButton" id="pnum">
                                     <property name="label" translatable="yes">Proportional</property>
-                                    <property name="visible">1</property>
-                                    <property name="can_focus">1</property>
+                                    <property name="can-focus">1</property>
                                     <property name="active">1</property>
-                                    <property name="draw_indicator">1</property>
+                                    <property name="draw-indicator">1</property>
                                     <property name="group">numspacedefault</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
@@ -667,10 +581,8 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="tnum_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
@@ -678,10 +590,9 @@
                                 <child>
                                   <object class="GtkRadioButton" id="tnum">
                                     <property name="label" translatable="yes">Tabular</property>
-                                    <property name="visible">1</property>
-                                    <property name="can_focus">1</property>
+                                    <property name="can-focus">1</property>
                                     <property name="active">1</property>
-                                    <property name="draw_indicator">1</property>
+                                    <property name="draw-indicator">1</property>
                                     <property name="group">numspacedefault</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
@@ -693,7 +604,6 @@
                         </child>
                         <child type="label">
                           <object class="GtkLabel">
-                            <property name="visible">1</property>
                             <property name="label" translatable="yes">Number Spacing</property>
                           </object>
                         </child>
@@ -701,21 +611,17 @@
                     </child>
                     <child>
                       <object class="GtkExpander">
-                        <property name="visible">1</property>
-                        <property name="can_focus">1</property>
+                        <property name="can-focus">1</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="visible">1</property>
-                            <property name="margin_start">10</property>
-                            <property name="margin_end">10</property>
-                            <property name="margin_top">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="fractiondefault_pres">
-                                    <property name="visible">1</property>
                                     <property name="opacity">0</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
@@ -724,10 +630,9 @@
                                 <child>
                                   <object class="GtkRadioButton" id="fractiondefault">
                                     <property name="label" translatable="yes">Off</property>
-                                    <property name="visible">1</property>
-                                    <property name="can_focus">1</property>
+                                    <property name="can-focus">1</property>
                                     <property name="active">1</property>
-                                    <property name="draw_indicator">1</property>
+                                    <property name="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -736,10 +641,8 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="frac_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
@@ -747,10 +650,9 @@
                                 <child>
                                   <object class="GtkRadioButton" id="frac">
                                     <property name="label" translatable="yes">Normal</property>
-                                    <property name="visible">1</property>
-                                    <property name="can_focus">1</property>
+                                    <property name="can-focus">1</property>
                                     <property name="active">1</property>
-                                    <property name="draw_indicator">1</property>
+                                    <property name="draw-indicator">1</property>
                                     <property name="group">fractiondefault</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
@@ -760,10 +662,8 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="afrc_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
@@ -771,10 +671,9 @@
                                 <child>
                                   <object class="GtkRadioButton" id="afrc">
                                     <property name="label" translatable="yes">Alternate</property>
-                                    <property name="visible">1</property>
-                                    <property name="can_focus">1</property>
+                                    <property name="can-focus">1</property>
                                     <property name="active">1</property>
-                                    <property name="draw_indicator">1</property>
+                                    <property name="draw-indicator">1</property>
                                     <property name="group">fractiondefault</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
@@ -786,7 +685,6 @@
                         </child>
                         <child type="label">
                           <object class="GtkLabel">
-                            <property name="visible">1</property>
                             <property name="label" translatable="yes">Fractions</property>
                           </object>
                         </child>
@@ -794,30 +692,25 @@
                     </child>
                     <child>
                       <object class="GtkExpander">
-                        <property name="visible">1</property>
-                        <property name="can_focus">1</property>
+                        <property name="can-focus">1</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="visible">1</property>
-                            <property name="margin_start">10</property>
-                            <property name="margin_end">10</property>
-                            <property name="margin_top">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="zero_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="zero_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -825,9 +718,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="zero">
                                     <property name="label" translatable="yes">Slashed Zero</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="zero_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -837,19 +729,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="nalt_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="nalt_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -857,9 +746,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="nalt">
                                     <property name="label" translatable="yes">Alternative 
Annotations</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="nalt_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -869,19 +757,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="sinf_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="sinf_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -889,9 +774,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="sinf">
                                     <property name="label" translatable="yes">Scientific Inferiors</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="sinf_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -903,7 +787,6 @@
                         </child>
                         <child type="label">
                           <object class="GtkLabel">
-                            <property name="visible">1</property>
                             <property name="label" translatable="yes">Numeric Extras</property>
                           </object>
                         </child>
@@ -911,30 +794,25 @@
                     </child>
                     <child>
                       <object class="GtkExpander">
-                        <property name="visible">1</property>
-                        <property name="can_focus">1</property>
+                        <property name="can-focus">1</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="visible">1</property>
-                            <property name="margin_start">10</property>
-                            <property name="margin_end">10</property>
-                            <property name="margin_top">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="swsh_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="swsh_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -942,9 +820,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="swsh">
                                     <property name="label" translatable="yes">Swash Glyphs</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="swsh_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -954,19 +831,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="cswh_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="cswh_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -974,9 +848,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="cswh">
                                     <property name="label" translatable="yes">Contextual Swash</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="cswh_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -986,19 +859,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="locl_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="locl_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -1006,9 +876,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="locl">
                                     <property name="label" translatable="yes">Localized Forms</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="locl_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -1018,19 +887,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="calt_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="calt_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -1038,9 +904,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="calt">
                                     <property name="label" translatable="yes">Contextual 
Alternatives</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="calt_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -1050,19 +915,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="hist_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="hist_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -1070,9 +932,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="hist">
                                     <property name="label" translatable="yes">Historical 
Alternatives</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="hist_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -1082,19 +943,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="salt_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="salt_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -1102,9 +960,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="salt">
                                     <property name="label" translatable="yes">Stylistic 
Alternatives</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="salt_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -1114,19 +971,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="titl_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="titl_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -1134,9 +988,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="titl">
                                     <property name="label" translatable="yes">Titling Alternatives</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="titl_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -1146,19 +999,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="rand_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="rand_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -1166,9 +1016,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="rand">
                                     <property name="label" translatable="yes">Randomize</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="rand_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -1178,19 +1027,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="subs_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="subs_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -1198,9 +1044,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="subs">
                                     <property name="label" translatable="yes">Subscript</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="subs_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -1210,19 +1055,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="sups_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="sups_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -1230,9 +1072,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="sups">
                                     <property name="label" translatable="yes">Superscript</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="sups_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -1244,7 +1085,6 @@
                         </child>
                         <child type="label">
                           <object class="GtkLabel">
-                            <property name="visible">1</property>
                             <property name="label" translatable="yes">Character Alternatives</property>
                           </object>
                         </child>
@@ -1252,30 +1092,25 @@
                     </child>
                     <child>
                       <object class="GtkExpander">
-                        <property name="visible">1</property>
-                        <property name="can_focus">1</property>
+                        <property name="can-focus">1</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="visible">1</property>
-                            <property name="margin_start">10</property>
-                            <property name="margin_end">10</property>
-                            <property name="margin_top">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="init_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="init_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -1283,9 +1118,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="init">
                                     <property name="label" translatable="yes">Initial Forms</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="init_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -1295,19 +1129,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="medi_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="medi_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -1315,9 +1146,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="medi">
                                     <property name="label" translatable="yes">Medial Forms</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="medi_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -1327,19 +1157,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="fina_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="fina_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -1347,9 +1174,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="fina">
                                     <property name="label" translatable="yes">Final Forms</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="fina_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -1359,19 +1185,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="isol_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="isol_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -1379,9 +1202,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="isol">
                                     <property name="label" translatable="yes">Isolated Forms</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="isol_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -1393,7 +1215,6 @@
                         </child>
                         <child type="label">
                           <object class="GtkLabel">
-                            <property name="visible">1</property>
                             <property name="label" translatable="yes">Positional Alternatives</property>
                           </object>
                         </child>
@@ -1401,30 +1222,25 @@
                     </child>
                     <child>
                       <object class="GtkExpander">
-                        <property name="visible">1</property>
-                        <property name="can_focus">1</property>
+                        <property name="can-focus">1</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="visible">1</property>
-                            <property name="margin_start">10</property>
-                            <property name="margin_end">10</property>
-                            <property name="margin_top">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="ss01_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="ss01_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -1432,9 +1248,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="ss01">
                                     <property name="label" translatable="yes">Set 1</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="ss01_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -1444,19 +1259,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="ss02_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="ss02_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -1464,9 +1276,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="ss02">
                                     <property name="label" translatable="yes">Set 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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="ss02_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -1476,19 +1287,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="ss03_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="ss03_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -1496,9 +1304,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="ss03">
                                     <property name="label" translatable="yes">Set 3</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="ss03_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -1508,19 +1315,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="ss04_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="ss04_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -1528,9 +1332,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="ss04">
                                     <property name="label" translatable="yes">Set 4</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="ss04_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -1540,19 +1343,16 @@
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkImage" id="ss05_pres">
-                                    <property name="visible">1</property>
                                     <property name="icon-name">object-select-symbolic</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="ss05_dflt">
-                                    <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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                   </object>
@@ -1560,9 +1360,8 @@
                                 <child>
                                   <object class="GtkCheckButton" id="ss05">
                                     <property name="label" translatable="yes">Set 5</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="draw-indicator">1</property>
                                     <property name="valign">baseline</property>
                                     <signal name="notify::active" handler="update_display" swapped="no"/>
                                     <property name="sensitive" bind-source="ss05_dflt" 
bind-property="active" bind-flags="sync-create|bidirectional"/>
@@ -1574,7 +1373,6 @@
                         </child>
                         <child type="label">
                           <object class="GtkLabel">
-                            <property name="visible">1</property>
                             <property name="label" translatable="yes">Alternative Stylistic Sets</property>
                           </object>
                         </child>
@@ -1591,22 +1389,18 @@
         </child>
         <child>
           <object class="GtkBox">
-            <property name="visible">1</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkStack" id="stack">
-                <property name="visible">1</property>
-                <property name="margin_start">20</property>
-                <property name="margin_end">20</property>
-                <property name="margin_top">20</property>
-                <property name="margin_bottom">20</property>
+                <property name="margin-start">20</property>
+                <property name="margin-end">20</property>
+                <property name="margin-top">20</property>
+                <property name="margin-bottom">20</property>
                 <child>
                   <object class="GtkEventBox">
-                    <property name="visible">1</property>
                     <signal name="button-press-event" handler="switch_to_entry"/>
                     <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>
@@ -1620,7 +1414,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.
 
 Разъяренный чтец эгоистично бьёт пятью жердями шустрого фехтовальщика. Наш банк вчера же выплатил Ф.Я. 
Эйхгольду комиссию за ценные вещи. Эх, чужак, общий съём цен шляп (юфть) – вдрызг! В чащах юга жил бы цитрус? 
Да, но фальшивый экземпляр!
@@ -1639,10 +1432,9 @@
             </child>
             <child>
               <object class="GtkLabel" id="settings">
-                <property name="visible">1</property>
-                <property name="margin_start">20</property>
-                <property name="margin_end">20</property>
-                <property name="margin_bottom">20</property>
+                <property name="margin-start">20</property>
+                <property name="margin-end">20</property>
+                <property name="margin-bottom">20</property>
                 <property name="xalign">0</property>
                 <property name="valign">end</property>
                 <property name="width-chars">50</property>
diff --git a/demos/gtk-demo/listbox.ui b/demos/gtk-demo/listbox.ui
index db0ce6e..39f60d7 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>
@@ -91,19 +81,18 @@
               </object>
               <packing>
                 <property name="fill">0</property>
-                <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>
@@ -112,21 +101,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>
@@ -136,9 +123,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>
@@ -148,20 +134,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>
@@ -172,18 +156,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>
@@ -194,9 +176,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>
@@ -206,14 +187,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>
@@ -229,53 +208,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>
@@ -288,10 +258,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"/>
@@ -301,9 +269,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"/>
@@ -322,8 +289,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 d3f10e1..325ec97 100644
--- a/demos/gtk-demo/main.ui
+++ b/demos/gtk-demo/main.ui
@@ -23,20 +23,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-close-button">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>
@@ -46,23 +43,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>
@@ -92,76 +85,69 @@
         </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>
             <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 8fbd90c..1b28170 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-close-button">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 7322684..b2692ff 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">6</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">6</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">6</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">6</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">6</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">6</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">6</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">6</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">6</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..7fef08c 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,8 @@
             <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="draw-indicator">1</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
               </object>
@@ -50,7 +45,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 +56,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 7d3c103..8fc5e8a 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-symbolic</property>
+            <property name="use-underline">1</property>
+            <property name="is-important">1</property>
+            <property name="icon-name">edit-find-symbolic</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-symbolic</property>
+            <property name="use-underline">1</property>
+            <property name="is-important">1</property>
+            <property name="icon-name">edit-find-symbolic</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,19 +148,17 @@
     </child>
     <child>
       <object class="GtkToolbar">
-        <property name="visible">1</property>
         <property name="hexpand">1</property>
-        <property name="icon_size">1</property>
+        <property name="icon-size">1</property>
         <property name="toolbar-style">icons</property>
         <style>
           <class name="inline-toolbar"/>
         </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>
@@ -183,10 +166,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>
@@ -195,8 +177,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>
@@ -205,10 +187,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>
@@ -217,11 +198,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>
@@ -229,11 +209,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>
@@ -244,12 +223,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>
           </object>
@@ -259,7 +235,6 @@
         </child>
         <child>
           <object class="GtkButton">
-            <property name="visible">1</property>
             <property name="label">Destructive</property>
             <style>
               <class name="destructive-action"/>
@@ -268,7 +243,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 3cedca4..40e2f9b 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-close-button">True</property>
+        <property name="show-close-button">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>
                 <property name="icon-size">1</property>
               </object>
@@ -62,32 +55,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>
@@ -95,16 +80,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">
@@ -117,7 +99,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>
@@ -138,24 +119,21 @@
     </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>
     <signal name="delete-event" handler="gtk_widget_hide_on_delete"/>
     <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>
             <child>
               <object class="GtkEventBox">
-                <property name="visible">True</property>
                 <child>
                   <object class="GtkImage" id="image1">
-                    <property name="visible">True</property>
                     <property name="halign">center</property>
                     <property name="valign">end</property>
                   </object>
@@ -168,10 +146,8 @@
             </child>
             <child>
               <object class="GtkEventBox">
-                <property name="visible">True</property>
                 <child>
                   <object class="GtkImage" id="image2">
-                    <property name="visible">True</property>
                     <property name="halign">center</property>
                     <property name="valign">end</property>
                   </object>
@@ -184,10 +160,8 @@
             </child>
             <child>
               <object class="GtkEventBox">
-                <property name="visible">True</property>
                 <child>
                   <object class="GtkImage" id="image3">
-                    <property name="visible">True</property>
                     <property name="halign">center</property>
                     <property name="valign">end</property>
                   </object>
@@ -200,10 +174,8 @@
             </child>
             <child>
               <object class="GtkEventBox">
-                <property name="visible">True</property>
                 <child>
                   <object class="GtkImage" id="image4">
-                    <property name="visible">True</property>
                     <property name="halign">center</property>
                     <property name="valign">end</property>
                   </object>
@@ -216,10 +188,8 @@
             </child>
             <child>
               <object class="GtkEventBox">
-                <property name="visible">True</property>
                 <child>
                   <object class="GtkImage" id="image5">
-                    <property name="visible">True</property>
                     <property name="halign">center</property>
                     <property name="valign">end</property>
                   </object>
@@ -230,10 +200,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>
@@ -248,7 +216,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>
@@ -263,7 +230,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>
@@ -278,7 +244,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>
@@ -293,7 +258,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>
@@ -308,8 +272,7 @@
             </child>
             <child>
               <object class="GtkLabel" id="description">
-                <property name="visible">True</property>
-                <property name="wrap">True</property>
+                <property name="wrap">1</property>
                 <property name="max-width-chars">60</property>
                 <property name="xalign">0</property>
                 <property name="valign">start</property>
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 dad8e90..0b08cec 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>
@@ -457,10 +456,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>
@@ -472,10 +471,10 @@ 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-name">view-refresh-symbolic</property>
                             <signal name="icon-release" handler="on_entry_icon_release" swapped="no"/>
                           </object>
                           <packing>
@@ -486,8 +485,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>
@@ -502,8 +501,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </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>
                               </object>
                               <packing>
@@ -512,7 +511,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </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>
@@ -596,8 +595,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </child>
                             <child>
                               <object class="GtkSpinButton" id="spinbutton1">
-                                <property name="can_focus">1</property>
-                                <property name="invisible_char">•</property>
+                                <property name="can-focus">1</property>
+                                <property name="invisible-char">•</property>
                                 <property name="width-chars">2</property>
                                 <property name="max-width-chars">2</property>
                                 <property name="adjustment">adjustment2</property>
@@ -609,8 +608,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </child>
                             <child>
                               <object class="GtkSpinButton" id="spinbutton2">
-                                <property name="can_focus">1</property>
-                                <property name="invisible_char">•</property>
+                                <property name="can-focus">1</property>
+                                <property name="invisible-char">•</property>
                                 <property name="sensitive">0</property>
                                 <property name="width-chars">2</property>
                                 <property name="max-width-chars">2</property>
@@ -627,62 +626,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>
@@ -690,72 +689,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>
@@ -763,13 +762,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>
@@ -777,16 +776,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>
@@ -795,8 +793,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>
@@ -804,8 +802,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>
@@ -833,8 +831,8 @@ 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>
                           <packing>
                             <property name="fill">0</property>
@@ -844,8 +842,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                           <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="fill">0</property>
@@ -855,8 +853,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>
@@ -868,8 +866,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>
@@ -911,8 +909,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="fill">0</property>
@@ -921,10 +919,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>
@@ -932,7 +930,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>
@@ -941,9 +938,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>
@@ -1011,7 +1008,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="fill">0</property>
@@ -1055,21 +1052,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>
@@ -1088,12 +1085,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>
@@ -1140,27 +1137,25 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="spacing">6</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>
                                     <signal name="format-value" handler="scale_format_value"/>
                                   </object>
                                 </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>
                                     <signal name="format-value" handler="scale_format_value_blank"/>
                                   </object>
@@ -1200,11 +1195,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkFrame" id="frame1">
-                            <property name="shadow_type">in</property>
+                            <property name="shadow-type">in</property>
                             <child type="label">
                               <object class="GtkLabel" id="label1">
                                 <property name="label" translatable="yes">&lt;b&gt;In&lt;/b&gt;</property>
-                                <property name="use_markup">1</property>
+                                <property name="use-markup">1</property>
                               </object>
                             </child>
                           </object>
@@ -1214,11 +1209,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                         <child>
                           <object class="GtkFrame" id="frame2">
-                            <property name="shadow_type">out</property>
+                            <property name="shadow-type">out</property>
                             <child type="label">
                               <object class="GtkLabel" id="label2">
                                 <property name="label" translatable="yes">&lt;b&gt;Out&lt;/b&gt;</property>
-                                <property name="use_markup">1</property>
+                                <property name="use-markup">1</property>
                               </object>
                             </child>
                           </object>
@@ -1232,7 +1227,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;Etched 
in&lt;/b&gt;</property>
-                                <property name="use_markup">1</property>
+                                <property name="use-markup">1</property>
                               </object>
                             </child>
                           </object>
@@ -1243,11 +1238,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                         <child>
                           <object class="GtkFrame" id="frame4">
-                            <property name="shadow_type">etched-out</property>
+                            <property name="shadow-type">etched-out</property>
                             <child type="label">
                               <object class="GtkLabel" id="label18">
                                 <property name="label" translatable="yes">&lt;b&gt;Etched 
out&lt;/b&gt;</property>
-                                <property name="use_markup">1</property>
+                                <property name="use-markup">1</property>
                               </object>
                             </child>
                           </object>
@@ -1276,16 +1271,16 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         <property name="spacing">6</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>
                             <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>
@@ -1356,16 +1351,16 @@ 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>
                             <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>
@@ -1386,8 +1381,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>
@@ -1398,7 +1392,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>
@@ -1409,7 +1403,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>
@@ -1426,7 +1420,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>
@@ -1443,15 +1437,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>
@@ -1462,7 +1456,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>
@@ -1479,7 +1473,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>
@@ -1496,7 +1490,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>
@@ -1506,8 +1500,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>
@@ -1518,7 +1512,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>
@@ -1535,7 +1529,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>
@@ -1552,7 +1546,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>
@@ -1562,8 +1556,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>
@@ -1574,7 +1568,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>
@@ -1591,7 +1585,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>
@@ -1608,7 +1602,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>
@@ -1733,8 +1727,7 @@ microphone-sensitivity-medium-symbolic</property>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkSeparator">
-                          </object>
+                          <object class="GtkSeparator"/>
                         </child>
                         <child>
                           <object class="GtkFrame" id="page2frame1">
@@ -1747,13 +1740,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>
@@ -1792,7 +1785,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>
@@ -1802,8 +1795,7 @@ microphone-sensitivity-medium-symbolic</property>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkSeparator">
-                          </object>
+                          <object class="GtkSeparator"/>
                         </child>
                         <child>
                           <object class="GtkScrolledWindow">
@@ -2027,42 +2019,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>
@@ -2072,53 +2063,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>
@@ -2126,27 +2117,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>
@@ -2154,18 +2145,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>
@@ -2173,27 +2163,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>
@@ -2201,7 +2191,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>
@@ -2215,37 +2205,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>
@@ -2255,14 +2245,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>
@@ -2308,8 +2298,7 @@ microphone-sensitivity-medium-symbolic</property>
                                 <child>
                                   <object class="GtkSearchBar" id="searchbar">
                                     <child>
-                                      <object class="GtkSearchEntry">
-                                      </object>
+                                      <object class="GtkSearchEntry"/>
                                     </child>
                                   </object>
                                 </child>
@@ -2330,16 +2319,16 @@ 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>
@@ -2354,8 +2343,7 @@ microphone-sensitivity-medium-symbolic</property>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkSeparator">
-                          </object>
+                          <object class="GtkSeparator"/>
                         </child>
                         <child>
                           <object class="GtkBox">
@@ -2432,26 +2420,25 @@ 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">
@@ -2507,25 +2494,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>
@@ -2615,8 +2602,7 @@ microphone-sensitivity-medium-symbolic</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkSeparator">
-                      </object>
+                      <object class="GtkSeparator"/>
                     </child>
                     <child>
                       <object class="GtkScrolledWindow">
@@ -2670,7 +2656,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>
@@ -2692,7 +2678,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>
@@ -2738,14 +2724,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">
@@ -2976,8 +2960,7 @@ microphone-sensitivity-medium-symbolic</property>
                             <child>
                               <object class="GtkScrolledWindow">
                                 <child>
-                                  <object class="GtkTextView" id="tooltextview">
-                                  </object>
+                                  <object class="GtkTextView" id="tooltextview"/>
                                 </child>
                               </object>
                               <packing>
@@ -3200,15 +3183,15 @@ 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="placeholder_text" translatable="yes">Age…</property>
+                            <property name="can-focus">1</property>
+                            <property name="placeholder-text" translatable="yes">Age…</property>
                           </object>
                           <packing>
                             <property name="position">1</property>
@@ -3221,7 +3204,6 @@ microphone-sensitivity-medium-symbolic</property>
                     </child>
                     <child>
                       <object class="GtkSeparator">
-                        <property name="orientation">horizontal</property>
                       </object>
                     </child>
                     <child>
@@ -3265,8 +3247,7 @@ microphone-sensitivity-medium-symbolic</property>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkBox">
-                          </object>
+                          <object class="GtkBox"/>
                           <packing>
                             <property name="tab-expand">1</property>
                           </packing>
@@ -3277,8 +3258,7 @@ microphone-sensitivity-medium-symbolic</property>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkBox">
-                          </object>
+                          <object class="GtkBox"/>
                           <packing>
                             <property name="tab-expand">1</property>
                           </packing>
@@ -3289,8 +3269,7 @@ microphone-sensitivity-medium-symbolic</property>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkBox">
-                          </object>
+                          <object class="GtkBox"/>
                           <packing>
                             <property name="tab-expand">1</property>
                           </packing>
@@ -3331,13 +3310,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>
@@ -3365,7 +3344,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">
@@ -3373,7 +3352,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>
@@ -3525,7 +3504,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">
@@ -3533,7 +3512,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>
@@ -3577,8 +3556,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>



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