diff --git a/.github/workflows/oneclient_nightly.yml b/.github/workflows/oneclient_nightly.yml
index 132b9586..19f3d39f 100644
--- a/.github/workflows/oneclient_nightly.yml
+++ b/.github/workflows/oneclient_nightly.yml
@@ -85,7 +85,7 @@ jobs:
             libfontconfig-dev libfreetype-dev \
             libgl1-mesa-dev libx11-dev libxcursor-dev libxi-dev libxrandr-dev \
             libxkbcommon-dev libxkbcommon-x11-dev libwayland-dev libdbus-1-dev \
-            libgtk-3-dev libayatana-appindicator3-dev libxdo-dev \
+            libgtk-3-dev libayatana-appindicator3-dev \
             libfuse2
 
       - name: Install cargo-packager
diff --git a/.github/workflows/oneclient_release.yml b/.github/workflows/oneclient_release.yml
index bc8e79f5..2856a7f4 100644
--- a/.github/workflows/oneclient_release.yml
+++ b/.github/workflows/oneclient_release.yml
@@ -216,7 +216,7 @@ jobs:
             libfontconfig-dev libfreetype-dev \
             libgl1-mesa-dev libx11-dev libxcursor-dev libxi-dev libxrandr-dev \
             libxkbcommon-dev libxkbcommon-x11-dev libwayland-dev libdbus-1-dev \
-            libgtk-3-dev libayatana-appindicator3-dev libxdo-dev \
+            libgtk-3-dev libayatana-appindicator3-dev \
             libfuse2
 
       - name: Install cargo-packager
diff --git a/Cargo.lock b/Cargo.lock
index 10f1a8cb..f6b69fbd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2254,7 +2254,7 @@ dependencies = [
 [[package]]
 name = "freya"
 version = "0.5.0-rc.8"
-source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.8#af55a77c3cb818c74d469d7da97f834f28cc1f0a"
+source = "git+https://github.com/Polyfrost/freya?rev=2e4a11ec569d72ef1a809e9365548daa3cc5f6b5#2e4a11ec569d72ef1a809e9365548daa3cc5f6b5"
 dependencies = [
  "cfg-if",
  "freya-android",
@@ -2279,7 +2279,7 @@ dependencies = [
 [[package]]
 name = "freya-android"
 version = "0.5.0-rc.8"
-source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.8#af55a77c3cb818c74d469d7da97f834f28cc1f0a"
+source = "git+https://github.com/Polyfrost/freya?rev=2e4a11ec569d72ef1a809e9365548daa3cc5f6b5#2e4a11ec569d72ef1a809e9365548daa3cc5f6b5"
 dependencies = [
  "freya-components",
  "freya-core",
@@ -2292,7 +2292,7 @@ dependencies = [
 [[package]]
 name = "freya-animation"
 version = "0.5.0-rc.8"
-source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.8#af55a77c3cb818c74d469d7da97f834f28cc1f0a"
+source = "git+https://github.com/Polyfrost/freya?rev=2e4a11ec569d72ef1a809e9365548daa3cc5f6b5#2e4a11ec569d72ef1a809e9365548daa3cc5f6b5"
 dependencies = [
  "easer",
  "freya-core",
@@ -2301,7 +2301,7 @@ dependencies = [
 [[package]]
 name = "freya-borderless-plugin"
 version = "0.5.0-rc.8"
-source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.8#af55a77c3cb818c74d469d7da97f834f28cc1f0a"
+source = "git+https://github.com/Polyfrost/freya?rev=2e4a11ec569d72ef1a809e9365548daa3cc5f6b5#2e4a11ec569d72ef1a809e9365548daa3cc5f6b5"
 dependencies = [
  "freya-core",
  "freya-engine",
@@ -2312,7 +2312,7 @@ dependencies = [
 [[package]]
 name = "freya-clipboard"
 version = "0.5.0-rc.8"
-source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.8#af55a77c3cb818c74d469d7da97f834f28cc1f0a"
+source = "git+https://github.com/Polyfrost/freya?rev=2e4a11ec569d72ef1a809e9365548daa3cc5f6b5#2e4a11ec569d72ef1a809e9365548daa3cc5f6b5"
 dependencies = [
  "copypasta",
  "freya-core",
@@ -2321,7 +2321,7 @@ dependencies = [
 [[package]]
 name = "freya-components"
 version = "0.5.0-rc.8"
-source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.8#af55a77c3cb818c74d469d7da97f834f28cc1f0a"
+source = "git+https://github.com/Polyfrost/freya?rev=2e4a11ec569d72ef1a809e9365548daa3cc5f6b5#2e4a11ec569d72ef1a809e9365548daa3cc5f6b5"
 dependencies = [
  "accesskit",
  "anyhow",
@@ -2347,7 +2347,7 @@ dependencies = [
 [[package]]
 name = "freya-core"
 version = "0.5.0-rc.8"
-source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.8#af55a77c3cb818c74d469d7da97f834f28cc1f0a"
+source = "git+https://github.com/Polyfrost/freya?rev=2e4a11ec569d72ef1a809e9365548daa3cc5f6b5#2e4a11ec569d72ef1a809e9365548daa3cc5f6b5"
 dependencies = [
  "accesskit",
  "async-io",
@@ -2377,7 +2377,7 @@ dependencies = [
 [[package]]
 name = "freya-edit"
 version = "0.5.0-rc.8"
-source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.8#af55a77c3cb818c74d469d7da97f834f28cc1f0a"
+source = "git+https://github.com/Polyfrost/freya?rev=2e4a11ec569d72ef1a809e9365548daa3cc5f6b5#2e4a11ec569d72ef1a809e9365548daa3cc5f6b5"
 dependencies = [
  "bitflags 2.13.2",
  "freya-clipboard",
@@ -2391,7 +2391,7 @@ dependencies = [
 [[package]]
 name = "freya-engine"
 version = "0.5.0-rc.8"
-source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.8#af55a77c3cb818c74d469d7da97f834f28cc1f0a"
+source = "git+https://github.com/Polyfrost/freya?rev=2e4a11ec569d72ef1a809e9365548daa3cc5f6b5#2e4a11ec569d72ef1a809e9365548daa3cc5f6b5"
 dependencies = [
  "freya-skia-safe",
 ]
@@ -2399,7 +2399,7 @@ dependencies = [
 [[package]]
 name = "freya-markdown"
 version = "0.5.0-rc.8"
-source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.8#af55a77c3cb818c74d469d7da97f834f28cc1f0a"
+source = "git+https://github.com/Polyfrost/freya?rev=2e4a11ec569d72ef1a809e9365548daa3cc5f6b5#2e4a11ec569d72ef1a809e9365548daa3cc5f6b5"
 dependencies = [
  "freya-components",
  "freya-core",
@@ -2410,7 +2410,7 @@ dependencies = [
 [[package]]
 name = "freya-metrics-plugin"
 version = "0.5.0-rc.8"
-source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.8#af55a77c3cb818c74d469d7da97f834f28cc1f0a"
+source = "git+https://github.com/Polyfrost/freya?rev=2e4a11ec569d72ef1a809e9365548daa3cc5f6b5#2e4a11ec569d72ef1a809e9365548daa3cc5f6b5"
 dependencies = [
  "freya-core",
  "freya-engine",
@@ -2421,7 +2421,7 @@ dependencies = [
 [[package]]
 name = "freya-query"
 version = "0.5.0-rc.8"
-source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.8#af55a77c3cb818c74d469d7da97f834f28cc1f0a"
+source = "git+https://github.com/Polyfrost/freya?rev=2e4a11ec569d72ef1a809e9365548daa3cc5f6b5#2e4a11ec569d72ef1a809e9365548daa3cc5f6b5"
 dependencies = [
  "freya-core",
  "futures-util",
@@ -2430,7 +2430,7 @@ dependencies = [
 [[package]]
 name = "freya-radio"
 version = "0.5.0-rc.8"
-source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.8#af55a77c3cb818c74d469d7da97f834f28cc1f0a"
+source = "git+https://github.com/Polyfrost/freya?rev=2e4a11ec569d72ef1a809e9365548daa3cc5f6b5#2e4a11ec569d72ef1a809e9365548daa3cc5f6b5"
 dependencies = [
  "freya-core",
 ]
@@ -2438,7 +2438,7 @@ dependencies = [
 [[package]]
 name = "freya-router"
 version = "0.5.0-rc.8"
-source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.8#af55a77c3cb818c74d469d7da97f834f28cc1f0a"
+source = "git+https://github.com/Polyfrost/freya?rev=2e4a11ec569d72ef1a809e9365548daa3cc5f6b5#2e4a11ec569d72ef1a809e9365548daa3cc5f6b5"
 dependencies = [
  "freya-core",
  "freya-router-macro",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "freya-router-macro"
 version = "0.5.0-rc.8"
-source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.8#af55a77c3cb818c74d469d7da97f834f28cc1f0a"
+source = "git+https://github.com/Polyfrost/freya?rev=2e4a11ec569d72ef1a809e9365548daa3cc5f6b5#2e4a11ec569d72ef1a809e9365548daa3cc5f6b5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2461,7 +2461,7 @@ dependencies = [
 [[package]]
 name = "freya-sdk"
 version = "0.5.0-rc.8"
-source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.8#af55a77c3cb818c74d469d7da97f834f28cc1f0a"
+source = "git+https://github.com/Polyfrost/freya?rev=2e4a11ec569d72ef1a809e9365548daa3cc5f6b5#2e4a11ec569d72ef1a809e9365548daa3cc5f6b5"
 dependencies = [
  "freya-core",
  "tokio",
@@ -2511,7 +2511,7 @@ dependencies = [
 [[package]]
 name = "freya-testing"
 version = "0.5.0-rc.8"
-source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.8#af55a77c3cb818c74d469d7da97f834f28cc1f0a"
+source = "git+https://github.com/Polyfrost/freya?rev=2e4a11ec569d72ef1a809e9365548daa3cc5f6b5#2e4a11ec569d72ef1a809e9365548daa3cc5f6b5"
 dependencies = [
  "accesskit",
  "freya-clipboard",
@@ -2526,7 +2526,7 @@ dependencies = [
 [[package]]
 name = "freya-winit"
 version = "0.5.0-rc.8"
-source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.8#af55a77c3cb818c74d469d7da97f834f28cc1f0a"
+source = "git+https://github.com/Polyfrost/freya?rev=2e4a11ec569d72ef1a809e9365548daa3cc5f6b5#2e4a11ec569d72ef1a809e9365548daa3cc5f6b5"
 dependencies = [
  "accesskit",
  "accesskit_winit",
@@ -3203,18 +3203,18 @@ dependencies = [
 
 [[package]]
 name = "hotpath"
-version = "0.27.0"
+version = "0.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fea08cd9a9b44bff59a678e2c140e25c90e0a5cf69032b546622ca4b29fdce6"
+checksum = "f94954c08de30a8d03236eff084da859eb8020c32fb110c8358e3e765e68e176"
 dependencies = [
  "hotpath-macros",
 ]
 
 [[package]]
 name = "hotpath-macros"
-version = "0.27.0"
+version = "0.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc192b9ee12373854f13fd22ca359a2225e2c11d584999d61d8384ee589d06ef"
+checksum = "0a57685508a0e0854667ccfd8583f3f71c377d64367a0f7bef64fcacef26646d"
 
 [[package]]
 name = "htmd"
@@ -3965,25 +3965,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "libxdo"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00333b8756a3d28e78def82067a377de7fa61b24909000aeaa2b446a948d14db"
-dependencies = [
- "libxdo-sys",
-]
-
-[[package]]
-name = "libxdo-sys"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db23b9e7e2b7831bbd8aac0bbeeeb7b68cbebc162b227e7052e8e55829a09212"
-dependencies = [
- "libc",
- "x11",
-]
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.15"
@@ -4218,7 +4199,6 @@ dependencies = [
  "dpi",
  "gtk",
  "keyboard-types 0.7.0",
- "libxdo",
  "objc2 0.6.4",
  "objc2-app-kit 0.3.2",
  "objc2-core-foundation",
@@ -5422,7 +5402,7 @@ checksum = "35fb2e5f958ec131621fdd531e9fc186ed768cbe395337403ae56c17a74c68ec"
 [[package]]
 name = "pathgraph"
 version = "0.5.0-rc.8"
-source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.8#af55a77c3cb818c74d469d7da97f834f28cc1f0a"
+source = "git+https://github.com/Polyfrost/freya?rev=2e4a11ec569d72ef1a809e9365548daa3cc5f6b5#2e4a11ec569d72ef1a809e9365548daa3cc5f6b5"
 
 [[package]]
 name = "percent-encoding"
@@ -5917,7 +5897,7 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 [[package]]
 name = "ragnarok"
 version = "0.5.0-rc.8"
-source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.8#af55a77c3cb818c74d469d7da97f834f28cc1f0a"
+source = "git+https://github.com/Polyfrost/freya?rev=2e4a11ec569d72ef1a809e9365548daa3cc5f6b5#2e4a11ec569d72ef1a809e9365548daa3cc5f6b5"
 dependencies = [
  "euclid",
  "hotpath",
@@ -7776,7 +7756,7 @@ checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2"
 [[package]]
 name = "torin"
 version = "0.5.0-rc.8"
-source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.8#af55a77c3cb818c74d469d7da97f834f28cc1f0a"
+source = "git+https://github.com/Polyfrost/freya?rev=2e4a11ec569d72ef1a809e9365548daa3cc5f6b5#2e4a11ec569d72ef1a809e9365548daa3cc5f6b5"
 dependencies = [
  "euclid",
  "itertools",
@@ -9031,16 +9011,6 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc"
 
-[[package]]
-name = "x11"
-version = "2.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e"
-dependencies = [
- "libc",
- "pkg-config",
-]
-
 [[package]]
 name = "x11-clipboard"
 version = "0.9.3"
diff --git a/Cargo.toml b/Cargo.toml
index 2f0eb6bc..cde4fe0d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -144,9 +144,9 @@ syn = {version = "=3.0.6"}
 thiserror = {version = "=2.0.21"}
 
 # ui
-freya = {git = "https://github.com/marc2332/freya", tag = "v0.5.0-rc.8", features = ["engine", "winit", "router", "remote-asset", "sdk-tokio", "query", "radio", "borderless", "titlebar", "tray", "metrics"]}
-freya-core = {git = "https://github.com/marc2332/freya", tag = "v0.5.0-rc.8"}
-freya-testing = {git = "https://github.com/marc2332/freya",  tag = "v0.5.0-rc.8"}
+freya = {git = "https://github.com/Polyfrost/freya", rev = "2e4a11ec569d72ef1a809e9365548daa3cc5f6b5", features = ["engine", "winit", "router", "remote-asset", "sdk-tokio", "query", "radio", "borderless", "titlebar", "tray", "metrics"]}
+freya-core = {git = "https://github.com/Polyfrost/freya", rev = "2e4a11ec569d72ef1a809e9365548daa3cc5f6b5",}
+freya-testing = {git = "https://github.com/Polyfrost/freya", rev = "2e4a11ec569d72ef1a809e9365548daa3cc5f6b5",}
 freya-skia-safe = "=0.100.0-beta.1" # required for the SKSL player renderer
 image = {version = "=0.25.10", default-features = false, features = ["png", "jpeg"]}
 
diff --git a/distribution/aur/oneclient-bin/PKGBUILD b/distribution/aur/oneclient-bin/PKGBUILD
index d0e7bab7..f73d0787 100644
--- a/distribution/aur/oneclient-bin/PKGBUILD
+++ b/distribution/aur/oneclient-bin/PKGBUILD
@@ -19,7 +19,6 @@ depends=(
   'dbus'
   'gtk3'
   'libayatana-appindicator'
-  'xdotool'
 )
 provides=('oneclient')
 conflicts=('oneclient')
diff --git a/distribution/aur/oneclient/PKGBUILD b/distribution/aur/oneclient/PKGBUILD
index 94cb371b..c8e145aa 100644
--- a/distribution/aur/oneclient/PKGBUILD
+++ b/distribution/aur/oneclient/PKGBUILD
@@ -18,7 +18,6 @@ depends=(
   'dbus'
   'gtk3'
   'libayatana-appindicator'
-  'xdotool'
 )
 makedepends=(
   'rust'
diff --git a/packages/oneclient_app/Cargo.toml b/packages/oneclient_app/Cargo.toml
index 3b6d792c..f18ed955 100644
--- a/packages/oneclient_app/Cargo.toml
+++ b/packages/oneclient_app/Cargo.toml
@@ -153,7 +153,6 @@ SectionEnd
 
 [package.metadata.packager.deb]
 desktop-template = "distribution/linux/org.polyfrost.oneclient.template"
-depends = ["libxdo3"]
 
 [package.metadata.packager.appimage]
 # desktop entry generated from the deb template above via the linux config