diff --git a/config.scm b/config.scm
index 6499846..b1e5db7 100644
--- a/config.scm
+++ b/config.scm
@@ -2,7 +2,6 @@
 
 (use-modules
  (gnu)
- (gnu build file-systems)
  (gnu image)
  (gnu services authentication)
  (gnu services avahi)
@@ -33,7 +32,8 @@
  (timezone "Europe/Berlin")
  (locale "de_DE.utf8")
  (keyboard-layout
-  (keyboard-layout "de" #:options '("caps:swapescape")))
+  (keyboard-layout "de" #:options
+                   '("caps:swapescape")))
  (bootloader
   (bootloader-configuration
    (bootloader grub-efi-bootloader)
@@ -43,12 +43,14 @@
  (file-systems
   (cons*
    (file-system
-    (device (file-system-label "EFI\\x20System\\x20Partition"))
+    (device
+     (partition-label "EFI System Partition"))
     #;(device "/dev/disk/by-partlabel/EFI\\x20System\\x20Partition")
     (mount-point "/boot/efi")
     (type "vfat"))
    (file-system
-    (device (file-system-label "guix-root"))
+    (device
+     (partition-label "guix-root"))
     #;(device "/dev/disk/by-partlabel/guix-root")
     (mount-point "/")
     (type "xfs"))
@@ -56,7 +58,8 @@
  (swap-devices
   (list
    (swap-space
-    (target (file-system-label "swap"))
+    (target
+     (partition-label "swap"))
     #;(target "/dev/disk/by-partlabel/swap")
     (discard? #t))))
  (users
@@ -113,7 +116,8 @@
                  (terminal-switch #t)
                  (default-session-command
                    (greetd-wlgreet-sway-session
-                    (sway (specification->package "swayfx"))
+                    (sway
+                     (specification->package "swayfx"))
                     ;; (sway-configuration #f)
                     )))))))
     (service fprintd-service-type)