diff --git a/Cargo.lock b/Cargo.lock
index 59414006..311d67c3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -655,7 +655,6 @@ name = "cosmic-app-list"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "calloop",
  "cosmic-applet",
  "cosmic-client-toolkit",
  "cosmic-protocols",
@@ -850,7 +849,6 @@ name = "cosmic-applet-workspaces"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "calloop",
  "cosmic-applet",
  "cosmic-client-toolkit",
  "cosmic-protocols",
@@ -863,25 +861,23 @@ dependencies = [
  "once_cell",
  "pretty_env_logger 0.5.0",
  "rust-embed",
- "wayland-backend",
- "wayland-client 0.30.2",
  "xdg",
 ]
 
 [[package]]
 name = "cosmic-client-toolkit"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-protocols?rev=f0cfe09#f0cfe0973376b31fba4a726a35633a8e39e9319e"
+source = "git+https://github.com/pop-os/cosmic-protocols?rev=e39748e#e39748e1312d74ab8b4c26f4813b858413500b59"
 dependencies = [
  "cosmic-protocols",
- "smithay-client-toolkit 0.17.0 (git+https://github.com/pop-os/client-toolkit?tag=themed-pointer)",
+ "smithay-client-toolkit 0.17.0",
  "wayland-client 0.30.2",
 ]
 
 [[package]]
 name = "cosmic-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
+source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
 dependencies = [
  "atomicwrites",
  "cosmic-config-derive",
@@ -895,7 +891,7 @@ dependencies = [
 [[package]]
 name = "cosmic-config-derive"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
+source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
 dependencies = [
  "quote",
  "syn 1.0.109",
@@ -962,7 +958,7 @@ dependencies = [
 [[package]]
 name = "cosmic-protocols"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-protocols?rev=f0cfe09#f0cfe0973376b31fba4a726a35633a8e39e9319e"
+source = "git+https://github.com/pop-os/cosmic-protocols?rev=e39748e#e39748e1312d74ab8b4c26f4813b858413500b59"
 dependencies = [
  "bitflags 1.3.2",
  "wayland-backend",
@@ -994,7 +990,7 @@ dependencies = [
 [[package]]
 name = "cosmic-theme"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
+source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
 dependencies = [
  "anyhow",
  "cosmic-config",
@@ -1009,7 +1005,7 @@ dependencies = [
 [[package]]
 name = "cosmic-time"
 version = "0.2.0"
-source = "git+https://github.com/pop-os/cosmic-time?branch=libcosmic#c39e737fc55f6c3cbb03a309627da5c525bddd6d"
+source = "git+https://github.com/pop-os/cosmic-time?rev=c39e737#c39e737fc55f6c3cbb03a309627da5c525bddd6d"
 dependencies = [
  "float-cmp",
  "libcosmic",
@@ -2297,7 +2293,7 @@ dependencies = [
 [[package]]
 name = "iced"
 version = "0.9.0"
-source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
+source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
 dependencies = [
  "iced_accessibility",
  "iced_core",
@@ -2312,7 +2308,7 @@ dependencies = [
 [[package]]
 name = "iced_accessibility"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
+source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
 dependencies = [
  "accesskit",
  "accesskit_unix",
@@ -2321,14 +2317,14 @@ dependencies = [
 [[package]]
 name = "iced_core"
 version = "0.9.0"
-source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
+source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
 dependencies = [
  "bitflags 1.3.2",
  "iced_accessibility",
  "instant",
  "log",
  "palette",
- "smithay-client-toolkit 0.17.0 (git+https://github.com/smithay/client-toolkit?rev=c9940f4)",
+ "smithay-client-toolkit 0.17.0",
  "thiserror",
  "twox-hash",
 ]
@@ -2336,7 +2332,7 @@ dependencies = [
 [[package]]
 name = "iced_futures"
 version = "0.6.0"
-source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
+source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
 dependencies = [
  "futures",
  "iced_core",
@@ -2349,7 +2345,7 @@ dependencies = [
 [[package]]
 name = "iced_graphics"
 version = "0.8.0"
-source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
+source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
 dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
@@ -2366,7 +2362,7 @@ dependencies = [
 [[package]]
 name = "iced_renderer"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
+source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
 dependencies = [
  "iced_graphics",
  "iced_tiny_skia",
@@ -2378,19 +2374,19 @@ dependencies = [
 [[package]]
 name = "iced_runtime"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
+source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
 dependencies = [
  "iced_accessibility",
  "iced_core",
  "iced_futures",
- "smithay-client-toolkit 0.17.0 (git+https://github.com/smithay/client-toolkit?rev=c9940f4)",
+ "smithay-client-toolkit 0.17.0",
  "thiserror",
 ]
 
 [[package]]
 name = "iced_sctk"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
+source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
 dependencies = [
  "enum-repr",
  "float-cmp",
@@ -2401,7 +2397,7 @@ dependencies = [
  "iced_style",
  "itertools 0.10.5",
  "raw-window-handle",
- "smithay-client-toolkit 0.17.0 (git+https://github.com/smithay/client-toolkit?rev=c9940f4)",
+ "smithay-client-toolkit 0.17.0",
  "smithay-clipboard",
  "thiserror",
  "tracing",
@@ -2412,7 +2408,7 @@ dependencies = [
 [[package]]
 name = "iced_style"
 version = "0.8.0"
-source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
+source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
 dependencies = [
  "iced_core",
  "once_cell",
@@ -2422,7 +2418,7 @@ dependencies = [
 [[package]]
 name = "iced_tiny_skia"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
+source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
 dependencies = [
  "bytemuck",
  "cosmic-text",
@@ -2440,7 +2436,7 @@ dependencies = [
 [[package]]
 name = "iced_wgpu"
 version = "0.10.0"
-source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
+source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
 dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
@@ -2461,14 +2457,14 @@ dependencies = [
 [[package]]
 name = "iced_widget"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
+source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
 dependencies = [
  "iced_renderer",
  "iced_runtime",
  "iced_style",
  "num-traits",
  "ouroboros 0.13.0",
- "smithay-client-toolkit 0.17.0 (git+https://github.com/smithay/client-toolkit?rev=c9940f4)",
+ "smithay-client-toolkit 0.17.0",
  "thiserror",
  "unicode-segmentation",
 ]
@@ -2727,7 +2723,7 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
 [[package]]
 name = "libcosmic"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
+source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
 dependencies = [
  "apply",
  "cosmic-config",
@@ -2747,7 +2743,7 @@ dependencies = [
  "lazy_static",
  "palette",
  "slotmap",
- "smithay-client-toolkit 0.17.0 (git+https://github.com/smithay/client-toolkit?rev=c9940f4)",
+ "smithay-client-toolkit 0.17.0",
  "tokio",
  "tracing",
 ]
@@ -4206,30 +4202,6 @@ dependencies = [
  "wayland-protocols 0.29.5",
 ]
 
-[[package]]
-name = "smithay-client-toolkit"
-version = "0.17.0"
-source = "git+https://github.com/pop-os/client-toolkit?tag=themed-pointer#fd15dd954bc5f0c78d079aeda7b11194a682bbff"
-dependencies = [
- "bitflags 1.3.2",
- "calloop",
- "cursor-icon",
- "dlib",
- "lazy_static",
- "log",
- "memmap2 0.5.10",
- "nix 0.26.2",
- "pkg-config",
- "thiserror",
- "wayland-backend",
- "wayland-client 0.30.2",
- "wayland-cursor 0.30.0",
- "wayland-protocols 0.30.1",
- "wayland-protocols-wlr",
- "wayland-scanner 0.30.1",
- "xkbcommon",
-]
-
 [[package]]
 name = "smithay-client-toolkit"
 version = "0.17.0"
diff --git a/Cargo.toml b/Cargo.toml
index 2319f05a..d71f32f5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,7 @@ resolver="2"
 [workspace.dependencies]
 cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "e39748e" }
 cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = ["client"], rev = "e39748e" }
-cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "39c96ac", default-features = false, features = ["libcosmic", "once_cell"] }
+cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "c39e737", default-features = false, features = ["libcosmic", "once_cell"] }
 libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = false, features = ["tokio", "wayland"] }
 
 [profile.release]
diff --git a/cosmic-app-list/Cargo.toml b/cosmic-app-list/Cargo.toml
index e86a460f..60497a04 100644
--- a/cosmic-app-list/Cargo.toml
+++ b/cosmic-app-list/Cargo.toml
@@ -16,7 +16,6 @@ futures-util = "0.3"
 once_cell = "1.9"
 xdg = "2.4"
 pretty_env_logger = "0.5"
-calloop = "0.10"
 nix = "0.26"
 shlex = "1.1.0"
 anyhow = "1.0"
diff --git a/cosmic-app-list/src/app.rs b/cosmic-app-list/src/app.rs
index d29a53b1..c0d0ecfa 100755
--- a/cosmic-app-list/src/app.rs
+++ b/cosmic-app-list/src/app.rs
@@ -5,7 +5,7 @@ use crate::fl;
 use crate::toplevel_subscription::toplevel_subscription;
 use crate::toplevel_subscription::ToplevelRequest;
 use crate::toplevel_subscription::ToplevelUpdate;
-use calloop::channel::Sender;
+use cctk::sctk::reexports::calloop::channel::Sender;
 use cctk::toplevel_info::ToplevelInfo;
 use cctk::wayland_client::protocol::wl_data_device_manager::DndAction;
 use cctk::wayland_client::protocol::wl_seat::WlSeat;
diff --git a/cosmic-app-list/src/toplevel_handler.rs b/cosmic-app-list/src/toplevel_handler.rs
index 9fe45026..2b1f2f41 100644
--- a/cosmic-app-list/src/toplevel_handler.rs
+++ b/cosmic-app-list/src/toplevel_handler.rs
@@ -2,7 +2,10 @@ use crate::toplevel_subscription::{ToplevelRequest, ToplevelUpdate};
 use cctk::{
     sctk::{
         self,
-        reexports::client::{protocol::wl_seat::WlSeat, WaylandSource},
+        reexports::{
+            calloop,
+            client::{protocol::wl_seat::WlSeat, WaylandSource},
+        },
         seat::{SeatHandler, SeatState},
     },
     toplevel_info::{ToplevelInfoHandler, ToplevelInfoState},
@@ -131,13 +134,9 @@ pub(crate) fn toplevel_handler(
     let qh = event_queue.handle();
     let wayland_source = WaylandSource::new(event_queue).unwrap();
     let handle = event_loop.handle();
-
-    if handle
-        .insert_source(wayland_source, |_, q, state| q.dispatch_pending(state))
-        .is_err()
-    {
-        return;
-    };
+    wayland_source
+        .insert(handle.clone())
+        .expect("Failed to insert wayland source.");
 
     if handle
         .insert_source(rx, |event, _, state| match event {
diff --git a/cosmic-app-list/src/toplevel_subscription.rs b/cosmic-app-list/src/toplevel_subscription.rs
index b77b3bb0..e52906f2 100644
--- a/cosmic-app-list/src/toplevel_subscription.rs
+++ b/cosmic-app-list/src/toplevel_subscription.rs
@@ -2,7 +2,7 @@
 //!
 //! This code was generated by `zbus-xmlgen` `2.0.1` from DBus introspection data.
 //! Source: `Interface '/org/freedesktop/UPower/KbdBacklight' from service 'org.freedesktop.UPower' on system bus`.
-use cctk::sctk::reexports::client::protocol::wl_seat::WlSeat;
+use cctk::sctk::reexports::{calloop, client::protocol::wl_seat::WlSeat};
 use cctk::toplevel_info::ToplevelInfo;
 use cosmic::iced;
 use cosmic::iced::subscription;
diff --git a/cosmic-applet-workspaces/Cargo.toml b/cosmic-applet-workspaces/Cargo.toml
index 52d078f2..80323fa4 100644
--- a/cosmic-applet-workspaces/Cargo.toml
+++ b/cosmic-applet-workspaces/Cargo.toml
@@ -9,9 +9,6 @@ libcosmic.workspace = true
 cosmic-applet = { path = "../applet" }
 cctk.workspace = true
 cosmic-protocols.workspace = true
-wayland-backend = {version = "0.1.0", features = ["client_system"]}
-wayland-client = {version = "0.30.0"}
-calloop = "0.10.1"
 nix = "0.26.1"
 log = "0.4"
 pretty_env_logger = "0.5"
diff --git a/cosmic-applet-workspaces/src/components/app.rs b/cosmic-applet-workspaces/src/components/app.rs
index 4fa7e7fe..0abd599a 100644
--- a/cosmic-applet-workspaces/src/components/app.rs
+++ b/cosmic-applet-workspaces/src/components/app.rs
@@ -1,4 +1,4 @@
-use calloop::channel::SyncSender;
+use cctk::sctk::reexports::{calloop::channel::SyncSender, client::backend::ObjectId};
 use cosmic::iced::alignment::{Horizontal, Vertical};
 use cosmic::iced::mouse::{self, ScrollDelta};
 use cosmic::iced::wayland::actions::window::SctkWindowSettings;
@@ -16,7 +16,6 @@ use cosmic_applet::cosmic_panel_config::PanelAnchor;
 use cosmic_applet::CosmicAppletHelper;
 use cosmic_protocols::workspace::v1::client::zcosmic_workspace_handle_v1;
 use std::cmp::Ordering;
-use wayland_backend::client::ObjectId;
 
 use crate::config;
 use crate::wayland::{WorkspaceEvent, WorkspaceList};
diff --git a/cosmic-applet-workspaces/src/wayland.rs b/cosmic-applet-workspaces/src/wayland.rs
index 21ca0518..330b9de8 100644
--- a/cosmic-applet-workspaces/src/wayland.rs
+++ b/cosmic-applet-workspaces/src/wayland.rs
@@ -3,7 +3,10 @@ use cctk::{
     sctk::{
         self,
         output::{OutputHandler, OutputState},
-        reexports::client::WaylandSource,
+        reexports::{
+            calloop,
+            client::{self as wayland_client},
+        },
         registry::{ProvidesRegistryState, RegistryState},
     },
     workspace::{WorkspaceHandler, WorkspaceState},
@@ -11,11 +14,11 @@ use cctk::{
 use cosmic_protocols::workspace::v1::client::zcosmic_workspace_handle_v1;
 use futures::{channel::mpsc, executor::block_on, SinkExt};
 use std::{env, os::unix::net::UnixStream, path::PathBuf, time::Duration};
-use wayland_backend::client::ObjectId;
+use wayland_client::backend::ObjectId;
 use wayland_client::{
     globals::registry_queue_init,
     protocol::wl_output::{self, WlOutput},
-    ConnectError, Proxy,
+    ConnectError, Proxy, WaylandSource,
 };
 use wayland_client::{Connection, QueueHandle, WEnum};
 
diff --git a/cosmic-applet-workspaces/src/wayland_subscription.rs b/cosmic-applet-workspaces/src/wayland_subscription.rs
index bdb8d1cb..4b45a7b4 100644
--- a/cosmic-applet-workspaces/src/wayland_subscription.rs
+++ b/cosmic-applet-workspaces/src/wayland_subscription.rs
@@ -1,5 +1,5 @@
 use crate::wayland::{self, WorkspaceEvent, WorkspaceList};
-use calloop::channel::SyncSender;
+use cctk::sctk::reexports::calloop::channel::SyncSender;
 use cosmic::iced::{
     self,
     futures::{channel::mpsc, SinkExt, StreamExt},