diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index b7a6ee442f..259c4def99 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -132,7 +132,6 @@
   </menu>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">100</property>
-    <property name="lower">0</property>
     <property name="value">50</property>
     <property name="step-increment">1</property>
     <property name="page-increment">10</property>
@@ -242,13 +241,13 @@
     <child type="tag">
       <object class="GtkTextTag">
         <property name="name">italic</property>
-        <property name="style">italic</property>
+        <property name="style">2</property>
       </object>
     </child>
     <child type="tag">
       <object class="GtkTextTag">
         <property name="name">underline</property>
-        <property name="underline">single</property>
+        <property name="underline">1</property>
       </object>
     </child>
   </object>
@@ -437,7 +436,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
         </child>
         <child type="end">
           <object class="GtkMenuButton" id="gear_menu_button">
-            <property name="valign">center</property>
+            <property name="valign">3</property>
             <property name="focus-on-click">0</property>
             <property name="popover">
               <object class="GtkPopoverMenu" id="gear_menu">
@@ -446,12 +445,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                   <object class="GtkScale">
                     <property name="adjustment">
                       <object class="GtkAdjustment">
-                        <property name="lower">0</property>
                         <property name="upper">1000</property>
                         <property name="value">250</property>
                         <property name="step-increment">50</property>
                         <property name="page-increment">50</property>
-                        <property name="page-size">0</property>
                       </object>
                     </property>
                     <signal name="value-changed" handler="transition_speed_changed"/>
@@ -466,7 +463,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
     </child>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="orientation">vertical</property>
+        <property name="orientation">1</property>
         <property name="margin-start">10</property>
         <property name="margin-end">10</property>
         <property name="margin-top">10</property>
@@ -474,29 +471,29 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
         <child>
           <object class="GtkStack" id="toplevel_stack">
             <property name="transition-duration">250</property>
-            <property name="transition-type">crossfade</property>
+            <property name="transition-type">1</property>
             <child>
               <object class="GtkStackPage">
                 <property name="name">page1</property>
-                <property name="title" translatable="yes">Page _1</property>
+                <property name="title" translatable="1">Page _1</property>
                 <property name="use-underline">1</property>
                 <property name="child">
                   <object class="GtkBox" id="page1">
-                    <property name="orientation">vertical</property>
+                    <property name="orientation">1</property>
                     <property name="spacing">10</property>
                     <child>
                       <object class="GtkBox" id="box2">
                         <property name="spacing">10</property>
                         <child>
                           <object class="GtkBox" id="box3">
-                            <property name="orientation">vertical</property>
+                            <property name="orientation">1</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkComboBoxText" id="comboboxtext1">
                                 <property name="has-entry">1</property>
                                 <child internal-child="entry">
                                   <object class="GtkEntry" id="comboboxtext-entry">
-                                    <property name="text" translatable="yes">comboboxentry</property>
+                                    <property name="text" translatable="1">comboboxentry</property>
                                   </object>
                                 </child>
                                 <items>
@@ -513,7 +510,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <child internal-child="entry">
                                   <object class="GtkEntry" id="comboboxtext-entry2">
                                     <property name="invisible-char">•</property>
-                                    <property name="text" translatable="yes">comboboxentry</property>
+                                    <property name="text" translatable="1">comboboxentry</property>
                                   </object>
                                 </child>
                               </object>
@@ -522,7 +519,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               <object class="GtkEntry" id="entry1">
                                 <property name="enable-emoji-completion">1</property>
                                 <property name="invisible_char">•</property>
-                                <property name="placeholder-text" translatable="yes">Click icon to change mode</property>
+                                <property name="placeholder-text" translatable="1">Click icon to change mode</property>
                                 <property name="secondary-icon-name">view-refresh-symbolic</property>
                                 <property name="secondary-icon-tooltip-text">Change mode</property>
                                 <signal name="icon-release" handler="on_entry_icon_release" swapped="no"/>
@@ -531,7 +528,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child>
                               <object class="GtkEntry" id="entry2">
                                 <property name="sensitive">0</property>
-                                <property name="text" translatable="yes">entry</property>
+                                <property name="text" translatable="1">entry</property>
                               </object>
                             </child>
                             <child>
@@ -542,7 +539,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <child>
                                   <object class="GtkEntry" id="entry24">
                                     <property name="enable-emoji-completion">1</property>
-                                    <property name="text" translatable="yes">entry</property>
+                                    <property name="text" translatable="1">entry</property>
                                     <property name="hexpand">1</property>
                                   </object>
                                 </child>
@@ -555,9 +552,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </child>
                             <child>
                               <object class="GtkPasswordEntry">
-                                <property name="halign">fill</property>
                                 <property name="show-peek-icon">1</property>
-                                <property name="placeholder-text" translatable="yes">Password…</property>
+                                <property name="placeholder-text" translatable="1">Password…</property>
                               </object>
                             </child>
                             <child>
@@ -612,13 +608,13 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="spacing">20</property>
                                 <child>
                                   <object class="GtkLabel" id="label3">
-                                    <property name="label" translatable="yes">label</property>
+                                    <property name="label" translatable="1">label</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label4">
                                     <property name="sensitive">0</property>
-                                    <property name="label" translatable="yes">label</property>
+                                    <property name="label" translatable="1">label</property>
                                   </object>
                                 </child>
                                 <child>
@@ -644,13 +640,13 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="row-spacing">6</property>
                                 <child>
                                   <object class="GtkCheckButton" id="checkbutton1">
-                                    <property name="label" translatable="yes">checkbutton</property>
+                                    <property name="label" translatable="1">checkbutton</property>
                                     <property name="active">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="checkbutton2">
-                                    <property name="label" translatable="yes">checkbutton</property>
+                                    <property name="label" translatable="1">checkbutton</property>
                                     <layout>
                                       <property name="column">0</property>
                                       <property name="row">1</property>
@@ -659,7 +655,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="checkbutton3">
-                                    <property name="label" translatable="yes">checkbutton</property>
+                                    <property name="label" translatable="1">checkbutton</property>
                                     <property name="inconsistent">1</property>
                                     <layout>
                                       <property name="column">0</property>
@@ -669,7 +665,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="checkbutton4">
-                                    <property name="label" translatable="yes">checkbutton</property>
+                                    <property name="label" translatable="1">checkbutton</property>
                                     <property name="sensitive">0</property>
                                     <property name="active">1</property>
                                     <layout>
@@ -680,7 +676,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="checkbutton5">
-                                    <property name="label" translatable="yes">checkbutton</property>
+                                    <property name="label" translatable="1">checkbutton</property>
                                     <property name="sensitive">0</property>
                                     <layout>
                                       <property name="column">0</property>
@@ -690,7 +686,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="checkbutton6">
-                                    <property name="label" translatable="yes">checkbutton</property>
+                                    <property name="label" translatable="1">checkbutton</property>
                                     <property name="sensitive">0</property>
                                     <property name="inconsistent">1</property>
                                     <layout>
@@ -701,7 +697,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="radiobutton1">
-                                    <property name="label" translatable="yes">radiobutton</property>
+                                    <property name="label" translatable="1">radiobutton</property>
                                     <property name="active">1</property>
                                     <layout>
                                       <property name="column">1</property>
@@ -711,7 +707,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton">
-                                    <property name="label" translatable="yes">radiobutton</property>
+                                    <property name="label" translatable="1">radiobutton</property>
                                     <property name="group">radiobutton1</property>
                                     <layout>
                                       <property name="column">1</property>
@@ -721,7 +717,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="radiobutton3">
-                                    <property name="label" translatable="yes">radiobutton</property>
+                                    <property name="label" translatable="1">radiobutton</property>
                                     <property name="inconsistent">1</property>
                                     <property name="group">radiobutton1</property>
                                     <layout>
@@ -732,7 +728,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="radiobutton4">
-                                    <property name="label" translatable="yes">radiobutton</property>
+                                    <property name="label" translatable="1">radiobutton</property>
                                     <property name="sensitive">0</property>
                                     <property name="active">1</property>
                                     <layout>
@@ -743,7 +739,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="radiobutton5">
-                                    <property name="label" translatable="yes">radiobutton</property>
+                                    <property name="label" translatable="1">radiobutton</property>
                                     <property name="sensitive">0</property>
                                     <property name="group">radiobutton4</property>
                                     <layout>
@@ -754,7 +750,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="radiobutton6">
-                                    <property name="label" translatable="yes">radiobutton</property>
+                                    <property name="label" translatable="1">radiobutton</property>
                                     <property name="sensitive">0</property>
                                     <property name="inconsistent">1</property>
                                     <property name="group">radiobutton4</property>
@@ -805,31 +801,31 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                         <child>
                           <object class="GtkBox" id="box19">
-                            <property name="orientation">vertical</property>
+                            <property name="orientation">1</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkToggleButton" id="togglebutton1">
-                                <property name="label" translatable="yes">togglebutton</property>
+                                <property name="label" translatable="1">togglebutton</property>
                                 <property name="receives-default">1</property>
                               </object>
                             </child>
                             <child>
                               <object class="GtkToggleButton" id="togglebutton2">
-                                <property name="label" translatable="yes">togglebutton</property>
+                                <property name="label" translatable="1">togglebutton</property>
                                 <property name="sensitive">0</property>
                                 <property name="receives-default">1</property>
                               </object>
                             </child>
                             <child>
                               <object class="GtkToggleButton" id="togglebutton3">
-                                <property name="label" translatable="yes">togglebutton</property>
+                                <property name="label" translatable="1">togglebutton</property>
                                 <property name="receives-default">1</property>
                                 <property name="active">1</property>
                               </object>
                             </child>
                             <child>
                               <object class="GtkToggleButton" id="togglebutton4">
-                                <property name="label" translatable="yes">togglebutton</property>
+                                <property name="label" translatable="1">togglebutton</property>
                                 <property name="sensitive">0</property>
                                 <property name="receives-default">1</property>
                                 <property name="active">1</property>
@@ -870,12 +866,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               <object class="GtkColorButton" id="colorbutton1">
                                 <property name="receives-default">1</property>
                                 <property name="rgba">#31316867a09f</property>
-                                <property name="use-alpha">1</property>
                               </object>
                             </child>
                             <child>
                               <object class="GtkLinkButton" id="linkbutton1">
-                                <property name="label" translatable="yes">link button</property>
+                                <property name="label" translatable="1">link button</property>
                                 <property name="receives-default">1</property>
                                 <property name="has-tooltip">1</property>
                                 <property name="has-frame">0</property>
@@ -884,25 +879,25 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </child>
                             <child>
                               <object class="GtkSwitch" id="switch1">
-                                <property name="halign">center</property>
+                                <property name="halign">3</property>
                               </object>
                             </child>
                             <child>
                               <object class="GtkSwitch" id="switch2">
                                 <property name="sensitive">0</property>
-                                <property name="halign">center</property>
+                                <property name="halign">3</property>
                               </object>
                             </child>
                           </object>
                         </child>
                         <child>
                           <object class="GtkBox" id="box20">
-                            <property name="orientation">vertical</property>
+                            <property name="orientation">1</property>
                             <property name="spacing">6</property>
                             <property name="hexpand">1</property>
                             <child>
                               <object class="GtkBox" id="box21">
-                                <property name="orientation">vertical</property>
+                                <property name="orientation">1</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkProgressBar" id="progressbar1">
@@ -945,14 +940,13 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <child>
                                   <object class="GtkBox" id="box24">
                                     <property name="hexpand">1</property>
-                                    <property name="orientation">vertical</property>
+                                    <property name="orientation">1</property>
                                     <property name="homogeneous">1</property>
                                     <child>
                                       <object class="GtkScale" id="scale1">
                                         <property name="adjustment">adjustment1</property>
                                         <property name="restrict-to-fill-level">0</property>
                                         <property name="fill-level">75</property>
-                                        <property name="draw-value">0</property>
                                       </object>
                                     </child>
                                     <child>
@@ -961,7 +955,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="adjustment">adjustment1</property>
                                         <property name="restrict-to-fill-level">0</property>
                                         <property name="fill-level">75</property>
-                                        <property name="draw-value">0</property>
                                       </object>
                                     </child>
                                   </object>
@@ -970,7 +963,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </child>
                             <child>
                               <object class="GtkScale" id="scale5">
-                                <property name="draw-value">0</property>
                                 <property name="has-origin">0</property>
                                 <property name="round-digits">0</property>
                                 <property name="adjustment">adjustment3</property>
@@ -994,17 +986,17 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="homogeneous">1</property>
                                     <child>
                                       <object class="GtkProgressBar" id="progressbar5">
-                                        <property name="orientation">vertical</property>
+                                        <property name="orientation">1</property>
                                         <property name="fraction">0.5</property>
-                                        <property name="halign">end</property>
+                                        <property name="halign">2</property>
                                       </object>
                                     </child>
                                     <child>
                                       <object class="GtkProgressBar" id="progressbar6">
-                                        <property name="orientation">vertical</property>
+                                        <property name="orientation">1</property>
                                         <property name="fraction">0.5</property>
                                         <property name="inverted">1</property>
-                                        <property name="halign">start</property>
+                                        <property name="halign">1</property>
                                       </object>
                                     </child>
                                   </object>
@@ -1017,26 +1009,26 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <child>
                                       <object class="GtkScale" id="scale3">
                                         <property name="height-request">100</property>
-                                        <property name="orientation">vertical</property>
+                                        <property name="orientation">1</property>
                                         <property name="adjustment">adjustment1</property>
                                         <property name="restrict-to-fill-level">0</property>
                                         <property name="fill-level">75</property>
                                         <property name="digits">-1</property>
                                         <property name="draw-value">1</property>
-                                        <property name="halign">end</property>
+                                        <property name="halign">2</property>
                                       </object>
                                     </child>
                                     <child>
                                       <object class="GtkScale" id="scale4">
                                         <property name="height-request">100</property>
                                         <property name="sensitive">0</property>
-                                        <property name="orientation">vertical</property>
+                                        <property name="orientation">1</property>
                                         <property name="adjustment">adjustment1</property>
                                         <property name="restrict-to-fill-level">0</property>
                                         <property name="fill-level">75</property>
                                         <property name="digits">-1</property>
                                         <property name="draw-value">1</property>
-                                        <property name="halign">start</property>
+                                        <property name="halign">1</property>
                                       </object>
                                     </child>
                                   </object>
@@ -1047,7 +1039,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                         <child>
                           <object class="GtkBox" id="box26">
-                            <property name="orientation">vertical</property>
+                            <property name="orientation">1</property>
                             <property name="spacing">10</property>
                             <property name="hexpand">1</property>
                             <child>
@@ -1065,73 +1057,90 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               <object class="GtkFrame">
                                 <child type="label">
                                   <object class="GtkLabel" id="label1">
-                                    <property name="label" translatable="yes">&lt;b&gt;Text Styles&lt;/b&gt;</property>
+                                    <property name="label" translatable="1">&lt;b&gt;Text Styles&lt;/b&gt;</property>
                                     <property name="use-markup">1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkScrolledWindow">
                                     <property name="vexpand">1</property>
-                                    <property name="hscrollbar-policy">never</property>
-                                    <property name="vscrollbar-policy">automatic</property>
+                                    <property name="hscrollbar-policy">2</property>
                                     <property name="propagate-natural-height">1</property>
                                     <property name="propagate-natural-width">1</property>
                                     <child>
                                       <object class="GtkBox">
-                                        <property name="orientation">vertical</property>
+                                        <property name="orientation">1</property>
                                         <property name="spacing">10</property>
                                         <child>
                                           <object class="GtkLabel">
                                             <property name="label">Large Title</property>
-                                            <style><class name="large-title"/></style>
+                                            <style>
+                                              <class name="large-title"/>
+                                            </style>
                                           </object>
                                         </child>
                                         <child>
                                           <object class="GtkLabel">
                                             <property name="label">Title 1</property>
-                                            <style><class name="title-1"/></style>
+                                            <style>
+                                              <class name="title-1"/>
+                                            </style>
                                           </object>
                                         </child>
                                         <child>
                                           <object class="GtkLabel">
                                             <property name="label">Title 2</property>
-                                            <style><class name="title-2"/></style>
+                                            <style>
+                                              <class name="title-2"/>
+                                            </style>
                                           </object>
                                         </child>
                                         <child>
                                           <object class="GtkLabel">
                                             <property name="label">Title 3</property>
-                                            <style><class name="title-3"/></style>
+                                            <style>
+                                              <class name="title-3"/>
+                                            </style>
                                           </object>
                                         </child>
                                         <child>
                                           <object class="GtkLabel">
                                             <property name="label">Title 4</property>
-                                            <style><class name="title-4"/></style>
+                                            <style>
+                                              <class name="title-4"/>
+                                            </style>
                                           </object>
                                         </child>
                                         <child>
                                           <object class="GtkLabel">
                                             <property name="label">Heading</property>
-                                            <style><class name="heading"/></style>
+                                            <style>
+                                              <class name="heading"/>
+                                            </style>
                                           </object>
                                         </child>
                                         <child>
                                           <object class="GtkLabel">
                                             <property name="label">Body</property>
-                                            <style><class name="body"/></style>
+                                            <style>
+                                              <class name="body"/>
+                                            </style>
                                           </object>
                                         </child>
                                         <child>
                                           <object class="GtkLabel">
                                             <property name="label">Caption Heading</property>
-                                            <style><class name="caption-heading"/></style>
+                                            <style>
+                                              <class name="caption-heading"/>
+                                            </style>
                                           </object>
                                         </child>
                                         <child>
                                           <object class="GtkLabel">
                                             <property name="label">Caption</property>
-                                            <style><class name="caption"/></style>
+                                            <style>
+                                              <class name="caption"/>
+                                            </style>
                                           </object>
                                         </child>
                                       </object>
@@ -1144,13 +1153,13 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                         <child>
                           <object class="GtkBox" id="box4">
-                            <property name="orientation">vertical</property>
+                            <property name="orientation">1</property>
                             <property name="spacing">6</property>
                             <property name="hexpand">1</property>
                             <child>
                               <object class="GtkScrolledWindow" id="scrolledwindow1">
                                 <property name="width-request">150</property>
-                                <property name="vscrollbar-policy">always</property>
+                                <property name="vscrollbar-policy">0</property>
                                 <property name="has-frame">1</property>
                                 <property name="vexpand">1</property>
                                 <child>
@@ -1163,7 +1172,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     </child>
                                     <child>
                                       <object class="GtkTreeViewColumn" id="treeviewcolumn3">
-                                        <property name="title" translatable="yes">Cool</property>
+                                        <property name="title" translatable="1">Cool</property>
                                         <child>
                                           <object class="GtkCellRendererToggle" id="cellrenderertoggle1"/>
                                           <attributes>
@@ -1175,7 +1184,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     </child>
                                     <child>
                                       <object class="GtkTreeViewColumn" id="treeviewcolumn4">
-                                        <property name="title" translatable="yes">Icon</property>
+                                        <property name="title" translatable="1">Icon</property>
                                         <property name="reorderable">1</property>
                                         <child>
                                           <object class="GtkCellRendererPixbuf" id="cellrendererpixbuf1"/>
@@ -1187,14 +1196,14 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     </child>
                                     <child>
                                       <object class="GtkTreeViewColumn" id="treeviewcolumn1">
-                                        <property name="title" translatable="yes">Name</property>
+                                        <property name="title" translatable="1">Name</property>
                                         <property name="resizable">1</property>
                                         <property name="reorderable">1</property>
                                         <property name="sort-indicator">1</property>
                                         <property name="sort-column-id">2</property>
                                         <child>
                                           <object class="GtkCellRendererText" id="cellrenderertext3">
-                                            <property name="ellipsize">end</property>
+                                            <property name="ellipsize">3</property>
                                           </object>
                                           <attributes>
                                             <attribute name="text">2</attribute>
@@ -1204,14 +1213,14 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     </child>
                                     <child>
                                       <object class="GtkTreeViewColumn" id="treeviewcolumn2">
-                                        <property name="title" translatable="yes">Nick</property>
+                                        <property name="title" translatable="1">Nick</property>
                                         <property name="resizable">1</property>
                                         <property name="reorderable">1</property>
                                         <property name="sort-indicator">1</property>
                                         <property name="sort-column-id">3</property>
                                         <child>
                                           <object class="GtkCellRendererText" id="cellrenderertext4">
-                                            <property name="ellipsize">end</property>
+                                            <property name="ellipsize">3</property>
                                           </object>
                                           <attributes>
                                             <attribute name="text">3</attribute>
@@ -1255,10 +1264,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                       <object class="GtkLoader">
                                         <property name="resource">/org/gtk/WidgetFactory4/sunset.jpg</property>
                                       </object>
-                                    </property> 
+                                    </property>
                                     <child>
                                       <object class="GtkDragSource">
-                                        <property name="actions">copy</property>
                                         <signal name="prepare" handler="on_picture_drag_prepare" swapped="no"/>
                                       </object>
                                     </child>
@@ -1273,7 +1281,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 </property>
                                 <property name="tab">
                                   <object class="GtkLabel" id="label5">
-                                    <property name="label" translatable="yes">page 1</property>
+                                    <property name="label" translatable="1">page 1</property>
                                   </object>
                                 </property>
                               </object>
@@ -1289,7 +1297,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     </property>
                                     <child>
                                       <object class="GtkDragSource">
-                                        <property name="actions">copy</property>
                                         <signal name="prepare" handler="on_picture_drag_prepare" swapped="no"/>
                                       </object>
                                     </child>
@@ -1304,7 +1311,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 </property>
                                 <property name="tab">
                                   <object class="GtkLabel" id="label6">
-                                    <property name="label" translatable="yes">page 2</property>
+                                    <property name="label" translatable="1">page 2</property>
                                   </object>
                                 </property>
                               </object>
@@ -1320,7 +1327,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     </property>
                                     <child>
                                       <object class="GtkDragSource">
-                                        <property name="actions">copy</property>
                                         <signal name="prepare" handler="on_picture_drag_prepare" swapped="no"/>
                                       </object>
                                     </child>
@@ -1335,7 +1341,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 </property>
                                 <property name="tab">
                                   <object class="GtkLabel" id="label7">
-                                    <property name="label" translatable="yes">page 3</property>
+                                    <property name="label" translatable="1">page 3</property>
                                   </object>
                                 </property>
                               </object>
@@ -1344,17 +1350,17 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                         <child>
                           <object class="GtkNotebook" id="notebook2">
-                            <property name="tab-pos">right</property>
+                            <property name="tab-pos">1</property>
                             <child>
                               <object class="GtkNotebookPage">
                                 <property name="child">
                                   <object class="GtkBox" id="box8">
-                                    <property name="orientation">vertical</property>
+                                    <property name="orientation">1</property>
                                   </object>
                                 </property>
                                 <property name="tab">
                                   <object class="GtkLabel" id="label8">
-                                    <property name="label" translatable="yes">page 1</property>
+                                    <property name="label" translatable="1">page 1</property>
                                   </object>
                                 </property>
                               </object>
@@ -1364,12 +1370,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="position">1</property>
                                 <property name="child">
                                   <object class="GtkBox" id="box10">
-                                    <property name="orientation">vertical</property>
+                                    <property name="orientation">1</property>
                                   </object>
                                 </property>
                                 <property name="tab">
                                   <object class="GtkLabel" id="label9">
-                                    <property name="label" translatable="yes">page 2</property>
+                                    <property name="label" translatable="1">page 2</property>
                                   </object>
                                 </property>
                               </object>
@@ -1379,12 +1385,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="position">2</property>
                                 <property name="child">
                                   <object class="GtkBox" id="box11">
-                                    <property name="orientation">vertical</property>
+                                    <property name="orientation">1</property>
                                   </object>
                                 </property>
                                 <property name="tab">
                                   <object class="GtkLabel" id="label10">
-                                    <property name="label" translatable="yes">page 3</property>
+                                    <property name="label" translatable="1">page 3</property>
                                   </object>
                                 </property>
                               </object>
@@ -1393,17 +1399,17 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                         <child>
                           <object class="GtkNotebook" id="notebook3">
-                            <property name="tab-pos">bottom</property>
+                            <property name="tab-pos">3</property>
                             <child>
                               <object class="GtkNotebookPage">
                                 <property name="child">
                                   <object class="GtkBox" id="box12">
-                                    <property name="orientation">vertical</property>
+                                    <property name="orientation">1</property>
                                   </object>
                                 </property>
                                 <property name="tab">
                                   <object class="GtkLabel" id="label11">
-                                    <property name="label" translatable="yes">page 1</property>
+                                    <property name="label" translatable="1">page 1</property>
                                   </object>
                                 </property>
                               </object>
@@ -1413,12 +1419,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="position">1</property>
                                 <property name="child">
                                   <object class="GtkBox" id="box13">
-                                    <property name="orientation">vertical</property>
+                                    <property name="orientation">1</property>
                                   </object>
                                 </property>
                                 <property name="tab">
                                   <object class="GtkLabel" id="label12">
-                                    <property name="label" translatable="yes">page 2</property>
+                                    <property name="label" translatable="1">page 2</property>
                                   </object>
                                 </property>
                               </object>
@@ -1428,12 +1434,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="position">2</property>
                                 <property name="child">
                                   <object class="GtkBox" id="box14">
-                                    <property name="orientation">vertical</property>
+                                    <property name="orientation">1</property>
                                   </object>
                                 </property>
                                 <property name="tab">
                                   <object class="GtkLabel" id="label13">
-                                    <property name="label" translatable="yes">page 3</property>
+                                    <property name="label" translatable="1">page 3</property>
                                   </object>
                                 </property>
                               </object>
@@ -1442,17 +1448,17 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                         <child>
                           <object class="GtkNotebook" id="notebook4">
-                            <property name="tab-pos">left</property>
+                            <property name="tab-pos">0</property>
                             <child>
                               <object class="GtkNotebookPage">
                                 <property name="child">
                                   <object class="GtkBox" id="box15">
-                                    <property name="orientation">vertical</property>
+                                    <property name="orientation">1</property>
                                   </object>
                                 </property>
                                 <property name="tab">
                                   <object class="GtkLabel" id="label14">
-                                    <property name="label" translatable="yes">page 1</property>
+                                    <property name="label" translatable="1">page 1</property>
                                   </object>
                                 </property>
                               </object>
@@ -1462,12 +1468,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="position">1</property>
                                 <property name="child">
                                   <object class="GtkBox" id="box16">
-                                    <property name="orientation">vertical</property>
+                                    <property name="orientation">1</property>
                                   </object>
                                 </property>
                                 <property name="tab">
                                   <object class="GtkLabel" id="label15">
-                                    <property name="label" translatable="yes">page 2</property>
+                                    <property name="label" translatable="1">page 2</property>
                                   </object>
                                 </property>
                               </object>
@@ -1477,12 +1483,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="position">2</property>
                                 <property name="child">
                                   <object class="GtkBox" id="box17">
-                                    <property name="orientation">vertical</property>
+                                    <property name="orientation">1</property>
                                   </object>
                                 </property>
                                 <property name="tab">
                                   <object class="GtkLabel" id="label16">
-                                    <property name="label" translatable="yes">page 3</property>
+                                    <property name="label" translatable="1">page 3</property>
                                   </object>
                                 </property>
                               </object>
@@ -1498,15 +1504,15 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
             <child>
               <object class="GtkStackPage">
                 <property name="name">page2</property>
-                <property name="title" translatable="yes">Page _2</property>
+                <property name="title" translatable="1">Page _2</property>
                 <property name="use-underline">1</property>
                 <property name="child">
                   <object class="GtkOverlay" id="page2">
                     <child type="overlay">
                       <object class="GtkRevealer" id="page2revealer">
-                        <property name="transition-type">swing-down</property>
-                        <property name="halign">center</property>
-                        <property name="valign">start</property>
+                        <property name="transition-type">9</property>
+                        <property name="halign">3</property>
+                        <property name="valign">1</property>
                         <child>
                           <object class="GtkFrame" id="page2frame">
                             <style>
@@ -1522,14 +1528,14 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <child>
                                   <object class="GtkLabel" id="page2note">
                                     <property name="hexpand">1</property>
-                                    <property name="halign">start</property>
+                                    <property name="halign">1</property>
                                     <property name="label">NEWS!</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="page2reset">
-                                    <property name="valign">center</property>
-                                    <property name="label" translatable="yes">Reset</property>
+                                    <property name="valign">3</property>
+                                    <property name="label" translatable="1">Reset</property>
                                   </object>
                                 </child>
                                 <child>
@@ -1550,21 +1556,21 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         <property name="spacing">10</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">vertical</property>
+                            <property name="orientation">1</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkBox">
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkSpinButton" id="verticalspin1">
-                                    <property name="orientation">vertical</property>
+                                    <property name="orientation">1</property>
                                     <property name="adjustment">adjustment2</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkSpinButton" id="verticalspin2">
                                     <property name="sensitive">0</property>
-                                    <property name="orientation">vertical</property>
+                                    <property name="orientation">1</property>
                                     <property name="adjustment">adjustment2</property>
                                   </object>
                                 </child>
@@ -1572,14 +1578,14 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkGrid">
                                     <property name="row-spacing">6</property>
                                     <property name="column-spacing">6</property>
-                                    <property name="halign">center</property>
-                                    <property name="valign">center</property>
+                                    <property name="halign">3</property>
+                                    <property name="valign">3</property>
                                     <child>
                                       <object class="GtkVolumeButton">
-                                        <property name="orientation">vertical</property>
-                                        <property name="valign">center</property>
+                                        <property name="orientation">1</property>
+                                        <property name="valign">3</property>
                                         <property name="value">.5</property>
-                                        <property name="halign">center</property>
+                                        <property name="halign">3</property>
                                         <layout>
                                           <property name="column">0</property>
                                           <property name="row">0</property>
@@ -1593,9 +1599,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
 microphone-sensitivity-high-symbolic
 microphone-sensitivity-low-symbolic
 microphone-sensitivity-medium-symbolic</property>
-                                        <property name="valign">center</property>
+                                        <property name="valign">3</property>
                                         <property name="value">.5</property>
-                                        <property name="halign">center</property>
+                                        <property name="halign">3</property>
                                         <signal name="value-changed" handler="on_scale_button_value_changed" swapped="no"/>
                                         <layout>
                                           <property name="column">0</property>
@@ -1611,10 +1617,10 @@ microphone-sensitivity-medium-symbolic</property>
                               <object class="GtkFrame" id="page2frame1">
                                 <child>
                                   <object class="GtkBox">
-                                    <property name="orientation">vertical</property>
+                                    <property name="orientation">1</property>
                                     <child>
                                       <object class="GtkStack" id="stack">
-                                        <property name="transition-type">rotate-left-right</property>
+                                        <property name="transition-type">22</property>
                                         <property name="transition-duration">250</property>
                                         <child>
                                           <object class="GtkStackPage">
@@ -1623,7 +1629,7 @@ microphone-sensitivity-medium-symbolic</property>
                                             <property name="title">News</property>
                                             <property name="child">
                                               <object class="GtkScrolledWindow" id="swo">
-                                                <property name="hscrollbar-policy">never</property>
+                                                <property name="hscrollbar-policy">2</property>
                                                 <child>
                                                   <object class="GtkTextView" id="tvo">
                                                     <property name="buffer">textbuffer2</property>
@@ -1658,14 +1664,14 @@ microphone-sensitivity-medium-symbolic</property>
                                         <child type="center">
                                           <object class="GtkStackSwitcher" id="switcher">
                                             <property name="stack">stack</property>
-                                            <property name="halign">center</property>
+                                            <property name="halign">3</property>
                                           </object>
                                         </child>
                                         <child type="end">
                                           <object class="GtkMenuButton">
                                             <property name="menu-model">dinner_menu</property>
-                                            <property name="halign">center</property>
-                                            <property name="valign">center</property>
+                                            <property name="halign">3</property>
+                                            <property name="valign">3</property>
                                             <property name="icon-name">emblem-system-symbolic</property>
                                           </object>
                                         </child>
@@ -1678,13 +1684,13 @@ microphone-sensitivity-medium-symbolic</property>
                             <child>
                               <object class="GtkScrolledWindow">
                                 <property name="has-frame">1</property>
-                                <property name="hscrollbar-policy">never</property>
+                                <property name="hscrollbar-policy">2</property>
                                 <property name="min-content-height">200</property>
                                 <property name="hexpand">0</property>
                                 <property name="vexpand">1</property>
                                 <child>
                                   <object class="GtkListBox" id="listbox">
-                                    <property name="selection-mode">none</property>
+                                    <property name="selection-mode">0</property>
                                     <property name="show-separators">1</property>
                                     <style>
                                       <class name="rich-list"/>
@@ -1702,16 +1708,16 @@ microphone-sensitivity-medium-symbolic</property>
                                           <object class="GtkBox">
                                             <child>
                                               <object class="GtkLabel">
-                                                <property name="label" translatable="yes">Row 1</property>
-                                                <property name="halign">start</property>
-                                                <property name="valign">center</property>
+                                                <property name="label" translatable="1">Row 1</property>
+                                                <property name="halign">1</property>
+                                                <property name="valign">3</property>
                                                 <property name="hexpand">1</property>
                                               </object>
                                             </child>
                                             <child>
                                               <object class="GtkSwitch" id="listboxrow1switch">
-                                                <property name="halign">end</property>
-                                                <property name="valign">center</property>
+                                                <property name="halign">2</property>
+                                                <property name="valign">3</property>
                                               </object>
                                             </child>
                                           </object>
@@ -1725,17 +1731,16 @@ microphone-sensitivity-medium-symbolic</property>
                                           <object class="GtkBox">
                                             <child>
                                               <object class="GtkLabel">
-                                                <property name="label" translatable="yes">Row 2</property>
-                                                <property name="halign">start</property>
-                                                <property name="valign">center</property>
+                                                <property name="label" translatable="1">Row 2</property>
+                                                <property name="halign">1</property>
+                                                <property name="valign">3</property>
                                                 <property name="hexpand">1</property>
                                               </object>
                                             </child>
                                             <child>
                                               <object class="GtkScale" id="opacity">
-                                                <property name="halign">end</property>
-                                                <property name="valign">center</property>
-                                                <property name="draw-value">0</property>
+                                                <property name="halign">2</property>
+                                                <property name="valign">3</property>
                                                 <property name="width-request">150</property>
                                                 <property name="adjustment">adjustment1</property>
                                               </object>
@@ -1750,17 +1755,17 @@ microphone-sensitivity-medium-symbolic</property>
                                           <object class="GtkBox">
                                             <child>
                                               <object class="GtkLabel">
-                                                <property name="label" translatable="yes">Row 3</property>
-                                                <property name="halign">start</property>
-                                                <property name="valign">center</property>
+                                                <property name="label" translatable="1">Row 3</property>
+                                                <property name="halign">1</property>
+                                                <property name="valign">3</property>
                                                 <property name="hexpand">1</property>
                                               </object>
                                             </child>
                                             <child>
                                               <object class="GtkImage" id="listboxrow3image">
                                                 <property name="icon-name">object-select-symbolic</property>
-                                                <property name="halign">end</property>
-                                                <property name="valign">center</property>
+                                                <property name="halign">2</property>
+                                                <property name="valign">3</property>
                                                 <property name="opacity">0</property>
                                               </object>
                                             </child>
@@ -1775,9 +1780,9 @@ microphone-sensitivity-medium-symbolic</property>
                                           <object class="GtkBox">
                                             <child>
                                               <object class="GtkLabel">
-                                                <property name="label" translatable="yes">Row 4</property>
-                                                <property name="halign">start</property>
-                                                <property name="valign">center</property>
+                                                <property name="label" translatable="1">Row 4</property>
+                                                <property name="halign">1</property>
+                                                <property name="valign">3</property>
                                                 <property name="hexpand">1</property>
                                               </object>
                                             </child>
@@ -1785,8 +1790,8 @@ microphone-sensitivity-medium-symbolic</property>
                                               <object class="GtkSpinButton">
                                                 <property name="adjustment">adjustment1</property>
                                                 <property name="hexpand">1</property>
-                                                <property name="halign">end</property>
-                                                <property name="valign">center</property>
+                                                <property name="halign">2</property>
+                                                <property name="valign">3</property>
                                               </object>
                                             </child>
                                           </object>
@@ -1800,16 +1805,16 @@ microphone-sensitivity-medium-symbolic</property>
                                           <object class="GtkBox">
                                             <child>
                                               <object class="GtkLabel">
-                                                <property name="label" translatable="yes">Row 5</property>
-                                                <property name="halign">start</property>
-                                                <property name="valign">center</property>
+                                                <property name="label" translatable="1">Row 5</property>
+                                                <property name="halign">1</property>
+                                                <property name="valign">3</property>
                                                 <property name="hexpand">1</property>
                                               </object>
                                             </child>
                                             <child>
                                               <object class="GtkButton" id="listboxrow5button">
-                                                <property name="halign">end</property>
-                                                <property name="valign">center</property>
+                                                <property name="halign">2</property>
+                                                <property name="valign">3</property>
                                                 <property name="icon-name">appointment-soon-symbolic</property>
                                               </object>
                                             </child>
@@ -1824,16 +1829,16 @@ microphone-sensitivity-medium-symbolic</property>
                                           <object class="GtkBox">
                                             <child>
                                               <object class="GtkLabel">
-                                                <property name="label" translatable="yes">Row 6</property>
-                                                <property name="halign">start</property>
-                                                <property name="valign">center</property>
+                                                <property name="label" translatable="1">Row 6</property>
+                                                <property name="halign">1</property>
+                                                <property name="valign">3</property>
                                                 <property name="hexpand">1</property>
                                               </object>
                                             </child>
                                             <child>
                                               <object class="GtkCheckButton">
-                                                <property name="halign">end</property>
-                                                <property name="valign">center</property>
+                                                <property name="halign">2</property>
+                                                <property name="valign">3</property>
                                               </object>
                                             </child>
                                           </object>
@@ -1846,9 +1851,9 @@ microphone-sensitivity-medium-symbolic</property>
                                           <object class="GtkBox">
                                             <child>
                                               <object class="GtkLabel">
-                                                <property name="label" translatable="yes">Row 7</property>
-                                                <property name="halign">start</property>
-                                                <property name="valign">center</property>
+                                                <property name="label" translatable="1">Row 7</property>
+                                                <property name="halign">1</property>
+                                                <property name="valign">3</property>
                                                 <property name="hexpand">1</property>
                                               </object>
                                             </child>
@@ -1862,10 +1867,9 @@ microphone-sensitivity-medium-symbolic</property>
                                           <object class="GtkBox">
                                             <child>
                                               <object class="GtkLabel">
-                                                <property name="label" translatable="yes">Row 8</property>
-                                                <property name="halign">start</property>
-                                                <property name="valign">center</property>
-
+                                                <property name="label" translatable="1">Row 8</property>
+                                                <property name="halign">1</property>
+                                                <property name="valign">3</property>
                                                 <property name="hexpand">1</property>
                                               </object>
                                             </child>
@@ -1881,13 +1885,13 @@ microphone-sensitivity-medium-symbolic</property>
                         </child>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">vertical</property>
+                            <property name="orientation">1</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkFrame" id="page2frame2">
                                 <child>
                                   <object class="GtkBox">
-                                    <property name="orientation">vertical</property>
+                                    <property name="orientation">1</property>
                                     <child>
                                       <object class="GtkPopoverMenuBar">
                                         <property name="menu-model">menu_bar_model</property>
@@ -1900,16 +1904,16 @@ microphone-sensitivity-medium-symbolic</property>
                                         </style>
                                         <child>
                                           <object class="GtkButton">
-                                            <property name="label" translatable="yes">New</property>
+                                            <property name="label" translatable="1">New</property>
                                             <property name="icon-name">document-new</property>
-                                            <property name="tooltip-text" translatable="yes">Create a new document</property>
+                                            <property name="tooltip-text" translatable="1">Create a new document</property>
                                           </object>
                                         </child>
                                         <child>
                                           <object class="GtkButton">
-                                            <property name="label" translatable="yes">Save</property>
+                                            <property name="label" translatable="1">Save</property>
                                             <property name="icon-name">document-save</property>
-                                            <property name="tooltip-text" translatable="yes">Save the current document</property>
+                                            <property name="tooltip-text" translatable="1">Save the current document</property>
                                           </object>
                                         </child>
                                         <child>
@@ -1917,18 +1921,18 @@ microphone-sensitivity-medium-symbolic</property>
                                         </child>
                                         <child>
                                           <object class="GtkButton">
-                                            <property name="label" translatable="yes">Search</property>
+                                            <property name="label" translatable="1">Search</property>
                                             <property name="icon-name">edit-find</property>
                                             <property name="action-name">win.search</property>
-                                            <property name="tooltip-text" translatable="yes">Search for it</property>
+                                            <property name="tooltip-text" translatable="1">Search for it</property>
                                           </object>
                                         </child>
                                         <child>
                                           <object class="GtkButton">
                                             <property name="sensitive">0</property>
-                                            <property name="label" translatable="yes">Insert</property>
+                                            <property name="label" translatable="1">Insert</property>
                                             <property name="icon-name">insert-image</property>
-                                            <property name="tooltip-text" translatable="yes">Insert something</property>
+                                            <property name="tooltip-text" translatable="1">Insert something</property>
                                           </object>
                                         </child>
                                       </object>
@@ -2015,7 +2019,7 @@ microphone-sensitivity-medium-symbolic</property>
                                         <property name="vexpand">1</property>
                                         <child>
                                           <object class="GtkPaned">
-                                            <property name="orientation">vertical</property>
+                                            <property name="orientation">1</property>
                                             <style>
                                               <class name="view"/>
                                             </style>
@@ -2041,11 +2045,11 @@ microphone-sensitivity-medium-symbolic</property>
                         </child>
                         <child>
                           <object class="GtkBox" id="filler2">
-                            <property name="orientation">vertical</property>
+                            <property name="orientation">1</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkCalendar">
-                                <property name="halign">center</property>
+                                <property name="halign">3</property>
                               </object>
                             </child>
                             <child>
@@ -2053,7 +2057,7 @@ microphone-sensitivity-medium-symbolic</property>
                                 <property name="expanded">1</property>
                                 <child>
                                   <object class="GtkBox">
-                                    <property name="orientation">vertical</property>
+                                    <property name="orientation">1</property>
                                     <child>
                                       <object class="GtkScrolledWindow" id="scrolledwindow3">
                                         <property name="has-frame">1</property>
@@ -2061,7 +2065,7 @@ microphone-sensitivity-medium-symbolic</property>
                                         <property name="height-request">226</property>
                                         <child>
                                           <object class="GtkIconView" id="iconview1">
-                                            <property name="selection-mode">multiple</property>
+                                            <property name="selection-mode">3</property>
                                             <property name="model">iconsmodel</property>
                                             <child>
                                               <object class="GtkCellRendererPixbuf" id="iconviewcell"/>
@@ -2105,32 +2109,32 @@ microphone-sensitivity-medium-symbolic</property>
                                 </child>
                                 <child type="label">
                                   <object class="GtkLabel" id="label19">
-                                    <property name="label" translatable="yes">Expander</property>
+                                    <property name="label" translatable="1">Expander</property>
                                   </object>
                                 </child>
                               </object>
                             </child>
                             <child>
                               <object class="GtkButton" id="info_dialog_button">
-                                <property name="label" translatable="yes">_Inform</property>
+                                <property name="label" translatable="1">_Inform</property>
                                 <property name="use-underline">1</property>
                               </object>
                             </child>
                             <child>
                               <object class="GtkButton" id="action_dialog_button">
-                                <property name="label" translatable="yes">_Act</property>
+                                <property name="label" translatable="1">_Act</property>
                                 <property name="use-underline">1</property>
                               </object>
                             </child>
                             <child>
                               <object class="GtkButton" id="preference_dialog_button">
-                                <property name="label" translatable="yes">_Configure</property>
+                                <property name="label" translatable="1">_Configure</property>
                                 <property name="use-underline">1</property>
                               </object>
                             </child>
                             <child>
                               <object class="GtkButton" id="selection_dialog_button">
-                                <property name="label" translatable="yes">S_elect</property>
+                                <property name="label" translatable="1">S_elect</property>
                                 <property name="use-underline">1</property>
                               </object>
                             </child>
@@ -2145,39 +2149,39 @@ microphone-sensitivity-medium-symbolic</property>
             <child>
               <object class="GtkStackPage">
                 <property name="name">page3</property>
-                <property name="title" translatable="yes">Page _3</property>
+                <property name="title" translatable="1">Page _3</property>
                 <property name="use-underline">1</property>
                 <property name="child">
                   <object class="GtkBox">
                     <property name="spacing">10</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="orientation">vertical</property>
+                        <property name="orientation">1</property>
                         <property name="spacing">10</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">vertical</property>
+                            <property name="orientation">1</property>
                             <property name="spacing">4</property>
                             <child>
                               <object class="GtkScrolledWindow">
-                                <property name="hscrollbar-policy">never</property>
-                                <property name="vscrollbar-policy">always</property>
+                                <property name="hscrollbar-policy">2</property>
+                                <property name="vscrollbar-policy">0</property>
                                 <property name="height-request">300</property>
                                 <property name="has-frame">1</property>
                                 <child>
                                   <object class="GtkTreeView" id="charletree">
-                                    <property name="enable-grid-lines">vertical</property>
+                                    <property name="enable-grid-lines">2</property>
                                     <property name="enable-tree-lines">1</property>
                                     <property name="rubber-banding">1</property>
                                     <property name="model">charlemodel</property>
                                     <child internal-child="selection">
                                       <object class="GtkTreeSelection">
-                                        <property name="mode">multiple</property>
+                                        <property name="mode">3</property>
                                       </object>
                                     </child>
                                     <child>
                                       <object class="GtkTreeViewColumn">
-                                        <property name="title" translatable="yes">Name</property>
+                                        <property name="title" translatable="1">Name</property>
                                         <child>
                                           <object class="GtkCellRendererText"/>
                                           <attributes>
@@ -2188,7 +2192,7 @@ microphone-sensitivity-medium-symbolic</property>
                                     </child>
                                     <child>
                                       <object class="GtkTreeViewColumn">
-                                        <property name="title" translatable="yes">Birth</property>
+                                        <property name="title" translatable="1">Birth</property>
                                         <child>
                                           <object class="GtkCellRendererText"/>
                                           <attributes>
@@ -2199,7 +2203,7 @@ microphone-sensitivity-medium-symbolic</property>
                                     </child>
                                     <child>
                                       <object class="GtkTreeViewColumn">
-                                        <property name="title" translatable="yes">Death</property>
+                                        <property name="title" translatable="1">Death</property>
                                         <child>
                                           <object class="GtkCellRendererText"/>
                                           <attributes>
@@ -2215,21 +2219,21 @@ microphone-sensitivity-medium-symbolic</property>
                             <child>
                               <object class="GtkLabel">
                                 <property name="selectable">1</property>
-                                <property name="halign">start</property>
+                                <property name="halign">1</property>
                                 <property name="use-markup">1</property>
-                                <property name="label" translatable="yes">&lt;small&gt;Data source: &lt;a href=&quot;http://en.wikipedia.org/wiki/Charlemagne#Ancestry&quot;&gt;Wikipedia&lt;/a&gt;&lt;/small&gt;</property>
+                                <property name="label" translatable="1">&lt;small&gt;Data source: &lt;a href=&quot;http://en.wikipedia.org/wiki/Charlemagne#Ancestry&quot;&gt;Wikipedia&lt;/a&gt;&lt;/small&gt;</property>
                               </object>
                             </child>
                           </object>
                         </child>
                         <child>
                           <object class="GtkScrolledWindow">
-                            <property name="hscrollbar-policy">never</property>
+                            <property name="hscrollbar-policy">2</property>
                             <property name="vexpand">1</property>
                             <property name="has-frame">1</property>
                             <child>
                               <object class="GtkListBox" id="munsell">
-                                <property name="selection-mode">multiple</property>
+                                <property name="selection-mode">3</property>
                                 <property name="activate-on-single-click">0</property>
                               </object>
                             </child>
@@ -2239,7 +2243,7 @@ microphone-sensitivity-medium-symbolic</property>
                     </child>
                     <child>
                       <object class="GtkBox">
-                        <property name="orientation">vertical</property>
+                        <property name="orientation">1</property>
                         <property name="spacing">10</property>
                         <child>
                           <object class="GtkBox">
@@ -2250,14 +2254,14 @@ microphone-sensitivity-medium-symbolic</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkMenuButton" id="open_menubutton">
-                                    <property name="halign">center</property>
+                                    <property name="halign">3</property>
                                     <property name="popover">open_popover</property>
                                     <property name="label">Open</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkToggleButton" id="record_button">
-                                    <property name="halign">center</property>
+                                    <property name="halign">3</property>
                                     <signal name="toggled" handler="on_record_button_toggled"/>
                                     <style>
                                       <class name="text-button"/>
@@ -2269,13 +2273,13 @@ microphone-sensitivity-medium-symbolic</property>
                                         <property name="spacing">6</property>
                                         <child>
                                           <object class="GtkImage">
-                                            <property name="valign">baseline</property>
+                                            <property name="valign">4</property>
                                             <property name="icon-name">media-record-symbolic</property>
                                           </object>
                                         </child>
                                         <child>
                                           <object class="GtkLabel">
-                                            <property name="valign">baseline</property>
+                                            <property name="valign">4</property>
                                             <property name="label">Record</property>
                                           </object>
                                         </child>
@@ -2340,14 +2344,14 @@ microphone-sensitivity-medium-symbolic</property>
                                         <property name="title">Identity</property>
                                         <property name="child">
                                           <object class="GtkBox">
-                                            <property name="orientation">vertical</property>
+                                            <property name="orientation">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="spacing">10</property>
-                                            <property name="halign">center</property>
-                                            <property name="valign">center</property>
+                                            <property name="halign">3</property>
+                                            <property name="valign">3</property>
                                             <child>
                                               <object class="GtkEntry">
                                                 <property name="placeholder-text">First Name</property>
@@ -2368,14 +2372,14 @@ microphone-sensitivity-medium-symbolic</property>
                                         <property name="title">Birthdate</property>
                                         <property name="child">
                                           <object class="GtkBox">
-                                            <property name="orientation">vertical</property>
+                                            <property name="orientation">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="spacing">10</property>
-                                            <property name="halign">center</property>
-                                            <property name="valign">center</property>
+                                            <property name="halign">3</property>
+                                            <property name="valign">3</property>
                                             <child>
                                               <object class="GtkBox">
                                                 <property name="spacing">2</property>
@@ -2453,13 +2457,13 @@ microphone-sensitivity-medium-symbolic</property>
                                         <property name="title">Address</property>
                                         <property name="child">
                                           <object class="GtkBox">
-                                            <property name="orientation">vertical</property>
+                                            <property name="orientation">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="halign">center</property>
-                                            <property name="valign">center</property>
+                                            <property name="halign">3</property>
+                                            <property name="valign">3</property>
                                             <style>
                                               <class name="linked"/>
                                             </style>
@@ -2488,13 +2492,13 @@ microphone-sensitivity-medium-symbolic</property>
                                         <property name="title">Pages</property>
                                         <property name="child">
                                           <object class="GtkBox">
-                                            <property name="orientation">vertical</property>
+                                            <property name="orientation">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="halign">center</property>
-                                            <property name="valign">center</property>
+                                            <property name="halign">3</property>
+                                            <property name="valign">3</property>
                                             <style>
                                               <class name="linked"/>
                                             </style>
@@ -2539,101 +2543,101 @@ microphone-sensitivity-medium-symbolic</property>
                             </child>
                           </object>
                         </child>
+                        <child>
+                          <object class="GtkBox">
                             <child>
                               <object class="GtkBox">
+                                <property name="orientation">1</property>
+                                <style>
+                                  <class name="linked"/>
+                                </style>
                                 <child>
-                                  <object class="GtkBox">
-                                    <property name="orientation">vertical</property>
-                                    <style>
-                                      <class name="linked"/>
-                                    </style>
-                                    <child>
-                                      <object class="GtkButton" id="toolbutton1">
-                                        <property name="icon-name">document-open-symbolic</property>
-                                        <property name="focus-on-click">0</property>
-                                        <property name="tooltip-text" translatable="yes">Insert ⌘</property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="toolbutton2">
-                                        <property name="icon-name">send-to-symbolic</property>
-                                        <property name="focus-on-click">0</property>
-                                        <property name="tooltip-text" translatable="yes">Insert ⚽</property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="toolbutton3">
-                                        <property name="icon-name">view-fullscreen-symbolic</property>
-                                        <property name="focus-on-click">0</property>
-                                        <property name="tooltip-text" translatable="yes">Insert ⤢</property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="toolbutton4">
-                                        <property name="icon-name">star-new-symbolic</property>
-                                        <property name="focus-on-click">0</property>
-                                        <property name="tooltip-text" translatable="yes">Insert ☆</property>
-                                      </object>
-                                    </child>
+                                  <object class="GtkButton" id="toolbutton1">
+                                    <property name="icon-name">document-open-symbolic</property>
+                                    <property name="focus-on-click">0</property>
+                                    <property name="tooltip-text" translatable="1">Insert ⌘</property>
                                   </object>
                                 </child>
                                 <child>
-                                  <object class="GtkScrolledWindow">
-                                    <property name="has-frame">1</property>
-                                    <property name="hexpand">1</property>
-                                    <child>
-                                      <object class="GtkTextView" id="tooltextview"/>
-                                    </child>
+                                  <object class="GtkButton" id="toolbutton2">
+                                    <property name="icon-name">send-to-symbolic</property>
+                                    <property name="focus-on-click">0</property>
+                                    <property name="tooltip-text" translatable="1">Insert ⚽</property>
                                   </object>
                                 </child>
                                 <child>
-                                  <object class="GtkBox">
-                                    <property name="orientation">vertical</property>
-                                    <child>
-                                      <object class="GtkBox">
-                                        <property name="orientation">vertical</property>
-                                        <style>
-                                          <class name="linked"/>
-                                        </style>
-                                        <child>
-                                          <object class="GtkButton" id="cutbutton">
-                                            <property name="sensitive">0</property>
-                                            <property name="icon-name">edit-cut-symbolic</property>
-                                            <property name="focus-on-click">0</property>
-                                            <property name="tooltip-text" translatable="yes">Cut</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkButton" id="copybutton">
-                                            <property name="sensitive">0</property>
-                                            <property name="icon-name">edit-copy-symbolic</property>
-                                            <property name="focus-on-click">0</property>
-                                            <property name="tooltip-text" translatable="yes">Copy</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkButton" id="pastebutton">
-                                            <property name="sensitive">0</property>
-                                            <property name="icon-name">edit-paste-symbolic</property>
-                                            <property name="focus-on-click">0</property>
-                                            <property name="tooltip-text" translatable="yes">Paste</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="deletebutton">
-                                        <property name="sensitive">0</property>
-                                        <property name="valign">end</property>
-                                        <property name="icon-name">edit-delete-symbolic</property>
-                                        <property name="focus-on-click">0</property>
-                                        <property name="tooltip-text" translatable="yes">Delete</property>
-                                      </object>
-                                    </child>
+                                  <object class="GtkButton" id="toolbutton3">
+                                    <property name="icon-name">view-fullscreen-symbolic</property>
+                                    <property name="focus-on-click">0</property>
+                                    <property name="tooltip-text" translatable="1">Insert ⤢</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="toolbutton4">
+                                    <property name="icon-name">star-new-symbolic</property>
+                                    <property name="focus-on-click">0</property>
+                                    <property name="tooltip-text" translatable="1">Insert ☆</property>
                                   </object>
                                 </child>
                               </object>
                             </child>
+                            <child>
+                              <object class="GtkScrolledWindow">
+                                <property name="has-frame">1</property>
+                                <property name="hexpand">1</property>
+                                <child>
+                                  <object class="GtkTextView" id="tooltextview"/>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkBox">
+                                <property name="orientation">1</property>
+                                <child>
+                                  <object class="GtkBox">
+                                    <property name="orientation">1</property>
+                                    <style>
+                                      <class name="linked"/>
+                                    </style>
+                                    <child>
+                                      <object class="GtkButton" id="cutbutton">
+                                        <property name="sensitive">0</property>
+                                        <property name="icon-name">edit-cut-symbolic</property>
+                                        <property name="focus-on-click">0</property>
+                                        <property name="tooltip-text" translatable="1">Cut</property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" id="copybutton">
+                                        <property name="sensitive">0</property>
+                                        <property name="icon-name">edit-copy-symbolic</property>
+                                        <property name="focus-on-click">0</property>
+                                        <property name="tooltip-text" translatable="1">Copy</property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" id="pastebutton">
+                                        <property name="sensitive">0</property>
+                                        <property name="icon-name">edit-paste-symbolic</property>
+                                        <property name="focus-on-click">0</property>
+                                        <property name="tooltip-text" translatable="1">Paste</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="deletebutton">
+                                    <property name="sensitive">0</property>
+                                    <property name="valign">2</property>
+                                    <property name="icon-name">edit-delete-symbolic</property>
+                                    <property name="focus-on-click">0</property>
+                                    <property name="tooltip-text" translatable="1">Delete</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
                         <child>
                           <object class="GtkOverlay">
                             <child type="overlay">
@@ -2644,7 +2648,7 @@ microphone-sensitivity-medium-symbolic</property>
                                 <property name="margin-end">20</property>
                                 <property name="margin-top">20</property>
                                 <property name="margin-bottom">20</property>
-                                <property name="valign">end</property>
+                                <property name="valign">2</property>
                                 <style>
                                   <class name="osd"/>
                                 </style>
@@ -2668,13 +2672,12 @@ microphone-sensitivity-medium-symbolic</property>
                                 <child>
                                   <object class="GtkScale">
                                     <property name="hexpand">1</property>
-                                    <property name="draw-value">0</property>
                                     <property name="adjustment">adjustment1</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkVolumeButton">
-                                    <property name="orientation">vertical</property>
+                                    <property name="orientation">1</property>
                                     <property name="value">.5</property>
                                     <style>
                                       <class name="image-button"/>
@@ -2693,7 +2696,7 @@ microphone-sensitivity-medium-symbolic</property>
                                         <property name="show-border">0</property>
                                         <child type="action-end">
                                           <object class="GtkMenuButton">
-                                            <property name="valign">center</property>
+                                            <property name="valign">3</property>
                                             <property name="popover">notebook_info_popover2</property>
                                             <property name="icon-name">emblem-important-symbolic</property>
                                             <property name="has-frame">0</property>
@@ -2714,8 +2717,8 @@ microphone-sensitivity-medium-symbolic</property>
                                               <object class="GtkBox">
                                                 <child>
                                                   <object class="GtkLabel">
-                                                    <property name="label" translatable="yes">Page 1</property>
-                                                    <property name="halign">center</property>
+                                                    <property name="label" translatable="1">Page 1</property>
+                                                    <property name="halign">3</property>
                                                     <property name="hexpand">1</property>
                                                   </object>
                                                 </child>
@@ -2746,8 +2749,8 @@ microphone-sensitivity-medium-symbolic</property>
                                               <object class="GtkBox">
                                                 <child>
                                                   <object class="GtkLabel">
-                                                    <property name="label" translatable="yes">Page 2</property>
-                                                    <property name="halign">center</property>
+                                                    <property name="label" translatable="1">Page 2</property>
+                                                    <property name="halign">3</property>
                                                     <property name="hexpand">1</property>
                                                   </object>
                                                 </child>
@@ -2780,7 +2783,7 @@ microphone-sensitivity-medium-symbolic</property>
                                             </property>
                                             <property name="tab">
                                               <object class="GtkLabel">
-                                                <property name="label" translatable="yes">Page 3</property>
+                                                <property name="label" translatable="1">Page 3</property>
                                               </object>
                                             </property>
                                           </object>
@@ -2802,15 +2805,14 @@ microphone-sensitivity-medium-symbolic</property>
                     </child>
                     <child>
                       <object class="GtkBox">
-                        <property name="orientation">vertical</property>
+                        <property name="orientation">1</property>
                         <property name="spacing">10</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="halign">fill</property>
                             <child>
                               <object class="GtkEntry">
                                 <property name="hexpand">1</property>
-                                <property name="placeholder-text" translatable="yes">Name…</property>
+                                <property name="placeholder-text" translatable="1">Name…</property>
                                 <property name="completion">name_completion</property>
                               </object>
                             </child>
@@ -2818,7 +2820,7 @@ microphone-sensitivity-medium-symbolic</property>
                               <object class="GtkEntry">
                                 <property name="hexpand">1</property>
                                 <property name="show-emoji-icon">1</property>
-                                <property name="placeholder-text" translatable="yes">Age…</property>
+                                <property name="placeholder-text" translatable="1">Age…</property>
                                 <signal name="notify::text" handler="age_entry_changed"/>
                               </object>
                             </child>
@@ -2832,7 +2834,7 @@ microphone-sensitivity-medium-symbolic</property>
                             <property name="scrollable">1</property>
                             <child type="action-end">
                               <object class="GtkMenuButton">
-                                <property name="valign">center</property>
+                                <property name="valign">3</property>
                                 <property name="popover">notebook_info_popover</property>
                                 <property name="icon-name">emblem-important-symbolic</property>
                                 <property name="has-frame">0</property>
@@ -2851,7 +2853,7 @@ microphone-sensitivity-medium-symbolic</property>
                                 </property>
                                 <property name="tab">
                                   <object class="GtkLabel">
-                                    <property name="label" translatable="yes">Page 1</property>
+                                    <property name="label" translatable="1">Page 1</property>
                                   </object>
                                 </property>
                               </object>
@@ -2866,7 +2868,7 @@ microphone-sensitivity-medium-symbolic</property>
                                 </property>
                                 <property name="tab">
                                   <object class="GtkLabel">
-                                    <property name="label" translatable="yes">Page 2</property>
+                                    <property name="label" translatable="1">Page 2</property>
                                   </object>
                                 </property>
                               </object>
@@ -2879,7 +2881,7 @@ microphone-sensitivity-medium-symbolic</property>
                                 </property>
                                 <property name="tab">
                                   <object class="GtkLabel">
-                                    <property name="label" translatable="yes">Page 3</property>
+                                    <property name="label" translatable="1">Page 3</property>
                                   </object>
                                 </property>
                               </object>
@@ -2892,7 +2894,7 @@ microphone-sensitivity-medium-symbolic</property>
                                 </property>
                                 <property name="tab">
                                   <object class="GtkLabel">
-                                    <property name="label" translatable="yes">Page 4</property>
+                                    <property name="label" translatable="1">Page 4</property>
                                   </object>
                                 </property>
                               </object>
@@ -2905,7 +2907,7 @@ microphone-sensitivity-medium-symbolic</property>
                                 </property>
                                 <property name="tab">
                                   <object class="GtkLabel">
-                                    <property name="label" translatable="yes">Page 5</property>
+                                    <property name="label" translatable="1">Page 5</property>
                                   </object>
                                 </property>
                               </object>
@@ -2932,23 +2934,22 @@ microphone-sensitivity-medium-symbolic</property>
     <property name="transient-for">window</property>
     <property name="resizable">0</property>
     <property name="modal">1</property>
-    <property name="text" translatable="yes">Do something?</property>
-    <property name="secondary-text" translatable="yes">If you do something,
+    <property name="text" translatable="1">Do something?</property>
+    <property name="secondary-text" translatable="1">If you do something,
 bad things might happen.</property>
     <property name="hide-on-close">1</property>
     <child type="action">
       <object class="GtkButton" id="cancel_info_dialog">
-        <property name="label" translatable="yes">_Cancel</property>
+        <property name="label" translatable="1">_Cancel</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="label" translatable="1">_Do It</property>
         <property name="use-underline">1</property>
       </object>
     </child>
-
     <action-widgets>
       <action-widget response="cancel">cancel_info_dialog</action-widget>
       <action-widget response="ok" default="true">doit_info_dialog</action-widget>
@@ -2959,7 +2960,7 @@ bad things might happen.</property>
     <property name="resizable">0</property>
     <property name="modal">1</property>
     <property name="use-header-bar">1</property>
-    <property name="title" translatable="yes">Zelda</property>
+    <property name="title" translatable="1">Zelda</property>
     <property name="hide-on-close">1</property>
     <property name="default-widget">act_action_dialog</property>
     <child internal-child="content_area">
@@ -2970,20 +2971,20 @@ bad things might happen.</property>
             <property name="margin-end">20</property>
             <property name="margin-top">20</property>
             <property name="margin-bottom">20</property>
-            <property name="label" translatable="yes">To free the princess, you have to slay the dragon.</property>
+            <property name="label" translatable="1">To free the princess, you have to slay the dragon.</property>
           </object>
         </child>
       </object>
     </child>
     <child type="action">
       <object class="GtkButton" id="cancel_action_dialog">
-        <property name="label" translatable="yes">_Run</property>
+        <property name="label" translatable="1">_Run</property>
         <property name="use-underline">1</property>
       </object>
     </child>
     <child type="action">
       <object class="GtkButton" id="act_action_dialog">
-        <property name="label" translatable="yes">_Act</property>
+        <property name="label" translatable="1">_Act</property>
         <property name="use-underline">1</property>
       </object>
     </child>
@@ -2997,7 +2998,7 @@ bad things might happen.</property>
     <property name="modal">1</property>
     <property name="resizable">0</property>
     <property name="use-header-bar">1</property>
-    <property name="title" translatable="yes">Settings</property>
+    <property name="title" translatable="1">Settings</property>
     <property name="hide-on-close">1</property>
     <child internal-child="content_area">
       <object class="GtkBox">
@@ -3011,8 +3012,8 @@ bad things might happen.</property>
             <property name="margin-bottom">20</property>
             <child>
               <object class="GtkLabel">
-                <property name="halign">end</property>
-                <property name="valign">baseline</property>
+                <property name="halign">2</property>
+                <property name="valign">4</property>
                 <property name="label">_Details</property>
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">details_entry</property>
@@ -3027,7 +3028,7 @@ bad things might happen.</property>
             </child>
             <child>
               <object class="GtkEntry" id="details_entry">
-                <property name="valign">baseline</property>
+                <property name="valign">4</property>
                 <signal name="notify::text" handler="validate_more_details" object="more_details_entry" swapped="yes"/>
                 <layout>
                   <property name="column">1</property>
@@ -3038,8 +3039,8 @@ bad things might happen.</property>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="halign">end</property>
-                <property name="valign">baseline</property>
+                <property name="halign">2</property>
+                <property name="valign">4</property>
                 <property name="label">More D_etails</property>
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">more_details_entry</property>
@@ -3054,7 +3055,7 @@ bad things might happen.</property>
             </child>
             <child>
               <object class="GtkEntry" id="more_details_entry">
-                <property name="valign">baseline</property>
+                <property name="valign">4</property>
                 <signal name="notify::text" handler="validate_more_details" object="details_entry" swapped="no"/>
                 <layout>
                   <property name="column">1</property>
@@ -3065,8 +3066,8 @@ bad things might happen.</property>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="halign">end</property>
-                <property name="valign">baseline</property>
+                <property name="halign">2</property>
+                <property name="valign">4</property>
                 <property name="label">_Level</property>
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">level_scale</property>
@@ -3081,8 +3082,7 @@ bad things might happen.</property>
             </child>
             <child>
               <object class="GtkScale" id="level_scale">
-                <property name="valign">baseline</property>
-                <property name="draw-value">0</property>
+                <property name="valign">4</property>
                 <property name="adjustment">adjustment1</property>
                 <signal name="value-changed" handler="level_scale_value_changed"/>
                 <layout>
@@ -3094,8 +3094,8 @@ bad things might happen.</property>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="halign">end</property>
-                <property name="valign">baseline</property>
+                <property name="halign">2</property>
+                <property name="valign">4</property>
                 <property name="label">_Mode</property>
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">mode_switch</property>
@@ -3110,8 +3110,8 @@ bad things might happen.</property>
             </child>
             <child>
               <object class="GtkSwitch" id="mode_switch">
-                <property name="halign">start</property>
-                <property name="valign">baseline</property>
+                <property name="halign">1</property>
+                <property name="valign">4</property>
                 <signal name="state-set" handler="mode_switch_state_set"/>
                 <layout>
                   <property name="column">1</property>
@@ -3122,8 +3122,8 @@ bad things might happen.</property>
             <child>
               <object class="GtkLabel" id="error_label">
                 <property name="visible">0</property>
-                <property name="halign">start</property>
-                <property name="valign">baseline</property>
+                <property name="halign">1</property>
+                <property name="valign">4</property>
                 <property name="label">Level too low</property>
                 <style>
                   <class name="error"/>
@@ -3143,7 +3143,7 @@ bad things might happen.</property>
     <property name="transient-for">window</property>
     <property name="modal">1</property>
     <property name="use-header-bar">1</property>
-    <property name="title" translatable="yes">Choose one</property>
+    <property name="title" translatable="1">Choose one</property>
     <property name="hide-on-close">1</property>
     <property name="default-widget">select_selection_dialog</property>
     <child internal-child="content_area">
@@ -3164,13 +3164,13 @@ bad things might happen.</property>
     </child>
     <child type="action">
       <object class="GtkButton" id="cancel_selection_dialog">
-        <property name="label" translatable="yes">_Cancel</property>
+        <property name="label" translatable="1">_Cancel</property>
         <property name="use-underline">1</property>
       </object>
     </child>
     <child type="action">
       <object class="GtkButton" id="select_selection_dialog">
-        <property name="label" translatable="yes">_Select</property>
+        <property name="label" translatable="1">_Select</property>
         <property name="use-underline">1</property>
       </object>
     </child>
@@ -3196,7 +3196,7 @@ bad things might happen.</property>
         </child>
         <child>
           <object class="GtkLabel" id="description_label">
-            <property name="valign">start</property>
+            <property name="valign">1</property>
             <property name="label">Description:</property>
             <property name="xalign">1</property>
             <layout>
@@ -3207,15 +3207,14 @@ bad things might happen.</property>
         </child>
         <child>
           <object class="GtkScrolledWindow">
-            <property name="valign">start</property>
+            <property name="valign">1</property>
             <property name="has-frame">1</property>
             <property name="min-content-height">70</property>
             <property name="max-content-height">120</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>
             <layout>
               <property name="column">1</property>
@@ -3256,7 +3255,7 @@ bad things might happen.</property>
         </child>
         <child>
           <object class="GtkMenuButton">
-            <property name="halign">end</property>
+            <property name="halign">2</property>
             <property name="icon-name">emblem-system-symbolic</property>
             <property name="menu-model">gear_menu_model</property>
             <property name="tooltip-text">This is a menu button</property>
@@ -3284,7 +3283,7 @@ bad things might happen.</property>
     </child>
   </object>
   <object class="GtkSizeGroup">
-    <property name="mode">vertical</property>
+    <property name="mode">2</property>
     <widgets>
       <widget name="listboxrow1"/>
       <widget name="listboxrow2"/>
@@ -3297,7 +3296,7 @@ bad things might happen.</property>
     </widgets>
   </object>
   <object class="GtkSizeGroup">
-    <property name="mode">both</property>
+    <property name="mode">3</property>
     <widgets>
       <widget name="panedframe1"/>
       <widget name="panedframe2"/>
@@ -3330,7 +3329,7 @@ bad things might happen.</property>
         </child>
         <child>
           <object class="GtkMenuButton">
-            <property name="valign">center</property>
+            <property name="valign">3</property>
             <property name="popover">notebook_info_popover3</property>
             <property name="icon-name">emblem-important-symbolic</property>
             <property name="has-frame">0</property>
diff --git a/gtk/ui/gtkaboutdialog.ui b/gtk/ui/gtkaboutdialog.ui
index 5382941c81..20a98cac74 100644
--- a/gtk/ui/gtkaboutdialog.ui
+++ b/gtk/ui/gtkaboutdialog.ui
@@ -17,7 +17,7 @@
     </child>
     <child>
       <object class="GtkBox">
-        <property name="orientation">vertical</property>
+        <property name="orientation">1</property>
         <property name="spacing">2</property>
         <property name="margin-start">5</property>
         <property name="margin-end">5</property>
@@ -25,7 +25,7 @@
         <property name="margin-bottom">5</property>
         <child>
           <object class="GtkBox" id="box">
-            <property name="orientation">vertical</property>
+            <property name="orientation">1</property>
             <property name="spacing">12</property>
             <property name="margin-start">5</property>
             <property name="margin-end">5</property>
@@ -35,7 +35,7 @@
             <child>
               <object class="GtkImage" id="logo_image">
                 <property name="icon-name">image-missing</property>
-                <property name="icon-size">large</property>
+                <property name="icon-size">2</property>
                 <style>
                   <class name="icon-dropshadow"/>
                 </style>
@@ -44,7 +44,7 @@
             <child>
               <object class="GtkLabel" id="name_label">
                 <property name="label">name label</property>
-                <property name="justify">center</property>
+                <property name="justify">2</property>
                 <property name="selectable">1</property>
               </object>
             </child>
@@ -52,23 +52,23 @@
               <object class="GtkStack" id="stack">
                 <property name="width-request">400</property>
                 <property name="height-request">100</property>
-                <property name="transition-type">over-up-down</property>
+                <property name="transition-type">16</property>
                 <property name="transition-duration">600</property>
                 <property name="vexpand">1</property>
                 <signal name="notify::visible-child" handler="stack_visible_child_notify" swapped="no"/>
                 <child>
                   <object class="GtkStackPage">
                     <property name="name">main</property>
-                    <property name="title" translatable="yes">About</property>
+                    <property name="title" translatable="1">About</property>
                     <property name="child">
                       <object class="GtkBox" id="page_vbox">
-                        <property name="orientation">vertical</property>
+                        <property name="orientation">1</property>
                         <property name="spacing">8</property>
                         <child>
                           <object class="GtkLabel" id="version_label">
                             <property name="visible">0</property>
                             <property name="label">version 1.0</property>
-                            <property name="justify">center</property>
+                            <property name="justify">2</property>
                             <property name="selectable">1</property>
                           </object>
                         </child>
@@ -76,7 +76,7 @@
                           <object class="GtkLabel" id="comments_label">
                             <property name="visible">0</property>
                             <property name="label">comments</property>
-                            <property name="justify">center</property>
+                            <property name="justify">2</property>
                             <property name="wrap">1</property>
                             <property name="selectable">1</property>
                             <property name="max-width-chars">60</property>
@@ -94,7 +94,7 @@
                           <object class="GtkLabel" id="copyright_label">
                             <property name="visible">0</property>
                             <property name="label">copyright</property>
-                            <property name="justify">center</property>
+                            <property name="justify">2</property>
                             <property name="wrap">1</property>
                             <property name="selectable">1</property>
                             <property name="max-width-chars">60</property>
@@ -105,7 +105,7 @@
                             <property name="visible">0</property>
                             <property name="label">license</property>
                             <property name="use-markup">1</property>
-                            <property name="justify">center</property>
+                            <property name="justify">2</property>
                             <property name="wrap">1</property>
                             <property name="selectable">1</property>
                             <property name="max-width-chars">60</property>
@@ -120,14 +120,14 @@
                   <object class="GtkStackPage">
                     <property name="name">credits</property>
                     <property name="visible">0</property>
-                    <property name="title" translatable="yes">Credits</property>
+                    <property name="title" translatable="1">Credits</property>
                     <property name="child">
                       <object class="GtkBox" id="credits_page">
-                        <property name="orientation">vertical</property>
+                        <property name="orientation">1</property>
                         <property name="spacing">8</property>
                         <child>
                           <object class="GtkScrolledWindow" id="scrolledwindow1">
-                            <property name="hscrollbar-policy">never</property>
+                            <property name="hscrollbar-policy">2</property>
                             <property name="has-frame">1</property>
                             <property name="vexpand">1</property>
                             <child>
@@ -137,9 +137,9 @@
                                 </style>
                                 <child>
                                   <object class="GtkGrid" id="credits_grid">
-                                    <property name="halign">center</property>
-                                    <property name="valign">start</property>
-                                    <property name="orientation">vertical</property>
+                                    <property name="halign">3</property>
+                                    <property name="valign">1</property>
+                                    <property name="orientation">1</property>
                                     <property name="row-spacing">2</property>
                                     <property name="column-spacing">8</property>
                                     <property name="margin-start">5</property>
@@ -160,14 +160,14 @@
                   <object class="GtkStackPage">
                     <property name="name">license</property>
                     <property name="visible">0</property>
-                    <property name="title" translatable="yes">License</property>
+                    <property name="title" translatable="1">License</property>
                     <property name="child">
                       <object class="GtkBox" id="license_page">
-                        <property name="orientation">vertical</property>
+                        <property name="orientation">1</property>
                         <property name="spacing">8</property>
                         <child>
                           <object class="GtkScrolledWindow" id="scrolledwindow2">
-                            <property name="hscrollbar-policy">never</property>
+                            <property name="hscrollbar-policy">2</property>
                             <property name="has-frame">1</property>
                             <property name="vexpand">1</property>
                             <child>
@@ -203,14 +203,14 @@
                   <object class="GtkStackPage">
                     <property name="name">system</property>
                     <property name="visible">0</property>
-                    <property name="title" translatable="yes">System</property>
+                    <property name="title" translatable="1">System</property>
                     <property name="child">
                       <object class="GtkBox" id="system_page">
-                        <property name="orientation">vertical</property>
+                        <property name="orientation">1</property>
                         <property name="spacing">8</property>
                         <child>
                           <object class="GtkScrolledWindow">
-                            <property name="hscrollbar-policy">never</property>
+                            <property name="hscrollbar-policy">2</property>
                             <property name="has-frame">1</property>
                             <property name="vexpand">1</property>
                             <child>
diff --git a/gtk/ui/gtkappchooserdialog.ui b/gtk/ui/gtkappchooserdialog.ui
index 654bb31d30..dece4176c6 100644
--- a/gtk/ui/gtkappchooserdialog.ui
+++ b/gtk/ui/gtkappchooserdialog.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkAppChooserDialog" parent="GtkDialog">
-    <property name="title" translatable="yes">Select Application</property>
+    <property name="title" translatable="1">Select Application</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="dialog-vbox1">
-        <property name="orientation">vertical</property>
+        <property name="orientation">1</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkSearchBar" id="search_bar">
@@ -19,17 +19,17 @@
         <child internal-child="action_area">
           <object class="GtkBox" id="dialog-action_area1">
             <property name="hexpand">1</property>
-            <property name="halign">end</property>
+            <property name="halign">2</property>
           </object>
         </child>
         <child>
           <object class="GtkBox" id="inner_box">
-            <property name="orientation">vertical</property>
+            <property name="orientation">1</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkLabel" id="label">
-                <property name="halign">center</property>
-                <property name="valign">center</property>
+                <property name="halign">3</property>
+                <property name="valign">3</property>
                 <property name="label">label</property>
                 <property name="wrap">1</property>
                 <property name="vexpand">1</property>
@@ -42,12 +42,12 @@
     <child type="action">
       <object class="GtkButton" id="cancel_button">
         <property name="use-underline">1</property>
-        <property name="label" translatable="yes">_Cancel</property>
+        <property name="label" translatable="1">_Cancel</property>
       </object>
     </child>
     <child type="action">
       <object class="GtkButton" id="ok_button">
-        <property name="label" translatable="yes">_Select</property>
+        <property name="label" translatable="1">_Select</property>
         <property name="use-underline">1</property>
       </object>
     </child>
@@ -57,19 +57,19 @@
     </action-widgets>
   </template>
   <object class="GtkButton" id="show_more_button">
-    <property name="label" translatable="yes">_View All Applications</property>
+    <property name="label" translatable="1">_View All Applications</property>
     <property name="use-underline">1</property>
     <property name="receives-default">1</property>
     <signal name="clicked" handler="show_more_button_clicked_cb" swapped="no"/>
   </object>
   <object class="GtkButton" id="software_button">
-    <property name="label" translatable="yes">_Find New Applications</property>
+    <property name="label" translatable="1">_Find New Applications</property>
     <property name="use-underline">1</property>
     <property name="receives-default">1</property>
     <signal name="clicked" handler="software_button_clicked_cb" swapped="no"/>
   </object>
   <object class="GtkSizeGroup" id="buttons">
-    <property name="mode">vertical</property>
+    <property name="mode">2</property>
     <widgets>
       <widget name="cancel_button"/>
       <widget name="ok_button"/>
diff --git a/gtk/ui/gtkappchooserwidget.ui b/gtk/ui/gtkappchooserwidget.ui
index cfce252c1a..ac2c485abf 100644
--- a/gtk/ui/gtkappchooserwidget.ui
+++ b/gtk/ui/gtkappchooserwidget.ui
@@ -24,7 +24,7 @@
           <object class="GtkScrolledWindow" id="scrolled_window">
             <property name="width-request">400</property>
             <property name="height-request">300</property>
-            <property name="hscrollbar-policy">never</property>
+            <property name="hscrollbar-policy">2</property>
             <property name="has-frame">1</property>
             <child>
               <object class="GtkTreeView" id="program_list">
@@ -33,7 +33,7 @@
                 <signal name="row-activated" handler="program_list_selection_activated" swapped="no"/>
                 <child internal-child="selection">
                   <object class="GtkTreeSelection" id="treeview-selection2">
-                    <property name="mode">browse</property>
+                    <property name="mode">2</property>
                     <signal name="changed" handler="refresh_and_emit_app_selected" object="GtkAppChooserWidget" swapped="yes"/>
                   </object>
                 </child>
@@ -45,7 +45,7 @@
                     <child>
                       <object class="GtkCellRendererText" id="heading">
                         <property name="ypad">6</property>
-                        <property name="wrap-mode">word</property>
+                        <property name="wrap-mode">0</property>
                         <property name="wrap-width">350</property>
                       </object>
                       <attributes>
@@ -64,7 +64,7 @@
                     </child>
                     <child>
                       <object class="GtkCellRendererText" id="app_name">
-                        <property name="ellipsize">end</property>
+                        <property name="ellipsize">3</property>
                       </object>
                       <attributes>
                         <attribute name="markup">3</attribute>
@@ -79,9 +79,9 @@
         <child type="overlay">
           <object class="GtkBox" id="no_apps">
             <property name="visible">0</property>
-            <property name="orientation">vertical</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
+            <property name="orientation">1</property>
+            <property name="halign">3</property>
+            <property name="valign">3</property>
             <child>
               <object class="GtkImage">
                 <property name="icon-name">application-x-executable-symbolic</property>
@@ -97,9 +97,9 @@
             </child>
             <child>
               <object class="GtkLabel" id="no_apps_label">
-                <property name="label" translatable="yes">No applications found.</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
+                <property name="label" translatable="1">No applications found.</property>
+                <property name="halign">3</property>
+                <property name="valign">3</property>
                 <property name="wrap">1</property>
                 <attributes>
                   <attribute name="scale" value="1.2"></attribute>
diff --git a/gtk/ui/gtkassistant.ui b/gtk/ui/gtkassistant.ui
index f8742b5f0a..4e8c906a90 100644
--- a/gtk/ui/gtkassistant.ui
+++ b/gtk/ui/gtkassistant.ui
@@ -10,7 +10,7 @@
       <object class="GtkBox" id="main_box">
         <child>
           <object class="GtkBox" id="sidebar">
-            <property name="orientation">vertical</property>
+            <property name="orientation">1</property>
             <style>
               <class name="sidebar"/>
             </style>
@@ -18,7 +18,7 @@
         </child>
         <child>
           <object class="GtkBox" id="content_box">
-            <property name="orientation">vertical</property>
+            <property name="orientation">1</property>
             <property name="hexpand">1</property>
             <child>
               <object class="GtkStack" id="content">
@@ -28,7 +28,7 @@
             </child>
             <child>
               <object class="GtkBox" id="action_area">
-                <property name="halign">end</property>
+                <property name="halign">2</property>
                 <property name="spacing">6</property>
                 <property name="margin-start">6</property>
                 <property name="margin-end">6</property>
@@ -37,7 +37,7 @@
                 <child>
                   <object class="GtkButton" id="close">
                     <property name="visible">0</property>
-                    <property name="label" translatable="yes">_Close</property>
+                    <property name="label" translatable="1">_Close</property>
                     <property name="receives-default">1</property>
                     <property name="use-underline">1</property>
                     <style>
@@ -49,7 +49,7 @@
                 <child>
                   <object class="GtkButton" id="cancel">
                     <property name="visible">0</property>
-                    <property name="label" translatable="yes">_Cancel</property>
+                    <property name="label" translatable="1">_Cancel</property>
                     <property name="receives-default">1</property>
                     <property name="use-underline">1</property>
                     <style>
@@ -61,7 +61,7 @@
                 <child>
                   <object class="GtkButton" id="last">
                     <property name="visible">0</property>
-                    <property name="label" translatable="yes">_Finish</property>
+                    <property name="label" translatable="1">_Finish</property>
                     <property name="receives-default">1</property>
                     <property name="use-underline">1</property>
                     <style>
@@ -72,7 +72,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="back">
-                    <property name="label" translatable="yes">_Back</property>
+                    <property name="label" translatable="1">_Back</property>
                     <property name="receives-default">1</property>
                     <property name="use-underline">1</property>
                     <style>
@@ -83,7 +83,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="forward">
-                    <property name="label" translatable="yes">_Next</property>
+                    <property name="label" translatable="1">_Next</property>
                     <property name="receives-default">1</property>
                     <property name="use-underline">1</property>
                     <style>
@@ -95,7 +95,7 @@
                 <child>
                   <object class="GtkButton" id="apply">
                     <property name="visible">0</property>
-                    <property name="label" translatable="yes">_Apply</property>
+                    <property name="label" translatable="1">_Apply</property>
                     <property name="receives-default">1</property>
                     <property name="use-underline">1</property>
                     <style>
diff --git a/gtk/ui/gtkcolorchooserdialog.ui b/gtk/ui/gtkcolorchooserdialog.ui
index 65b23b51ab..6cf8eac1cb 100644
--- a/gtk/ui/gtkcolorchooserdialog.ui
+++ b/gtk/ui/gtkcolorchooserdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkColorChooserDialog" parent="GtkDialog">
-    <property name="title" translatable="yes">Select a Color</property>
+    <property name="title" translatable="1">Select a Color</property>
     <property name="resizable">0</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="dialog-vbox1">
-        <property name="orientation">vertical</property>
+        <property name="orientation">1</property>
         <property name="spacing">2</property>
         <property name="margin-start">5</property>
         <property name="margin-end">5</property>
@@ -30,12 +30,12 @@
     <child type="action">
       <object class="GtkButton" id="cancel_button">
         <property name="use-underline">1</property>
-        <property name="label" translatable="yes">_Cancel</property>
+        <property name="label" translatable="1">_Cancel</property>
       </object>
     </child>
     <child type="action">
       <object class="GtkButton" id="ok_button">
-        <property name="label" translatable="yes">_Select</property>
+        <property name="label" translatable="1">_Select</property>
         <property name="use-underline">1</property>
       </object>
     </child>
diff --git a/gtk/ui/gtkcoloreditor.ui b/gtk/ui/gtkcoloreditor.ui
index c34f6a008a..2058143128 100644
--- a/gtk/ui/gtkcoloreditor.ui
+++ b/gtk/ui/gtkcoloreditor.ui
@@ -38,9 +38,9 @@
             <child>
               <object class="GtkButton" id="picker_button">
                 <property name="icon-name">color-select-symbolic</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="tooltip-text" translatable="yes">Pick a color from the screen</property>
+                <property name="halign">3</property>
+                <property name="valign">3</property>
+                <property name="tooltip-text" translatable="1">Pick a color from the screen</property>
                 <signal name="clicked" handler="pick_color"/>
                 <style>
                   <class name="circular"/>
@@ -50,7 +50,7 @@
                   <property name="row">0</property>
                 </layout>
                 <accessibility>
-                  <property name="label" translatable="yes">Pick a color from the screen</property>
+                  <property name="label" translatable="1">Pick a color from the screen</property>
                 </accessibility>
               </object>
             </child>
@@ -77,7 +77,7 @@
                   <property name="row">0</property>
                 </layout>
                 <accessibility>
-                  <property name="label" translatable="yes">Hexadecimal color or color name</property>
+                  <property name="label" translatable="1">Hexadecimal color or color name</property>
                 </accessibility>
               </object>
             </child>
@@ -92,7 +92,7 @@
                   <property name="row">1</property>
                 </layout>
                 <accessibility>
-                  <property name="label" translatable="yes">Hue</property>
+                  <property name="label" translatable="1">Hue</property>
                 </accessibility>
               </object>
             </child>
@@ -111,7 +111,7 @@
                   <property name="column-span">2</property>
                 </layout>
                 <accessibility>
-                  <property name="label" translatable="yes">Alpha value</property>
+                  <property name="label" translatable="1">Alpha value</property>
                 </accessibility>
               </object>
             </child>
@@ -129,7 +129,7 @@
                   <property name="column-span">2</property>
                 </layout>
                 <accessibility>
-                  <property name="label" translatable="yes">Saturation and value</property>
+                  <property name="label" translatable="1">Saturation and value</property>
                 </accessibility>
               </object>
             </child>
@@ -153,7 +153,7 @@
         <property name="column-spacing">6</property>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="label" translatable="yes" context="Color channel">A</property>
+            <property name="label" translatable="1" context="Color channel">A</property>
             <layout>
               <property name="column">0</property>
               <property name="row">0</property>
@@ -189,7 +189,7 @@
         <property name="column-spacing">6</property>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="label" translatable="yes" context="Color channel">H</property>
+            <property name="label" translatable="1" context="Color channel">H</property>
             <layout>
               <property name="column">0</property>
               <property name="row">0</property>
@@ -226,7 +226,7 @@
         <property name="column-spacing">6</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="label" translatable="yes" context="Color Channel">S</property>
+            <property name="label" translatable="1" context="Color Channel">S</property>
             <layout>
               <property name="column">0</property>
               <property name="row">0</property>
@@ -235,7 +235,7 @@
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="label" translatable="yes" context="Color Channel">V</property>
+            <property name="label" translatable="1" context="Color Channel">V</property>
             <layout>
               <property name="column">0</property>
               <property name="row">1</property>
diff --git a/gtk/ui/gtkcombobox.ui b/gtk/ui/gtkcombobox.ui
index c502fc8529..3cc5556275 100644
--- a/gtk/ui/gtkcombobox.ui
+++ b/gtk/ui/gtkcombobox.ui
@@ -23,19 +23,21 @@
       </object>
     </child>
     <child>
-  <object class="GtkTreePopover" id="popup_widget">
-    <property name="cell-area"><object class="GtkCellAreaBox" id="area"/></property>
-    <property name="has-arrow">0</property>
-    <signal name="menu-activate" handler="gtk_combo_box_menu_activate" swapped="no"/>
-    <signal name="show" handler="gtk_combo_box_menu_show" swapped="no"/>
-    <signal name="hide" handler="gtk_combo_box_menu_hide" swapped="no"/>
-    <child>
-      <object class="GtkEventControllerKey">
-        <signal name="key-pressed" handler="gtk_combo_box_menu_key" swapped="no"/>
-        <signal name="key-released" handler="gtk_combo_box_menu_key" swapped="no"/>
+      <object class="GtkTreePopover" id="popup_widget">
+        <property name="cell-area">
+          <object class="GtkCellAreaBox" id="area"/>
+        </property>
+        <property name="has-arrow">0</property>
+        <signal name="menu-activate" handler="gtk_combo_box_menu_activate" swapped="no"/>
+        <signal name="show" handler="gtk_combo_box_menu_show" swapped="no"/>
+        <signal name="hide" handler="gtk_combo_box_menu_hide" swapped="no"/>
+        <child>
+          <object class="GtkEventControllerKey">
+            <signal name="key-pressed" handler="gtk_combo_box_menu_key" swapped="no"/>
+            <signal name="key-released" handler="gtk_combo_box_menu_key" swapped="no"/>
+          </object>
+        </child>
       </object>
     </child>
-  </object>
-  </child>
   </template>
 </interface>
diff --git a/gtk/ui/gtkdialog.ui b/gtk/ui/gtkdialog.ui
index 2b25d79192..76cbe1675e 100644
--- a/gtk/ui/gtkdialog.ui
+++ b/gtk/ui/gtkdialog.ui
@@ -6,7 +6,7 @@
     </child>
     <child>
       <object class="GtkBox">
-        <property name="orientation">vertical</property>
+        <property name="orientation">1</property>
         <style>
           <class name="dialog-vbox"/>
         </style>
@@ -21,7 +21,7 @@
             <child>
               <object class="GtkBox" id="action_area">
                 <property name="hexpand">1</property>
-                <property name="halign">end</property>
+                <property name="halign">2</property>
                 <style>
                   <class name="dialog-action-area"/>
                 </style>
diff --git a/gtk/ui/gtkdropdown.ui b/gtk/ui/gtkdropdown.ui
index 16e55b5b3d..2b789853db 100644
--- a/gtk/ui/gtkdropdown.ui
+++ b/gtk/ui/gtkdropdown.ui
@@ -9,7 +9,6 @@
             <property name="can-focus">0</property>
             <child>
               <object class="GtkStack" id="button_stack">
-                <property name="halign">fill</property>
                 <property name="hexpand">1</property>
                 <property name="hhomogeneous">0</property>
                 <child>
@@ -17,7 +16,7 @@
                     <property name="name">empty</property>
                     <property name="child">
                       <object class="GtkLabel">
-                        <property name="label" translatable="yes">(None)</property>
+                        <property name="label" translatable="1">(None)</property>
                         <property name="xalign">0</property>
                       </object>
                     </property>
@@ -43,52 +42,50 @@
       </object>
     </child>
     <child>
-  <object class="GtkPopover" id="popup">
-    <signal name="closed" handler="popover_closed"/>
-    <property name="halign">start</property>
-    <property name="has-arrow">0</property>
-    <property name="autohide">1</property>
-    <style>
-     <class name="menu"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <property name="orientation">vertical</property>
+      <object class="GtkPopover" id="popup">
+        <signal name="closed" handler="popover_closed"/>
+        <property name="halign">1</property>
+        <property name="has-arrow">0</property>
+        <style>
+          <class name="menu"/>
+        </style>
         <child>
-          <object class="GtkBox" id="search_box">
-            <property name="visible">0</property>
-            <style>
-              <class name="dropdown-searchbar"/>
-            </style>
+          <object class="GtkBox">
+            <property name="orientation">1</property>
             <child>
-              <object class="GtkSearchEntry" id="search_entry">
-                <signal name="search-changed" handler="search_changed"/>
-                <signal name="stop-search" handler="search_stop"/>
-                <property name="hexpand">1</property>
-                <property name="max-width-chars">6</property>
-                <property name="width-chars">6</property>
-                <property name="placeholder-text" translatable="yes">Search…</property>
+              <object class="GtkBox" id="search_box">
+                <property name="visible">0</property>
+                <style>
+                  <class name="dropdown-searchbar"/>
+                </style>
+                <child>
+                  <object class="GtkSearchEntry" id="search_entry">
+                    <signal name="search-changed" handler="search_changed"/>
+                    <signal name="stop-search" handler="search_stop"/>
+                    <property name="hexpand">1</property>
+                    <property name="max-width-chars">6</property>
+                    <property name="width-chars">6</property>
+                    <property name="placeholder-text" translatable="1">Search…</property>
+                  </object>
+                </child>
               </object>
             </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow">
-            <property name="hscrollbar-policy">never</property>
-            <property name="vscrollbar-policy">automatic</property>
-            <property name="max-content-height">400</property>
-            <property name="propagate-natural-height">1</property>
             <child>
-              <object class="GtkListView" id="popup_list">
-                <signal name="activate" handler="row_activated"/>
-                <property name="single-click-activate">1</property>
+              <object class="GtkScrolledWindow">
+                <property name="hscrollbar-policy">2</property>
+                <property name="max-content-height">400</property>
+                <property name="propagate-natural-height">1</property>
+                <child>
+                  <object class="GtkListView" id="popup_list">
+                    <signal name="activate" handler="row_activated"/>
+                    <property name="single-click-activate">1</property>
+                  </object>
+                </child>
               </object>
             </child>
           </object>
         </child>
       </object>
     </child>
-  </object>
-  </child>
   </template>
 </interface>
diff --git a/gtk/ui/gtkemojichooser.ui b/gtk/ui/gtkemojichooser.ui
index 4a2dc407fa..280b152ce1 100644
--- a/gtk/ui/gtkemojichooser.ui
+++ b/gtk/ui/gtkemojichooser.ui
@@ -7,7 +7,7 @@
     </style>
     <child>
       <object class="GtkBox" id="box">
-        <property name="orientation">vertical</property>
+        <property name="orientation">1</property>
         <child>
           <object class="GtkBox">
             <style>
@@ -29,17 +29,17 @@
                 <property name="name">list</property>
                 <property name="child">
                   <object class="GtkBox">
-                    <property name="orientation">vertical</property>
+                    <property name="orientation">1</property>
                     <child>
                       <object class="GtkScrolledWindow" id="scrolled_window">
                         <property name="vexpand">1</property>
-                        <property name="hscrollbar-policy">never</property>
+                        <property name="hscrollbar-policy">2</property>
                         <style>
                           <class name="view"/>
                         </style>
                         <child>
                           <object class="GtkBox" id="emoji_box">
-                            <property name="orientation">vertical</property>
+                            <property name="orientation">1</property>
                             <property name="margin-start">6</property>
                             <property name="margin-end">6</property>
                             <property name="margin-top">6</property>
@@ -48,7 +48,7 @@
                             <child>
                               <object class="GtkFlowBox" id="recent.box">
                                 <property name="homogeneous">1</property>
-                                <property name="selection-mode">none</property>
+                                <property name="selection-mode">0</property>
                                 <signal name="child-activated" handler="emoji_activated"/>
                                 <signal name="keynav-failed" handler="keynav_failed"/>
                                 <child>
@@ -66,14 +66,14 @@
                             </child>
                             <child>
                               <object class="GtkLabel" id="people.heading">
-                                <property name="label" translatable="yes" context="emoji category">Smileys &amp; People</property>
+                                <property name="label" translatable="1" context="emoji category">Smileys &amp; People</property>
                                 <property name="xalign">0</property>
                               </object>
                             </child>
                             <child>
                               <object class="GtkFlowBox" id="people.box">
                                 <property name="homogeneous">1</property>
-                                <property name="selection-mode">none</property>
+                                <property name="selection-mode">0</property>
                                 <signal name="child-activated" handler="emoji_activated"/>
                                 <signal name="keynav-failed" handler="keynav_failed"/>
                                 <child>
@@ -91,14 +91,14 @@
                             </child>
                             <child>
                               <object class="GtkLabel" id="body.heading">
-                                <property name="label" translatable="yes" context="emoji category">Body &amp; Clothing</property>
+                                <property name="label" translatable="1" context="emoji category">Body &amp; Clothing</property>
                                 <property name="xalign">0</property>
                               </object>
                             </child>
                             <child>
                               <object class="GtkFlowBox" id="body.box">
                                 <property name="homogeneous">1</property>
-                                <property name="selection-mode">none</property>
+                                <property name="selection-mode">0</property>
                                 <signal name="child-activated" handler="emoji_activated"/>
                                 <signal name="keynav-failed" handler="keynav_failed"/>
                                 <child>
@@ -116,98 +116,98 @@
                             </child>
                             <child>
                               <object class="GtkLabel" id="nature.heading">
-                                <property name="label" translatable="yes" context="emoji category">Animals &amp; Nature</property>
+                                <property name="label" translatable="1" context="emoji category">Animals &amp; Nature</property>
                                 <property name="xalign">0</property>
                               </object>
                             </child>
                             <child>
                               <object class="GtkFlowBox" id="nature.box">
                                 <property name="homogeneous">1</property>
-                                <property name="selection-mode">none</property>
+                                <property name="selection-mode">0</property>
                                 <signal name="child-activated" handler="emoji_activated"/>
                                 <signal name="keynav-failed" handler="keynav_failed"/>
                               </object>
                             </child>
                             <child>
                               <object class="GtkLabel" id="food.heading">
-                                <property name="label" translatable="yes" context="emoji category">Food &amp; Drink</property>
+                                <property name="label" translatable="1" context="emoji category">Food &amp; Drink</property>
                                 <property name="xalign">0</property>
                               </object>
                             </child>
                             <child>
                               <object class="GtkFlowBox" id="food.box">
                                 <property name="homogeneous">1</property>
-                                <property name="selection-mode">none</property>
+                                <property name="selection-mode">0</property>
                                 <signal name="child-activated" handler="emoji_activated"/>
                                 <signal name="keynav-failed" handler="keynav_failed"/>
                               </object>
                             </child>
                             <child>
                               <object class="GtkLabel" id="travel.heading">
-                                <property name="label" translatable="yes" context="emoji category">Travel &amp; Places</property>
+                                <property name="label" translatable="1" context="emoji category">Travel &amp; Places</property>
                                 <property name="xalign">0</property>
                               </object>
                             </child>
                             <child>
                               <object class="GtkFlowBox" id="travel.box">
                                 <property name="homogeneous">1</property>
-                                <property name="selection-mode">none</property>
+                                <property name="selection-mode">0</property>
                                 <signal name="child-activated" handler="emoji_activated"/>
                                 <signal name="keynav-failed" handler="keynav_failed"/>
                               </object>
                             </child>
                             <child>
                               <object class="GtkLabel" id="activities.heading">
-                                <property name="label" translatable="yes" context="emoji category">Activities</property>
+                                <property name="label" translatable="1" context="emoji category">Activities</property>
                                 <property name="xalign">0</property>
                               </object>
                             </child>
                             <child>
                               <object class="GtkFlowBox" id="activities.box">
                                 <property name="homogeneous">1</property>
-                                <property name="selection-mode">none</property>
+                                <property name="selection-mode">0</property>
                                 <signal name="child-activated" handler="emoji_activated"/>
                                 <signal name="keynav-failed" handler="keynav_failed"/>
                               </object>
                             </child>
                             <child>
                               <object class="GtkLabel" id="objects.heading">
-                                <property name="label" translatable="yes" context="emoji category">Objects</property>
+                                <property name="label" translatable="1" context="emoji category">Objects</property>
                                 <property name="xalign">0</property>
                               </object>
                             </child>
                             <child>
                               <object class="GtkFlowBox" id="objects.box">
                                 <property name="homogeneous">1</property>
-                                <property name="selection-mode">none</property>
+                                <property name="selection-mode">0</property>
                                 <signal name="child-activated" handler="emoji_activated"/>
                                 <signal name="keynav-failed" handler="keynav_failed"/>
                               </object>
                             </child>
                             <child>
                               <object class="GtkLabel" id="symbols.heading">
-                                <property name="label" translatable="yes" context="emoji category">Symbols</property>
+                                <property name="label" translatable="1" context="emoji category">Symbols</property>
                                 <property name="xalign">0</property>
                               </object>
                             </child>
                             <child>
                               <object class="GtkFlowBox" id="symbols.box">
                                 <property name="homogeneous">1</property>
-                                <property name="selection-mode">none</property>
+                                <property name="selection-mode">0</property>
                                 <signal name="child-activated" handler="emoji_activated"/>
                                 <signal name="keynav-failed" handler="keynav_failed"/>
                               </object>
                             </child>
                             <child>
                               <object class="GtkLabel" id="flags.heading">
-                                <property name="label" translatable="yes" context="emoji category">Flags</property>
+                                <property name="label" translatable="1" context="emoji category">Flags</property>
                                 <property name="xalign">0</property>
                               </object>
                             </child>
                             <child>
                               <object class="GtkFlowBox" id="flags.box">
                                 <property name="homogeneous">1</property>
-                                <property name="selection-mode">none</property>
+                                <property name="selection-mode">0</property>
                                 <signal name="child-activated" handler="emoji_activated"/>
                                 <signal name="keynav-failed" handler="keynav_failed"/>
                               </object>
@@ -220,14 +220,14 @@
                       <object class="GtkFlowBox">
                         <property name="min-children-per-line">3</property>
                         <property name="max-children-per-line">10</property>
-                        <property name="selection-mode">none</property>
+                        <property name="selection-mode">0</property>
                         <style>
                           <class name="emoji-toolbar"/>
                         </style>
                         <child>
                           <object class="GtkButton" id="recent.button">
                             <property name="has-frame">0</property>
-                            <property name="tooltip-text" translatable="yes" context="emoji category">Recent</property>
+                            <property name="tooltip-text" translatable="1" context="emoji category">Recent</property>
                             <style>
                               <class name="emoji-section"/>
                             </style>
@@ -236,7 +236,7 @@
                         <child>
                           <object class="GtkButton" id="people.button">
                             <property name="has-frame">0</property>
-                            <property name="tooltip-text" translatable="yes" context="emoji category">Smileys &amp; People</property>
+                            <property name="tooltip-text" translatable="1" context="emoji category">Smileys &amp; People</property>
                             <style>
                               <class name="emoji-section"/>
                             </style>
@@ -245,7 +245,7 @@
                         <child>
                           <object class="GtkButton" id="body.button">
                             <property name="has-frame">0</property>
-                            <property name="tooltip-text" translatable="yes" context="emoji category">Body &amp; Clothing</property>
+                            <property name="tooltip-text" translatable="1" context="emoji category">Body &amp; Clothing</property>
                             <style>
                               <class name="emoji-section"/>
                             </style>
@@ -254,7 +254,7 @@
                         <child>
                           <object class="GtkButton" id="nature.button">
                             <property name="has-frame">0</property>
-                            <property name="tooltip-text" translatable="yes" context="emoji category">Animals &amp; Nature</property>
+                            <property name="tooltip-text" translatable="1" context="emoji category">Animals &amp; Nature</property>
                             <style>
                               <class name="emoji-section"/>
                             </style>
@@ -263,7 +263,7 @@
                         <child>
                           <object class="GtkButton" id="food.button">
                             <property name="has-frame">0</property>
-                            <property name="tooltip-text" translatable="yes" context="emoji category">Food &amp; Drink</property>
+                            <property name="tooltip-text" translatable="1" context="emoji category">Food &amp; Drink</property>
                             <style>
                               <class name="emoji-section"/>
                             </style>
@@ -272,7 +272,7 @@
                         <child>
                           <object class="GtkButton" id="travel.button">
                             <property name="has-frame">0</property>
-                            <property name="tooltip-text" translatable="yes" context="emoji category">Travel &amp; Places</property>
+                            <property name="tooltip-text" translatable="1" context="emoji category">Travel &amp; Places</property>
                             <style>
                               <class name="emoji-section"/>
                             </style>
@@ -281,7 +281,7 @@
                         <child>
                           <object class="GtkButton" id="activities.button">
                             <property name="has-frame">0</property>
-                            <property name="tooltip-text" translatable="yes" context="emoji category">Activities</property>
+                            <property name="tooltip-text" translatable="1" context="emoji category">Activities</property>
                             <style>
                               <class name="emoji-section"/>
                             </style>
@@ -290,7 +290,7 @@
                         <child>
                           <object class="GtkButton" id="objects.button">
                             <property name="has-frame">0</property>
-                            <property name="tooltip-text" translatable="yes" context="emoji category">Objects</property>
+                            <property name="tooltip-text" translatable="1" context="emoji category">Objects</property>
                             <style>
                               <class name="emoji-section"/>
                             </style>
@@ -299,7 +299,7 @@
                         <child>
                           <object class="GtkButton" id="symbols.button">
                             <property name="has-frame">0</property>
-                            <property name="tooltip-text" translatable="yes" context="emoji category">Symbols</property>
+                            <property name="tooltip-text" translatable="1" context="emoji category">Symbols</property>
                             <style>
                               <class name="emoji-section"/>
                             </style>
@@ -308,7 +308,7 @@
                         <child>
                           <object class="GtkButton" id="flags.button">
                             <property name="has-frame">0</property>
-                            <property name="tooltip-text" translatable="yes" context="emoji category">Flags</property>
+                            <property name="tooltip-text" translatable="1" context="emoji category">Flags</property>
                             <style>
                               <class name="emoji-section"/>
                             </style>
@@ -326,8 +326,8 @@
                 <property name="child">
                   <object class="GtkGrid">
                     <property name="row-spacing">12</property>
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
+                    <property name="halign">3</property>
+                    <property name="valign">3</property>
                     <style>
                       <class name="dim-label"/>
                     </style>
@@ -346,7 +346,7 @@
                     </child>
                     <child>
                       <object class="GtkLabel">
-                        <property name="label" translatable="yes">No Results Found</property>
+                        <property name="label" translatable="1">No Results Found</property>
                         <attributes>
                           <attribute name="weight" value="bold"></attribute>
                           <attribute name="scale" value="1.44"></attribute>
@@ -359,7 +359,7 @@
                     </child>
                     <child>
                       <object class="GtkLabel">
-                        <property name="label" translatable="yes">Try a different search</property>
+                        <property name="label" translatable="1">Try a different search</property>
                         <style>
                           <class name="dim-label"/>
                         </style>
diff --git a/gtk/ui/gtkemojicompletion.ui b/gtk/ui/gtkemojicompletion.ui
index 5d975abefe..9d6797a41c 100644
--- a/gtk/ui/gtkemojicompletion.ui
+++ b/gtk/ui/gtkemojicompletion.ui
@@ -8,7 +8,7 @@
     </style>
     <child>
       <object class="GtkListBox" id="list">
-        <property name="selection-mode">none</property>
+        <property name="selection-mode">0</property>
         <signal name="row-activated" handler="row_activated"/>
       </object>
     </child>
diff --git a/gtk/ui/gtkfilechooserdialog.ui b/gtk/ui/gtkfilechooserdialog.ui
index c48e07f2b5..53ed506135 100644
--- a/gtk/ui/gtkfilechooserdialog.ui
+++ b/gtk/ui/gtkfilechooserdialog.ui
@@ -5,7 +5,7 @@
     <signal name="response" handler="response_cb" swapped="no"/>
     <child internal-child="content_area">
       <object class="GtkBox">
-        <property name="orientation">vertical</property>
+        <property name="orientation">1</property>
         <child internal-child="action_area">
           <object class="GtkBox" id="dialog-action_area1">
             <property name="margin-start">6</property>
@@ -13,7 +13,7 @@
             <property name="margin-top">6</property>
             <property name="margin-bottom">6</property>
             <property name="hexpand">1</property>
-            <property name="halign">end</property>
+            <property name="halign">2</property>
           </object>
         </child>
         <child>
@@ -26,6 +26,6 @@
     </child>
   </template>
   <object class="GtkSizeGroup" id="buttons">
-    <property name="mode">vertical</property>
+    <property name="mode">2</property>
   </object>
 </interface>
diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
index 9346afd767..f9d0426511 100644
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -3,10 +3,10 @@
   <template class="GtkFileChooserWidget" parent="GtkWidget">
     <child>
       <object class="GtkBox" id="box">
-        <property name="orientation">vertical</property>
+        <property name="orientation">1</property>
         <child>
           <object class="GtkBox" id="browse_widgets_box">
-            <property name="orientation">vertical</property>
+            <property name="orientation">1</property>
             <property name="vexpand">1</property>
             <child>
               <object class="GtkPaned" id="browse_widgets_hpaned">
@@ -28,21 +28,21 @@
                 </child>
                 <child>
                   <object class="GtkBox">
-                    <property name="orientation">vertical</property>
+                    <property name="orientation">1</property>
                     <child>
                       <object class="GtkRevealer" id="browse_header_revealer">
                         <property name="hexpand">1</property>
                         <child>
                           <object class="GtkBox">
                             <property name="name">pathbarbox</property>
-                            <property name="orientation">vertical</property>
+                            <property name="orientation">1</property>
                             <property name="spacing">12</property>
                             <style>
                               <class name="view"/>
                             </style>
                             <child>
                               <object class="GtkStack" id="browse_header_stack">
-                                <property name="transition-type">crossfade</property>
+                                <property name="transition-type">1</property>
                                 <child>
                                   <object class="GtkStackPage">
                                     <property name="name">pathbar</property>
@@ -61,7 +61,7 @@
                                         </child>
                                         <child>
                                           <object class="GtkMenuButton" id="browse_new_folder_button">
-                                            <property name="tooltip-text" translatable="yes">Create Folder</property>
+                                            <property name="tooltip-text" translatable="1">Create Folder</property>
                                             <property name="popover">new_folder_popover</property>
                                             <property name="icon-name">folder-new-symbolic</property>
                                           </object>
@@ -97,7 +97,7 @@
                                           <object class="GtkSearchEntry" id="search_entry">
                                             <property name="width-chars">45</property>
                                             <property name="hexpand">1</property>
-                                            <property name="halign">center</property>
+                                            <property name="halign">3</property>
                                             <signal name="search-changed" handler="search_entry_activate_cb" swapped="yes"/>
                                             <signal name="stop-search" handler="search_entry_stop_cb" swapped="yes"/>
                                           </object>
@@ -123,7 +123,7 @@
                         <property name="vexpand">1</property>
                         <child>
                           <object class="GtkStack" id="browse_files_stack">
-                            <property name="transition-type">crossfade</property>
+                            <property name="transition-type">1</property>
                             <property name="hexpand">1</property>
                             <property name="vexpand">1</property>
                             <style>
@@ -134,10 +134,10 @@
                                 <property name="name">list</property>
                                 <property name="child">
                                   <object class="GtkBox">
-                                    <property name="orientation">vertical</property>
+                                    <property name="orientation">1</property>
                                     <child>
                                       <object class="GtkScrolledWindow" id="browse_files_swin">
-                                        <property name="hscrollbar-policy">never</property>
+                                        <property name="hscrollbar-policy">2</property>
                                         <property name="vexpand">1</property>
                                         <child>
                                           <object class="GtkTreeView" id="browse_files_tree_view">
@@ -165,7 +165,7 @@
                                             </child>
                                             <child>
                                               <object class="GtkTreeViewColumn" id="list_name_column">
-                                                <property name="title" translatable="yes">Name</property>
+                                                <property name="title" translatable="1">Name</property>
                                                 <property name="resizable">1</property>
                                                 <property name="expand">1</property>
                                                 <child>
@@ -176,14 +176,14 @@
                                                 <child>
                                                   <object class="GtkCellRendererText" id="list_name_renderer">
                                                     <property name="width-chars">10</property>
-                                                    <property name="ellipsize">end</property>
+                                                    <property name="ellipsize">3</property>
                                                   </object>
                                                 </child>
                                               </object>
                                             </child>
                                             <child>
                                               <object class="GtkTreeViewColumn" id="list_location_column">
-                                                <property name="title" translatable="yes">Location</property>
+                                                <property name="title" translatable="1">Location</property>
                                                 <property name="resizable">1</property>
                                                 <property name="visible">0</property>
                                                 <property name="expand">1</property>
@@ -191,7 +191,7 @@
                                                   <object class="GtkCellRendererText" id="list_location_renderer">
                                                     <property name="xalign">0</property>
                                                     <property name="width-chars">10</property>
-                                                    <property name="ellipsize">start</property>
+                                                    <property name="ellipsize">1</property>
                                                     <property name="xpad">6</property>
                                                   </object>
                                                 </child>
@@ -199,8 +199,8 @@
                                             </child>
                                             <child>
                                               <object class="GtkTreeViewColumn" id="list_size_column">
-                                                <property name="title" translatable="yes">Size</property>
-                                                <property name="sizing">fixed</property>
+                                                <property name="title" translatable="1">Size</property>
+                                                <property name="sizing">2</property>
                                                 <child>
                                                   <object class="GtkCellRendererText" id="list_size_renderer">
                                                     <property name="xalign">0</property>
@@ -211,7 +211,7 @@
                                             </child>
                                             <child>
                                               <object class="GtkTreeViewColumn" id="list_type_column">
-                                                <property name="title" translatable="yes">Type</property>
+                                                <property name="title" translatable="1">Type</property>
                                                 <property name="resizable">1</property>
                                                 <child>
                                                   <object class="GtkCellRendererText" id="list_type_renderer">
@@ -223,8 +223,8 @@
                                             </child>
                                             <child>
                                               <object class="GtkTreeViewColumn" id="list_time_column">
-                                                <property name="title" translatable="yes">Modified</property>
-                                                <property name="sizing">fixed</property>
+                                                <property name="title" translatable="1">Modified</property>
+                                                <property name="sizing">2</property>
                                                 <child>
                                                   <object class="GtkCellRendererText" id="list_date_renderer">
                                                     <property name="xpad">6</property>
@@ -246,7 +246,7 @@
                                         <property name="visible">0</property>
                                         <child type="center">
                                           <object class="GtkLabel">
-                                            <property name="label" translatable="yes">Remote location — only searching the current folder</property>
+                                            <property name="label" translatable="1">Remote location — only searching the current folder</property>
                                           </object>
                                         </child>
                                       </object>
@@ -274,8 +274,8 @@
                                     <property name="row-spacing">12</property>
                                     <property name="hexpand">1</property>
                                     <property name="vexpand">1</property>
-                                    <property name="halign">center</property>
-                                    <property name="valign">center</property>
+                                    <property name="halign">3</property>
+                                    <property name="valign">3</property>
                                     <style>
                                       <class name="dim-label"/>
                                     </style>
@@ -294,7 +294,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkLabel">
-                                        <property name="label" translatable="yes">No Results Found</property>
+                                        <property name="label" translatable="1">No Results Found</property>
                                         <attributes>
                                           <attribute name="weight" value="bold"></attribute>
                                           <attribute name="scale" value="1.44"></attribute>
@@ -307,7 +307,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkLabel">
-                                        <property name="label" translatable="yes">Try a different search</property>
+                                        <property name="label" translatable="1">Try a different search</property>
                                         <style>
                                           <class name="dim-label"/>
                                         </style>
@@ -343,9 +343,9 @@
               <object class="GtkBox" id="filter_combo_hbox">
                 <child>
                   <object class="GtkDropDown" id="filter_combo">
-                    <property name="tooltip-text" translatable="yes">Select which types of files are shown</property>
+                    <property name="tooltip-text" translatable="1">Select which types of files are shown</property>
                     <property name="focus-on-click">0</property>
-                    <property name="valign">start</property>
+                    <property name="valign">1</property>
                     <signal name="notify::selected" handler="filter_combo_changed" swapped="no"/>
                   </object>
                 </child>
@@ -357,7 +357,7 @@
     </child>
   </template>
   <object class="GtkSizeGroup" id="browse_path_bar_size_group">
-    <property name="mode">vertical</property>
+    <property name="mode">2</property>
     <widgets>
       <widget name="browse_path_bar"/>
       <widget name="browse_new_folder_button"/>
@@ -375,8 +375,8 @@
         <property name="row-spacing">6</property>
         <child>
           <object class="GtkLabel">
-            <property name="label" translatable="yes">Folder Name</property>
-            <property name="halign">start</property>
+            <property name="label" translatable="1">Folder Name</property>
+            <property name="halign">1</property>
             <property name="mnemonic-widget">new_folder_name_entry</property>
             <attributes>
               <attribute name="weight" value="bold"></attribute>
@@ -401,7 +401,7 @@
         <child>
           <object class="GtkButton" id="new_folder_create_button">
             <property name="sensitive">0</property>
-            <property name="label" translatable="yes">_Create</property>
+            <property name="label" translatable="1">_Create</property>
             <property name="use-underline">1</property>
             <signal name="clicked" handler="new_folder_create_clicked"/>
             <style>
@@ -437,8 +437,8 @@
         <property name="column-spacing">6</property>
         <child>
           <object class="GtkLabel">
-            <property name="label" translatable="yes">Name</property>
-            <property name="halign">start</property>
+            <property name="label" translatable="1">Name</property>
+            <property name="halign">1</property>
             <property name="mnemonic-widget">rename_file_name_entry</property>
             <attributes>
               <attribute name="weight" value="bold"></attribute>
@@ -462,7 +462,7 @@
         <child>
           <object class="GtkButton" id="rename_file_rename_button">
             <property name="sensitive">0</property>
-            <property name="label" translatable="yes">_Rename</property>
+            <property name="label" translatable="1">_Rename</property>
             <property name="use-underline">1</property>
             <signal name="clicked" handler="rename_file_rename_clicked"/>
             <style>
diff --git a/gtk/ui/gtkfontchooserdialog.ui b/gtk/ui/gtkfontchooserdialog.ui
index c7fd9086db..b99ed11ba8 100644
--- a/gtk/ui/gtkfontchooserdialog.ui
+++ b/gtk/ui/gtkfontchooserdialog.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkFontChooserDialog" parent="GtkDialog">
-    <property name="title" translatable="yes">Select Font</property>
+    <property name="title" translatable="1">Select Font</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="dialog-vbox1">
-        <property name="orientation">vertical</property>
+        <property name="orientation">1</property>
         <property name="spacing">2</property>
         <property name="margin-start">5</property>
         <property name="margin-end">5</property>
@@ -21,12 +21,12 @@
     <child type="action">
       <object class="GtkButton" id="cancel_button">
         <property name="use-underline">1</property>
-        <property name="label" translatable="yes">_Cancel</property>
+        <property name="label" translatable="1">_Cancel</property>
       </object>
     </child>
     <child type="action">
       <object class="GtkButton" id="select_button">
-        <property name="label" translatable="yes">_Select</property>
+        <property name="label" translatable="1">_Select</property>
         <property name="use-underline">1</property>
       </object>
     </child>
diff --git a/gtk/ui/gtkfontchooserwidget.ui b/gtk/ui/gtkfontchooserwidget.ui
index 1070cc7e45..fdd9cf597a 100644
--- a/gtk/ui/gtkfontchooserwidget.ui
+++ b/gtk/ui/gtkfontchooserwidget.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkSingleSelection" id="selection">
-    <signal name="notify::selected-item" handler="selection_changed_cb" object="GtkFontChooserWidget" swapped="0" />
-    <signal name="items-changed" handler="rows_changed_cb" object="GtkFontChooserWidget" swapped="1" />
+    <signal name="notify::selected-item" handler="selection_changed_cb" object="GtkFontChooserWidget" swapped="0"/>
+    <signal name="items-changed" handler="rows_changed_cb" object="GtkFontChooserWidget" swapped="1"/>
     <property name="model">
       <object class="GtkFilterListModel" id="filter_model">
-        <signal name="notify::pending" handler="rows_changed_cb" object="GtkFontChooserWidget" swapped="1" />
+        <signal name="notify::pending" handler="rows_changed_cb" object="GtkFontChooserWidget" swapped="1"/>
         <property name="incremental">1</property>
         <property name="filter">
           <object class="GtkEveryFilter">
@@ -15,7 +15,7 @@
                   <lookup name="text">search_entry</lookup>
                 </binding>
                 <property name="expression">
-                  <closure type="gchararray" swapped="1" function="get_font_name" />
+                  <closure type="gchararray" swapped="1" function="get_font_name"/>
                 </property>
               </object>
             </child>
@@ -61,7 +61,7 @@
                       <object class="GtkSearchEntry" id="search_entry">
                         <property name="hexpand">1</property>
                         <property name="activates-default">1</property>
-                        <property name="placeholder-text" translatable="yes">Search font name</property>
+                        <property name="placeholder-text" translatable="1">Search font name</property>
                         <signal name="stop-search" handler="stop_search_cb" swapped="no"/>
                       </object>
                     </child>
@@ -72,11 +72,11 @@
                           <object class="GtkPopover">
                             <child>
                               <object class="GtkBox">
-                                <property name="orientation">vertical</property>
+                                <property name="orientation">1</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkLabel">
-                                    <property name="label" translatable="yes">Filter by</property>
+                                    <property name="label" translatable="1">Filter by</property>
                                     <property name="width-chars">20</property>
                                     <property name="margin-bottom">10</property>
                                     <style>
@@ -86,13 +86,13 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="monospace_button">
-                                    <property name="label" translatable="yes">Monospace</property>
+                                    <property name="label" translatable="1">Monospace</property>
                                     <signal name="notify::active" handler="monospace_check_changed"/>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="language_button">
-                                    <property name="label" translatable="yes">Language</property>
+                                    <property name="label" translatable="1">Language</property>
                                     <signal name="notify::active" handler="language_check_changed"/>
                                   </object>
                                 </child>
@@ -102,11 +102,9 @@
                                     <child>
                                       <object class="GtkScrolledWindow">
                                         <property name="min-content-height">200</property>
-                                        <property name="hscrollbar-policy">never</property>
-                                        <property name="vscrollbar-policy">automatic</property>
+                                        <property name="hscrollbar-policy">2</property>
                                         <child>
-                                          <object class="GtkListView" id="language_list">
-                                          </object>
+                                          <object class="GtkListView" id="language_list"/>
                                         </child>
                                       </object>
                                     </child>
@@ -139,11 +137,10 @@
                                 <property name="height-request">300</property>
                                 <property name="hexpand">1</property>
                                 <property name="vexpand">1</property>
-                                <property name="hscrollbar-policy">never</property>
+                                <property name="hscrollbar-policy">2</property>
                                 <property name="has-frame">1</property>
                                 <child>
                                   <object class="GtkListView" id="family_face_list">
-                                    <property name="can-focus">1</property>
                                     <property name="model">selection</property>
                                     <signal name="activate" handler="row_activated_cb" swapped="no"/>
                                     <property name="factory">
@@ -188,10 +185,10 @@
                             </child>
                             <child>
                               <object class="GtkEntry" id="preview">
-                                <property name="placeholder-text" translatable="yes">Preview text</property>
+                                <property name="placeholder-text" translatable="1">Preview text</property>
                                 <child>
                                   <object class="GtkEventControllerScroll">
-                                    <property name="flags" translatable="yes">horizontal</property>
+                                    <property name="flags" translatable="1">horizontal</property>
                                     <signal name="scroll" handler="resize_by_scroll_cb"/>
                                   </object>
                                 </child>
@@ -204,9 +201,9 @@
                             </child>
                             <child>
                               <object class="GtkLabel" id="size_label">
-                                <property name="label" translatable="yes">Size</property>
+                                <property name="label" translatable="1">Size</property>
                                 <property name="xalign">0</property>
-                                <property name="valign">baseline</property>
+                                <property name="valign">4</property>
                                 <layout>
                                   <property name="column">0</property>
                                   <property name="row">3</property>
@@ -217,11 +214,10 @@
                               <object class="GtkScale" id="size_slider">
                                 <property name="hexpand">1</property>
                                 <property name="adjustment">slider_adjustment</property>
-                                <property name="draw-value">0</property>
                                 <property name="round-digits">0</property>
                                 <child>
                                   <object class="GtkEventControllerScroll">
-                                    <property name="flags" translatable="yes">horizontal</property>
+                                    <property name="flags" translatable="1">horizontal</property>
                                     <signal name="scroll" handler="resize_by_scroll_cb"/>
                                   </object>
                                 </child>
@@ -234,7 +230,7 @@
                             <child>
                               <object class="GtkSpinButton" id="size_spin">
                                 <property name="adjustment">spin_adjustment</property>
-                                <property name="valign">center</property>
+                                <property name="valign">3</property>
                                 <signal name="output" handler="output_cb"/>
                                 <layout>
                                   <property name="column">2</property>
@@ -254,8 +250,8 @@
                             <property name="row-spacing">12</property>
                             <property name="hexpand">1</property>
                             <property name="vexpand">1</property>
-                            <property name="halign">center</property>
-                            <property name="valign">center</property>
+                            <property name="halign">3</property>
+                            <property name="valign">3</property>
                             <style>
                               <class name="dim-label"/>
                             </style>
@@ -271,7 +267,7 @@
                             </child>
                             <child>
                               <object class="GtkLabel">
-                                <property name="label" translatable="yes">No Fonts Found</property>
+                                <property name="label" translatable="1">No Fonts Found</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"></attribute>
                                   <attribute name="scale" value="1.2"></attribute>
@@ -301,7 +297,7 @@
             <property name="name">tweaks</property>
             <property name="child">
               <object class="GtkBox">
-                <property name="orientation">vertical</property>
+                <property name="orientation">1</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="font_name_label">
@@ -309,7 +305,7 @@
                     <property name="margin-bottom">6</property>
                     <property name="margin-start">12</property>
                     <property name="margin-end">12</property>
-                    <property name="ellipsize">end</property>
+                    <property name="ellipsize">3</property>
                     <property name="xalign">0</property>
                     <binding name="label" object="GtkFontChooserWidget">
                       <closure type="gchararray" function="get_font_name">
@@ -325,14 +321,14 @@
                 </child>
                 <child>
                   <object class="GtkEntry" id="preview2">
-                    <property name="placeholder-text" translatable="yes">Preview text</property>
+                    <property name="placeholder-text" translatable="1">Preview text</property>
                     <property name="text" bind-source="preview" bind-property="text" bind-flags="bidirectional"/>
                     <property name="attributes" bind-source="preview" bind-property="attributes" bind-flags="bidirectional"/>
                   </object>
                 </child>
                 <child>
                   <object class="GtkScrolledWindow">
-                    <property name="hscrollbar-policy">never</property>
+                    <property name="hscrollbar-policy">2</property>
                     <property name="has-frame">1</property>
                     <property name="vexpand">1</property>
                     <style>
@@ -340,7 +336,7 @@
                     </style>
                     <child>
                       <object class="GtkBox">
-                        <property name="orientation">vertical</property>
+                        <property name="orientation">1</property>
                         <property name="spacing">12</property>
                         <property name="margin-start">12</property>
                         <property name="margin-end">12</property>
@@ -352,9 +348,9 @@
                             <property name="column-spacing">12</property>
                             <child>
                               <object class="GtkLabel" id="size_label2">
-                                <property name="label" translatable="yes">Size</property>
+                                <property name="label" translatable="1">Size</property>
                                 <property name="xalign">0</property>
-                                <property name="valign">baseline</property>
+                                <property name="valign">4</property>
                                 <layout>
                                   <property name="column">0</property>
                                   <property name="row">0</property>
@@ -365,7 +361,6 @@
                               <object class="GtkScale" id="size_slider2">
                                 <property name="hexpand">1</property>
                                 <property name="adjustment">slider_adjustment</property>
-                                <property name="draw-value">0</property>
                                 <property name="round-digits">0</property>
                                 <layout>
                                   <property name="column">1</property>
@@ -376,7 +371,7 @@
                             <child>
                               <object class="GtkSpinButton" id="size_spin2">
                                 <property name="adjustment">spin_adjustment</property>
-                                <property name="valign">center</property>
+                                <property name="valign">3</property>
                                 <signal name="output" handler="output_cb"/>
                                 <layout>
                                   <property name="column">2</property>
@@ -388,7 +383,7 @@
                         </child>
                         <child>
                           <object class="GtkBox" id="feature_box">
-                            <property name="orientation">vertical</property>
+                            <property name="orientation">1</property>
                             <property name="spacing">12</property>
                           </object>
                         </child>
diff --git a/gtk/ui/gtklockbutton.ui b/gtk/ui/gtklockbutton.ui
index a5bb4538f6..9cf27e7389 100644
--- a/gtk/ui/gtklockbutton.ui
+++ b/gtk/ui/gtklockbutton.ui
@@ -4,8 +4,8 @@
     <property name="receives-default">1</property>
     <child>
       <object class="GtkBox" id="box">
-        <property name="halign">center</property>
-        <property name="valign">center</property>
+        <property name="halign">3</property>
+        <property name="valign">3</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkImage" id="image">
@@ -17,13 +17,13 @@
             <child>
               <object class="GtkLabel" id="label_lock">
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Lock</property>
+                <property name="label" translatable="1">Lock</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label_unlock">
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Unlock</property>
+                <property name="label" translatable="1">Unlock</property>
               </object>
             </child>
           </object>
diff --git a/gtk/ui/gtkmediacontrols.ui b/gtk/ui/gtkmediacontrols.ui
index eaca2ae17c..08799d64e6 100644
--- a/gtk/ui/gtkmediacontrols.ui
+++ b/gtk/ui/gtkmediacontrols.ui
@@ -21,8 +21,8 @@
         <child>
           <object class="GtkButton" id="play_button">
             <property name="receives-default">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
+            <property name="halign">3</property>
+            <property name="valign">3</property>
             <property name="has-frame">0</property>
             <property name="icon-name">media-playback-start-symbolic</property>
             <signal name="clicked" handler="play_button_clicked" object="GtkMediaControls" swapped="no"/>
@@ -33,14 +33,13 @@
             <child>
               <object class="GtkLabel" id="time_label">
                 <attributes>
-                  <attribute name="font-features" value="tnum=1"/>
+                  <attribute name="font-features" value="tnum=1"></attribute>
                 </attributes>
               </object>
             </child>
             <child>
               <object class="GtkScale" id="seek_scale">
                 <property name="adjustment">time_adjustment</property>
-                <property name="draw_value">0</property>
                 <property name="restrict-to-fill-level">0</property>
                 <property name="hexpand">1</property>
               </object>
@@ -48,7 +47,7 @@
             <child>
               <object class="GtkLabel" id="duration_label">
                 <attributes>
-                  <attribute name="font-features" value="tnum=1"/>
+                  <attribute name="font-features" value="tnum=1"></attribute>
                 </attributes>
               </object>
             </child>
diff --git a/gtk/ui/gtkmessagedialog.ui b/gtk/ui/gtkmessagedialog.ui
index 42c6528b4a..5d0a760f74 100644
--- a/gtk/ui/gtkmessagedialog.ui
+++ b/gtk/ui/gtkmessagedialog.ui
@@ -10,7 +10,7 @@
     </child>
     <child internal-child="content_area">
       <object class="GtkBox" id="dialog-vbox1">
-        <property name="orientation">vertical</property>
+        <property name="orientation">1</property>
         <property name="spacing">20</property>
         <child>
           <object class="GtkBox" id="box">
@@ -19,13 +19,13 @@
             <property name="spacing">30</property>
             <child>
               <object class="GtkBox" id="message_area">
-                <property name="orientation">vertical</property>
+                <property name="orientation">1</property>
                 <property name="spacing">10</property>
                 <property name="hexpand">1</property>
                 <child>
                   <object class="GtkLabel" id="label">
-                    <property name="halign">center</property>
-                    <property name="valign">start</property>
+                    <property name="halign">3</property>
+                    <property name="valign">1</property>
                     <property name="wrap">1</property>
                     <property name="max-width-chars">60</property>
                   </object>
@@ -34,8 +34,8 @@
                   <object class="GtkLabel" id="secondary_label">
                     <property name="visible">0</property>
                     <property name="margin-bottom">2</property>
-                    <property name="halign">center</property>
-                    <property name="valign">start</property>
+                    <property name="halign">3</property>
+                    <property name="valign">1</property>
                     <property name="vexpand">1</property>
                     <property name="wrap">1</property>
                     <property name="max-width-chars">60</property>
diff --git a/gtk/ui/gtkpagesetupunixdialog.ui b/gtk/ui/gtkpagesetupunixdialog.ui
index 1fe89e5575..79b5edce16 100644
--- a/gtk/ui/gtkpagesetupunixdialog.ui
+++ b/gtk/ui/gtkpagesetupunixdialog.ui
@@ -2,10 +2,10 @@
 <interface domain="gtk40">
   <template class="GtkPageSetupUnixDialog" parent="GtkDialog">
     <property name="resizable">0</property>
-    <property name="title" translatable="yes">Page Setup</property>
+    <property name="title" translatable="1">Page Setup</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="dialog-vbox1">
-        <property name="orientation">vertical</property>
+        <property name="orientation">1</property>
         <property name="spacing">2</property>
         <property name="margin-start">5</property>
         <property name="margin-end">5</property>
@@ -22,9 +22,9 @@
             <property name="vexpand">1</property>
             <child>
               <object class="GtkLabel" id="printer_combo_label">
-                <property name="halign">start</property>
-                <property name="valign">center</property>
-                <property name="label" translatable="yes">_Format for:</property>
+                <property name="halign">1</property>
+                <property name="valign">3</property>
+                <property name="label" translatable="1">_Format for:</property>
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">printer_combo</property>
                 <layout>
@@ -46,9 +46,9 @@
             </child>
             <child>
               <object class="GtkLabel" id="paper_size_combo_label">
-                <property name="halign">start</property>
-                <property name="valign">center</property>
-                <property name="label" translatable="yes">_Paper size:</property>
+                <property name="halign">1</property>
+                <property name="valign">3</property>
+                <property name="label" translatable="1">_Paper size:</property>
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">paper_size_combo</property>
                 <layout>
@@ -70,8 +70,8 @@
             </child>
             <child>
               <object class="GtkLabel" id="paper_size_label">
-                <property name="halign">start</property>
-                <property name="valign">center</property>
+                <property name="halign">1</property>
+                <property name="valign">3</property>
                 <layout>
                   <property name="column">1</property>
                   <property name="row">2</property>
@@ -81,9 +81,9 @@
             </child>
             <child>
               <object class="GtkLabel" id="orientation_label">
-                <property name="halign">start</property>
-                <property name="valign">center</property>
-                <property name="label" translatable="yes">_Orientation:</property>
+                <property name="halign">1</property>
+                <property name="valign">3</property>
+                <property name="label" translatable="1">_Orientation:</property>
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">portrait_radio</property>
                 <layout>
@@ -95,7 +95,7 @@
             <child>
               <object class="GtkCheckButton" id="portrait_radio">
                 <property name="active">1</property>
-                <property name="label" translatable="yes">Portrait</property>
+                <property name="label" translatable="1">Portrait</property>
                 <layout>
                   <property name="column">1</property>
                   <property name="row">3</property>
@@ -106,7 +106,7 @@
               <object class="GtkCheckButton" id="reverse_portrait_radio">
                 <property name="active">1</property>
                 <property name="group">portrait_radio</property>
-                <property name="label" translatable="yes">Reverse portrait</property>
+                <property name="label" translatable="1">Reverse portrait</property>
                 <layout>
                   <property name="column">2</property>
                   <property name="row">3</property>
@@ -118,7 +118,7 @@
                 <property name="hexpand">1</property>
                 <property name="active">1</property>
                 <property name="group">portrait_radio</property>
-                <property name="label" translatable="yes">Landscape</property>
+                <property name="label" translatable="1">Landscape</property>
                 <layout>
                   <property name="column">1</property>
                   <property name="row">4</property>
@@ -129,7 +129,7 @@
               <object class="GtkCheckButton" id="reverse_landscape_radio">
                 <property name="hexpand">1</property>
                 <property name="group">portrait_radio</property>
-                <property name="label" translatable="yes">Reverse landscape</property>
+                <property name="label" translatable="1">Reverse landscape</property>
                 <layout>
                   <property name="column">2</property>
                   <property name="row">4</property>
diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui
index 7c5a927ae2..2544baed5a 100644
--- a/gtk/ui/gtkplacesview.ui
+++ b/gtk/ui/gtkplacesview.ui
@@ -13,10 +13,10 @@
     <property name="popup-completion">0</property>
   </object>
   <object class="GtkPopover" id="server_adresses_popover">
-    <property name="position">top</property>
+    <property name="position">2</property>
     <child>
       <object class="GtkBox">
-        <property name="orientation">vertical</property>
+        <property name="orientation">1</property>
         <property name="spacing">6</property>
         <property name="margin-start">18</property>
         <property name="margin-end">18</property>
@@ -25,7 +25,7 @@
         <child>
           <object class="GtkLabel">
             <property name="hexpand">1</property>
-            <property name="label" translatable="yes">Server Addresses</property>
+            <property name="label" translatable="1">Server Addresses</property>
             <attributes>
               <attribute name="weight" value="bold"></attribute>
             </attributes>
@@ -37,7 +37,7 @@
         <child>
           <object class="GtkLabel">
             <property name="hexpand">1</property>
-            <property name="label" translatable="yes">Server addresses are made up of a protocol prefix and an address. Examples:</property>
+            <property name="label" translatable="1">Server addresses are made up of a protocol prefix and an address. Examples:</property>
             <property name="wrap">1</property>
             <property name="width-chars">40</property>
             <property name="max-width-chars">40</property>
@@ -63,7 +63,7 @@
             <child>
               <object class="GtkLabel">
                 <property name="hexpand">1</property>
-                <property name="label" translatable="yes">Available Protocols</property>
+                <property name="label" translatable="1">Available Protocols</property>
                 <property name="xalign">0</property>
                 <attributes>
                   <attribute name="weight" value="bold"></attribute>
@@ -76,7 +76,7 @@
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="label" translatable="yes">Prefix</property>
+                <property name="label" translatable="1">Prefix</property>
                 <property name="xalign">0</property>
                 <attributes>
                   <attribute name="weight" value="bold"></attribute>
@@ -101,8 +101,8 @@
             <property name="child">
               <object class="GtkBox">
                 <property name="vexpand">1</property>
-                <property name="valign">center</property>
-                <property name="orientation">vertical</property>
+                <property name="valign">3</property>
+                <property name="orientation">1</property>
                 <property name="spacing">18</property>
                 <child>
                   <object class="GtkImage">
@@ -115,7 +115,7 @@
                 </child>
                 <child>
                   <object class="GtkLabel">
-                    <property name="label" translatable="yes" comments="Translators: Server as any successfully connected network address">No recent servers found</property>
+                    <property name="label" translatable="1" comments="Translators: Server as any successfully connected network address">No recent servers found</property>
                     <style>
                       <class name="dim-label"/>
                     </style>
@@ -130,7 +130,7 @@
             <property name="name">list</property>
             <property name="child">
               <object class="GtkBox">
-                <property name="orientation">vertical</property>
+                <property name="orientation">1</property>
                 <property name="spacing">12</property>
                 <property name="margin-start">12</property>
                 <property name="margin-end">12</property>
@@ -138,7 +138,7 @@
                 <property name="margin-bottom">12</property>
                 <child>
                   <object class="GtkLabel">
-                    <property name="label" translatable="yes">Recent Servers</property>
+                    <property name="label" translatable="1">Recent Servers</property>
                     <attributes>
                       <attribute name="weight" value="bold"></attribute>
                     </attributes>
@@ -154,7 +154,7 @@
                       <object class="GtkViewport">
                         <child>
                           <object class="GtkListBox" id="recent_servers_listbox">
-                            <property name="selection-mode">none</property>
+                            <property name="selection-mode">0</property>
                             <signal name="row-activated" handler="on_recent_servers_listbox_row_activated" object="GtkPlacesView" swapped="yes"/>
                           </object>
                         </child>
@@ -170,11 +170,11 @@
     </child>
   </object>
   <template class="GtkPlacesView" parent="GtkBox">
-    <property name="orientation">vertical</property>
+    <property name="orientation">1</property>
     <child>
       <object class="GtkStack" id="stack">
         <property name="vhomogeneous">0</property>
-        <property name="transition-type">crossfade</property>
+        <property name="transition-type">1</property>
         <child>
           <object class="GtkStackPage">
             <property name="name">browse</property>
@@ -186,7 +186,7 @@
                   <object class="GtkViewport">
                     <child>
                       <object class="GtkListBox" id="listbox">
-                        <property name="selection-mode">none</property>
+                        <property name="selection-mode">0</property>
                         <signal name="row-activated" handler="on_listbox_row_activated" object="GtkPlacesView" swapped="yes"/>
                       </object>
                     </child>
@@ -201,11 +201,11 @@
             <property name="name">empty-search</property>
             <property name="child">
               <object class="GtkBox">
-                <property name="halign">center</property>
-                <property name="valign">center</property>
+                <property name="halign">3</property>
+                <property name="valign">3</property>
                 <property name="hexpand">1</property>
                 <property name="vexpand">1</property>
-                <property name="orientation">vertical</property>
+                <property name="orientation">1</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkImage">
@@ -218,7 +218,7 @@
                 </child>
                 <child>
                   <object class="GtkLabel">
-                    <property name="label" translatable="yes">No results found</property>
+                    <property name="label" translatable="1">No results found</property>
                     <attributes>
                       <attribute name="weight" value="bold"></attribute>
                       <attribute name="scale" value="1.44"></attribute>
@@ -227,7 +227,7 @@
                 </child>
                 <child>
                   <object class="GtkLabel">
-                    <property name="label" translatable="yes">Try a different search</property>
+                    <property name="label" translatable="1">Try a different search</property>
                     <style>
                       <class name="dim-label"/>
                     </style>
@@ -249,7 +249,7 @@
           <object class="GtkLabel">
             <property name="hexpand">1</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Connect to _Server</property>
+            <property name="label" translatable="1">Connect to _Server</property>
             <property name="mnemonic-widget">address_entry</property>
             <property name="use-underline">1</property>
             <attributes>
@@ -259,11 +259,11 @@
         </child>
         <child type="end">
           <object class="GtkButton" id="connect_button">
-            <property name="label" translatable="yes">Con_nect</property>
+            <property name="label" translatable="1">Con_nect</property>
             <property name="use-underline">1</property>
             <property name="sensitive">0</property>
             <property name="receives-default">1</property>
-            <property name="valign">center</property>
+            <property name="valign">3</property>
             <signal name="clicked" handler="on_connect_button_clicked" object="GtkPlacesView" swapped="yes"/>
           </object>
         </child>
@@ -274,7 +274,7 @@
               <object class="GtkEntry" id="address_entry">
                 <property name="hexpand">1</property>
                 <property name="width-chars">20</property>
-                <property name="placeholder-text" translatable="yes">Enter server address…</property>
+                <property name="placeholder-text" translatable="1">Enter server address…</property>
                 <property name="secondary-icon-name">dialog-question-symbolic</property>
                 <property name="completion">address_entry_completion</property>
                 <signal name="notify::text" handler="on_address_entry_text_changed" object="GtkPlacesView" swapped="yes"/>
@@ -285,7 +285,7 @@
             <child>
               <object class="GtkMenuButton" id="server_list_button">
                 <property name="receives-default">1</property>
-                <property name="direction">up</property>
+                <property name="direction">0</property>
                 <property name="popover">recent_servers_popover</property>
                 <property name="icon-name">pan-down-symbolic</property>
                 <style>
diff --git a/gtk/ui/gtkplacesviewrow.ui b/gtk/ui/gtkplacesviewrow.ui
index 1941c222a3..9ecd5b4a60 100644
--- a/gtk/ui/gtkplacesviewrow.ui
+++ b/gtk/ui/gtkplacesviewrow.ui
@@ -18,7 +18,7 @@
           <object class="GtkLabel" id="name_label">
             <property name="hexpand">1</property>
             <property name="xalign">0</property>
-            <property name="ellipsize">end</property>
+            <property name="ellipsize">3</property>
           </object>
         </child>
         <child>
@@ -31,8 +31,8 @@
         </child>
         <child>
           <object class="GtkLabel" id="path_label">
-            <property name="justify">right</property>
-            <property name="ellipsize">middle</property>
+            <property name="justify">1</property>
+            <property name="ellipsize">2</property>
             <property name="xalign">0</property>
             <property name="max-width-chars">15</property>
             <style>
@@ -48,9 +48,9 @@
                 <property name="child">
                   <object class="GtkButton" id="eject_button">
                     <property name="visible">0</property>
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
-                    <property name="tooltip-text" translatable="yes">Unmount</property>
+                    <property name="halign">3</property>
+                    <property name="valign">3</property>
+                    <property name="tooltip-text" translatable="1">Unmount</property>
                     <child>
                       <object class="GtkImage" id="eject_icon">
                         <property name="icon-name">media-eject-symbolic</property>
@@ -69,8 +69,8 @@
                 <property name="name">spinner</property>
                 <property name="child">
                   <object class="GtkSpinner" id="busy_spinner">
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
+                    <property name="halign">3</property>
+                    <property name="valign">3</property>
                   </object>
                 </property>
               </object>
diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui
index eecc472628..087d846763 100644
--- a/gtk/ui/gtkprintunixdialog.ui
+++ b/gtk/ui/gtkprintunixdialog.ui
@@ -17,14 +17,14 @@
     <signal name="response" handler="error_dialogs" swapped="no"/>
     <child internal-child="content_area">
       <object class="GtkBox" id="dialog-vbox1">
-        <property name="orientation">vertical</property>
+        <property name="orientation">1</property>
         <property name="spacing">2</property>
         <style>
           <class name="view"/>
         </style>
         <child>
           <object class="GtkBox" id="box1">
-            <property name="orientation">vertical</property>
+            <property name="orientation">1</property>
             <property name="vexpand">1</property>
             <child>
               <object class="GtkNotebook" id="notebook">
@@ -33,7 +33,7 @@
                   <object class="GtkNotebookPage">
                     <property name="child">
                       <object class="GtkBox" id="general_main_box">
-                        <property name="orientation">vertical</property>
+                        <property name="orientation">1</property>
                         <property name="spacing">18</property>
                         <property name="margin-start">12</property>
                         <property name="margin-end">12</property>
@@ -41,7 +41,7 @@
                         <property name="margin-bottom">12</property>
                         <child>
                           <object class="GtkBox" id="box2">
-                            <property name="orientation">vertical</property>
+                            <property name="orientation">1</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkScrolledWindow" id="printer_swin">
@@ -49,8 +49,6 @@
                                 <property name="vexpand">1</property>
                                 <child>
                                   <object class="GtkColumnView" id="printer_list">
-                                    <property name="can-focus">1</property>
-                                    <property name="halign">fill</property>
                                     <child>
                                       <object class="GtkColumnViewColumn">
                                         <property name="factory">
@@ -82,7 +80,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkColumnViewColumn">
-                                        <property name="title" translatable="yes">Name</property>
+                                        <property name="title" translatable="1">Name</property>
                                         <property name="factory">
                                           <object class="GtkBuilderListItemFactory">
                                             <property name="bytes"><![CDATA[
@@ -113,7 +111,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkColumnViewColumn">
-                                        <property name="title" translatable="yes" comments="this is the header for the location column in the print dialog">Location</property>
+                                        <property name="title" translatable="1" comments="this is the header for the location column in the print dialog">Location</property>
                                         <property name="factory">
                                           <object class="GtkBuilderListItemFactory">
                                             <property name="bytes"><![CDATA[
@@ -144,7 +142,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkColumnViewColumn">
-                                        <property name="title" translatable="yes" comments="this is the header for the printer status column in the print dialog">Status</property>
+                                        <property name="title" translatable="1" comments="this is the header for the printer status column in the print dialog">Status</property>
                                         <property name="expand">1</property>
                                         <property name="factory">
                                           <object class="GtkBuilderListItemFactory">
@@ -191,14 +189,14 @@
                             <property name="spacing">18</property>
                             <child>
                               <object class="GtkBox" id="frame_template1">
-                                <property name="orientation">vertical</property>
+                                <property name="orientation">1</property>
                                 <property name="spacing">6</property>
                                 <property name="hexpand">1</property>
                                 <child>
                                   <object class="GtkLabel" id="label_widget1">
-                                    <property name="halign">start</property>
-                                    <property name="valign">center</property>
-                                    <property name="label" translatable="yes">Range</property>
+                                    <property name="halign">1</property>
+                                    <property name="valign">3</property>
+                                    <property name="label" translatable="1">Range</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"></attribute>
                                     </attributes>
@@ -211,7 +209,7 @@
                                     <property name="column-spacing">12</property>
                                     <child>
                                       <object class="GtkCheckButton" id="all_pages_radio">
-                                        <property name="label" translatable="yes">_All Pages</property>
+                                        <property name="label" translatable="1">_All Pages</property>
                                         <property name="use-underline">1</property>
                                         <property name="active">1</property>
                                         <layout>
@@ -223,7 +221,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="current_page_radio">
-                                        <property name="label" translatable="yes">C_urrent Page</property>
+                                        <property name="label" translatable="1">C_urrent Page</property>
                                         <property name="sensitive">0</property>
                                         <property name="use-underline">1</property>
                                         <property name="group">all_pages_radio</property>
@@ -236,7 +234,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="selection_radio">
-                                        <property name="label" translatable="yes">Se_lection</property>
+                                        <property name="label" translatable="1">Se_lection</property>
                                         <property name="sensitive">0</property>
                                         <property name="use-underline">1</property>
                                         <property name="group">all_pages_radio</property>
@@ -249,8 +247,8 @@
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="page_range_radio">
-                                        <property name="label" translatable="yes">Pag_es:</property>
-                                        <property name="tooltip-text" translatable="yes">Specify one or more page ranges,
+                                        <property name="label" translatable="1">Pag_es:</property>
+                                        <property name="tooltip-text" translatable="1">Specify one or more page ranges,
  e.g. 1–3, 7, 11</property>
                                         <property name="use-underline">1</property>
                                         <property name="group">all_pages_radio</property>
@@ -263,7 +261,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkEntry" id="page_range_entry">
-                                        <property name="tooltip-text" translatable="yes">Specify one or more page ranges,
+                                        <property name="tooltip-text" translatable="1">Specify one or more page ranges,
  e.g. 1–3, 7, 11</property>
                                         <property name="activates-default">1</property>
                                         <signal name="notify::has-focus" handler="page_range_entry_focus_changed" swapped="no"/>
@@ -279,14 +277,14 @@
                             </child>
                             <child>
                               <object class="GtkBox" id="frame_template2">
-                                <property name="orientation">vertical</property>
+                                <property name="orientation">1</property>
                                 <property name="spacing">6</property>
                                 <property name="hexpand">1</property>
                                 <child>
                                   <object class="GtkLabel" id="label_widget2">
-                                    <property name="halign">start</property>
-                                    <property name="valign">center</property>
-                                    <property name="label" translatable="yes">Copies</property>
+                                    <property name="halign">1</property>
+                                    <property name="valign">3</property>
+                                    <property name="label" translatable="1">Copies</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"></attribute>
                                     </attributes>
@@ -299,9 +297,9 @@
                                     <property name="column-spacing">12</property>
                                     <child>
                                       <object class="GtkLabel" id="label4">
-                                        <property name="halign">start</property>
-                                        <property name="valign">baseline</property>
-                                        <property name="label" translatable="yes">Copie_s:</property>
+                                        <property name="halign">1</property>
+                                        <property name="valign">4</property>
+                                        <property name="label" translatable="1">Copie_s:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">copies_spin</property>
                                         <layout>
@@ -312,7 +310,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkSpinButton" id="copies_spin">
-                                        <property name="valign">baseline</property>
+                                        <property name="valign">4</property>
                                         <property name="adjustment">copies_spin_adjustment</property>
                                         <signal name="changed" handler="update_dialog_from_capabilities" object="GtkPrintUnixDialog" swapped="yes"/>
                                         <signal name="value-changed" handler="update_dialog_from_capabilities" object="GtkPrintUnixDialog" swapped="yes"/>
@@ -324,7 +322,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="collate_check">
-                                        <property name="label" translatable="yes">C_ollate</property>
+                                        <property name="label" translatable="1">C_ollate</property>
                                         <property name="use-underline">1</property>
                                         <signal name="toggled" handler="update_collate_icon" swapped="no"/>
                                         <layout>
@@ -335,7 +333,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="reverse_check">
-                                        <property name="label" translatable="yes">_Reverse</property>
+                                        <property name="label" translatable="1">_Reverse</property>
                                         <property name="use-underline">1</property>
                                         <signal name="toggled" handler="update_collate_icon" swapped="no"/>
                                         <layout>
@@ -365,7 +363,7 @@
                     </property>
                     <property name="tab">
                       <object class="GtkLabel" id="label1">
-                        <property name="label" translatable="yes">General</property>
+                        <property name="label" translatable="1">General</property>
                       </object>
                     </property>
                   </object>
@@ -374,7 +372,7 @@
                   <object class="GtkNotebookPage">
                     <property name="child">
                       <object class="GtkBox" id="page_setup_main_box">
-                        <property name="orientation">vertical</property>
+                        <property name="orientation">1</property>
                         <property name="spacing">18</property>
                         <property name="margin-start">12</property>
                         <property name="margin-end">12</property>
@@ -385,14 +383,14 @@
                             <property name="spacing">18</property>
                             <child>
                               <object class="GtkBox" id="frame_template3">
-                                <property name="orientation">vertical</property>
+                                <property name="orientation">1</property>
                                 <property name="spacing">6</property>
                                 <property name="hexpand">1</property>
                                 <child>
                                   <object class="GtkLabel" id="label_widget3">
-                                    <property name="halign">start</property>
-                                    <property name="valign">center</property>
-                                    <property name="label" translatable="yes">Layout</property>
+                                    <property name="halign">1</property>
+                                    <property name="valign">3</property>
+                                    <property name="label" translatable="1">Layout</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"></attribute>
                                     </attributes>
@@ -405,9 +403,9 @@
                                     <property name="column-spacing">12</property>
                                     <child>
                                       <object class="GtkLabel" id="label5">
-                                        <property name="halign">start</property>
-                                        <property name="valign">baseline</property>
-                                        <property name="label" translatable="yes">T_wo-sided:</property>
+                                        <property name="halign">1</property>
+                                        <property name="valign">4</property>
+                                        <property name="label" translatable="1">T_wo-sided:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">duplex</property>
                                         <layout>
@@ -418,7 +416,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkPrinterOptionWidget" id="duplex">
-                                        <property name="valign">baseline</property>
+                                        <property name="valign">4</property>
                                         <layout>
                                           <property name="column">1</property>
                                           <property name="row">0</property>
@@ -427,9 +425,9 @@
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label6">
-                                        <property name="halign">start</property>
-                                        <property name="valign">baseline</property>
-                                        <property name="label" translatable="yes">Pages per _side:</property>
+                                        <property name="halign">1</property>
+                                        <property name="valign">4</property>
+                                        <property name="label" translatable="1">Pages per _side:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">pages_per_sheet</property>
                                         <layout>
@@ -440,7 +438,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkPrinterOptionWidget" id="pages_per_sheet">
-                                        <property name="valign">baseline</property>
+                                        <property name="valign">4</property>
                                         <signal name="changed" handler="redraw_page_layout_preview" object="GtkPrintUnixDialog" swapped="yes"/>
                                         <signal name="changed" handler="update_number_up_layout" object="GtkPrintUnixDialog" swapped="yes"/>
                                         <layout>
@@ -451,9 +449,9 @@
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label7">
-                                        <property name="halign">start</property>
-                                        <property name="valign">baseline</property>
-                                        <property name="label" translatable="yes">Page or_dering:</property>
+                                        <property name="halign">1</property>
+                                        <property name="valign">4</property>
+                                        <property name="label" translatable="1">Page or_dering:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">number_up_layout</property>
                                         <layout>
@@ -464,7 +462,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkPrinterOptionWidget" id="number_up_layout">
-                                        <property name="valign">baseline</property>
+                                        <property name="valign">4</property>
                                         <signal name="changed" handler="redraw_page_layout_preview" object="GtkPrintUnixDialog" swapped="yes"/>
                                         <layout>
                                           <property name="column">1</property>
@@ -474,9 +472,9 @@
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label8">
-                                        <property name="halign">start</property>
-                                        <property name="valign">baseline</property>
-                                        <property name="label" translatable="yes">_Only print:</property>
+                                        <property name="halign">1</property>
+                                        <property name="valign">4</property>
+                                        <property name="label" translatable="1">_Only print:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">page_set_combo</property>
                                         <layout>
@@ -487,7 +485,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkDropDown" id="page_set_combo">
-                                        <property name="valign">baseline</property>
+                                        <property name="valign">4</property>
                                         <property name="selected">0</property>
                                         <property name="model">
                                           <object class="GtkStringList">
@@ -506,9 +504,9 @@
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label9">
-                                        <property name="halign">start</property>
-                                        <property name="valign">baseline</property>
-                                        <property name="label" translatable="yes">Sc_ale:</property>
+                                        <property name="halign">1</property>
+                                        <property name="valign">4</property>
+                                        <property name="label" translatable="1">Sc_ale:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">scale_spin</property>
                                         <layout>
@@ -520,17 +518,17 @@
                                     <child>
                                       <object class="GtkBox" id="box5">
                                         <property name="spacing">6</property>
-                                        <property name="valign">baseline</property>
+                                        <property name="valign">4</property>
                                         <child>
                                           <object class="GtkSpinButton" id="scale_spin">
-                                            <property name="valign">baseline</property>
+                                            <property name="valign">4</property>
                                             <property name="adjustment">scale_spin_adjustment</property>
                                             <property name="digits">1</property>
                                           </object>
                                         </child>
                                         <child>
                                           <object class="GtkLabel" id="label10">
-                                            <property name="valign">baseline</property>
+                                            <property name="valign">4</property>
                                             <property name="label">%</property>
                                           </object>
                                         </child>
@@ -546,14 +544,14 @@
                             </child>
                             <child>
                               <object class="GtkBox" id="frame_template4">
-                                <property name="orientation">vertical</property>
+                                <property name="orientation">1</property>
                                 <property name="spacing">6</property>
                                 <property name="hexpand">1</property>
                                 <child>
                                   <object class="GtkLabel" id="label_widget4">
-                                    <property name="halign">start</property>
-                                    <property name="valign">center</property>
-                                    <property name="label" translatable="yes">Paper</property>
+                                    <property name="halign">1</property>
+                                    <property name="valign">3</property>
+                                    <property name="label" translatable="1">Paper</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"></attribute>
                                     </attributes>
@@ -566,9 +564,9 @@
                                     <property name="column-spacing">12</property>
                                     <child>
                                       <object class="GtkLabel" id="label11">
-                                        <property name="halign">start</property>
-                                        <property name="valign">baseline</property>
-                                        <property name="label" translatable="yes">Paper _type:</property>
+                                        <property name="halign">1</property>
+                                        <property name="valign">4</property>
+                                        <property name="label" translatable="1">Paper _type:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">paper_type</property>
                                         <layout>
@@ -579,7 +577,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkPrinterOptionWidget" id="paper_type">
-                                        <property name="valign">baseline</property>
+                                        <property name="valign">4</property>
                                         <layout>
                                           <property name="column">1</property>
                                           <property name="row">0</property>
@@ -588,9 +586,9 @@
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label12">
-                                        <property name="halign">start</property>
-                                        <property name="valign">baseline</property>
-                                        <property name="label" translatable="yes">Paper _source:</property>
+                                        <property name="halign">1</property>
+                                        <property name="valign">4</property>
+                                        <property name="label" translatable="1">Paper _source:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">paper_source</property>
                                         <layout>
@@ -601,7 +599,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkPrinterOptionWidget" id="paper_source">
-                                        <property name="valign">baseline</property>
+                                        <property name="valign">4</property>
                                         <layout>
                                           <property name="column">1</property>
                                           <property name="row">1</property>
@@ -610,9 +608,9 @@
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label13">
-                                        <property name="halign">start</property>
-                                        <property name="valign">baseline</property>
-                                        <property name="label" translatable="yes">Output t_ray:</property>
+                                        <property name="halign">1</property>
+                                        <property name="valign">4</property>
+                                        <property name="label" translatable="1">Output t_ray:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">output_tray</property>
                                         <layout>
@@ -623,7 +621,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkPrinterOptionWidget" id="output_tray">
-                                        <property name="valign">baseline</property>
+                                        <property name="valign">4</property>
                                         <layout>
                                           <property name="column">1</property>
                                           <property name="row">2</property>
@@ -632,9 +630,9 @@
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="paper_size_combo_label">
-                                        <property name="halign">start</property>
-                                        <property name="valign">baseline</property>
-                                        <property name="label" translatable="yes">_Paper size:</property>
+                                        <property name="halign">1</property>
+                                        <property name="valign">4</property>
+                                        <property name="label" translatable="1">_Paper size:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">paper_size_combo</property>
                                         <layout>
@@ -646,7 +644,7 @@
                                     <child>
                                       <object class="GtkDropDown" id="paper_size_combo">
                                         <property name="sensitive">0</property>
-                                        <property name="valign">baseline</property>
+                                        <property name="valign">4</property>
                                         <layout>
                                           <property name="column">1</property>
                                           <property name="row">3</property>
@@ -655,9 +653,9 @@
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="orientation_combo_label">
-                                        <property name="halign">start</property>
-                                        <property name="valign">baseline</property>
-                                        <property name="label" translatable="yes">Or_ientation:</property>
+                                        <property name="halign">1</property>
+                                        <property name="valign">4</property>
+                                        <property name="label" translatable="1">Or_ientation:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">orientation_combo</property>
                                         <layout>
@@ -670,7 +668,7 @@
                                       <object class="GtkDropDown" id="orientation_combo">
                                         <property name="sensitive">0</property>
                                         <property name="selected">0</property>
-                                        <property name="valign">baseline</property>
+                                        <property name="valign">4</property>
                                         <property name="model">
                                           <object class="GtkStringList">
                                             <items>
@@ -708,7 +706,7 @@
                     </property>
                     <property name="tab">
                       <object class="GtkLabel" id="label2">
-                        <property name="label" translatable="yes">Page Setup</property>
+                        <property name="label" translatable="1">Page Setup</property>
                       </object>
                     </property>
                   </object>
@@ -725,13 +723,13 @@
                         <property name="margin-bottom">12</property>
                         <child>
                           <object class="GtkBox" id="frame_template5">
-                            <property name="orientation">vertical</property>
+                            <property name="orientation">1</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkLabel" id="label_widget5">
-                                <property name="halign">start</property>
-                                <property name="valign">center</property>
-                                <property name="label" translatable="yes">Job Details</property>
+                                <property name="halign">1</property>
+                                <property name="valign">3</property>
+                                <property name="label" translatable="1">Job Details</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"></attribute>
                                 </attributes>
@@ -744,9 +742,9 @@
                                 <property name="column-spacing">12</property>
                                 <child>
                                   <object class="GtkLabel" id="label16">
-                                    <property name="halign">start</property>
-                                    <property name="valign">center</property>
-                                    <property name="label" translatable="yes">Pri_ority:</property>
+                                    <property name="halign">1</property>
+                                    <property name="valign">3</property>
+                                    <property name="label" translatable="1">Pri_ority:</property>
                                     <property name="use-underline">1</property>
                                     <property name="mnemonic-widget">job_prio</property>
                                     <layout>
@@ -765,9 +763,9 @@
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label17">
-                                    <property name="halign">start</property>
-                                    <property name="valign">center</property>
-                                    <property name="label" translatable="yes">_Billing info:</property>
+                                    <property name="halign">1</property>
+                                    <property name="valign">3</property>
+                                    <property name="label" translatable="1">_Billing info:</property>
                                     <property name="use-underline">1</property>
                                     <property name="mnemonic-widget">billing_info</property>
                                     <layout>
@@ -794,13 +792,13 @@
                         </child>
                         <child>
                           <object class="GtkBox" id="frame_template6">
-                            <property name="orientation">vertical</property>
+                            <property name="orientation">1</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkLabel" id="label_widget6">
-                                <property name="halign">start</property>
-                                <property name="valign">center</property>
-                                <property name="label" translatable="yes">Print Document</property>
+                                <property name="halign">1</property>
+                                <property name="valign">3</property>
+                                <property name="label" translatable="1">Print Document</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"></attribute>
                                 </attributes>
@@ -813,7 +811,7 @@
                                 <property name="column-spacing">12</property>
                                 <child>
                                   <object class="GtkCheckButton" id="print_now_radio">
-                                    <property name="label" translatable="yes" comments="this is one of the choices for the print at option in the print dialog">_Now</property>
+                                    <property name="label" translatable="1" comments="this is one of the choices for the print at option in the print dialog">_Now</property>
                                     <property name="use-underline">1</property>
                                     <property name="active">1</property>
                                     <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
@@ -827,11 +825,11 @@
                                 <child>
                                   <object class="GtkCheckButton" id="print_at_radio">
                                     <property name="sensitive">0</property>
-                                    <property name="label" translatable="yes" comments="this is one of the choices for the print at option in the print dialog. It also serves as the label for an entry that allows the user to enter a time.">A_t:</property>
+                                    <property name="label" translatable="1" comments="this is one of the choices for the print at option in the print dialog. It also serves as the label for an entry that allows the user to enter a time.">A_t:</property>
                                     <property name="has-tooltip">1</property>
-                                    <property name="tooltip-markup" translatable="yes">Specify the time of print,
+                                    <property name="tooltip-markup" translatable="1">Specify the time of print,
  e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
-                                    <property name="tooltip-text" translatable="yes" comments="Ability to parse the am/pm format depends on actual locale. You can remove the am/pm values below for your locale if they are not supported.">Specify the time of print,
+                                    <property name="tooltip-text" translatable="1" comments="Ability to parse the am/pm format depends on actual locale. You can remove the am/pm values below for your locale if they are not supported.">Specify the time of print,
  e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
                                     <property name="use-underline">1</property>
                                     <property name="group">print_now_radio</property>
@@ -847,9 +845,9 @@
                                   <object class="GtkEntry" id="print_at_entry">
                                     <property name="sensitive">0</property>
                                     <property name="has-tooltip">1</property>
-                                    <property name="tooltip-markup" translatable="yes">Specify the time of print,
+                                    <property name="tooltip-markup" translatable="1">Specify the time of print,
  e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
-                                    <property name="tooltip-text" translatable="yes" comments="Ability to parse the am/pm format depends on actual locale. You can remove the am/pm values below for your locale if they are not supported.">Specify the time of print,
+                                    <property name="tooltip-text" translatable="1" comments="Ability to parse the am/pm format depends on actual locale. You can remove the am/pm values below for your locale if they are not supported.">Specify the time of print,
  e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
                                     <signal name="changed" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
                                     <layout>
@@ -861,10 +859,10 @@
                                 <child>
                                   <object class="GtkCheckButton" id="print_hold_radio">
                                     <property name="sensitive">0</property>
-                                    <property name="label" translatable="yes" comments="this is one of the choices for the print at option in the print dialog. It means that the print job will not be printed until it explicitly gets &apos;released&apos;.">On _hold</property>
+                                    <property name="label" translatable="1" comments="this is one of the choices for the print at option in the print dialog. It means that the print job will not be printed until it explicitly gets &apos;released&apos;.">On _hold</property>
                                     <property name="has-tooltip">1</property>
-                                    <property name="tooltip-markup" translatable="yes">Hold the job until it is explicitly released</property>
-                                    <property name="tooltip-text" translatable="yes">Hold the job until it is explicitly released</property>
+                                    <property name="tooltip-markup" translatable="1">Hold the job until it is explicitly released</property>
+                                    <property name="tooltip-text" translatable="1">Hold the job until it is explicitly released</property>
                                     <property name="use-underline">1</property>
                                     <property name="group">print_now_radio</property>
                                     <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
@@ -885,13 +883,13 @@
                         </child>
                         <child>
                           <object class="GtkBox" id="frame_template7">
-                            <property name="orientation">vertical</property>
+                            <property name="orientation">1</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkLabel" id="label_widget7">
-                                <property name="halign">start</property>
-                                <property name="valign">center</property>
-                                <property name="label" translatable="yes">Add Cover Page</property>
+                                <property name="halign">1</property>
+                                <property name="valign">3</property>
+                                <property name="label" translatable="1">Add Cover Page</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"></attribute>
                                 </attributes>
@@ -904,9 +902,9 @@
                                 <property name="column-spacing">12</property>
                                 <child>
                                   <object class="GtkLabel" id="label18">
-                                    <property name="halign">start</property>
-                                    <property name="valign">center</property>
-                                    <property name="label" translatable="yes" comments="this is the label used for the option in the print dialog that controls the front cover page.">Be_fore:</property>
+                                    <property name="halign">1</property>
+                                    <property name="valign">3</property>
+                                    <property name="label" translatable="1" comments="this is the label used for the option in the print dialog that controls the front cover page.">Be_fore:</property>
                                     <property name="use-underline">1</property>
                                     <property name="mnemonic-widget">cover_before</property>
                                     <layout>
@@ -925,9 +923,9 @@
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label19">
-                                    <property name="halign">start</property>
-                                    <property name="valign">center</property>
-                                    <property name="label" translatable="yes" comments="this is the label used for the option in the print dialog that controls the back cover page.">_After:</property>
+                                    <property name="halign">1</property>
+                                    <property name="valign">3</property>
+                                    <property name="label" translatable="1" comments="this is the label used for the option in the print dialog that controls the back cover page.">_After:</property>
                                     <property name="use-underline">1</property>
                                     <property name="mnemonic-widget">cover_after</property>
                                     <layout>
@@ -956,7 +954,7 @@
                     </property>
                     <property name="tab">
                       <object class="GtkLabel" id="label3">
-                        <property name="label" translatable="yes">Job</property>
+                        <property name="label" translatable="1">Job</property>
                       </object>
                     </property>
                   </object>
@@ -966,7 +964,7 @@
                     <property name="position">3</property>
                     <property name="child">
                       <object class="GtkScrolledWindow" id="image_quality_page">
-                        <property name="hscrollbar-policy">never</property>
+                        <property name="hscrollbar-policy">2</property>
                         <property name="hexpand">1</property>
                         <child>
                           <object class="GtkViewport" id="viewport1">
@@ -986,7 +984,7 @@
                     </property>
                     <property name="tab">
                       <object class="GtkLabel" id="label20">
-                        <property name="label" translatable="yes" comments="This will appear as a tab label in the print dialog.">Image Quality</property>
+                        <property name="label" translatable="1" comments="This will appear as a tab label in the print dialog.">Image Quality</property>
                       </object>
                     </property>
                   </object>
@@ -996,7 +994,7 @@
                     <property name="position">4</property>
                     <property name="child">
                       <object class="GtkScrolledWindow" id="color_page">
-                        <property name="hscrollbar-policy">never</property>
+                        <property name="hscrollbar-policy">2</property>
                         <child>
                           <object class="GtkViewport" id="viewport2">
                             <child>
@@ -1015,7 +1013,7 @@
                     </property>
                     <property name="tab">
                       <object class="GtkLabel" id="label21">
-                        <property name="label" translatable="yes" comments="This will appear as a tab label in the print dialog.">Color</property>
+                        <property name="label" translatable="1" comments="This will appear as a tab label in the print dialog.">Color</property>
                       </object>
                     </property>
                   </object>
@@ -1025,7 +1023,7 @@
                     <property name="position">5</property>
                     <property name="child">
                       <object class="GtkScrolledWindow" id="finishing_page">
-                        <property name="hscrollbar-policy">never</property>
+                        <property name="hscrollbar-policy">2</property>
                         <child>
                           <object class="GtkViewport" id="viewport3">
                             <child>
@@ -1044,7 +1042,7 @@
                     </property>
                     <property name="tab">
                       <object class="GtkLabel" id="label22">
-                        <property name="label" translatable="yes" comments="This will appear as a tab label in the print dialog. It&apos;s a typographical term, as in &quot;Binding and finishing&quot;">Finishing</property>
+                        <property name="label" translatable="1" comments="This will appear as a tab label in the print dialog. It&apos;s a typographical term, as in &quot;Binding and finishing&quot;">Finishing</property>
                       </object>
                     </property>
                   </object>
@@ -1054,12 +1052,12 @@
                     <property name="position">6</property>
                     <property name="child">
                       <object class="GtkScrolledWindow" id="advanced_page">
-                        <property name="hscrollbar-policy">never</property>
+                        <property name="hscrollbar-policy">2</property>
                         <child>
                           <object class="GtkViewport" id="viewport4">
                             <child>
                               <object class="GtkBox" id="advanced_vbox">
-                                <property name="orientation">vertical</property>
+                                <property name="orientation">1</property>
                                 <property name="spacing">18</property>
                                 <property name="margin-start">12</property>
                                 <property name="margin-end">12</property>
@@ -1073,7 +1071,7 @@
                     </property>
                     <property name="tab">
                       <object class="GtkLabel" id="label23">
-                        <property name="label" translatable="yes">Advanced</property>
+                        <property name="label" translatable="1">Advanced</property>
                       </object>
                     </property>
                   </object>
@@ -1089,7 +1087,7 @@
                 </child>
                 <child>
                   <object class="GtkLabel" id="label24">
-                    <property name="label" translatable="yes">Some of the settings in the dialog conflict</property>
+                    <property name="label" translatable="1">Some of the settings in the dialog conflict</property>
                   </object>
                 </child>
               </object>
diff --git a/gtk/ui/gtkscalebutton.ui b/gtk/ui/gtkscalebutton.ui
index f95045e62d..92bfb41dfc 100644
--- a/gtk/ui/gtkscalebutton.ui
+++ b/gtk/ui/gtkscalebutton.ui
@@ -17,7 +17,7 @@
     </style>
     <child>
       <object class="GtkBox" id="box">
-        <property name="orientation">vertical</property>
+        <property name="orientation">1</property>
         <property name="margin-start">4</property>
         <property name="margin-end">4</property>
         <property name="margin-top">4</property>
@@ -27,8 +27,8 @@
           <object class="GtkButton" id="plus_button">
             <property name="receives-default">1</property>
             <property name="has-frame">0</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
+            <property name="halign">3</property>
+            <property name="valign">3</property>
             <property name="icon-name">list-add-symbolic</property>
             <signal name="clicked" handler="cb_button_clicked" swapped="no"/>
           </object>
@@ -36,10 +36,9 @@
         <child>
           <object class="GtkScale" id="scale">
             <property name="height-request">100</property>
-            <property name="orientation">vertical</property>
+            <property name="orientation">1</property>
             <property name="inverted">1</property>
             <property name="round-digits">1</property>
-            <property name="draw-value">0</property>
             <signal name="value-changed" handler="cb_scale_value_changed" swapped="no"/>
           </object>
         </child>
@@ -47,8 +46,8 @@
           <object class="GtkButton" id="minus_button">
             <property name="receives-default">1</property>
             <property name="has-frame">0</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
+            <property name="halign">3</property>
+            <property name="valign">3</property>
             <property name="icon-name">list-remove-symbolic</property>
             <signal name="clicked" handler="cb_button_clicked" swapped="no"/>
           </object>
diff --git a/gtk/ui/gtksidebarrow.ui b/gtk/ui/gtksidebarrow.ui
index 787a478276..c11baec314 100644
--- a/gtk/ui/gtksidebarrow.ui
+++ b/gtk/ui/gtksidebarrow.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkSidebarRow" parent="GtkListBoxRow">
-    <property name="focus-on-click">False</property>
+    <property name="focus-on-click">0</property>
     <style>
       <class name="sidebar-row"/>
     </style>
@@ -34,8 +34,8 @@
               <object class="GtkImage" id="end_icon_widget">
                 <property name="visible">0</property>
                 <property name="hexpand">1</property>
-                <property name="halign">end</property>
-                <property name="valign">center</property>
+                <property name="halign">2</property>
+                <property name="valign">3</property>
                 <style>
                   <class name="sidebar-icon"/>
                 </style>
@@ -43,11 +43,11 @@
             </child>
             <child>
               <object class="GtkButton" id="eject_button">
-                <property name="halign">center</property>
-                <property name="valign">center</property>
+                <property name="halign">3</property>
+                <property name="valign">3</property>
                 <property name="margin-start">4px</property>
                 <property name="icon-name">media-eject-symbolic</property>
-                <property name="tooltip-text" translatable="yes">Unmount</property>
+                <property name="tooltip-text" translatable="1">Unmount</property>
                 <style>
                   <class name="sidebar-button"/>
                 </style>
@@ -56,8 +56,8 @@
             <child>
               <object class="GtkSpinner" id="busy_spinner">
                 <property name="spinning">1</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
+                <property name="halign">3</property>
+                <property name="valign">3</property>
                 <property name="margin-start">4px</property>
                 <property name="visible">0</property>
               </object>
diff --git a/gtk/ui/gtkstatusbar.ui b/gtk/ui/gtkstatusbar.ui
index 86a8148d3c..a50e2d3d6c 100644
--- a/gtk/ui/gtkstatusbar.ui
+++ b/gtk/ui/gtkstatusbar.ui
@@ -7,9 +7,9 @@
         <property name="spacing">4</property>
         <child>
           <object class="GtkLabel" id="label">
-            <property name="halign">start</property>
-            <property name="valign">center</property>
-            <property name="ellipsize">end</property>
+            <property name="halign">1</property>
+            <property name="valign">3</property>
+            <property name="ellipsize">3</property>
             <property name="single-line-mode">1</property>
           </object>
         </child>
diff --git a/gtk/ui/gtkvideo.ui b/gtk/ui/gtkvideo.ui
index ce70bb6e23..94ee866107 100644
--- a/gtk/ui/gtkvideo.ui
+++ b/gtk/ui/gtkvideo.ui
@@ -12,10 +12,10 @@
               <class name="osd"/>
               <class name="circular"/>
             </style>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
+            <property name="halign">3</property>
+            <property name="valign">3</property>
             <property name="icon-name">media-playback-start-symbolic</property>
-            <property name="icon-size">large</property>
+            <property name="icon-size">2</property>
             <layout>
               <property name="measure">1</property>
             </layout>
@@ -23,8 +23,8 @@
         </child>
         <child type="overlay">
           <object class="GtkRevealer" id="controls_revealer">
-            <property name="valign">end</property>
-            <property name="transition-type">crossfade</property>
+            <property name="valign">2</property>
+            <property name="transition-type">1</property>
             <child>
               <object class="GtkMediaControls" id="controls">
                 <style>
diff --git a/gtk/ui/gtkvolumebutton.ui b/gtk/ui/gtkvolumebutton.ui
index 7b065d251e..4180574c90 100644
--- a/gtk/ui/gtkvolumebutton.ui
+++ b/gtk/ui/gtkvolumebutton.ui
@@ -16,12 +16,10 @@ audio-volume-medium</property>
     <signal name="query-tooltip" handler="cb_query_tooltip" swapped="no"/>
     <signal name="value-changed" handler="cb_value_changed" swapped="no"/>
     <child internal-child="plus_button">
-      <object class="GtkButton" id="scalebutton-plus_button1">
-      </object>
+      <object class="GtkButton" id="scalebutton-plus_button1"/>
     </child>
     <child internal-child="minus_button">
-      <object class="GtkButton" id="scalebutton-minus_button1">
-      </object>
+      <object class="GtkButton" id="scalebutton-minus_button1"/>
     </child>
   </template>
 </interface>