diff --git a/packages/cloudstation.nix b/packages/cloudstation.nix
index 745c4e4..8532b00 100644
--- a/packages/cloudstation.nix
+++ b/packages/cloudstation.nix
@@ -35,7 +35,7 @@ in buildFHSUserEnv {
     with xorg; [
       cloudstation
       curl
-      dbus_libs
+      dbus
       fontconfig
       freetype
       glib
diff --git a/roles/desktop.nix b/roles/desktop.nix
index 355f909..efea983 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -16,11 +16,11 @@ in
     extraPackages = with pkgs; [
       bemenu
       brightnessctl
+      gammastep
       grim
       i3status-rust
       kanshi
       mako
-      redshift-wlr
       slurp
       swayidle
       swaylock
@@ -160,9 +160,10 @@ in
     lxappearance
     numix-icon-theme
 
+    alacritty
     imv
     inkscape
-    libqrencode
+    keepassxc
     libreoffice
     libsecret
     mpv
@@ -172,15 +173,12 @@ in
     pavucontrol
     pcmanfm
     pulseeffects-pw
-    alacritty
-    unstable.keepassxc
-    unstable.noisetorch
+    qrencode
 
     solaar
     gdk-pixbuf
 
     clipman
-    gebaar-libinput
     wdisplays
     wl-clipboard
     xdg_utils
diff --git a/roles/vpn.nix b/roles/vpn.nix
index 79bcd23..b3a801a 100644
--- a/roles/vpn.nix
+++ b/roles/vpn.nix
@@ -2,5 +2,5 @@
 
 {
   networking.wireguard.enable = true;
-  environment.systemPackages = with pkgs; [ wireguard ];
+  environment.systemPackages = with pkgs; [ wireguard-tools ];
 }