diff --git a/contrib/ci/check-quirks.py b/contrib/ci/check-quirks.py
index b1e5dba7c..83b09fac8 100755
--- a/contrib/ci/check-quirks.py
+++ b/contrib/ci/check-quirks.py
@@ -26,12 +26,22 @@ def test_files() -> int:
                         print("{} has invalid section header: {}".format(fn, line))
                         rc = 1
                         continue
+                    for deprecated in ["DeviceInstanceId", "Guid"]:
+                        if line.find(deprecated) != -1:
+                            print("{} has deprecated prefix: {}".format(fn, deprecated))
+                            rc = 1
+                            continue
                 else:
-                    sections = line.split("=")
+                    sections = line.split(" = ")
                     if len(sections) != 2:
                         print("{} has invalid line: {}".format(fn, line))
                         rc = 1
                         continue
+                    for section in sections:
+                        if section.strip() != section:
+                            print("{} has invalid spacing: {}".format(fn, line))
+                            rc = 1
+                            break
     return rc
 
 
diff --git a/data/tests/quirks.d/tests.quirk b/data/tests/quirks.d/tests.quirk
index fe71e55f4..81bcf15ae 100644
--- a/data/tests/quirks.d/tests.quirk
+++ b/data/tests/quirks.d/tests.quirk
@@ -1,5 +1,5 @@
 [USB\VID_0A5C&PID_6412]
-Flags= ignore-runtime
+Flags = ignore-runtime
 
 [ACME Inc.=True]
 Name = awesome
diff --git a/plugins/dell-dock/dell-dock.quirk b/plugins/dell-dock/dell-dock.quirk
index 55283e5ae..da0574eac 100644
--- a/plugins/dell-dock/dell-dock.quirk
+++ b/plugins/dell-dock/dell-dock.quirk
@@ -102,10 +102,10 @@ Vendor = Dell Inc.
 Plugin = dell_dock
 ParentGuid = USB\VID_413C&PID_B06E&hub&embedded
 Flags = skips-restart,require-ac,dual-image,usable-during-update
-FirmwareSize=524288
+FirmwareSize = 524288
 DellDockUnlockTarget = 9
 InstallDuration = 95
-DellDockInstallDurationI2C=360
+DellDockInstallDurationI2C = 360
 DellDockBlobMajorOffset = 0x18400
 DellDockBlobMinorOffset = 0x18401
 DellDockBlobBuildOffset = 0x18402
@@ -118,8 +118,8 @@ Summary = Thunderbolt controller
 Vendor = Dell Inc.
 VendorId = TBT:0x00D4
 ParentGuid = USB\VID_413C&PID_B06E&hub&embedded
-FirmwareSizeMin=0x40000
-FirmwareSizeMax=0x80000
+FirmwareSizeMin = 0x40000
+FirmwareSizeMax = 0x80000
 Flags = skips-restart,require-ac,dual-image
 Icon = thunderbolt
 InstallDuration = 22
@@ -136,8 +136,8 @@ Summary = USB4 controller
 Vendor = Dell Inc.
 VendorId = TBT:0x00D4
 ParentGuid = USB\VID_413C&PID_B06E&hub&embedded
-FirmwareSizeMin=0x40000
-FirmwareSizeMax=0x80000
+FirmwareSizeMin = 0x40000
+FirmwareSizeMax = 0x80000
 Flags = skips-restart,require-ac,dual-image
 Icon = thunderbolt
 InstallDuration = 46
diff --git a/plugins/flashrom/flashrom.quirk b/plugins/flashrom/flashrom.quirk
index 0fb5222f4..cedb62dc6 100644
--- a/plugins/flashrom/flashrom.quirk
+++ b/plugins/flashrom/flashrom.quirk
@@ -1,34 +1,34 @@
 # Purism
 [a0ce5085-2dea-5086-ae72-45810a186ad0]
-Plugin=flashrom
+Plugin = flashrom
 
 # Libretrend
 [52b68c34-6b31-5ecc-8a5c-de37e666ccd5]
-Plugin=flashrom
-VersionFormat=quad
+Plugin = flashrom
+VersionFormat = quad
 
 # Star LabTop Mk III (HwId)
 [013b60e5-1023-5bee-8ae5-14cae21377b7]
-Plugin=flashrom
+Plugin = flashrom
 
 # Star LabTop Mk IV (HwId)
 [baf1d04e-fd16-5e6a-93cc-1c23d171f879]
-Plugin=flashrom
+Plugin = flashrom
 
 # Star Lite Mk II (HwId)
 [013b60e5-1023-5bee-8ae5-14cae21377b7]
-Plugin=flashrom
+Plugin = flashrom
 
 # Star Lite Mk III (HwId)
 [d5521faa-c50b-5d64-971d-8fd400030c51]
-Plugin=flashrom
+Plugin = flashrom
 
 # Star LabTop Mk III (coreboot GUID)
 [d33219e2-b84c-53a8-a624-27af9752dba6]
-Branch=coreboot
-VersionFormat=number
+Branch = coreboot
+VersionFormat = number
 
 # Star LabTop Mk IV (coreboot GUID)
 [0ee5867c-93f0-5fb4-adf1-9d686ea1183a]
-Branch=coreboot
-VersionFormat=number
+Branch = coreboot
+VersionFormat = number
diff --git a/plugins/logitech-hidpp/logitech-hidpp.quirk b/plugins/logitech-hidpp/logitech-hidpp.quirk
index 11279c972..edfdee5fb 100644
--- a/plugins/logitech-hidpp/logitech-hidpp.quirk
+++ b/plugins/logitech-hidpp/logitech-hidpp.quirk
@@ -2,7 +2,7 @@
 [HIDRAW\VEN_046D&DEV_C52B]
 Plugin = logitech_hidpp
 GType = FuLogitechHidPpRuntimeUnifying
-VendorId=USB:0x046D
+VendorId = USB:0x046D
 InstallDuration = 30
 
 # Nordic
diff --git a/plugins/parade-lspcon/parade-lspcon.quirk b/plugins/parade-lspcon/parade-lspcon.quirk
index b34672200..9bf8fa949 100644
--- a/plugins/parade-lspcon/parade-lspcon.quirk
+++ b/plugins/parade-lspcon/parade-lspcon.quirk
@@ -8,4 +8,4 @@ Name = PS175
 
 # "Puff" Chromeboxes
 [PARADE-LSPCON\NAME_1AF80175:00&FAMILY_Google_Hatch]
-ParadeLspconAuxDeviceName=DPDDC-B
+ParadeLspconAuxDeviceName = DPDDC-B
diff --git a/plugins/superio/superio.quirk b/plugins/superio/superio.quirk
index f83925f54..3d5e4a779 100644
--- a/plugins/superio/superio.quirk
+++ b/plugins/superio/superio.quirk
@@ -1,74 +1,74 @@
 # N13xWU
 [992f1bc7-f8ee-567a-88dd-30e5158d72ed]
-SuperioChipsets =   IT8587
+SuperioChipsets = IT8587
 
 # W740SU
 [f00d8c4e-dce2-51c3-89d6-6cbc5fc5cdbb]
-SuperioChipsets=IT8587
+SuperioChipsets = IT8587
 
 # Star LabTop Mk III (HwId)
 [013b60e5-1023-5bee-8ae5-14cae21377b7]
-SuperioChipsets=IT8987
-InstallDuration=20
+SuperioChipsets = IT8987
+InstallDuration = 20
 
 # Star LabTop Mk IV (HwId)
 [baf1d04e-fd16-5e6a-93cc-1c23d171f879]
-SuperioChipsets=IT8987
-InstallDuration=20
+SuperioChipsets = IT8987
+InstallDuration = 20
 
 # Star Lite Mk II (HwId)
 [013b60e5-1023-5bee-8ae5-14cae21377b7]
-SuperioChipsets=IT8987
-InstallDuration=20
+SuperioChipsets = IT8987
+InstallDuration = 20
 
 # Star Lite Mk III (HwId)
 [d5521faa-c50b-5d64-971d-8fd400030c51]
-SuperioChipsets=IT8987
-InstallDuration=20
+SuperioChipsets = IT8987
+InstallDuration = 20
 
 # Tuxedo InifinityBook S14 Gen6
 [6c80d85b-d0b6-5ee2-99d4-ec28dd32febd]
-SuperioChipsets=IT5570
+SuperioChipsets = IT5570
 
 # Tuxedo InifinityBook S15 Gen6
 [60f53465-e8fc-5122-b79b-f7b03f063037]
-SuperioChipsets=IT5570
+SuperioChipsets = IT5570
 
 [SuperIO-IT8510]
-SuperioId=0x8510
-SuperioPort=0x2e
+SuperioId = 0x8510
+SuperioPort = 0x2e
 
 [SuperIO-IT8511]
-SuperioId=0x8511
-SuperioPort=0x2e
+SuperioId = 0x8511
+SuperioPort = 0x2e
 
 [SuperIO-IT8512]
-SuperioId=0x8512
-SuperioPort=0x2e
+SuperioId = 0x8512
+SuperioPort = 0x2e
 
 [SuperIO-IT8513]
-SuperioId=0x8513
-SuperioPort=0x2e
+SuperioId = 0x8513
+SuperioPort = 0x2e
 
 [SuperIO-IT8516]
-SuperioId=0x8516
-SuperioPort=0x2e
+SuperioId = 0x8516
+SuperioPort = 0x2e
 
 [SuperIO-IT8518]
-SuperioId=0x8518
-SuperioPort=0x2e
+SuperioId = 0x8518
+SuperioPort = 0x2e
 
 [SuperIO-IT8587]
-SuperioId=0x8587
-SuperioPort=0x2e
+SuperioId = 0x8587
+SuperioPort = 0x2e
 
 [SuperIO-IT8987]
-SuperioId=0x8987
-SuperioPort=0x4e
+SuperioId = 0x8987
+SuperioPort = 0x4e
 
 [SuperIO-IT5570]
-SuperioId=0x5570
-SuperioControlPort=0x66
-SuperioDataPort=0x62
-SuperioAutoloadAction=disable
-SuperioTimeout=650
+SuperioId = 0x5570
+SuperioControlPort = 0x66
+SuperioDataPort = 0x62
+SuperioAutoloadAction = disable
+SuperioTimeout = 650
diff --git a/plugins/wacom-raw/wacom-raw.quirk b/plugins/wacom-raw/wacom-raw.quirk
index 79f6ee5d2..a982bc8c0 100644
--- a/plugins/wacom-raw/wacom-raw.quirk
+++ b/plugins/wacom-raw/wacom-raw.quirk
@@ -88,20 +88,20 @@ Guid = WacomEMR
 Flags = is-bootloader
 
 [WacomEMR_W9013]
-WacomI2cFlashBlockSize=64
-WacomI2cFlashBaseAddr=0x2000
-WacomI2cFlashSize=0x1e000
+WacomI2cFlashBlockSize = 64
+WacomI2cFlashBaseAddr = 0x2000
+WacomI2cFlashSize = 0x1e000
 
 [WacomEMR_W9021]
-WacomI2cFlashBlockSize=256
-WacomI2cFlashBaseAddr=0x3000
-WacomI2cFlashSize=0x3c000
+WacomI2cFlashBlockSize = 256
+WacomI2cFlashBaseAddr = 0x3000
+WacomI2cFlashSize = 0x3c000
 
 [WacomEMR]
-GType=FuWacomEmrDevice
+GType = FuWacomEmrDevice
 
 [WacomAES]
-GType=FuWacomAesDevice
-WacomI2cFlashBlockSize=128
-WacomI2cFlashBaseAddr=0x8000
-WacomI2cFlashSize=0x24000
+GType = FuWacomAesDevice
+WacomI2cFlashBlockSize = 128
+WacomI2cFlashBaseAddr = 0x8000
+WacomI2cFlashSize = 0x24000