diff --git a/sway/default.nix b/sway/default.nix
index 4f97e3a..f583d3d 100644
--- a/sway/default.nix
+++ b/sway/default.nix
@@ -126,16 +126,12 @@ in
           "${modifier}+l" = "exec ${lock_command}";
           "${modifier}+Shift+m" = "output '*' power off, output '*' power on, exec ${pkgs.kanshi}/bin/kanshictl reload";
 
-          "--release Caps_Lock" = "exec swayosd-client --caps-lock";
-          "--release Num_Lock" = "exec swayosd-client --num-lock";
+          "--release Caps_Lock" = "exec swayosd --caps-lock";
 
-          "XF86AudioRaiseVolume" = "exec swayosd-client --output-volume raise";
-          "XF86AudioLowerVolume" = "exec swayosd-client --output-volume lower";
-          "XF86AudioMute" = "exec swayosd-client --output-volume mute-toggle";
-          "XF86AudioMicMute" = "exec swayosd-client --input-volume mute-toggle";
-
-          "XF86MonBrightnessUp" = "exec swayosd-client --brightness raise";
-          "XF86MonBrightnessDown" = "exec swayosd-client --brightness lower";
+          "XF86AudioRaiseVolume" = "exec swayosd --output-volume raise";
+          "XF86AudioLowerVolume" = "exec swayosd --output-volume lower";
+          "XF86AudioMute" = "exec swayosd --output-volume mute-toggle";
+          "XF86AudioMicMute" = "exec swayosd --input-volume mute-toggle";
         };
 
       startup = [
diff --git a/xps.nix b/xps.nix
index 2d0565e..91b9f27 100644
--- a/xps.nix
+++ b/xps.nix
@@ -1,9 +1,5 @@
-{ pkgs, ... }:
-let
-  swaymsg = "${pkgs.sway}/bin/swaymsg";
-  acer_left = "Acer Technologies Acer PE270K 0x0027A130";
-  acer_right = "Acer Technologies Acer PE270K 0x0027A150";
-in
+{ ... }:
+
 {
   services.kanshi = {
     enable = true;
@@ -26,7 +22,7 @@ in
           name = "home_office";
           outputs = [
             {
-              criteria = acer_left;
+              criteria = "Acer Technologies Acer PE270K 0x0027A130";
               mode = "3840x2160";
               scale = 1.75;
               status = "enable";
@@ -34,7 +30,7 @@ in
               transform = "normal";
             }
             {
-              criteria = acer_right;
+              criteria = "Acer Technologies Acer PE270K 0x0027A150";
               mode = "3840x2160";
               scale = 1.75;
               status = "enable";
@@ -47,17 +43,17 @@ in
             }
           ];
           exec = ''
-            exec ${swaymsg} workspace 10 output '"${acer_left}"', workspace 10, move workspace to output '"${acer_left}"'
-            exec ${swaymsg} workspace 8 output '"${acer_left}"', workspace 8, move workspace to output '"${acer_left}"'
-            exec ${swaymsg} workspace 6 output '"${acer_left}"', workspace 6, move workspace to output '"${acer_left}"'
-            exec ${swaymsg} workspace 4 output '"${acer_left}"', workspace 4, move workspace to output '"${acer_left}"'
-            exec ${swaymsg} workspace 2 output '"${acer_left}"', workspace 2, move workspace to output '"${acer_left}"'
+            exec swaymsg workspace 0, move workspace to output '"Acer Technologies Acer PE270K 0x0027A130"'
+            exec swaymsg workspace 8, move workspace to output '"Acer Technologies Acer PE270K 0x0027A130"'
+            exec swaymsg workspace 6, move workspace to output '"Acer Technologies Acer PE270K 0x0027A130"'
+            exec swaymsg workspace 4, move workspace to output '"Acer Technologies Acer PE270K 0x0027A130"'
+            exec swaymsg workspace 2, move workspace to output '"Acer Technologies Acer PE270K 0x0027A130"'
 
-            exec ${swaymsg} workspace 9 output '"${acer_right}"', workspace 9, move workspace to output '"${acer_right}"'
-            exec ${swaymsg} workspace 7 output '"${acer_right}"', workspace 7, move workspace to output '"${acer_right}"'
-            exec ${swaymsg} workspace 5 output '"${acer_right}"', workspace 5, move workspace to output '"${acer_right}"'
-            exec ${swaymsg} workspace 3 output '"${acer_right}"', workspace 3, move workspace to output '"${acer_right}"'
-            exec ${swaymsg} workspace 1 output '"${acer_right}"', workspace 1, move workspace to output '"${acer_right}"'
+            exec swaymsg workspace 9, move workspace to output '"Acer Technologies Acer PE270K 0x0027A150"'
+            exec swaymsg workspace 7, move workspace to output '"Acer Technologies Acer PE270K 0x0027A150"'
+            exec swaymsg workspace 5, move workspace to output '"Acer Technologies Acer PE270K 0x0027A150"'
+            exec swaymsg workspace 3, move workspace to output '"Acer Technologies Acer PE270K 0x0027A150"'
+            exec swaymsg workspace 1, move workspace to output '"Acer Technologies Acer PE270K 0x0027A150"'
           '';
         };
       }