diff --git a/hosts/kirsty/system.scm b/hosts/kirsty/system.scm
index 44fea60..76684c9 100644
--- a/hosts/kirsty/system.scm
+++ b/hosts/kirsty/system.scm
@@ -5,7 +5,7 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages rsync)
-  #:use-module (gnu packages xdisorg)
+  #:use-module (gnu packages wm)
   #:use-module (gnu services desktop)
   #:use-module (gnu services networking)
   #:use-module (gnu services security-token)
@@ -68,17 +68,17 @@
      (name "timotej")
      (comment "Timotej Lazar")
      (group "users")
-     (supplementary-groups '("audio" "cdrom" "input" "kvm" "netdev" "video" "wheel"))
+     (supplementary-groups '("cdrom" "kvm" "netdev" "wheel"))
      (home-directory "/home/timotej"))
     %base-user-accounts))
 
   (packages
-   (cons* ncurses nss-certs rsync rxvt-unicode %base-packages))
+   (cons* ncurses nss-certs rsync %base-packages))
 
   (setuid-programs
    (cons*
     (setuid-program
-     (program (file-append xsecurelock "/libexec/xsecurelock/authproto_pam")))
+     (program (file-append swaylock "/bin/swaylock")))
     %setuid-programs))
 
   (services