diff --git a/src/daemon/client-rt.conf.in b/src/daemon/client-rt.conf.in
index 70728d184..22be8e0b5 100644
--- a/src/daemon/client-rt.conf.in
+++ b/src/daemon/client-rt.conf.in
@@ -2,39 +2,41 @@
 
 context.properties = {
     ## Configure properties in the system.
-    #mem.warn-mlock =		false
-    #mem.allow-mlock =		true
-    #mem.mlock-all =		false
-    #log.level =		2
+    #mem.warn-mlock  = false
+    #mem.allow-mlock = true
+    #mem.mlock-all   = false
+    #log.level       = 2
 }
 
 context.spa-libs = {
-    ## <factory-name regex> = <library-name>
+    #<factory-name regex> = <library-name>
     #
     # Used to find spa factory names. It maps an spa factory name
     # regular expression to a library name that should contain
     # that factory.
     #
-    audio.convert* = 	audioconvert/libspa-audioconvert
-    support.* =		support/libspa-support
+    audio.convert* = audioconvert/libspa-audioconvert
+    support.*      = support/libspa-support
 }
 
 context.modules = {
-    ##  <module-name> = { [args = { <key>=<value> ... }]
-    #                     [flags = [ [ifexists] [nofail] ]}
+    #<module-name> = {
+    #    [ args  = { <key> = <value> ... } ]
+    #    [ flags = [ [ ifexists ] [ nofail ] ]
+    #}
     #
     # Loads a module with the given parameters.
     # If ifexists is given, the module is ignored when it is not found.
     # If nofail is given, module initialization failures are ignored.
     #
     # Uses RTKit to boost the data thread priority.
-    libpipewire-module-rtkit  = {
+    libpipewire-module-rtkit = {
         args = {
-            #nice.level = -11
-            #rt.prio = 20
+            #nice.level   = -11
+            #rt.prio      = 20
             #rt.time.soft = 200000
             #rt.time.hard = 200000
-	}
+        }
         flags = [ ifexists nofail ]
     }
 
diff --git a/src/daemon/client.conf.in b/src/daemon/client.conf.in
index e1568a3df..fd8ef596a 100644
--- a/src/daemon/client.conf.in
+++ b/src/daemon/client.conf.in
@@ -1,26 +1,28 @@
 # Client config file for PipeWire version @VERSION@ #
 context.properties = {
     ## Configure properties in the system.
-    #mem.warn-mlock =		false
-    #mem.allow-mlock =		true
-    #mem.mlock-all =		false
-    #log.level =		2
+    #mem.warn-mlock  = false
+    #mem.allow-mlock = true
+    #mem.mlock-all   = false
+    #log.level       = 2
 }
 
 context.spa-libs = {
-    ## <factory-name regex> = <library-name>
+    #<factory-name regex> = <library-name>
     #
     # Used to find spa factory names. It maps an spa factory name
     # regular expression to a library name that should contain
     # that factory.
     #
-    audio.convert* = 	audioconvert/libspa-audioconvert
-    support.* =		support/libspa-support
+    audio.convert* = audioconvert/libspa-audioconvert
+    support.*      = support/libspa-support
 }
 
 context.modules = {
-    ##  <module-name> = { [args = { <key>=<value> ... }]
-    #                     [flags = [ [ifexists] [nofail] ]}
+    #<module-name> = {
+    #    [ args  = { <key> = <value> ... } ]
+    #    [ flags = [ [ ifexists ] [ nofail ] ]
+    #}
     #
     # Loads a module with the given parameters.
     # If ifexists is given, the module is ignored when it is not found.
diff --git a/src/daemon/jack.conf.in b/src/daemon/jack.conf.in
index 8356efac8..7a850f85e 100644
--- a/src/daemon/jack.conf.in
+++ b/src/daemon/jack.conf.in
@@ -2,25 +2,27 @@
 
 context.properties = {
     ## Configure properties in the system.
-    #mem.warn-mlock =		false
-    #mem.allow-mlock =		true
-    #mem.mlock-all =		false
-    #log.level =		2
+    #mem.warn-mlock  = false
+    #mem.allow-mlock = true
+    #mem.mlock-all   = false
+    #log.level       = 2
 }
 
 context.spa-libs = {
-    ## <factory-name regex> = <library-name>
+    #<factory-name regex> = <library-name>
     #
     # Used to find spa factory names. It maps an spa factory name
     # regular expression to a library name that should contain
     # that factory.
     #
-    support.* =		support/libspa-support
+    support.* = support/libspa-support
 }
 
 context.modules = {
-    ##  <module-name> = { [args = { <key>=<value> ... }]
-    #                     [flags = [ [ifexists] [nofail] ]}
+    #<module-name> = {
+    #    [ args  = { <key> = <value> ... } ]
+    #    [ flags = [ [ ifexists ] [ nofail ] ]
+    #}
     #
     # Loads a module with the given parameters.
     # If ifexists is given, the module is ignored when it is not found.
@@ -28,13 +30,13 @@ context.modules = {
     #
     #
     # Uses RTKit to boost the data thread priority.
-    libpipewire-module-rtkit  = {
+    libpipewire-module-rtkit = {
         args = {
-            #nice.level = -11
-            #rt.prio = 20
+            #nice.level   = -11
+            #rt.prio      = 20
             #rt.time.soft = 200000
             #rt.time.hard = 200000
-	}
+        }
         flags = [ ifexists nofail ]
     }
 
diff --git a/src/daemon/media-session.d/media-session.conf b/src/daemon/media-session.d/media-session.conf
index 0d6e69de8..cccac7ee9 100644
--- a/src/daemon/media-session.d/media-session.conf
+++ b/src/daemon/media-session.d/media-session.conf
@@ -2,8 +2,8 @@
 context.properties = {
     # Properties to configure the session and some
     # modules.
-    #mem.mlock-all           = false
-    #support.dbus            = true
+    #mem.mlock-all = false
+    #support.dbus  = true
 }
 
 context.spa-libs = {
@@ -15,21 +15,23 @@ context.spa-libs = {
 }
 
 context.modules = {
-    ##  <module-name> = { [args = { <key>=<value> ... }]
-    #                     [flags = [ [ifexists] [nofail] ]}
+    #<module-name> = {
+    #    [ args  = { <key> = <value> ... } ]
+    #    [ flags = [ [ ifexists ] [ nofail ] ]
+    #}
     #
     # Loads a module with the given parameters.
     # If ifexists is given, the module is ignored when it is not found.
     # If nofail is given, module initialization failures are ignored.
     #
     # Uses RTKit to boost the data thread priority.
-    libpipewire-module-rtkit  = {
+    libpipewire-module-rtkit = {
         args = {
-            #nice.level = -11
-            #rt.prio = 20
+            #nice.level   = -11
+            #rt.prio      = 20
             #rt.time.soft = 200000
             #rt.time.hard = 200000
-	}
+        }
         flags = [ ifexists nofail ]
     }
 
diff --git a/src/daemon/pipewire-pulse.conf.in b/src/daemon/pipewire-pulse.conf.in
index f28687b7d..85086117a 100644
--- a/src/daemon/pipewire-pulse.conf.in
+++ b/src/daemon/pipewire-pulse.conf.in
@@ -1,36 +1,38 @@
 # PulseAudio config file for PipeWire version @VERSION@ #
 context.properties = {
     ## Configure properties in the system.
-    #mem.warn-mlock =		false
-    #mem.allow-mlock =		true
-    #mem.mlock-all =		false
-    #log.level =		2
+    #mem.warn-mlock  = false
+    #mem.allow-mlock = true
+    #mem.mlock-all   = false
+    #log.level       = 2
 }
 
 context.spa-libs = {
-    audio.convert* = 	audioconvert/libspa-audioconvert
-    support.* =		support/libspa-support
+    audio.convert* = audioconvert/libspa-audioconvert
+    support.*      = support/libspa-support
 }
 
 context.modules = {
-    libpipewire-module-rtkit  = {
+    libpipewire-module-rtkit = {
         args = {
-            #nice.level = -11
-            #rt.prio = 20
+            #nice.level   = -11
+            #rt.prio      = 20
             #rt.time.soft = 200000
             #rt.time.hard = 200000
-	}
+        }
         flags = [ ifexists nofail ]
     }
     libpipewire-module-protocol-native = null
-    libpipewire-module-client-node = null
-    libpipewire-module-adapter = null
-    libpipewire-module-metadata = null
+    libpipewire-module-client-node     = null
+    libpipewire-module-adapter         = null
+    libpipewire-module-metadata        = null
+
     libpipewire-module-protocol-pulse = {
         args = {
-	    server.address = [
-	        "unix:native"
-		# "tcp:4713"
-	}
+            server.address = [
+                "unix:native"
+                # "tcp:4713"
+            ]
+        }
     }
 }
diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
index 810e9353a..6e4a1faec 100644
--- a/src/daemon/pipewire.conf.in
+++ b/src/daemon/pipewire.conf.in
@@ -162,11 +162,11 @@ context.objects = {
     # that you can link, to provide audio for this source.
     #adapter = {
     #    args = {
-    #        factory.name      = support.null-audio-sink
-    #        node.name         = my-mic
-    #        node.description  = Microphone
-    #        media.class       = Audio/Source/Virtual
-    #        audio.position    = "FL,FR"
+    #        factory.name     = support.null-audio-sink
+    #        node.name        = my-mic
+    #        node.description = Microphone
+    #        media.class      = Audio/Source/Virtual
+    #        audio.position   = "FL,FR"
     #    }
     #}