diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9efd5f0..ca99924 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: install system dependencies
-        run: sudo apt-get update && sudo apt-get install lld cmake libexpat1-dev libfontconfig-dev libfreetype-dev pkg-config
+        run: sudo apt-get update && sudo apt-get install lld cmake libexpat1-dev libfontconfig-dev libfreetype-dev pkg-config libxkbcommon-dev
       - uses: actions/checkout@v3
       - name: install toolchain
         run: rustup show
@@ -33,7 +33,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: install system dependencies
-        run: sudo apt-get update && sudo apt-get install lld cmake libexpat1-dev libfontconfig-dev libfreetype-dev pkg-config
+        run: sudo apt-get update && sudo apt-get install lld cmake libexpat1-dev libfontconfig-dev libfreetype-dev pkg-config libxkbcommon-dev
       - uses: actions/checkout@v3
       - name: install toolchain
         run: rustup show
diff --git a/Cargo.lock b/Cargo.lock
index 5d11e2b..40d9bc4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -811,7 +811,7 @@ dependencies = [
  "futures-lite",
  "image",
  "rayon",
- "smithay-client-toolkit 0.17.0 (git+https://github.com/Smithay/client-toolkit)",
+ "smithay-client-toolkit 0.17.0",
  "tokio",
  "tracing",
  "wayland-client 0.30.2",
@@ -2155,7 +2155,7 @@ dependencies = [
  "instant",
  "log",
  "palette",
- "smithay-client-toolkit 0.17.0 (git+https://github.com/pop-os/client-toolkit?tag=themed-pointer)",
+ "smithay-client-toolkit 0.17.0",
  "thiserror",
  "twox-hash",
 ]
@@ -2210,7 +2210,7 @@ dependencies = [
  "iced_accessibility",
  "iced_core",
  "iced_futures",
- "smithay-client-toolkit 0.17.0 (git+https://github.com/pop-os/client-toolkit?tag=themed-pointer)",
+ "smithay-client-toolkit 0.17.0",
  "thiserror",
 ]
 
@@ -2229,7 +2229,7 @@ dependencies = [
  "itertools",
  "log",
  "raw-window-handle 0.5.2",
- "smithay-client-toolkit 0.17.0 (git+https://github.com/pop-os/client-toolkit?tag=themed-pointer)",
+ "smithay-client-toolkit 0.17.0",
  "smithay-clipboard",
  "thiserror",
  "wayland-backend",
@@ -2295,7 +2295,7 @@ dependencies = [
  "iced_style",
  "num-traits",
  "ouroboros 0.13.0",
- "smithay-client-toolkit 0.17.0 (git+https://github.com/pop-os/client-toolkit?tag=themed-pointer)",
+ "smithay-client-toolkit 0.17.0",
  "thiserror",
  "unicode-segmentation",
 ]
@@ -2636,7 +2636,7 @@ dependencies = [
  "lazy_static",
  "palette",
  "slotmap",
- "smithay-client-toolkit 0.17.0 (git+https://github.com/pop-os/client-toolkit?tag=themed-pointer)",
+ "smithay-client-toolkit 0.17.0",
  "tokio",
 ]
 
@@ -4109,30 +4109,6 @@ dependencies = [
  "xkbcommon",
 ]
 
-[[package]]
-name = "smithay-client-toolkit"
-version = "0.17.0"
-source = "git+https://github.com/Smithay/client-toolkit#9d0bbc69f33873d5e85864413e12c71f8c458a2d"
-dependencies = [
- "bitflags 1.3.2",
- "calloop",
- "cursor-icon",
- "dlib",
- "log",
- "memmap2",
- "nix 0.26.2",
- "pkg-config",
- "thiserror",
- "wayland-backend",
- "wayland-client 0.30.2",
- "wayland-csd-frame",
- "wayland-cursor 0.30.0",
- "wayland-protocols 0.30.0",
- "wayland-protocols-wlr",
- "wayland-scanner 0.30.0",
- "xkbcommon",
-]
-
 [[package]]
 name = "smithay-clipboard"
 version = "0.6.6"
@@ -4335,15 +4311,16 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab"
 
 [[package]]
 name = "tempfile"
-version = "3.5.0"
+version = "3.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
+checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6"
 dependencies = [
+ "autocfg",
  "cfg-if",
  "fastrand",
  "redox_syscall 0.3.5",
  "rustix",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -5008,17 +4985,6 @@ dependencies = [
  "wayland-sys 0.29.5",
 ]
 
-[[package]]
-name = "wayland-csd-frame"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72191e30290b83491325d32c1327be7f45459c97263d9d48494c81efc9328116"
-dependencies = [
- "bitflags 2.3.1",
- "cursor-icon",
- "wayland-backend",
-]
-
 [[package]]
 name = "wayland-cursor"
 version = "0.29.5"
diff --git a/app/src/pages/desktop/panel/applets.rs b/app/src/pages/desktop/panel/applets.rs
index 63b8d47..6064c7d 100644
--- a/app/src/pages/desktop/panel/applets.rs
+++ b/app/src/pages/desktop/panel/applets.rs
@@ -637,7 +637,7 @@ impl<'a> Applet<'a> {
 }
 
 // TODO A11y / keyboard support
-
+#[allow(dead_code)]
 pub struct AppletReorderList<'a, Message> {
     id: Id,
     info: Vec<Applet<'a>>,
diff --git a/debian/control b/debian/control
index 031acce..af3f80f 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends:
     libfreetype-dev,
     lld,
     pkg-config,
+    libxkbcommon-dev,
     rustc (>= 1.65.0)
 Standards-Version: 4.6.2
 Homepage: https://github.com/pop-os/cosmic-settings
diff --git a/pages/desktop/Cargo.toml b/pages/desktop/Cargo.toml
index 38b9fbc..fad5060 100644
--- a/pages/desktop/Cargo.toml
+++ b/pages/desktop/Cargo.toml
@@ -15,5 +15,5 @@ image = "0.24.6"
 rayon = "1.7.0"
 tokio = { version = "1.28.0", features = ["sync"] }
 tracing = "0.1.37"
-sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit" }
-wayland-client = "0.30.1"
\ No newline at end of file
+sctk = { package = "smithay-client-toolkit", git = "https://github.com/pop-os/client-toolkit", tag = "themed-pointer"}
+wayland-client = "0.30.1"