diff --git a/home/desktop/niri.nix b/home/desktop/niri.nix
index 5ff1e89..f99b348 100644
--- a/home/desktop/niri.nix
+++ b/home/desktop/niri.nix
@@ -46,7 +46,7 @@ in
     settings = {
       # Autostart DMS if you prefer launching it directly from Niri instead of systemd
       spawn-at-startup = [
-        { command = [ "${pkgs.dms}/bin/dms" "run" ]; }
+        { command = [ "dms" "run" ]; }
         { command = [ "${launch-lisgd}/bin/launch-lisgd" ]; } # Spawns the daemon
         { command = [ "${launch-wvkbd}/bin/launch-wvkbd" ]; }
       ];
diff --git a/home/jashton.nix b/home/jashton.nix
index e8666bd..b031696 100644
--- a/home/jashton.nix
+++ b/home/jashton.nix
@@ -38,7 +38,6 @@
     steam
     spotify
     vlc
-    wvkbd
     yt-dlp
 
     (pkgs.writeShellScriptBin "find-open-port" ''
diff --git a/system/packages.nix b/system/packages.nix
index a4d7574..94c920a 100644
--- a/system/packages.nix
+++ b/system/packages.nix
@@ -35,6 +35,7 @@
     v4l-utils
     vim
     wget
+    wvkbd
     xclip
     xournalpp