diff --git a/flake.lock b/flake.lock
index 54a8c29..f6989b6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,17 +23,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1730157521,
-        "narHash": "sha256-xyodl47NDih2SEYbRkAvv6lPbjjA/E9B0TlCLnGIFa8=",
-        "ref": "refs/heads/master",
-        "rev": "4e48c6eefb399abfcdefbe046a6a642bdcfcc1a6",
-        "revCount": 358,
-        "type": "git",
-        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
+        "lastModified": 1730530038,
+        "narHash": "sha256-D3t7uwFNdgJNgSvoHAY+nX4azEkJFIIx7hntVAqihGU=",
+        "owner": "nydragon",
+        "repo": "quickshell",
+        "rev": "28f281952d93768ec664f3eeb2becba5abdddf0d",
+        "type": "github"
       },
       "original": {
-        "type": "git",
-        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
+        "owner": "nydragon",
+        "repo": "quickshell",
+        "type": "github"
       }
     },
     "root": {
diff --git a/flake.nix b/flake.nix
index d61433e..91e4a65 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
 
     quickshell = {
-      url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
+      url = "github:nydragon/quickshell";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
diff --git a/src/provider/Sway.qml b/src/provider/Sway.qml
deleted file mode 100644
index 7dd240a..0000000
--- a/src/provider/Sway.qml
+++ /dev/null
@@ -1,34 +0,0 @@
-pragma Singleton
-
-import Quickshell
-import QtQuick
-import Quickshell.Io
-
-Singleton {
-    id: root
-
-    property int activeWorkspace: 1
-    property var dispatch: m => {
-        sender.command = ["swaymsg", ...m];
-        sender.running = true;
-    }
-
-    Process {
-        id: sender
-        command: []
-    }
-
-    Process {
-        command: ["swaymsg", "-mtsubscribe", "[\"workspace\"]"]
-        running: true
-
-        stdout: SplitParser {
-            onRead: data => {
-                const parsed = JSON.parse(data);
-                if (parsed.change == "focus") {
-                    root.activeWorkspace = parsed.current.num;
-                }
-            }
-        }
-    }
-}
diff --git a/src/widgets/workspaces/WorkspaceIPC.qml b/src/widgets/workspaces/WorkspaceIPC.qml
index 9e64df9..0a8f5bd 100644
--- a/src/widgets/workspaces/WorkspaceIPC.qml
+++ b/src/widgets/workspaces/WorkspaceIPC.qml
@@ -1,7 +1,7 @@
 import QtQuick
 import Quickshell.Io
 import Quickshell.Hyprland
-import "root:provider"
+import Quickshell.Sway
 
 Item {
     id: root
@@ -14,7 +14,7 @@ Item {
         console.log(`We are switching from workspace ${active} to ${w}`);
         switch (root.name) {
         case "sway":
-            Sway.dispatch(["workspace", w]);
+            Sway.dispatch(`workspace ${w}`);
             break;
         case "Hyprland":
             Hyprland.dispatch(`workspace ${w}`);
@@ -34,7 +34,7 @@ Item {
                     root.name = data.slice(20);
                     switch (root.name) {
                     case "sway":
-                        root.active = Qt.binding(() => Sway.activeWorkspace ?? root.active);
+                        root.active = Qt.binding(() => Sway.focusedWorkspace?.num ?? root.active);
                         break;
                     case "Hyprland":
                         root.active = Qt.binding(() => Hyprland.focusedMonitor?.activeWorkspace?.id ?? root.active);