diff --git a/data/org.freedesktop.impl.portal.Background.xml b/data/org.freedesktop.impl.portal.Background.xml
index 9f9152db4..6ccfea6bf 100644
--- a/data/org.freedesktop.impl.portal.Background.xml
+++ b/data/org.freedesktop.impl.portal.Background.xml
@@ -42,7 +42,7 @@
       - ``1``: Running (at least one open window)
       - ``2``: Active (in the foreground)
     -->
-    <method name='GetAppState'>
+    <method name="GetAppState">
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
       <arg type="a{sv}" name="apps" direction="out"/>
     </method>
@@ -68,7 +68,7 @@
         - ``1``: Allow background activity by this app
         - ``2``: Allow this instance of background activity
     -->
-    <method name='NotifyBackground'>
+    <method name="NotifyBackground">
       <arg type="o" name="handle" direction="in"/>
       <arg type="s" name="app_id" direction="in"/>
       <arg type="s" name="name" direction="in"/>
@@ -94,7 +94,7 @@
 
       - ``1``: Use D-Bus activation
     -->
-    <method name='EnableAutostart'>
+    <method name="EnableAutostart">
       <arg type="s" name="app_id" direction="in"/>
       <arg type="b" name="enable" direction="in"/>
       <arg type="as" name="commandline" direction="in"/>
@@ -108,7 +108,7 @@
       This signal gets emitted when applications change their state
       and it is worth calling GetAppState again.
     -->
-    <signal name='RunningApplicationsChanged'>
+    <signal name="RunningApplicationsChanged">
     </signal>
   </interface>
 </node>
diff --git a/data/org.freedesktop.impl.portal.PermissionStore.xml b/data/org.freedesktop.impl.portal.PermissionStore.xml
index 10033388e..6f6114472 100644
--- a/data/org.freedesktop.impl.portal.PermissionStore.xml
+++ b/data/org.freedesktop.impl.portal.PermissionStore.xml
@@ -45,7 +45,7 @@
 
       This document describes version 2 of the permission store interface.
   -->
-  <interface name='org.freedesktop.impl.portal.PermissionStore'>
+  <interface name="org.freedesktop.impl.portal.PermissionStore">
     <property name="version" type="u" access="read"/>
 
     <!--
@@ -59,11 +59,11 @@
         all associated application permissions and data.
     -->
     <method name="Lookup">
-      <arg name='table' type='s' direction='in'/>
-      <arg name='id' type='s' direction='in'/>
+      <arg name="table" type="s" direction="in"/>
+      <arg name="id" type="s" direction="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QMap&lt;QString,QStringList&gt;"/>
-      <arg name='permissions' type='a{sas}' direction='out'/>
-      <arg name='data' type='v' direction='out'/>
+      <arg name="permissions" type="a{sas}" direction="out"/>
+      <arg name="data" type="v" direction="out"/>
     </method>
 
     <!--
@@ -77,12 +77,12 @@
         Writes the entry for a resource in the given table.
     -->
     <method name="Set">
-      <arg name='table' type='s' direction='in'/>
-      <arg name='create' type='b' direction='in'/>
-      <arg name='id' type='s' direction='in'/>
+      <arg name="table" type="s" direction="in"/>
+      <arg name="create" type="b" direction="in"/>
+      <arg name="id" type="s" direction="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.In3" value="QMap&lt;QString,QStringList&gt;"/>
-      <arg name='app_permissions' type='a{sas}' direction='in'/>
-      <arg name='data' type='v' direction='in'/>
+      <arg name="app_permissions" type="a{sas}" direction="in"/>
+      <arg name="data" type="v" direction="in"/>
     </method>
 
     <!--
@@ -93,8 +93,8 @@
         Removes the entry for a resource in the given table.
     -->
     <method name="Delete">
-      <arg name='table' type='s' direction='in'/>
-      <arg name='id' type='s' direction='in'/>
+      <arg name="table" type="s" direction="in"/>
+      <arg name="id" type="s" direction="in"/>
     </method>
 
     <!--
@@ -107,10 +107,10 @@
         Sets just the data for a resource in the given table.
     -->
     <method name="SetValue">
-      <arg name='table' type='s' direction='in'/>
-      <arg name='create' type='b' direction='in'/>
-      <arg name='id' type='s' direction='in'/>
-      <arg name='data' type='v' direction='in'/>
+      <arg name="table" type="s" direction="in"/>
+      <arg name="create" type="b" direction="in"/>
+      <arg name="id" type="s" direction="in"/>
+      <arg name="data" type="v" direction="in"/>
     </method>
 
     <!--
@@ -125,11 +125,11 @@
         in the given table.
     -->
     <method name="SetPermission">
-      <arg name='table' type='s' direction='in'/>
-      <arg name='create' type='b' direction='in'/>
-      <arg name='id' type='s' direction='in'/>
-      <arg name='app' type='s' direction='in'/>
-      <arg name='permissions' type='as' direction='in'/>
+      <arg name="table" type="s" direction="in"/>
+      <arg name="create" type="b" direction="in"/>
+      <arg name="id" type="s" direction="in"/>
+      <arg name="app" type="s" direction="in"/>
+      <arg name="permissions" type="as" direction="in"/>
     </method>
 
     <!--
@@ -144,9 +144,9 @@
         This method was added in version 2.
     -->
     <method name="DeletePermission">
-      <arg name='table' type='s' direction='in'/>
-      <arg name='id' type='s' direction='in'/>
-      <arg name='app' type='s' direction='in'/>
+      <arg name="table" type="s" direction="in"/>
+      <arg name="id" type="s" direction="in"/>
+      <arg name="app" type="s" direction="in"/>
     </method>
 
     <!--
@@ -160,10 +160,10 @@
         in the given table.
     -->
     <method name="GetPermission">
-      <arg name='table' type='s' direction='in'/>
-      <arg name='id' type='s' direction='in'/>
-      <arg name='app' type='s' direction='in'/>
-      <arg name='permissions' type='as' direction='out'/>
+      <arg name="table" type="s" direction="in"/>
+      <arg name="id" type="s" direction="in"/>
+      <arg name="app" type="s" direction="in"/>
+      <arg name="permissions" type="as" direction="out"/>
     </method>
 
     <!--
@@ -174,8 +174,8 @@
         Returns all the resources that are present in the table.
     -->
     <method name="List">
-      <arg name='table' type='s' direction='in'/>
-      <arg name='ids' type='as' direction='out'/>
+      <arg name="table" type="s" direction="in"/>
+      <arg name="ids" type="as" direction="out"/>
     </method>
 
     <!--
@@ -192,12 +192,12 @@
         database. If the entry was modified, they contain the new values.
     -->
     <signal name="Changed">
-      <arg name='table' type='s' direction='out'/>
-      <arg name='id' type='s' direction='out'/>
-      <arg name='deleted' type='b' direction='out'/>
-      <arg name='data' type='v' direction='out'/>
+      <arg name="table" type="s" direction="out"/>
+      <arg name="id" type="s" direction="out"/>
+      <arg name="deleted" type="b" direction="out"/>
+      <arg name="data" type="v" direction="out"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out4" value="QMap&lt;QString,QStringList&gt;"/>
-      <arg name='permissions' type='a{sas}' direction='out'/>
+      <arg name="permissions" type="a{sas}" direction="out"/>
     </signal>
   </interface>
 
diff --git a/data/org.freedesktop.impl.portal.Settings.xml b/data/org.freedesktop.impl.portal.Settings.xml
index f76e371d3..4139ec523 100644
--- a/data/org.freedesktop.impl.portal.Settings.xml
+++ b/data/org.freedesktop.impl.portal.Settings.xml
@@ -75,10 +75,10 @@
       If @namespaces is an empty array or contains an empty string it matches all. Globbing is supported but only for
       trailing sections, e.g. "org.example.*".
     -->
-    <method name='ReadAll'>
-      <arg name='namespaces' type='as'/>
+    <method name="ReadAll">
+      <arg type="as" name="namespaces" direction="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QMap&lt;QString,QVariantMap&gt;"/>
-      <arg name='value' direction='out' type='a{sa{sv}}'/>
+      <arg type="a{sa{sv}}" name="value" direction="out"/>
     </method>
 
     <!--
@@ -89,10 +89,10 @@
 
       Reads a single value. Returns an error on any unknown namespace or key.
     -->
-    <method name='Read'>
-      <arg name='namespace' type='s'/>
-      <arg name='key' type='s'/>
-      <arg name='value' direction='out' type='v'/>
+    <method name="Read">
+      <arg type="s" name="namespace" direction="in"/>
+      <arg type="s" name="key" direction="in"/>
+      <arg type="v" name="value" direction="out"/>
     </method>
 
     <!--
@@ -103,10 +103,10 @@
 
       Emitted when a setting changes.
     -->
-    <signal name='SettingChanged'>
-      <arg name='namespace' direction='out' type='s'/>
-      <arg name='key' direction='out' type='s'/>
-      <arg name='value' direction='out' type='v'/>
+    <signal name="SettingChanged">
+      <arg type="s" name="namespace" direction="out"/>
+      <arg type="s" name="key" direction="out"/>
+      <arg type="v" name="value" direction="out"/>
     </signal>
 
     <property name="version" type="u" access="read"/>
diff --git a/data/org.freedesktop.portal.Documents.xml b/data/org.freedesktop.portal.Documents.xml
index 61d7ff598..6c769bf46 100644
--- a/data/org.freedesktop.portal.Documents.xml
+++ b/data/org.freedesktop.portal.Documents.xml
@@ -52,7 +52,7 @@
 
       This documentation describes version 5 of this interface.
   -->
-  <interface name='org.freedesktop.portal.Documents'>
+  <interface name="org.freedesktop.portal.Documents">
     <property name="version" type="u" access="read"/>
 
     <!--
@@ -63,7 +63,7 @@
         is mounted. This will typically be ``/run/user/$UID/doc/``.
     -->
     <method name="GetMountPoint">
-      <arg type='ay' name='path' direction='out'/>
+      <arg type="ay" name="path" direction="out"/>
     </method>
 
     <!--
@@ -79,10 +79,10 @@
     -->
     <method name="Add">
       <annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
-      <arg type='h' name='o_path_fd' direction='in'/>
-      <arg type='b' name='reuse_existing' direction='in'/>
-      <arg type='b' name='persistent' direction='in'/>
-      <arg type='s' name='doc_id' direction='out'/>
+      <arg type="h" name="o_path_fd" direction="in"/>
+      <arg type="b" name="reuse_existing" direction="in"/>
+      <arg type="b" name="persistent" direction="in"/>
+      <arg type="s" name="doc_id" direction="out"/>
     </method>
 
     <!--
@@ -97,12 +97,12 @@
     -->
     <method name="AddNamed">
       <annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
-      <arg type='h' name='o_path_parent_fd' direction='in'/>
+      <arg type="h" name="o_path_parent_fd" direction="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QByteArray"/>
-      <arg type='ay' name='filename' direction='in'/>
-      <arg type='b' name='reuse_existing' direction='in'/>
-      <arg type='b' name='persistent' direction='in'/>
-      <arg type='s' name='doc_id' direction='out'/>
+      <arg type="ay" name="filename" direction="in"/>
+      <arg type="b" name="reuse_existing" direction="in"/>
+      <arg type="b" name="persistent" direction="in"/>
+      <arg type="s" name="doc_id" direction="out"/>
     </method>
 
     <!--
@@ -137,13 +137,13 @@
     <method name="AddFull">
       <annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QList&lt;QDBusUnixFileDescriptor&gt;"/>
-      <arg type='ah' name='o_path_fds' direction='in'/>
-      <arg type='u' name='flags' direction='in'/>
-      <arg type='s' name='app_id' direction='in'/>
-      <arg type='as' name='permissions' direction='in'/>
-      <arg type='as' name='doc_ids' direction='out'/>
+      <arg type="ah" name="o_path_fds" direction="in"/>
+      <arg type="u" name="flags" direction="in"/>
+      <arg type="s" name="app_id" direction="in"/>
+      <arg type="as" name="permissions" direction="in"/>
+      <arg type="as" name="doc_ids" direction="out"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QVariantMap"/>
-      <arg type='a{sv}' name='extra_out' direction='out'/>
+      <arg type="a{sv}" name="extra_out" direction="out"/>
     </method>
 
     <!--
@@ -174,14 +174,14 @@
     -->
     <method name="AddNamedFull">
       <annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
-      <arg type='h' name='o_path_fd' direction='in'/>
-      <arg type='ay' name='filename' direction='in'/>
-      <arg type='u' name='flags' direction='in'/>
-      <arg type='s' name='app_id' direction='in'/>
-      <arg type='as' name='permissions' direction='in'/>
-      <arg type='s' name='doc_id' direction='out'/>
+      <arg type="h" name="o_path_fd" direction="in"/>
+      <arg type="ay" name="filename" direction="in"/>
+      <arg type="u" name="flags" direction="in"/>
+      <arg type="s" name="app_id" direction="in"/>
+      <arg type="as" name="permissions" direction="in"/>
+      <arg type="s" name="doc_id" direction="out"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QVariantMap"/>
-      <arg type='a{sv}' name='extra_out' direction='out'/>
+      <arg type="a{sv}" name="extra_out" direction="out"/>
     </method>
 
     <!--
@@ -197,9 +197,9 @@
         has the ``grant-permissions`` permission for the document.
     -->
     <method name="GrantPermissions">
-      <arg type='s' name='doc_id' direction='in'/>
-      <arg type='s' name='app_id' direction='in'/>
-      <arg type='as' name='permissions' direction='in'/>
+      <arg type="s" name="doc_id" direction="in"/>
+      <arg type="s" name="app_id" direction="in"/>
+      <arg type="as" name="permissions" direction="in"/>
     </method>
 
     <!--
@@ -215,9 +215,9 @@
         has the ``grant-permissions`` permission for the document.
     -->
     <method name="RevokePermissions">
-      <arg type='s' name='doc_id' direction='in'/>
-      <arg type='s' name='app_id' direction='in'/>
-      <arg type='as' name='permissions' direction='in'/>
+      <arg type="s" name="doc_id" direction="in"/>
+      <arg type="s" name="app_id" direction="in"/>
+      <arg type="as" name="permissions" direction="in"/>
     </method>
 
     <!--
@@ -231,7 +231,7 @@
         has the ``delete`` permission for the document.
     -->
     <method name="Delete">
-      <arg type='s' name='doc_id' direction='in'/>
+      <arg type="s" name="doc_id" direction="in"/>
     </method>
 
     <!--
@@ -244,8 +244,8 @@
         This call is not available inside the sandbox.
     -->
     <method name="Lookup">
-      <arg type='ay' name='filename' direction='in'/>
-      <arg type='s' name='doc_id' direction='out'/>
+      <arg type="ay" name="filename" direction="in"/>
+      <arg type="s" name="doc_id" direction="out"/>
     </method>
 
     <!--
@@ -260,10 +260,10 @@
         This call is not available inside the sandbox.
     -->
     <method name="Info">
-      <arg type='s' name='doc_id' direction='in'/>
-      <arg type='ay' name='path' direction='out'/>
+      <arg type="s" name="doc_id" direction="in"/>
+      <arg type="ay" name="path" direction="out"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QMap&lt;QString,QStringList&gt;"/>
-      <arg type='a{sas}' name='apps' direction='out'/>
+      <arg type="a{sas}" name="apps" direction="out"/>
     </method>
 
     <!--
@@ -277,9 +277,9 @@
         This call is not available inside the sandbox.
     -->
     <method name="List">
-      <arg type='s' name='app_id' direction='in'/>
+      <arg type="s" name="app_id" direction="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QMap&lt;QString,QByteArray&gt;"/>
-      <arg type='a{say}' name='docs' direction='out'/>
+      <arg type="a{say}" name="docs" direction="out"/>
     </method>
 
     <!--
diff --git a/data/org.freedesktop.portal.NetworkMonitor.xml b/data/org.freedesktop.portal.NetworkMonitor.xml
index 80240e59d..8ab905264 100644
--- a/data/org.freedesktop.portal.NetworkMonitor.xml
+++ b/data/org.freedesktop.portal.NetworkMonitor.xml
@@ -51,7 +51,7 @@
         the available property.
     -->
     <method name="GetAvailable">
-      <arg type='b' name='available' direction='out'/>
+      <arg type="b" name="available" direction="out"/>
     </method>
     <!--
         GetMetered:
@@ -66,7 +66,7 @@
         the metered property.
     -->
     <method name="GetMetered">
-      <arg type='b' name='metered' direction='out'/>
+      <arg type="b" name="metered" direction="out"/>
     </method>
     <!--
         GetConnectivity:
@@ -84,7 +84,7 @@
         the connectivity property.
     -->
     <method name="GetConnectivity">
-      <arg type='u' name='connectivity' direction='out'/>
+      <arg type="u" name="connectivity" direction="out"/>
     </method>
     <!--
         GetStatus:
@@ -110,7 +110,7 @@
     -->
     <method name="GetStatus">
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
-      <arg type='a{sv}' name='status' direction='out'/>
+      <arg type="a{sv}" name="status" direction="out"/>
     </method>
 
     <!--
@@ -123,9 +123,9 @@
         This method was added in version 3.
     -->
     <method name="CanReach">
-      <arg type='s' name='hostname' direction='in'/>
-      <arg type='u' name='port' direction='in'/>
-      <arg type='b' name='reachable' direction='out'/>
+      <arg type="s" name="hostname" direction="in"/>
+      <arg type="u" name="port" direction="in"/>
+      <arg type="b" name="reachable" direction="out"/>
     </method>
 
     <property name="version" type="u" access="read"/>
diff --git a/data/org.freedesktop.portal.Settings.xml b/data/org.freedesktop.portal.Settings.xml
index 003341887..622806e82 100644
--- a/data/org.freedesktop.portal.Settings.xml
+++ b/data/org.freedesktop.portal.Settings.xml
@@ -74,10 +74,10 @@
       If @namespaces is an empty array or contains an empty string it matches all. Globbing is supported but only for
       trailing sections, e.g. "org.example.*".
     -->
-    <method name='ReadAll'>
-      <arg name='namespaces' type='as'/>
+    <method name="ReadAll">
+      <arg type="as" name="namespaces" direction="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QMap&lt;QString,QVariantMap&gt;"/>
-      <arg name='value' direction='out' type='a{sa{sv}}'/>
+      <arg type="a{sa{sv}}" name="value" direction="out"/>
     </method>
 
     <!--
@@ -94,11 +94,11 @@
       returned inside two layers of variant, for example
       `&lt;&lt;string "hello"&gt;&gt;`.
     -->
-    <method name='Read'>
+    <method name="Read">
       <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
-      <arg name='namespace' type='s'/>
-      <arg name='key' type='s'/>
-      <arg name='value' direction='out' type='v'/>
+      <arg type="s" name="namespace" direction="in"/>
+      <arg type="s" name="key" direction="in"/>
+      <arg type="v" name="value" direction="out"/>
     </method>
 
     <!--
@@ -111,10 +111,10 @@
 
       This method was added in version 2.
     -->
-    <method name='ReadOne'>
-      <arg name='namespace' type='s'/>
-      <arg name='key' type='s'/>
-      <arg name='value' direction='out' type='v'/>
+    <method name="ReadOne">
+      <arg type="s" name="namespace" direction="in"/>
+      <arg type="s" name="key" direction="in"/>
+      <arg type="v" name="value" direction="out"/>
     </method>
 
     <!--
@@ -125,10 +125,10 @@
 
       Emitted when a setting changes.
     -->
-    <signal name='SettingChanged'>
-      <arg name='namespace' direction='out' type='s'/>
-      <arg name='key' direction='out' type='s'/>
-      <arg name='value' direction='out' type='v'/>
+    <signal name="SettingChanged">
+      <arg type="s" name="namespace" direction="out"/>
+      <arg type="s" name="key" direction="out"/>
+      <arg type="v" name="value" direction="out"/>
     </signal>
 
     <property name="version" type="u" access="read"/>
diff --git a/src/xdg-desktop-portal.gresource.xml b/src/xdg-desktop-portal.gresource.xml
index aa1c4341c..dfaf11bff 100644
--- a/src/xdg-desktop-portal.gresource.xml
+++ b/src/xdg-desktop-portal.gresource.xml
@@ -1,6 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix='/org/freedesktop/portal/desktop'>
+  <gresource prefix="/org/freedesktop/portal/desktop">
     <file alias="org.freedesktop.portal.FileChooser.xml">data/org.freedesktop.portal.FileChooser.xml</file>
     <file alias="org.freedesktop.portal.OpenURI.xml">data/org.freedesktop.portal.OpenURI.xml</file>
     <file alias="org.freedesktop.portal.Print.xml">data/org.freedesktop.portal.Print.xml</file>