diff --git a/.config/environment.d/pi-status-bridge.conf b/.config/environment.d/pi-status-bridge.conf
index 7804e88..f35a284 100644
--- a/.config/environment.d/pi-status-bridge.conf
+++ b/.config/environment.d/pi-status-bridge.conf
@@ -1,2 +1,3 @@
 # Used by the Noctalia Pi Status Bridge adapter and the Hyprland launcher.
+PI_STATUS_BRIDGE_CLIENT=/home/alex/.npm-global/bin/pi-status-bridge-client
 PI_STATUS_UI_BINARY=/home/alex/.local/bin/pi-status-ui
diff --git a/.config/systemd/user/pi-status-bridge.service b/.config/systemd/user/pi-status-bridge.service
index 9b011a7..948c490 100644
--- a/.config/systemd/user/pi-status-bridge.service
+++ b/.config/systemd/user/pi-status-bridge.service
@@ -4,8 +4,8 @@ After=graphical-session.target
 
 [Service]
 Type=simple
-Environment=PATH=/home/alex/.local/bin:/usr/local/bin:/usr/bin:/bin
-ExecStart=/home/alex/.local/bin/pi-status-bridge --session-root %h/.local/state/pi-status-bridge/sessions
+Environment=PATH=/home/alex/.npm-global/bin:/usr/local/bin:/usr/bin:/bin
+ExecStart=/usr/bin/env pi-status-bridge --session-root %h/.local/state/pi-status-bridge/sessions
 Restart=on-failure
 RestartSec=3
 
diff --git a/.local/bin/pi-status-ui b/.local/bin/pi-status-ui
index e9b2a00..39aab7c 100755
--- a/.local/bin/pi-status-ui
+++ b/.local/bin/pi-status-ui
@@ -1,4 +1,4 @@
 #!/bin/sh
 # The opaque release window runs natively on Wayland; disable WebKit DMABUF,
 # which is unreliable with this NVIDIA desktop's compositor path.
-exec env WEBKIT_DISABLE_DMABUF_RENDERER=1 "$HOME/projects/pi-gui/ui/src-tauri/target/release/pi-status-ui" "$@"
+exec env WEBKIT_DISABLE_DMABUF_RENDERER=1 "$HOME/projects/pi-status-bridge/ui/src-tauri/target/release/pi-status-ui" "$@"
diff --git a/.local/share/noctalia/plugins/pi-status-bridge b/.local/share/noctalia/plugins/pi-status-bridge
index bd500f2..d0b4ee1 120000
--- a/.local/share/noctalia/plugins/pi-status-bridge
+++ b/.local/share/noctalia/plugins/pi-status-bridge
@@ -1 +1 @@
-../../../../projects/pi-gui/noctalia-v5-plugin/pi-status-bridge
\ No newline at end of file
+../../../../projects/pi-status-bridge/noctalia-v5-plugin/pi-status-bridge
\ No newline at end of file