diff --git a/testsuite/reftests/721800-0px-dotted-border.ref.ui b/testsuite/reftests/721800-0px-dotted-border.ref.ui
index 56115658fe..4ada156fa2 100644
--- a/testsuite/reftests/721800-0px-dotted-border.ref.ui
+++ b/testsuite/reftests/721800-0px-dotted-border.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">Hello World</property>
diff --git a/testsuite/reftests/721800-0px-dotted-border.ui b/testsuite/reftests/721800-0px-dotted-border.ui
index 0da0e9de66..c9fc7fe6ad 100644
--- a/testsuite/reftests/721800-0px-dotted-border.ui
+++ b/testsuite/reftests/721800-0px-dotted-border.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">Hello World</property>
diff --git a/testsuite/reftests/actionbar.ref.ui b/testsuite/reftests/actionbar.ref.ui
index f92771d949..a662d72dc9 100644
--- a/testsuite/reftests/actionbar.ref.ui
+++ b/testsuite/reftests/actionbar.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox">
         <child>
diff --git a/testsuite/reftests/actionbar.ui b/testsuite/reftests/actionbar.ui
index 064d90e143..3b90924939 100644
--- a/testsuite/reftests/actionbar.ui
+++ b/testsuite/reftests/actionbar.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkActionBar">
         <child type="start">
diff --git a/testsuite/reftests/align-expand.sh b/testsuite/reftests/align-expand.sh
index b635f84707..adcd946dd4 100755
--- a/testsuite/reftests/align-expand.sh
+++ b/testsuite/reftests/align-expand.sh
@@ -30,7 +30,7 @@ cat << EOF
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window">
     <property name="can_focus">False</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid">
         <property name="visible">True</property>
diff --git a/testsuite/reftests/animation-direction.ref.ui b/testsuite/reftests/animation-direction.ref.ui
index abcd7d641e..96bc47509d 100644
--- a/testsuite/reftests/animation-direction.ref.ui
+++ b/testsuite/reftests/animation-direction.ref.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="column_spacing">2</property>
diff --git a/testsuite/reftests/animation-direction.ui b/testsuite/reftests/animation-direction.ui
index 3cc6672287..ad6880339c 100644
--- a/testsuite/reftests/animation-direction.ui
+++ b/testsuite/reftests/animation-direction.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="column_spacing">2</property>
diff --git a/testsuite/reftests/background-area.ref.ui b/testsuite/reftests/background-area.ref.ui
index 33789a1040..a9299f4346 100644
--- a/testsuite/reftests/background-area.ref.ui
+++ b/testsuite/reftests/background-area.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/background-area.ui b/testsuite/reftests/background-area.ui
index f4b96de1d4..8d668c71fc 100644
--- a/testsuite/reftests/background-area.ui
+++ b/testsuite/reftests/background-area.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/background-blend-mode-clip-interaction.ref.ui b/testsuite/reftests/background-blend-mode-clip-interaction.ref.ui
index d8e47d84e3..5776a26ba3 100644
--- a/testsuite/reftests/background-blend-mode-clip-interaction.ref.ui
+++ b/testsuite/reftests/background-blend-mode-clip-interaction.ref.ui
@@ -3,7 +3,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">50</property>
     <property name="height_request">50</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="name">reference</property>
     <child>
       <object class="GtkBox"/>
diff --git a/testsuite/reftests/background-blend-mode-clip-interaction.ui b/testsuite/reftests/background-blend-mode-clip-interaction.ui
index 8b5af4d54e..1f8efff0a4 100644
--- a/testsuite/reftests/background-blend-mode-clip-interaction.ui
+++ b/testsuite/reftests/background-blend-mode-clip-interaction.ui
@@ -3,7 +3,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">50</property>
     <property name="height_request">50</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox"/>
     </child>
diff --git a/testsuite/reftests/background-image-multiple.ref.ui b/testsuite/reftests/background-image-multiple.ref.ui
index 079929abf1..6dec5707fc 100644
--- a/testsuite/reftests/background-image-multiple.ref.ui
+++ b/testsuite/reftests/background-image-multiple.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/background-image-multiple.ui b/testsuite/reftests/background-image-multiple.ui
index b30e02f939..80ba54ffbf 100644
--- a/testsuite/reftests/background-image-multiple.ui
+++ b/testsuite/reftests/background-image-multiple.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/background-origin.ref.ui b/testsuite/reftests/background-origin.ref.ui
index bb9080172a..3bcf4e2b84 100644
--- a/testsuite/reftests/background-origin.ref.ui
+++ b/testsuite/reftests/background-origin.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="width_request">154</property>
     <property name="height_request">680</property>
     <child>
diff --git a/testsuite/reftests/background-origin.ui b/testsuite/reftests/background-origin.ui
index 061c285cb1..9c9318b0c9 100644
--- a/testsuite/reftests/background-origin.ui
+++ b/testsuite/reftests/background-origin.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/background-position-repeat.ref.ui b/testsuite/reftests/background-position-repeat.ref.ui
index 399e9b34a4..9e12372511 100644
--- a/testsuite/reftests/background-position-repeat.ref.ui
+++ b/testsuite/reftests/background-position-repeat.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkButton" id="button1_ref">
         <property name="name">button1_ref</property>
diff --git a/testsuite/reftests/background-position-repeat.ui b/testsuite/reftests/background-position-repeat.ui
index 28c855bcba..1cf71f8d06 100644
--- a/testsuite/reftests/background-position-repeat.ui
+++ b/testsuite/reftests/background-position-repeat.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">button1</property>
diff --git a/testsuite/reftests/background-position-simple.ref.ui b/testsuite/reftests/background-position-simple.ref.ui
index 73a6a91297..55d9c45315 100644
--- a/testsuite/reftests/background-position-simple.ref.ui
+++ b/testsuite/reftests/background-position-simple.ref.ui
@@ -4,7 +4,7 @@
     <property name="name">reference</property>
     <property name="width_request">40</property>
     <property name="height_request">40</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <placeholder/>
     </child>
diff --git a/testsuite/reftests/background-position-simple.ui b/testsuite/reftests/background-position-simple.ui
index a15b766c8b..dd664e1e73 100644
--- a/testsuite/reftests/background-position-simple.ui
+++ b/testsuite/reftests/background-position-simple.ui
@@ -3,7 +3,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">40</property>
     <property name="height_request">40</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <placeholder/>
     </child>
diff --git a/testsuite/reftests/background-position.ref.ui b/testsuite/reftests/background-position.ref.ui
index d7d6a5c6b7..cdf7258e40 100644
--- a/testsuite/reftests/background-position.ref.ui
+++ b/testsuite/reftests/background-position.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="name">ref</property>
     <child>
       <object class="GtkFixed" id="fixed1">
diff --git a/testsuite/reftests/background-position.ui b/testsuite/reftests/background-position.ui
index cfa5cb1c59..8949ab3688 100644
--- a/testsuite/reftests/background-position.ui
+++ b/testsuite/reftests/background-position.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/background-positioning-area-empty.ref.ui b/testsuite/reftests/background-positioning-area-empty.ref.ui
index 2367e407d9..e08f45f1ba 100644
--- a/testsuite/reftests/background-positioning-area-empty.ref.ui
+++ b/testsuite/reftests/background-positioning-area-empty.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="receives_default">1</property>
diff --git a/testsuite/reftests/background-positioning-area-empty.ui b/testsuite/reftests/background-positioning-area-empty.ui
index 2367e407d9..e08f45f1ba 100644
--- a/testsuite/reftests/background-positioning-area-empty.ui
+++ b/testsuite/reftests/background-positioning-area-empty.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="receives_default">1</property>
diff --git a/testsuite/reftests/background-repeat.ref.ui b/testsuite/reftests/background-repeat.ref.ui
index e0bedecf05..58913f65e8 100644
--- a/testsuite/reftests/background-repeat.ref.ui
+++ b/testsuite/reftests/background-repeat.ref.ui
@@ -3,7 +3,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">50</property>
     <property name="height_request">60</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/background-repeat.ui b/testsuite/reftests/background-repeat.ui
index dffc4645bd..a01be2c656 100644
--- a/testsuite/reftests/background-repeat.ui
+++ b/testsuite/reftests/background-repeat.ui
@@ -3,7 +3,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">50</property>
     <property name="height_request">60</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/background-size-keywords.ref.ui b/testsuite/reftests/background-size-keywords.ref.ui
index 397398434e..5cdb90e8bf 100644
--- a/testsuite/reftests/background-size-keywords.ref.ui
+++ b/testsuite/reftests/background-size-keywords.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/background-size-keywords.ui b/testsuite/reftests/background-size-keywords.ui
index d6acd4e05e..38a41cfb78 100644
--- a/testsuite/reftests/background-size-keywords.ui
+++ b/testsuite/reftests/background-size-keywords.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/background-size-zero.ref.ui b/testsuite/reftests/background-size-zero.ref.ui
index 5cb0e82ca6..955e256835 100644
--- a/testsuite/reftests/background-size-zero.ref.ui
+++ b/testsuite/reftests/background-size-zero.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="name">reference</property>
     <child>
       <placeholder/>
diff --git a/testsuite/reftests/background-size-zero.ui b/testsuite/reftests/background-size-zero.ui
index ec70764dc3..6c4305beae 100644
--- a/testsuite/reftests/background-size-zero.ui
+++ b/testsuite/reftests/background-size-zero.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <placeholder/>
     </child>
diff --git a/testsuite/reftests/background-size.ref.ui b/testsuite/reftests/background-size.ref.ui
index 3fe2e2f29e..5f327c40b6 100644
--- a/testsuite/reftests/background-size.ref.ui
+++ b/testsuite/reftests/background-size.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/background-size.ui b/testsuite/reftests/background-size.ui
index 5fd91c028c..aeb5bca537 100644
--- a/testsuite/reftests/background-size.ui
+++ b/testsuite/reftests/background-size.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/background-window-transparent.ref.ui b/testsuite/reftests/background-window-transparent.ref.ui
index 62011eb05c..1c40adb507 100644
--- a/testsuite/reftests/background-window-transparent.ref.ui
+++ b/testsuite/reftests/background-window-transparent.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="name">reference</property>
     <child>
       <object class="GtkViewport" id="viewport1">
diff --git a/testsuite/reftests/background-window-transparent.ui b/testsuite/reftests/background-window-transparent.ui
index 9b4f1d07ed..e019b118df 100644
--- a/testsuite/reftests/background-window-transparent.ui
+++ b/testsuite/reftests/background-window-transparent.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkViewport" id="viewport1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/bad-color-names.ref.ui b/testsuite/reftests/bad-color-names.ref.ui
index 297844bb36..3c0e77e927 100644
--- a/testsuite/reftests/bad-color-names.ref.ui
+++ b/testsuite/reftests/bad-color-names.ref.ui
@@ -3,6 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/bad-color-names.ui b/testsuite/reftests/bad-color-names.ui
index 297844bb36..3c0e77e927 100644
--- a/testsuite/reftests/bad-color-names.ui
+++ b/testsuite/reftests/bad-color-names.ui
@@ -3,6 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/border-color-default.ref.ui b/testsuite/reftests/border-color-default.ref.ui
index c4e75901a2..a05366b380 100644
--- a/testsuite/reftests/border-color-default.ref.ui
+++ b/testsuite/reftests/border-color-default.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/border-color-default.ui b/testsuite/reftests/border-color-default.ui
index 5171539c74..4a32ca0378 100644
--- a/testsuite/reftests/border-color-default.ui
+++ b/testsuite/reftests/border-color-default.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/border-corner-zero-width-rendering.ref.ui b/testsuite/reftests/border-corner-zero-width-rendering.ref.ui
index df0ac760ae..dc2b636d9b 100644
--- a/testsuite/reftests/border-corner-zero-width-rendering.ref.ui
+++ b/testsuite/reftests/border-corner-zero-width-rendering.ref.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/border-corner-zero-width-rendering.ui b/testsuite/reftests/border-corner-zero-width-rendering.ui
index 51f3df159a..2bc861851e 100644
--- a/testsuite/reftests/border-corner-zero-width-rendering.ui
+++ b/testsuite/reftests/border-corner-zero-width-rendering.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/border-half-pixel.ref.ui b/testsuite/reftests/border-half-pixel.ref.ui
index c4e75901a2..a05366b380 100644
--- a/testsuite/reftests/border-half-pixel.ref.ui
+++ b/testsuite/reftests/border-half-pixel.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/border-half-pixel.ui b/testsuite/reftests/border-half-pixel.ui
index 5171539c74..4a32ca0378 100644
--- a/testsuite/reftests/border-half-pixel.ui
+++ b/testsuite/reftests/border-half-pixel.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/border-image-excess-size.ref.ui b/testsuite/reftests/border-image-excess-size.ref.ui
index 599e809c00..fd0e79e609 100644
--- a/testsuite/reftests/border-image-excess-size.ref.ui
+++ b/testsuite/reftests/border-image-excess-size.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="row_spacing">8</property>
diff --git a/testsuite/reftests/border-image-excess-size.ui b/testsuite/reftests/border-image-excess-size.ui
index 3ea01d36f2..bea2c8f8dc 100644
--- a/testsuite/reftests/border-image-excess-size.ui
+++ b/testsuite/reftests/border-image-excess-size.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox">
         <property name="width_request">10</property>
diff --git a/testsuite/reftests/border-image-url-scaled.ref.ui b/testsuite/reftests/border-image-url-scaled.ref.ui
index 3509cbc830..de67b5d436 100644
--- a/testsuite/reftests/border-image-url-scaled.ref.ui
+++ b/testsuite/reftests/border-image-url-scaled.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/border-image-url-scaled.ui b/testsuite/reftests/border-image-url-scaled.ui
index 4542d594c8..d3cc46db3c 100644
--- a/testsuite/reftests/border-image-url-scaled.ui
+++ b/testsuite/reftests/border-image-url-scaled.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/border-image-url.ref.ui b/testsuite/reftests/border-image-url.ref.ui
index b1464c4ac7..c3bfc84a10 100644
--- a/testsuite/reftests/border-image-url.ref.ui
+++ b/testsuite/reftests/border-image-url.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/border-image-url.ui b/testsuite/reftests/border-image-url.ui
index 4542d594c8..d3cc46db3c 100644
--- a/testsuite/reftests/border-image-url.ui
+++ b/testsuite/reftests/border-image-url.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/border-radius-clamp.ref.ui b/testsuite/reftests/border-radius-clamp.ref.ui
index 1f3fbc4282..00426335fa 100644
--- a/testsuite/reftests/border-radius-clamp.ref.ui
+++ b/testsuite/reftests/border-radius-clamp.ref.ui
@@ -2,7 +2,7 @@
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="name">reference</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkProgressBar" id="progressbar1">
         <property name="width_request">150</property>
diff --git a/testsuite/reftests/border-radius-clamp.ui b/testsuite/reftests/border-radius-clamp.ui
index 481c5508c2..0123885de0 100644
--- a/testsuite/reftests/border-radius-clamp.ui
+++ b/testsuite/reftests/border-radius-clamp.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkProgressBar" id="progressbar1">
         <property name="width_request">150</property>
diff --git a/testsuite/reftests/border-style-none.ref.ui b/testsuite/reftests/border-style-none.ref.ui
index ca4bfdeabd..bb021ed06e 100644
--- a/testsuite/reftests/border-style-none.ref.ui
+++ b/testsuite/reftests/border-style-none.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/border-style-none.ui b/testsuite/reftests/border-style-none.ui
index fc9d598981..24395b16fb 100644
--- a/testsuite/reftests/border-style-none.ui
+++ b/testsuite/reftests/border-style-none.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/border-style.ref.ui b/testsuite/reftests/border-style.ref.ui
index 88556a8377..a3342d0902 100644
--- a/testsuite/reftests/border-style.ref.ui
+++ b/testsuite/reftests/border-style.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/border-style.ui b/testsuite/reftests/border-style.ui
index e3c08e17a9..c3751d4657 100644
--- a/testsuite/reftests/border-style.ui
+++ b/testsuite/reftests/border-style.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/box-order.ref.ui b/testsuite/reftests/box-order.ref.ui
index 7b539bfb85..42a8c35e39 100644
--- a/testsuite/reftests/box-order.ref.ui
+++ b/testsuite/reftests/box-order.ref.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/box-order.ui b/testsuite/reftests/box-order.ui
index 8bf2687da7..27826c4b11 100644
--- a/testsuite/reftests/box-order.ui
+++ b/testsuite/reftests/box-order.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/box-pseudo-classes.ref.ui b/testsuite/reftests/box-pseudo-classes.ref.ui
index acb21faa98..4f207d6a74 100644
--- a/testsuite/reftests/box-pseudo-classes.ref.ui
+++ b/testsuite/reftests/box-pseudo-classes.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/box-pseudo-classes.ui b/testsuite/reftests/box-pseudo-classes.ui
index f458da2795..62096cbe9d 100644
--- a/testsuite/reftests/box-pseudo-classes.ui
+++ b/testsuite/reftests/box-pseudo-classes.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui b/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui
index c18d74d7e6..fbcf495923 100644
--- a/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui
+++ b/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui
@@ -4,7 +4,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="halign">center</property>
diff --git a/testsuite/reftests/box-shadow-changes-modify-clip.ui b/testsuite/reftests/box-shadow-changes-modify-clip.ui
index f69a690560..0913545288 100644
--- a/testsuite/reftests/box-shadow-changes-modify-clip.ui
+++ b/testsuite/reftests/box-shadow-changes-modify-clip.ui
@@ -4,7 +4,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <signal name="map" handler="reftest:inhibit_for_3_frames" swapped="no"/>
     <child>
       <object class="GtkBox" id="box2">
diff --git a/testsuite/reftests/box-shadow-spec-inset.ref.ui b/testsuite/reftests/box-shadow-spec-inset.ref.ui
index 14646a3a4a..9aff2f360f 100644
--- a/testsuite/reftests/box-shadow-spec-inset.ref.ui
+++ b/testsuite/reftests/box-shadow-spec-inset.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="row_spacing">20</property>
diff --git a/testsuite/reftests/box-shadow-spec-inset.ui b/testsuite/reftests/box-shadow-spec-inset.ui
index 3d38e4d42d..f30bad18f9 100644
--- a/testsuite/reftests/box-shadow-spec-inset.ui
+++ b/testsuite/reftests/box-shadow-spec-inset.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="row_spacing">20</property>
diff --git a/testsuite/reftests/box-shadow-spread.ref.ui b/testsuite/reftests/box-shadow-spread.ref.ui
index 826a0dde37..0303ab9ebb 100644
--- a/testsuite/reftests/box-shadow-spread.ref.ui
+++ b/testsuite/reftests/box-shadow-spread.ref.ui
@@ -4,7 +4,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="label" translatable="yes">Hi</property>
diff --git a/testsuite/reftests/box-shadow-spread.ui b/testsuite/reftests/box-shadow-spread.ui
index 9a7384a6a1..216df0d516 100644
--- a/testsuite/reftests/box-shadow-spread.ui
+++ b/testsuite/reftests/box-shadow-spread.ui
@@ -4,7 +4,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="label" translatable="yes">Hi</property>
diff --git a/testsuite/reftests/box-shadow-with-blend-mode.ref.ui b/testsuite/reftests/box-shadow-with-blend-mode.ref.ui
index 6e81666205..6cc3c7e051 100644
--- a/testsuite/reftests/box-shadow-with-blend-mode.ref.ui
+++ b/testsuite/reftests/box-shadow-with-blend-mode.ref.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkButton" id="b">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/box-shadow-with-blend-mode.ui b/testsuite/reftests/box-shadow-with-blend-mode.ui
index 0926699a8c..56573a6a7c 100644
--- a/testsuite/reftests/box-shadow-with-blend-mode.ui
+++ b/testsuite/reftests/box-shadow-with-blend-mode.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkButton" id="b">
         <property name="label" translatable="yes">Hello World!</property>
diff --git a/testsuite/reftests/button-wrapping.ref.ui b/testsuite/reftests/button-wrapping.ref.ui
index 44dc22f0cb..fc75f474f9 100644
--- a/testsuite/reftests/button-wrapping.ref.ui
+++ b/testsuite/reftests/button-wrapping.ref.ui
@@ -3,7 +3,7 @@
   <object class="GtkWindow" id="window1">
     <property name="height_request">500</property>
     <property name="width_request">500</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/button-wrapping.ui b/testsuite/reftests/button-wrapping.ui
index 9e66104984..671be5fdbe 100644
--- a/testsuite/reftests/button-wrapping.ui
+++ b/testsuite/reftests/button-wrapping.ui
@@ -3,7 +3,7 @@
   <object class="GtkWindow" id="window1">
     <property name="height_request">500</property>
     <property name="width_request">500</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/color-transition.ref.ui b/testsuite/reftests/color-transition.ref.ui
index 331350ef6d..15c69be8b5 100644
--- a/testsuite/reftests/color-transition.ref.ui
+++ b/testsuite/reftests/color-transition.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/color-transition.ui b/testsuite/reftests/color-transition.ui
index 715d42c771..363fa1c8e5 100644
--- a/testsuite/reftests/color-transition.ui
+++ b/testsuite/reftests/color-transition.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/cross-fade-syntax.ref.ui b/testsuite/reftests/cross-fade-syntax.ref.ui
index dfbd9d7c59..5aaf669e88 100644
--- a/testsuite/reftests/cross-fade-syntax.ref.ui
+++ b/testsuite/reftests/cross-fade-syntax.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="row-spacing">1</property>
diff --git a/testsuite/reftests/cross-fade-syntax.ui b/testsuite/reftests/cross-fade-syntax.ui
index d7fd2805e6..2ea329f4ec 100644
--- a/testsuite/reftests/cross-fade-syntax.ui
+++ b/testsuite/reftests/cross-fade-syntax.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="row-spacing">1</property>
diff --git a/testsuite/reftests/css-currentcolor-alpha.ref.ui b/testsuite/reftests/css-currentcolor-alpha.ref.ui
index 5cb0e82ca6..955e256835 100644
--- a/testsuite/reftests/css-currentcolor-alpha.ref.ui
+++ b/testsuite/reftests/css-currentcolor-alpha.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="name">reference</property>
     <child>
       <placeholder/>
diff --git a/testsuite/reftests/css-currentcolor-alpha.ui b/testsuite/reftests/css-currentcolor-alpha.ui
index ec70764dc3..6c4305beae 100644
--- a/testsuite/reftests/css-currentcolor-alpha.ui
+++ b/testsuite/reftests/css-currentcolor-alpha.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <placeholder/>
     </child>
diff --git a/testsuite/reftests/css-em-label-size.ref.ui b/testsuite/reftests/css-em-label-size.ref.ui
index 8dbfeb4d76..786d4620c8 100644
--- a/testsuite/reftests/css-em-label-size.ref.ui
+++ b/testsuite/reftests/css-em-label-size.ref.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid">
         <property name="row_homogeneous">1</property>
diff --git a/testsuite/reftests/css-em-label-size.ui b/testsuite/reftests/css-em-label-size.ui
index 66190f6c1b..b3a2c9f33d 100644
--- a/testsuite/reftests/css-em-label-size.ui
+++ b/testsuite/reftests/css-em-label-size.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid">
         <property name="row_homogeneous">1</property>
diff --git a/testsuite/reftests/css-image-aspect-ratio.ref.ui b/testsuite/reftests/css-image-aspect-ratio.ref.ui
index 8198b04612..af106e0175 100644
--- a/testsuite/reftests/css-image-aspect-ratio.ref.ui
+++ b/testsuite/reftests/css-image-aspect-ratio.ref.ui
@@ -3,7 +3,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">48</property>
     <property name="height_request">24</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="name">reference</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/css-image-aspect-ratio.ui b/testsuite/reftests/css-image-aspect-ratio.ui
index f9a37b7a61..9ec4cec356 100644
--- a/testsuite/reftests/css-image-aspect-ratio.ui
+++ b/testsuite/reftests/css-image-aspect-ratio.ui
@@ -3,6 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">48</property>
     <property name="height_request">24</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/css-image-color-aspect-ratio.ref.ui b/testsuite/reftests/css-image-color-aspect-ratio.ref.ui
index 5e2a51192a..e538dfc9fd 100644
--- a/testsuite/reftests/css-image-color-aspect-ratio.ref.ui
+++ b/testsuite/reftests/css-image-color-aspect-ratio.ref.ui
@@ -3,7 +3,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">10</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="name">reference</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/css-image-color-aspect-ratio.ui b/testsuite/reftests/css-image-color-aspect-ratio.ui
index 63e8f04846..aa8e65c092 100644
--- a/testsuite/reftests/css-image-color-aspect-ratio.ui
+++ b/testsuite/reftests/css-image-color-aspect-ratio.ui
@@ -3,6 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">10</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/css-match-class.ref.ui b/testsuite/reftests/css-match-class.ref.ui
index e85bbec582..01ca5d499c 100644
--- a/testsuite/reftests/css-match-class.ref.ui
+++ b/testsuite/reftests/css-match-class.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkPicture">
         <property name="paintable">green-20x20.png</property>
diff --git a/testsuite/reftests/css-match-class.ui b/testsuite/reftests/css-match-class.ui
index ab783b3219..2fb13f45b7 100644
--- a/testsuite/reftests/css-match-class.ui
+++ b/testsuite/reftests/css-match-class.ui
@@ -3,7 +3,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">20</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="name">window</property>
     <style>
       <class name="window"/>
diff --git a/testsuite/reftests/css-match-descendant-later.ref.ui b/testsuite/reftests/css-match-descendant-later.ref.ui
index 0c8a4b46e0..eb3a855d27 100644
--- a/testsuite/reftests/css-match-descendant-later.ref.ui
+++ b/testsuite/reftests/css-match-descendant-later.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="width_request">10</property>
diff --git a/testsuite/reftests/css-match-descendant-later.ui b/testsuite/reftests/css-match-descendant-later.ui
index 90e3d7a3de..711dd67047 100644
--- a/testsuite/reftests/css-match-descendant-later.ui
+++ b/testsuite/reftests/css-match-descendant-later.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/css-match-exact.ref.ui b/testsuite/reftests/css-match-exact.ref.ui
index 74b65db8a1..f8abc0afbf 100644
--- a/testsuite/reftests/css-match-exact.ref.ui
+++ b/testsuite/reftests/css-match-exact.ref.ui
@@ -3,7 +3,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <placeholder/>
     </child>
diff --git a/testsuite/reftests/css-match-exact.ui b/testsuite/reftests/css-match-exact.ui
index 7a9389c2d5..669d50da7a 100644
--- a/testsuite/reftests/css-match-exact.ui
+++ b/testsuite/reftests/css-match-exact.ui
@@ -3,7 +3,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/css-match-import.ref.ui b/testsuite/reftests/css-match-import.ref.ui
index a2f55c86fd..a9fefa05f5 100644
--- a/testsuite/reftests/css-match-import.ref.ui
+++ b/testsuite/reftests/css-match-import.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="name">purple</property>
diff --git a/testsuite/reftests/css-match-import.ui b/testsuite/reftests/css-match-import.ui
index 8ea0858c14..239af5a367 100644
--- a/testsuite/reftests/css-match-import.ui
+++ b/testsuite/reftests/css-match-import.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">Purple</property>
diff --git a/testsuite/reftests/css-match-inherit-different-state.ref.ui b/testsuite/reftests/css-match-inherit-different-state.ref.ui
index 84596a0208..9860e94590 100644
--- a/testsuite/reftests/css-match-inherit-different-state.ref.ui
+++ b/testsuite/reftests/css-match-inherit-different-state.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/css-match-inherit-different-state.ui b/testsuite/reftests/css-match-inherit-different-state.ui
index 15f803784c..917bf4c16a 100644
--- a/testsuite/reftests/css-match-inherit-different-state.ui
+++ b/testsuite/reftests/css-match-inherit-different-state.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/css-match-inherit.ref.ui b/testsuite/reftests/css-match-inherit.ref.ui
index d3b58f7432..bfae5a9484 100644
--- a/testsuite/reftests/css-match-inherit.ref.ui
+++ b/testsuite/reftests/css-match-inherit.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/css-match-inherit.ui b/testsuite/reftests/css-match-inherit.ui
index 8395c51add..c45a2fc0e2 100644
--- a/testsuite/reftests/css-match-inherit.ui
+++ b/testsuite/reftests/css-match-inherit.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/css-match-name.ref.ui b/testsuite/reftests/css-match-name.ref.ui
index 5fc9c823dc..f918e7be1b 100644
--- a/testsuite/reftests/css-match-name.ref.ui
+++ b/testsuite/reftests/css-match-name.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkPicture">
         <property name="paintable">green-20x20.png</property>
diff --git a/testsuite/reftests/css-match-name.ui b/testsuite/reftests/css-match-name.ui
index ab783b3219..2fb13f45b7 100644
--- a/testsuite/reftests/css-match-name.ui
+++ b/testsuite/reftests/css-match-name.ui
@@ -3,7 +3,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">20</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="name">window</property>
     <style>
       <class name="window"/>
diff --git a/testsuite/reftests/css-match-siblings.ref.ui b/testsuite/reftests/css-match-siblings.ref.ui
index cdd1d6730b..c542e5e811 100644
--- a/testsuite/reftests/css-match-siblings.ref.ui
+++ b/testsuite/reftests/css-match-siblings.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/css-match-siblings.ui b/testsuite/reftests/css-match-siblings.ui
index 5e8dfcae6c..b979d03631 100644
--- a/testsuite/reftests/css-match-siblings.ui
+++ b/testsuite/reftests/css-match-siblings.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/css-match-type.ref.ui b/testsuite/reftests/css-match-type.ref.ui
index 5fc9c823dc..f918e7be1b 100644
--- a/testsuite/reftests/css-match-type.ref.ui
+++ b/testsuite/reftests/css-match-type.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkPicture">
         <property name="paintable">green-20x20.png</property>
diff --git a/testsuite/reftests/css-match-type.ui b/testsuite/reftests/css-match-type.ui
index ab783b3219..2fb13f45b7 100644
--- a/testsuite/reftests/css-match-type.ui
+++ b/testsuite/reftests/css-match-type.ui
@@ -3,7 +3,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">20</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="name">window</property>
     <style>
       <class name="window"/>
diff --git a/testsuite/reftests/css-multi-state.ref.ui b/testsuite/reftests/css-multi-state.ref.ui
index b99269be6b..256a8dc0b9 100644
--- a/testsuite/reftests/css-multi-state.ref.ui
+++ b/testsuite/reftests/css-multi-state.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkToggleButton" id="togglebutton1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/css-multi-state.ui b/testsuite/reftests/css-multi-state.ui
index 9f7979e29a..ac855f2a75 100644
--- a/testsuite/reftests/css-multi-state.ui
+++ b/testsuite/reftests/css-multi-state.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkToggleButton" id="togglebutton1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/css-rem-label-size.ref.ui b/testsuite/reftests/css-rem-label-size.ref.ui
index aa903fb77d..85fe92601c 100644
--- a/testsuite/reftests/css-rem-label-size.ref.ui
+++ b/testsuite/reftests/css-rem-label-size.ref.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel">
         <property name="label" translatable="yes">███</property>
diff --git a/testsuite/reftests/css-rem-label-size.ui b/testsuite/reftests/css-rem-label-size.ui
index f70bf80600..b3579624e8 100644
--- a/testsuite/reftests/css-rem-label-size.ui
+++ b/testsuite/reftests/css-rem-label-size.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel">
         <property name="label" translatable="yes">███</property>
diff --git a/testsuite/reftests/data-url.ref.ui b/testsuite/reftests/data-url.ref.ui
index 7a09474075..30f74640a6 100644
--- a/testsuite/reftests/data-url.ref.ui
+++ b/testsuite/reftests/data-url.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkPicture">
         <property name="can-shrink">0</property>
diff --git a/testsuite/reftests/data-url.ui b/testsuite/reftests/data-url.ui
index 6fa417228a..a1702ce008 100644
--- a/testsuite/reftests/data-url.ui
+++ b/testsuite/reftests/data-url.ui
@@ -3,6 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">20</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/expander.ref.ui b/testsuite/reftests/expander.ref.ui
index cf55a788dc..024c1ad1d3 100644
--- a/testsuite/reftests/expander.ref.ui
+++ b/testsuite/reftests/expander.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkExpander" id="expander1">
         <property name="expanded">1</property>
diff --git a/testsuite/reftests/expander.ui b/testsuite/reftests/expander.ui
index 628d0c60c9..95fe9abe86 100644
--- a/testsuite/reftests/expander.ui
+++ b/testsuite/reftests/expander.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkExpander" id="expander1">
         <property name="label">Hello</property>
diff --git a/testsuite/reftests/fixed-widget-stacking.ref.ui b/testsuite/reftests/fixed-widget-stacking.ref.ui
index acfe9c984c..50f9dcfc45 100644
--- a/testsuite/reftests/fixed-widget-stacking.ref.ui
+++ b/testsuite/reftests/fixed-widget-stacking.ref.ui
@@ -5,7 +5,7 @@
 TEST123</property>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkFixed" id="fixed1">
         <child>
diff --git a/testsuite/reftests/fixed-widget-stacking.ui b/testsuite/reftests/fixed-widget-stacking.ui
index dc2e9f73a7..775a2a8498 100644
--- a/testsuite/reftests/fixed-widget-stacking.ui
+++ b/testsuite/reftests/fixed-widget-stacking.ui
@@ -5,7 +5,7 @@
 TEST123</property>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkFixed" id="fixed1">
         <child>
diff --git a/testsuite/reftests/flipping-icons.ref.ui b/testsuite/reftests/flipping-icons.ref.ui
index a669882851..7cac497f3f 100644
--- a/testsuite/reftests/flipping-icons.ref.ui
+++ b/testsuite/reftests/flipping-icons.ref.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/flipping-icons.ui b/testsuite/reftests/flipping-icons.ui
index 3a508cf48e..a36c917c62 100644
--- a/testsuite/reftests/flipping-icons.ui
+++ b/testsuite/reftests/flipping-icons.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <signal name="map" handler="reftest:switch_default_direction" swapped="no"/>
     <signal name="destroy" handler="reftest:switch_default_direction" swapped="no"/>
     <child>
diff --git a/testsuite/reftests/font-sizes-names.ref.ui b/testsuite/reftests/font-sizes-names.ref.ui
index da94ffd4ba..d7b9979bac 100644
--- a/testsuite/reftests/font-sizes-names.ref.ui
+++ b/testsuite/reftests/font-sizes-names.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="name">reference</property>
     <child>
       <object class="GtkBox" id="box1">
diff --git a/testsuite/reftests/font-sizes-names.ui b/testsuite/reftests/font-sizes-names.ui
index 6c396675cf..f3efaa2b14 100644
--- a/testsuite/reftests/font-sizes-names.ui
+++ b/testsuite/reftests/font-sizes-names.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/grid-empty-with-spacing.ref.ui b/testsuite/reftests/grid-empty-with-spacing.ref.ui
index aa2b506bf9..2bc5131da3 100644
--- a/testsuite/reftests/grid-empty-with-spacing.ref.ui
+++ b/testsuite/reftests/grid-empty-with-spacing.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="row_spacing">5</property>
diff --git a/testsuite/reftests/grid-empty-with-spacing.ui b/testsuite/reftests/grid-empty-with-spacing.ui
index 5b9e81e76b..cd1dd008b4 100644
--- a/testsuite/reftests/grid-empty-with-spacing.ui
+++ b/testsuite/reftests/grid-empty-with-spacing.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="row_spacing">5</property>
diff --git a/testsuite/reftests/grid-expand.ref.ui b/testsuite/reftests/grid-expand.ref.ui
index 431a73c05f..c2959be5f4 100644
--- a/testsuite/reftests/grid-expand.ref.ui
+++ b/testsuite/reftests/grid-expand.ref.ui
@@ -3,7 +3,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/grid-expand.ui b/testsuite/reftests/grid-expand.ui
index c0b33be95f..1267b3a451 100644
--- a/testsuite/reftests/grid-expand.ui
+++ b/testsuite/reftests/grid-expand.ui
@@ -3,7 +3,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid0">
         <child>
diff --git a/testsuite/reftests/grid-homogeneous.ref.ui b/testsuite/reftests/grid-homogeneous.ref.ui
index d40f0d620d..69203a4c0e 100644
--- a/testsuite/reftests/grid-homogeneous.ref.ui
+++ b/testsuite/reftests/grid-homogeneous.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/grid-homogeneous.ui b/testsuite/reftests/grid-homogeneous.ui
index 43116e11d5..ad4f54c5cf 100644
--- a/testsuite/reftests/grid-homogeneous.ui
+++ b/testsuite/reftests/grid-homogeneous.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/grid-spacing1.ref.ui b/testsuite/reftests/grid-spacing1.ref.ui
index 2faa9a0117..fcc3a87d59 100644
--- a/testsuite/reftests/grid-spacing1.ref.ui
+++ b/testsuite/reftests/grid-spacing1.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/grid-spacing1.ui b/testsuite/reftests/grid-spacing1.ui
index 004c62ed9d..225f8151de 100644
--- a/testsuite/reftests/grid-spacing1.ui
+++ b/testsuite/reftests/grid-spacing1.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid">
         <child>
diff --git a/testsuite/reftests/grid-spacing2.ref.ui b/testsuite/reftests/grid-spacing2.ref.ui
index c37863a841..551d875d5e 100644
--- a/testsuite/reftests/grid-spacing2.ref.ui
+++ b/testsuite/reftests/grid-spacing2.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box">
         <child>
diff --git a/testsuite/reftests/grid-spacing2.ui b/testsuite/reftests/grid-spacing2.ui
index 4c6fd8259b..fc5c0d8616 100644
--- a/testsuite/reftests/grid-spacing2.ui
+++ b/testsuite/reftests/grid-spacing2.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid">
         <child>
diff --git a/testsuite/reftests/grid-spacing3.ref.ui b/testsuite/reftests/grid-spacing3.ref.ui
index 9aaba61583..1ea0d32e5e 100644
--- a/testsuite/reftests/grid-spacing3.ref.ui
+++ b/testsuite/reftests/grid-spacing3.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="row-spacing">10</property>
diff --git a/testsuite/reftests/grid-spacing3.ui b/testsuite/reftests/grid-spacing3.ui
index bf6f584ce2..1bf76e464d 100644
--- a/testsuite/reftests/grid-spacing3.ui
+++ b/testsuite/reftests/grid-spacing3.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="row-spacing">10</property>
diff --git a/testsuite/reftests/grid-wfh.ref.ui b/testsuite/reftests/grid-wfh.ref.ui
index ebea05d7e7..bf17b58d55 100644
--- a/testsuite/reftests/grid-wfh.ref.ui
+++ b/testsuite/reftests/grid-wfh.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/grid-wfh.ui b/testsuite/reftests/grid-wfh.ui
index 0e5396a7dd..b304aa189a 100644
--- a/testsuite/reftests/grid-wfh.ui
+++ b/testsuite/reftests/grid-wfh.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/gtk-icontheme-sizing.ref.ui b/testsuite/reftests/gtk-icontheme-sizing.ref.ui
index d93b42a014..800b02e63d 100644
--- a/testsuite/reftests/gtk-icontheme-sizing.ref.ui
+++ b/testsuite/reftests/gtk-icontheme-sizing.ref.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkImage" id="image1">
         <property name="pixel_size">100</property>
diff --git a/testsuite/reftests/gtk-icontheme-sizing.ui b/testsuite/reftests/gtk-icontheme-sizing.ui
index c1a1e6014b..714c9cee82 100644
--- a/testsuite/reftests/gtk-icontheme-sizing.ui
+++ b/testsuite/reftests/gtk-icontheme-sizing.ui
@@ -4,7 +4,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/gtk-image-effect-inherit.ref.ui b/testsuite/reftests/gtk-image-effect-inherit.ref.ui
index cc0482913b..a63be79375 100644
--- a/testsuite/reftests/gtk-image-effect-inherit.ref.ui
+++ b/testsuite/reftests/gtk-image-effect-inherit.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/gtk-image-effect-inherit.ui b/testsuite/reftests/gtk-image-effect-inherit.ui
index 6ef4925023..37e6fc5c30 100644
--- a/testsuite/reftests/gtk-image-effect-inherit.ui
+++ b/testsuite/reftests/gtk-image-effect-inherit.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/icon-effect-missing.ref.ui b/testsuite/reftests/icon-effect-missing.ref.ui
index 9200097442..ee9b2657c7 100644
--- a/testsuite/reftests/icon-effect-missing.ref.ui
+++ b/testsuite/reftests/icon-effect-missing.ref.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/icon-effect-missing.ui b/testsuite/reftests/icon-effect-missing.ui
index 5d432aec96..7d77f96e2f 100644
--- a/testsuite/reftests/icon-effect-missing.ui
+++ b/testsuite/reftests/icon-effect-missing.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/icon-shadow-no-transform.ref.ui b/testsuite/reftests/icon-shadow-no-transform.ref.ui
index b8c3d8157c..51ecb0a95d 100644
--- a/testsuite/reftests/icon-shadow-no-transform.ref.ui
+++ b/testsuite/reftests/icon-shadow-no-transform.ref.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkSpinner" id="spinner1"/>
     </child>
diff --git a/testsuite/reftests/icon-shadow-no-transform.ui b/testsuite/reftests/icon-shadow-no-transform.ui
index 503a8b0393..3c4b93831f 100644
--- a/testsuite/reftests/icon-shadow-no-transform.ui
+++ b/testsuite/reftests/icon-shadow-no-transform.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkSpinner" id="spinner1">
         <style>
diff --git a/testsuite/reftests/icon-style-basics.ref.ui b/testsuite/reftests/icon-style-basics.ref.ui
index edf7842d9a..df4846d1f4 100644
--- a/testsuite/reftests/icon-style-basics.ref.ui
+++ b/testsuite/reftests/icon-style-basics.ref.ui
@@ -12,7 +12,7 @@
     </data>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/icon-style-basics.ui b/testsuite/reftests/icon-style-basics.ui
index 1d4c07f6de..246099bced 100644
--- a/testsuite/reftests/icon-style-basics.ui
+++ b/testsuite/reftests/icon-style-basics.ui
@@ -12,7 +12,7 @@
     </data>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/iconview-empty.ref.ui b/testsuite/reftests/iconview-empty.ref.ui
index 2ec7dcb502..f497bd026e 100644
--- a/testsuite/reftests/iconview-empty.ref.ui
+++ b/testsuite/reftests/iconview-empty.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid">
         <property name="row_spacing">5</property>
diff --git a/testsuite/reftests/iconview-empty.ui b/testsuite/reftests/iconview-empty.ui
index a483b42272..e1c656ca8d 100644
--- a/testsuite/reftests/iconview-empty.ui
+++ b/testsuite/reftests/iconview-empty.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid">
         <property name="row_spacing">5</property>
diff --git a/testsuite/reftests/image-icon-name-use-fallback.ref.ui b/testsuite/reftests/image-icon-name-use-fallback.ref.ui
index 8ba61ab4bd..49815a302a 100644
--- a/testsuite/reftests/image-icon-name-use-fallback.ref.ui
+++ b/testsuite/reftests/image-icon-name-use-fallback.ref.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkImage" id="image1">
         <property name="icon_name">edit-delete</property>
diff --git a/testsuite/reftests/image-icon-name-use-fallback.ui b/testsuite/reftests/image-icon-name-use-fallback.ui
index 10fefbd028..b353ed4721 100644
--- a/testsuite/reftests/image-icon-name-use-fallback.ui
+++ b/testsuite/reftests/image-icon-name-use-fallback.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkImage" id="image1">
         <property name="icon_name">edit-delete-lolwtfbbq</property>
diff --git a/testsuite/reftests/image-icon-shadow-clipping.ref.ui b/testsuite/reftests/image-icon-shadow-clipping.ref.ui
index 7573765213..36813408f9 100644
--- a/testsuite/reftests/image-icon-shadow-clipping.ref.ui
+++ b/testsuite/reftests/image-icon-shadow-clipping.ref.ui
@@ -4,7 +4,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkImage" id="image1">
         <property name="icon_name">edit-delete</property>
diff --git a/testsuite/reftests/image-icon-shadow-clipping.ui b/testsuite/reftests/image-icon-shadow-clipping.ui
index 4f88c0f0ee..fa151544fa 100644
--- a/testsuite/reftests/image-icon-shadow-clipping.ui
+++ b/testsuite/reftests/image-icon-shadow-clipping.ui
@@ -4,7 +4,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box2">
         <property name="halign">center</property>
diff --git a/testsuite/reftests/image-load-from-file.ref.ui b/testsuite/reftests/image-load-from-file.ref.ui
index 6ebe6b9f90..a4bda87155 100644
--- a/testsuite/reftests/image-load-from-file.ref.ui
+++ b/testsuite/reftests/image-load-from-file.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/image-load-from-file.ui b/testsuite/reftests/image-load-from-file.ui
index 8e7a5446ce..c2c0df4e43 100644
--- a/testsuite/reftests/image-load-from-file.ui
+++ b/testsuite/reftests/image-load-from-file.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/label-attribute-preference.ref.ui b/testsuite/reftests/label-attribute-preference.ref.ui
index 2d45923300..6ef8fdc0cd 100644
--- a/testsuite/reftests/label-attribute-preference.ref.ui
+++ b/testsuite/reftests/label-attribute-preference.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">Hello linky World</property>
diff --git a/testsuite/reftests/label-attribute-preference.ui b/testsuite/reftests/label-attribute-preference.ui
index ae9fbfe046..9f1f53d17c 100644
--- a/testsuite/reftests/label-attribute-preference.ui
+++ b/testsuite/reftests/label-attribute-preference.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="use-markup">1</property>
diff --git a/testsuite/reftests/label-background.ref.ui b/testsuite/reftests/label-background.ref.ui
index 1bda217d61..e6a46ecbb8 100644
--- a/testsuite/reftests/label-background.ref.ui
+++ b/testsuite/reftests/label-background.ref.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">Hello World!</property>
diff --git a/testsuite/reftests/label-background.ui b/testsuite/reftests/label-background.ui
index 3f7117ee31..e2665bd2eb 100644
--- a/testsuite/reftests/label-background.ui
+++ b/testsuite/reftests/label-background.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/label-box-shadow-clip.ref.ui b/testsuite/reftests/label-box-shadow-clip.ref.ui
index 97be53210b..b6b0b04041 100644
--- a/testsuite/reftests/label-box-shadow-clip.ref.ui
+++ b/testsuite/reftests/label-box-shadow-clip.ref.ui
@@ -4,7 +4,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="halign">center</property>
diff --git a/testsuite/reftests/label-box-shadow-clip.ui b/testsuite/reftests/label-box-shadow-clip.ui
index 7672f7db14..0047f8c25e 100644
--- a/testsuite/reftests/label-box-shadow-clip.ui
+++ b/testsuite/reftests/label-box-shadow-clip.ui
@@ -4,7 +4,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="halign">center</property>
diff --git a/testsuite/reftests/label-clipping.ref.ui b/testsuite/reftests/label-clipping.ref.ui
index 905cf05636..83db896757 100644
--- a/testsuite/reftests/label-clipping.ref.ui
+++ b/testsuite/reftests/label-clipping.ref.ui
@@ -3,7 +3,7 @@
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">fffffffff</property>
diff --git a/testsuite/reftests/label-clipping.ui b/testsuite/reftests/label-clipping.ui
index 058d66b280..45c6ca8138 100644
--- a/testsuite/reftests/label-clipping.ui
+++ b/testsuite/reftests/label-clipping.ui
@@ -3,7 +3,7 @@
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box2">
         <property name="halign">center</property>
diff --git a/testsuite/reftests/label-ellipsize-small.ref.ui b/testsuite/reftests/label-ellipsize-small.ref.ui
index 20c9277b9d..a5254dabe2 100644
--- a/testsuite/reftests/label-ellipsize-small.ref.ui
+++ b/testsuite/reftests/label-ellipsize-small.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">d</property>
diff --git a/testsuite/reftests/label-ellipsize-small.ui b/testsuite/reftests/label-ellipsize-small.ui
index 7b7ca38894..0d3f777fb9 100644
--- a/testsuite/reftests/label-ellipsize-small.ui
+++ b/testsuite/reftests/label-ellipsize-small.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">d</property>
diff --git a/testsuite/reftests/label-ellipsize-with-big.ref.ui b/testsuite/reftests/label-ellipsize-with-big.ref.ui
index 18dff6e51a..60f01bfd28 100644
--- a/testsuite/reftests/label-ellipsize-with-big.ref.ui
+++ b/testsuite/reftests/label-ellipsize-with-big.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes"> &lt;big&gt;&lt;b&gt;There&apos;s a space in front&lt;/b&gt;&lt;/big&gt;</property>
diff --git a/testsuite/reftests/label-ellipsize-with-big.ui b/testsuite/reftests/label-ellipsize-with-big.ui
index 18dff6e51a..60f01bfd28 100644
--- a/testsuite/reftests/label-ellipsize-with-big.ui
+++ b/testsuite/reftests/label-ellipsize-with-big.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes"> &lt;big&gt;&lt;b&gt;There&apos;s a space in front&lt;/b&gt;&lt;/big&gt;</property>
diff --git a/testsuite/reftests/label-fonts.ref.ui b/testsuite/reftests/label-fonts.ref.ui
index 55a881b7c7..0694062fe9 100644
--- a/testsuite/reftests/label-fonts.ref.ui
+++ b/testsuite/reftests/label-fonts.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label3">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/label-fonts.ui b/testsuite/reftests/label-fonts.ui
index a7d468885f..c10ce94e60 100644
--- a/testsuite/reftests/label-fonts.ui
+++ b/testsuite/reftests/label-fonts.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label3">
         <property name="name">label</property>
diff --git a/testsuite/reftests/label-shadows.ref.ui b/testsuite/reftests/label-shadows.ref.ui
index 32c9c96922..d121121c6d 100644
--- a/testsuite/reftests/label-shadows.ref.ui
+++ b/testsuite/reftests/label-shadows.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkFixed">
         <property name="width-request">200</property>
diff --git a/testsuite/reftests/label-shadows.ui b/testsuite/reftests/label-shadows.ui
index 56a6ac0a2d..6a528c7fe2 100644
--- a/testsuite/reftests/label-shadows.ui
+++ b/testsuite/reftests/label-shadows.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkFixed">
         <property name="width-request">200</property>
diff --git a/testsuite/reftests/label-sizing.ref.ui b/testsuite/reftests/label-sizing.ref.ui
index d1ac565dc8..de016f649f 100644
--- a/testsuite/reftests/label-sizing.ref.ui
+++ b/testsuite/reftests/label-sizing.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <signal name="realize" handler="reftest:set_default_direction_ltr"/>
     <child>
       <object class="GtkGrid" id="grid1">
diff --git a/testsuite/reftests/label-sizing.ui b/testsuite/reftests/label-sizing.ui
index 69784ba8ee..9f1dbfada5 100644
--- a/testsuite/reftests/label-sizing.ui
+++ b/testsuite/reftests/label-sizing.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <signal name="realize" handler="reftest:set_default_direction_ltr"/>
     <child>
       <object class="GtkGrid" id="grid1">
diff --git a/testsuite/reftests/label-small-ellipsized.ref.ui b/testsuite/reftests/label-small-ellipsized.ref.ui
index bb047f0a15..aca13be91b 100644
--- a/testsuite/reftests/label-small-ellipsized.ref.ui
+++ b/testsuite/reftests/label-small-ellipsized.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes"> </property>
diff --git a/testsuite/reftests/label-small-ellipsized.ui b/testsuite/reftests/label-small-ellipsized.ui
index 260149d2c1..d71b77d3c0 100644
--- a/testsuite/reftests/label-small-ellipsized.ui
+++ b/testsuite/reftests/label-small-ellipsized.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes"> </property>
diff --git a/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui b/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui
index b92d933f48..73b8efb450 100644
--- a/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui
+++ b/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui
@@ -4,7 +4,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">Hello World</property>
diff --git a/testsuite/reftests/label-text-shadow-changes-modify-clip.ui b/testsuite/reftests/label-text-shadow-changes-modify-clip.ui
index f69a690560..0913545288 100644
--- a/testsuite/reftests/label-text-shadow-changes-modify-clip.ui
+++ b/testsuite/reftests/label-text-shadow-changes-modify-clip.ui
@@ -4,7 +4,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <signal name="map" handler="reftest:inhibit_for_3_frames" swapped="no"/>
     <child>
       <object class="GtkBox" id="box2">
diff --git a/testsuite/reftests/label-text-shadow-clipping.ref.ui b/testsuite/reftests/label-text-shadow-clipping.ref.ui
index 1b0ddf015a..2d15374f73 100644
--- a/testsuite/reftests/label-text-shadow-clipping.ref.ui
+++ b/testsuite/reftests/label-text-shadow-clipping.ref.ui
@@ -4,7 +4,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">Hello World</property>
diff --git a/testsuite/reftests/label-text-shadow-clipping.ui b/testsuite/reftests/label-text-shadow-clipping.ui
index 0e4873a3d0..5b581f8277 100644
--- a/testsuite/reftests/label-text-shadow-clipping.ui
+++ b/testsuite/reftests/label-text-shadow-clipping.ui
@@ -4,7 +4,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box2">
         <property name="halign">center</property>
diff --git a/testsuite/reftests/label-width-chars-dont-shrink.ref.ui b/testsuite/reftests/label-width-chars-dont-shrink.ref.ui
index 852813ec0e..b15069caff 100644
--- a/testsuite/reftests/label-width-chars-dont-shrink.ref.ui
+++ b/testsuite/reftests/label-width-chars-dont-shrink.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/label-width-chars-dont-shrink.ui b/testsuite/reftests/label-width-chars-dont-shrink.ui
index 89f4631e1b..424b21f5a0 100644
--- a/testsuite/reftests/label-width-chars-dont-shrink.ui
+++ b/testsuite/reftests/label-width-chars-dont-shrink.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/label-wrap-justify.ref.ui b/testsuite/reftests/label-wrap-justify.ref.ui
index a52a604f24..cd8d257ad6 100644
--- a/testsuite/reftests/label-wrap-justify.ref.ui
+++ b/testsuite/reftests/label-wrap-justify.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/label-wrap-justify.ui b/testsuite/reftests/label-wrap-justify.ui
index 38d0597ac4..374451d123 100644
--- a/testsuite/reftests/label-wrap-justify.ui
+++ b/testsuite/reftests/label-wrap-justify.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/letter-spacing.ref.ui b/testsuite/reftests/letter-spacing.ref.ui
index 491cecd129..dbd264b6ed 100644
--- a/testsuite/reftests/letter-spacing.ref.ui
+++ b/testsuite/reftests/letter-spacing.ref.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label">abc</property>
diff --git a/testsuite/reftests/letter-spacing.ui b/testsuite/reftests/letter-spacing.ui
index 6ab4185af9..564b4e1d37 100644
--- a/testsuite/reftests/letter-spacing.ui
+++ b/testsuite/reftests/letter-spacing.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="name">spaced</property>
diff --git a/testsuite/reftests/linear-gradient-transition-to-other.ref.ui b/testsuite/reftests/linear-gradient-transition-to-other.ref.ui
index 489098df2d..93a1eb6dd7 100644
--- a/testsuite/reftests/linear-gradient-transition-to-other.ref.ui
+++ b/testsuite/reftests/linear-gradient-transition-to-other.ref.ui
@@ -3,7 +3,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">20</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="name">reference</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/linear-gradient-transition-to-other.ui b/testsuite/reftests/linear-gradient-transition-to-other.ui
index 6fa417228a..a1702ce008 100644
--- a/testsuite/reftests/linear-gradient-transition-to-other.ui
+++ b/testsuite/reftests/linear-gradient-transition-to-other.ui
@@ -3,6 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">20</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/linear-gradient.ref.ui b/testsuite/reftests/linear-gradient.ref.ui
index 27f85476a3..cf99d258db 100644
--- a/testsuite/reftests/linear-gradient.ref.ui
+++ b/testsuite/reftests/linear-gradient.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/linear-gradient.ui b/testsuite/reftests/linear-gradient.ui
index e2fbdc6949..2943b209fc 100644
--- a/testsuite/reftests/linear-gradient.ui
+++ b/testsuite/reftests/linear-gradient.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/link-coloring.ref.ui b/testsuite/reftests/link-coloring.ref.ui
index 882e737e15..ec654784d9 100644
--- a/testsuite/reftests/link-coloring.ref.ui
+++ b/testsuite/reftests/link-coloring.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/link-coloring.ui b/testsuite/reftests/link-coloring.ui
index 8d6ff5bcd6..9f9eaca94c 100644
--- a/testsuite/reftests/link-coloring.ui
+++ b/testsuite/reftests/link-coloring.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/messagedialog-secondarytext.ref.ui b/testsuite/reftests/messagedialog-secondarytext.ref.ui
index 584ad22b19..84195decf0 100644
--- a/testsuite/reftests/messagedialog-secondarytext.ref.ui
+++ b/testsuite/reftests/messagedialog-secondarytext.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkMessageDialog" id="messagedialog1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="type_hint">dialog</property>
     <property name="buttons">ok</property>
     <property name="text" translatable="yes">Text</property>
diff --git a/testsuite/reftests/messagedialog-secondarytext.ui b/testsuite/reftests/messagedialog-secondarytext.ui
index 8f97175665..1a052d25be 100644
--- a/testsuite/reftests/messagedialog-secondarytext.ui
+++ b/testsuite/reftests/messagedialog-secondarytext.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkMessageDialog" id="messagedialog1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="type_hint">dialog</property>
     <property name="buttons">ok</property>
     <property name="text" translatable="yes">Text</property>
diff --git a/testsuite/reftests/named-colors.ref.ui b/testsuite/reftests/named-colors.ref.ui
index 6bbb850534..4489759244 100644
--- a/testsuite/reftests/named-colors.ref.ui
+++ b/testsuite/reftests/named-colors.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid0">
         <child>
diff --git a/testsuite/reftests/named-colors.ui b/testsuite/reftests/named-colors.ui
index ddc39d742f..f1f76b0345 100644
--- a/testsuite/reftests/named-colors.ui
+++ b/testsuite/reftests/named-colors.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid0">
         <child>
diff --git a/testsuite/reftests/no-colors.ref.ui b/testsuite/reftests/no-colors.ref.ui
index 3278c9f53d..87413db15b 100644
--- a/testsuite/reftests/no-colors.ref.ui
+++ b/testsuite/reftests/no-colors.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">no colors for you</property>
diff --git a/testsuite/reftests/no-colors.ui b/testsuite/reftests/no-colors.ui
index 3278c9f53d..87413db15b 100644
--- a/testsuite/reftests/no-colors.ui
+++ b/testsuite/reftests/no-colors.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">no colors for you</property>
diff --git a/testsuite/reftests/nonresizable-size.ref.ui b/testsuite/reftests/nonresizable-size.ref.ui
index 56115658fe..4ada156fa2 100644
--- a/testsuite/reftests/nonresizable-size.ref.ui
+++ b/testsuite/reftests/nonresizable-size.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">Hello World</property>
diff --git a/testsuite/reftests/nonresizable-size.ui b/testsuite/reftests/nonresizable-size.ui
index 532136d282..9da1788ca4 100644
--- a/testsuite/reftests/nonresizable-size.ui
+++ b/testsuite/reftests/nonresizable-size.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="resizable">0</property>
     <child>
       <object class="GtkLabel" id="label1">
diff --git a/testsuite/reftests/notebook-tab-position.ref.ui b/testsuite/reftests/notebook-tab-position.ref.ui
index c536009d68..4f7ad691bd 100644
--- a/testsuite/reftests/notebook-tab-position.ref.ui
+++ b/testsuite/reftests/notebook-tab-position.ref.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkNotebook" id="notebook1">
         <property name="width_request">50</property>
diff --git a/testsuite/reftests/notebook-tab-position.ui b/testsuite/reftests/notebook-tab-position.ui
index 209f3dc272..4e1a2943a6 100644
--- a/testsuite/reftests/notebook-tab-position.ui
+++ b/testsuite/reftests/notebook-tab-position.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkNotebook" id="notebook1">
         <property name="width_request">50</property>
diff --git a/testsuite/reftests/nth-child.ref.ui b/testsuite/reftests/nth-child.ref.ui
index f8143de95e..252d839473 100644
--- a/testsuite/reftests/nth-child.ref.ui
+++ b/testsuite/reftests/nth-child.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/nth-child.ui b/testsuite/reftests/nth-child.ui
index b8001fd18c..bb5e261777 100644
--- a/testsuite/reftests/nth-child.ui
+++ b/testsuite/reftests/nth-child.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/opacity-initial.ref.ui b/testsuite/reftests/opacity-initial.ref.ui
index 40232e76a7..32b8fc9bb5 100644
--- a/testsuite/reftests/opacity-initial.ref.ui
+++ b/testsuite/reftests/opacity-initial.ref.ui
@@ -4,6 +4,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">200</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/opacity-initial.ui b/testsuite/reftests/opacity-initial.ui
index cc08a18087..e3116565b2 100644
--- a/testsuite/reftests/opacity-initial.ui
+++ b/testsuite/reftests/opacity-initial.ui
@@ -4,7 +4,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">200</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkOverlay" id="overlay1">
         <child>
diff --git a/testsuite/reftests/opacity.ref.ui b/testsuite/reftests/opacity.ref.ui
index 535a35cb4e..37983fa6eb 100644
--- a/testsuite/reftests/opacity.ref.ui
+++ b/testsuite/reftests/opacity.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/opacity.ui b/testsuite/reftests/opacity.ui
index 69159109ed..a936add93a 100644
--- a/testsuite/reftests/opacity.ui
+++ b/testsuite/reftests/opacity.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="name">alpha</property>
diff --git a/testsuite/reftests/paned-undersized.ref.ui b/testsuite/reftests/paned-undersized.ref.ui
index 7a2ea496c2..c306dbda88 100644
--- a/testsuite/reftests/paned-undersized.ref.ui
+++ b/testsuite/reftests/paned-undersized.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="height_request">120</property>
     <child>
       <object class="GtkPaned" id="paned1">
diff --git a/testsuite/reftests/paned-undersized.ui b/testsuite/reftests/paned-undersized.ui
index aff21c97e7..666240c874 100644
--- a/testsuite/reftests/paned-undersized.ui
+++ b/testsuite/reftests/paned-undersized.ui
@@ -2,7 +2,7 @@
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="height_request">120</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkPaned" id="paned1">
         <property name="resize-child1">0</property>
diff --git a/testsuite/reftests/partial-rounded-border.ref.ui b/testsuite/reftests/partial-rounded-border.ref.ui
index 04bd817a67..4b60261d5d 100644
--- a/testsuite/reftests/partial-rounded-border.ref.ui
+++ b/testsuite/reftests/partial-rounded-border.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/partial-rounded-border.ui b/testsuite/reftests/partial-rounded-border.ui
index c0d272463c..e7b5ab0219 100644
--- a/testsuite/reftests/partial-rounded-border.ui
+++ b/testsuite/reftests/partial-rounded-border.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid">
         <child>
diff --git a/testsuite/reftests/picture-load-invalid-file.ref.ui b/testsuite/reftests/picture-load-invalid-file.ref.ui
index 3ae6f89153..0dafe99932 100644
--- a/testsuite/reftests/picture-load-invalid-file.ref.ui
+++ b/testsuite/reftests/picture-load-invalid-file.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkPicture"/>
     </child>
diff --git a/testsuite/reftests/picture-load-invalid-file.ui b/testsuite/reftests/picture-load-invalid-file.ui
index 6b74b8a147..f95e6406c3 100644
--- a/testsuite/reftests/picture-load-invalid-file.ui
+++ b/testsuite/reftests/picture-load-invalid-file.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkPicture">
         <property name="file">does://not.com/exist.png</property>
diff --git a/testsuite/reftests/pseudoclass-on-box.ref.ui b/testsuite/reftests/pseudoclass-on-box.ref.ui
index 15ebb3d267..d9ec817a09 100644
--- a/testsuite/reftests/pseudoclass-on-box.ref.ui
+++ b/testsuite/reftests/pseudoclass-on-box.ref.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/pseudoclass-on-box.ui b/testsuite/reftests/pseudoclass-on-box.ui
index 54255546f5..f4e818679c 100644
--- a/testsuite/reftests/pseudoclass-on-box.ui
+++ b/testsuite/reftests/pseudoclass-on-box.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/pseudoclass-on-parent.ref.ui b/testsuite/reftests/pseudoclass-on-parent.ref.ui
index c60fc8c499..22c7758166 100644
--- a/testsuite/reftests/pseudoclass-on-parent.ref.ui
+++ b/testsuite/reftests/pseudoclass-on-parent.ref.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkToggleButton" id="togglebutton1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/pseudoclass-on-parent.ui b/testsuite/reftests/pseudoclass-on-parent.ui
index 829aecc4ec..de2db22711 100644
--- a/testsuite/reftests/pseudoclass-on-parent.ui
+++ b/testsuite/reftests/pseudoclass-on-parent.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkToggleButton" id="togglebutton1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/quit-mnemonic.ref.ui b/testsuite/reftests/quit-mnemonic.ref.ui
index c5509ae0b4..2a3b9f669a 100644
--- a/testsuite/reftests/quit-mnemonic.ref.ui
+++ b/testsuite/reftests/quit-mnemonic.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">Quit
diff --git a/testsuite/reftests/quit-mnemonic.ui b/testsuite/reftests/quit-mnemonic.ui
index b0f30e80a4..d699bbf290 100644
--- a/testsuite/reftests/quit-mnemonic.ui
+++ b/testsuite/reftests/quit-mnemonic.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/repeating-radial-gradient-at-beginning.ref.ui b/testsuite/reftests/repeating-radial-gradient-at-beginning.ref.ui
index d3f4a731a4..9a4425741c 100644
--- a/testsuite/reftests/repeating-radial-gradient-at-beginning.ref.ui
+++ b/testsuite/reftests/repeating-radial-gradient-at-beginning.ref.ui
@@ -3,7 +3,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">64</property>
     <property name="height_request">32</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="name">reference</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/repeating-radial-gradient-at-beginning.ui b/testsuite/reftests/repeating-radial-gradient-at-beginning.ui
index b91f9285a6..df37e29b12 100644
--- a/testsuite/reftests/repeating-radial-gradient-at-beginning.ui
+++ b/testsuite/reftests/repeating-radial-gradient-at-beginning.ui
@@ -3,6 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">64</property>
     <property name="height_request">32</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/revealer-extra-size.ref.ui b/testsuite/reftests/revealer-extra-size.ref.ui
index 73ad6e03c6..7b2f37399b 100644
--- a/testsuite/reftests/revealer-extra-size.ref.ui
+++ b/testsuite/reftests/revealer-extra-size.ref.ui
@@ -3,7 +3,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">400</property>
     <property name="height_request">300</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">Hello World</property>
diff --git a/testsuite/reftests/revealer-extra-size.ui b/testsuite/reftests/revealer-extra-size.ui
index 4b121f219c..a774d6e5a8 100644
--- a/testsuite/reftests/revealer-extra-size.ui
+++ b/testsuite/reftests/revealer-extra-size.ui
@@ -3,7 +3,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">400</property>
     <property name="height_request">300</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkRevealer" id="revealer1">
         <property name="transition_type">none</property>
diff --git a/testsuite/reftests/revealer-wrappable-contents.ref.ui b/testsuite/reftests/revealer-wrappable-contents.ref.ui
index 89b534249d..e5b14ae43e 100644
--- a/testsuite/reftests/revealer-wrappable-contents.ref.ui
+++ b/testsuite/reftests/revealer-wrappable-contents.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="default_width">300</property>
     <property name="default_height">200</property>
     <child>
diff --git a/testsuite/reftests/revealer-wrappable-contents.ui b/testsuite/reftests/revealer-wrappable-contents.ui
index 434d249467..9f54f32b80 100644
--- a/testsuite/reftests/revealer-wrappable-contents.ui
+++ b/testsuite/reftests/revealer-wrappable-contents.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="default_width">300</property>
     <property name="default_height">200</property>
     <child>
diff --git a/testsuite/reftests/rotated-layout.ref.ui b/testsuite/reftests/rotated-layout.ref.ui
index a6ae7ea6f8..674e264d1d 100644
--- a/testsuite/reftests/rotated-layout.ref.ui
+++ b/testsuite/reftests/rotated-layout.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/rotated-layout.ui b/testsuite/reftests/rotated-layout.ui
index ba9603afbe..ed14ce7bd4 100644
--- a/testsuite/reftests/rotated-layout.ui
+++ b/testsuite/reftests/rotated-layout.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/separator-size.ref.ui b/testsuite/reftests/separator-size.ref.ui
index e3cd91644e..d86610f7c1 100644
--- a/testsuite/reftests/separator-size.ref.ui
+++ b/testsuite/reftests/separator-size.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/separator-size.ui b/testsuite/reftests/separator-size.ui
index 8afd8a1b70..a34467cb11 100644
--- a/testsuite/reftests/separator-size.ui
+++ b/testsuite/reftests/separator-size.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/set-default-direction.ref.ui b/testsuite/reftests/set-default-direction.ref.ui
index a64eebe5f3..d54ff23ba8 100644
--- a/testsuite/reftests/set-default-direction.ref.ui
+++ b/testsuite/reftests/set-default-direction.ref.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <signal name="realize" handler="reftest:switch_default_direction" after="yes" swapped="no"/>
     <signal name="map" handler="reftest:swap_child" after="yes" swapped="no"/>
     <signal name="destroy" handler="reftest:switch_default_direction" after="yes" swapped="no"/>
diff --git a/testsuite/reftests/set-default-direction.ui b/testsuite/reftests/set-default-direction.ui
index 6f379a1f78..80a013e57d 100644
--- a/testsuite/reftests/set-default-direction.ui
+++ b/testsuite/reftests/set-default-direction.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <signal name="map" handler="reftest:switch_default_direction" swapped="no"/>
     <signal name="destroy" handler="reftest:switch_default_direction" swapped="no"/>
     <child>
diff --git a/testsuite/reftests/shadow-clip-rounding.ref.ui b/testsuite/reftests/shadow-clip-rounding.ref.ui
index 97be53210b..b6b0b04041 100644
--- a/testsuite/reftests/shadow-clip-rounding.ref.ui
+++ b/testsuite/reftests/shadow-clip-rounding.ref.ui
@@ -4,7 +4,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="halign">center</property>
diff --git a/testsuite/reftests/shadow-clip-rounding.ui b/testsuite/reftests/shadow-clip-rounding.ui
index 7672f7db14..0047f8c25e 100644
--- a/testsuite/reftests/shadow-clip-rounding.ui
+++ b/testsuite/reftests/shadow-clip-rounding.ui
@@ -4,7 +4,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="halign">center</property>
diff --git a/testsuite/reftests/shorthand-entry-border.ref.ui b/testsuite/reftests/shorthand-entry-border.ref.ui
index bd5c6d34a1..36aa8a81e4 100644
--- a/testsuite/reftests/shorthand-entry-border.ref.ui
+++ b/testsuite/reftests/shorthand-entry-border.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkEntry" id="entry1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/shorthand-entry-border.ui b/testsuite/reftests/shorthand-entry-border.ui
index 6c5efd2a3e..cb9ea51f68 100644
--- a/testsuite/reftests/shorthand-entry-border.ui
+++ b/testsuite/reftests/shorthand-entry-border.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkEntry" id="entry1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/simple.ref.ui b/testsuite/reftests/simple.ref.ui
index 34efec74e8..e01e8f954c 100644
--- a/testsuite/reftests/simple.ref.ui
+++ b/testsuite/reftests/simple.ref.ui
@@ -3,7 +3,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/simple.ui b/testsuite/reftests/simple.ui
index 34efec74e8..e01e8f954c 100644
--- a/testsuite/reftests/simple.ui
+++ b/testsuite/reftests/simple.ui
@@ -3,7 +3,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/sizegroups-basics.ref.ui b/testsuite/reftests/sizegroups-basics.ref.ui
index 2dfae31713..1265d6b31d 100644
--- a/testsuite/reftests/sizegroups-basics.ref.ui
+++ b/testsuite/reftests/sizegroups-basics.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/sizegroups-basics.ui b/testsuite/reftests/sizegroups-basics.ui
index ae2239b426..aac033e236 100644
--- a/testsuite/reftests/sizegroups-basics.ui
+++ b/testsuite/reftests/sizegroups-basics.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui b/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui
index 4f03d91f24..decf244477 100644
--- a/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui
+++ b/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="row_spacing">6</property>
diff --git a/testsuite/reftests/sizegroups-evolution-identity-page.ui b/testsuite/reftests/sizegroups-evolution-identity-page.ui
index f1525ab882..0f9a3e9444 100644
--- a/testsuite/reftests/sizegroups-evolution-identity-page.ui
+++ b/testsuite/reftests/sizegroups-evolution-identity-page.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/sizegroups-get-preferred-null.ref.ui b/testsuite/reftests/sizegroups-get-preferred-null.ref.ui
index b5151592fa..953a53098e 100644
--- a/testsuite/reftests/sizegroups-get-preferred-null.ref.ui
+++ b/testsuite/reftests/sizegroups-get-preferred-null.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkFixed" id="grid1">
         <child>
diff --git a/testsuite/reftests/sizegroups-get-preferred-null.ui b/testsuite/reftests/sizegroups-get-preferred-null.ui
index b0f8074c84..92084dca09 100644
--- a/testsuite/reftests/sizegroups-get-preferred-null.ui
+++ b/testsuite/reftests/sizegroups-get-preferred-null.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkFixed" id="grid1">
         <child>
diff --git a/testsuite/reftests/statusbar-remove-all.ref.ui b/testsuite/reftests/statusbar-remove-all.ref.ui
index 169f08fc43..6bda5b3922 100644
--- a/testsuite/reftests/statusbar-remove-all.ref.ui
+++ b/testsuite/reftests/statusbar-remove-all.ref.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkStatusbar" id="statusbar1">
         <property name="margin_start">10</property>
diff --git a/testsuite/reftests/statusbar-remove-all.ui b/testsuite/reftests/statusbar-remove-all.ui
index 26113ca552..0baf34621e 100644
--- a/testsuite/reftests/statusbar-remove-all.ui
+++ b/testsuite/reftests/statusbar-remove-all.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkStatusbar" id="statusbar1">
         <property name="margin_start">10</property>
diff --git a/testsuite/reftests/style-context-save-inheritance.ref.ui b/testsuite/reftests/style-context-save-inheritance.ref.ui
index abbb2f709b..d3745e4bd7 100644
--- a/testsuite/reftests/style-context-save-inheritance.ref.ui
+++ b/testsuite/reftests/style-context-save-inheritance.ref.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/style-context-save-inheritance.ui b/testsuite/reftests/style-context-save-inheritance.ui
index c8395ae1b6..c058490869 100644
--- a/testsuite/reftests/style-context-save-inheritance.ui
+++ b/testsuite/reftests/style-context-save-inheritance.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">GREEN
diff --git a/testsuite/reftests/style-properties-only-child.ref.ui b/testsuite/reftests/style-properties-only-child.ref.ui
index 78bfbf4c79..aac77b2ab1 100644
--- a/testsuite/reftests/style-properties-only-child.ref.ui
+++ b/testsuite/reftests/style-properties-only-child.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="width_request">300</property>
     <property name="height_request">300</property>
     <child>
diff --git a/testsuite/reftests/style-properties-only-child.ui b/testsuite/reftests/style-properties-only-child.ui
index 415b9de3a1..b44672e179 100644
--- a/testsuite/reftests/style-properties-only-child.ui
+++ b/testsuite/reftests/style-properties-only-child.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="width_request">300</property>
     <property name="height_request">300</property>
     <child>
diff --git a/testsuite/reftests/symbolic-icon-translucent-color.ref.ui b/testsuite/reftests/symbolic-icon-translucent-color.ref.ui
index 7d86e0b5f5..5420b758e1 100644
--- a/testsuite/reftests/symbolic-icon-translucent-color.ref.ui
+++ b/testsuite/reftests/symbolic-icon-translucent-color.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkImage" id="image1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/symbolic-icon-translucent-color.ui b/testsuite/reftests/symbolic-icon-translucent-color.ui
index 138fb2c578..e17b9c296d 100644
--- a/testsuite/reftests/symbolic-icon-translucent-color.ui
+++ b/testsuite/reftests/symbolic-icon-translucent-color.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkImage" id="image1">
         <property name="icon_name">media-playback-stop-symbolic</property>
diff --git a/testsuite/reftests/textview-border-windows.ref.ui b/testsuite/reftests/textview-border-windows.ref.ui
index 2d6ea088eb..4aaa49d082 100644
--- a/testsuite/reftests/textview-border-windows.ref.ui
+++ b/testsuite/reftests/textview-border-windows.ref.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="window">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/textview-border-windows.ui b/testsuite/reftests/textview-border-windows.ui
index 711576acec..26f31cd6dd 100644
--- a/testsuite/reftests/textview-border-windows.ui
+++ b/testsuite/reftests/textview-border-windows.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="window">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkTextView" id="textview1">
         <property name="width_request">160</property>
diff --git a/testsuite/reftests/textview-margins.ref.ui b/testsuite/reftests/textview-margins.ref.ui
index 3807b945fd..4a7aec0c88 100644
--- a/testsuite/reftests/textview-margins.ref.ui
+++ b/testsuite/reftests/textview-margins.ref.ui
@@ -5,7 +5,7 @@
     <property name="text" translatable="yes">Lorem ipsum dolor sit amet, consectetur adipisci elit, sed eiusmod tempor incidunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquid ex ea commodi consequat. Quis aute iure reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum</property>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="default_width">150</property>
     <property name="resizable">0</property>
     <child>
diff --git a/testsuite/reftests/textview-margins.ui b/testsuite/reftests/textview-margins.ui
index 57f621b31b..80aa46d3c9 100644
--- a/testsuite/reftests/textview-margins.ui
+++ b/testsuite/reftests/textview-margins.ui
@@ -5,7 +5,7 @@
     <property name="text" translatable="yes">Lorem ipsum dolor sit amet, consectetur adipisci elit, sed eiusmod tempor incidunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquid ex ea commodi consequat. Quis aute iure reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum</property>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="default_width">150</property>
     <property name="resizable">0</property>
     <child>
diff --git a/testsuite/reftests/treeview-fixed-height.ref.ui b/testsuite/reftests/treeview-fixed-height.ref.ui
index 790665832b..627a62ce30 100644
--- a/testsuite/reftests/treeview-fixed-height.ref.ui
+++ b/testsuite/reftests/treeview-fixed-height.ref.ui
@@ -20,7 +20,7 @@
     </data>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkTreeView" id="treeview1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/treeview-fixed-height.ui b/testsuite/reftests/treeview-fixed-height.ui
index db871a56c5..bced7f956d 100644
--- a/testsuite/reftests/treeview-fixed-height.ui
+++ b/testsuite/reftests/treeview-fixed-height.ui
@@ -20,7 +20,7 @@
     </data>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkTreeView" id="treeview1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/treeview-headers-hidden.ref.ui b/testsuite/reftests/treeview-headers-hidden.ref.ui
index 9a7b147dfc..96b862e296 100644
--- a/testsuite/reftests/treeview-headers-hidden.ref.ui
+++ b/testsuite/reftests/treeview-headers-hidden.ref.ui
@@ -14,7 +14,7 @@
     </data>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkTreeView" id="treeview1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/treeview-headers-hidden.ui b/testsuite/reftests/treeview-headers-hidden.ui
index 9a7b147dfc..96b862e296 100644
--- a/testsuite/reftests/treeview-headers-hidden.ui
+++ b/testsuite/reftests/treeview-headers-hidden.ui
@@ -14,7 +14,7 @@
     </data>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkTreeView" id="treeview1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/unresolvable.ref.ui b/testsuite/reftests/unresolvable.ref.ui
index b5ccb79617..9d2d538c5a 100644
--- a/testsuite/reftests/unresolvable.ref.ui
+++ b/testsuite/reftests/unresolvable.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/unresolvable.ui b/testsuite/reftests/unresolvable.ui
index f12da9077d..22d7b815bc 100644
--- a/testsuite/reftests/unresolvable.ui
+++ b/testsuite/reftests/unresolvable.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox">
         <property name="width_request">10</property>
diff --git a/testsuite/reftests/window-border-width.ref.ui b/testsuite/reftests/window-border-width.ref.ui
index ea309cc149..2054796076 100644
--- a/testsuite/reftests/window-border-width.ref.ui
+++ b/testsuite/reftests/window-border-width.ref.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window_information_collection">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/window-border-width.ui b/testsuite/reftests/window-border-width.ui
index d020f3e40d..fcd2d931d9 100644
--- a/testsuite/reftests/window-border-width.ui
+++ b/testsuite/reftests/window-border-width.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window_information_collection">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">Hello World</property>
diff --git a/testsuite/reftests/window-default-size.ref.ui b/testsuite/reftests/window-default-size.ref.ui
index 29b9330844..acae24dd51 100644
--- a/testsuite/reftests/window-default-size.ref.ui
+++ b/testsuite/reftests/window-default-size.ref.ui
@@ -3,7 +3,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">103</property>
     <property name="height_request">97</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <placeholder/>
     </child>
diff --git a/testsuite/reftests/window-default-size.ui b/testsuite/reftests/window-default-size.ui
index 143cac3e68..dba54c03a5 100644
--- a/testsuite/reftests/window-default-size.ui
+++ b/testsuite/reftests/window-default-size.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <property name="default_width">103</property>
     <property name="default_height">97</property>
     <child>
diff --git a/testsuite/reftests/window-show-contents-on-map.ref.ui b/testsuite/reftests/window-show-contents-on-map.ref.ui
index 897580cc48..d074202b08 100644
--- a/testsuite/reftests/window-show-contents-on-map.ref.ui
+++ b/testsuite/reftests/window-show-contents-on-map.ref.ui
@@ -4,7 +4,7 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">200</property>
     <property name="height_request">200</property>
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">This label is only shown when the window is mapped. So the window does its first size allocation without the label being visible and has to resize.</property>
diff --git a/testsuite/reftests/window-show-contents-on-map.ui b/testsuite/reftests/window-show-contents-on-map.ui
index 3285b5f05a..89d56bbd68 100644
--- a/testsuite/reftests/window-show-contents-on-map.ui
+++ b/testsuite/reftests/window-show-contents-on-map.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
+    <property name="decorated">0</property>
     <signal name="map" handler="gtk_widget_show" object="label1" after="yes" swapped="yes"/>
     <child>
       <object class="GtkLabel" id="label1">