diff --git a/Cargo.lock b/Cargo.lock
index fddfc7c4..37b13b81 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -515,20 +515,6 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
 
-[[package]]
-name = "calloop"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8"
-dependencies = [
- "bitflags 1.3.2",
- "log",
- "nix 0.25.1",
- "slotmap",
- "thiserror",
- "vec_map",
-]
-
 [[package]]
 name = "calloop"
 version = "0.12.2"
@@ -549,7 +535,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02"
 dependencies = [
- "calloop 0.12.2",
+ "calloop",
  "rustix 0.38.8",
  "wayland-backend 0.3.2",
  "wayland-client 0.31.1",
@@ -923,11 +909,11 @@ dependencies = [
 [[package]]
 name = "cosmic-client-toolkit"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-protocols?rev=e39748e#e39748e1312d74ab8b4c26f4813b858413500b59"
+source = "git+https://github.com/pop-os/cosmic-protocols?rev=5c03417#5c03417a08ef04755ad7bc2285d07968d89d69f8"
 dependencies = [
  "cosmic-protocols",
- "smithay-client-toolkit 0.17.0 (git+https://github.com/smithay/client-toolkit?rev=c9940f4)",
- "wayland-client 0.30.2",
+ "smithay-client-toolkit 0.17.0",
+ "wayland-client 0.31.1",
 ]
 
 [[package]]
@@ -1013,14 +999,14 @@ dependencies = [
 [[package]]
 name = "cosmic-protocols"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-protocols?rev=e39748e#e39748e1312d74ab8b4c26f4813b858413500b59"
+source = "git+https://github.com/pop-os/cosmic-protocols?rev=5c03417#5c03417a08ef04755ad7bc2285d07968d89d69f8"
 dependencies = [
- "bitflags 1.3.2",
- "wayland-backend 0.1.2",
- "wayland-client 0.30.2",
- "wayland-protocols 0.30.1",
- "wayland-scanner 0.30.1",
- "wayland-server",
+ "bitflags 2.4.0",
+ "wayland-backend 0.3.2",
+ "wayland-client 0.31.1",
+ "wayland-protocols 0.31.0",
+ "wayland-scanner 0.31.0",
+ "wayland-server 0.31.0",
 ]
 
 [[package]]
@@ -2438,7 +2424,7 @@ dependencies = [
  "instant",
  "log",
  "palette",
- "smithay-client-toolkit 0.17.0 (git+https://github.com/smithay/client-toolkit?rev=dc8c4a0)",
+ "smithay-client-toolkit 0.17.0",
  "thiserror",
  "twox-hash",
 ]
@@ -2495,7 +2481,7 @@ dependencies = [
  "iced_accessibility",
  "iced_core",
  "iced_futures",
- "smithay-client-toolkit 0.17.0 (git+https://github.com/smithay/client-toolkit?rev=dc8c4a0)",
+ "smithay-client-toolkit 0.17.0",
  "thiserror",
 ]
 
@@ -2514,7 +2500,7 @@ dependencies = [
  "itertools 0.10.5",
  "lazy_static",
  "raw-window-handle",
- "smithay-client-toolkit 0.17.0 (git+https://github.com/smithay/client-toolkit?rev=dc8c4a0)",
+ "smithay-client-toolkit 0.17.0",
  "smithay-clipboard",
  "thiserror",
  "tracing",
@@ -2583,7 +2569,7 @@ dependencies = [
  "iced_style",
  "num-traits",
  "ouroboros",
- "smithay-client-toolkit 0.17.0 (git+https://github.com/smithay/client-toolkit?rev=dc8c4a0)",
+ "smithay-client-toolkit 0.17.0",
  "thiserror",
  "unicode-segmentation",
 ]
@@ -2719,6 +2705,12 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "io-lifetimes"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bffb4def18c48926ccac55c1223e02865ce1a821751a95920448662696e7472c"
+
 [[package]]
 name = "is-terminal"
 version = "0.4.9"
@@ -2866,7 +2858,7 @@ dependencies = [
  "palette",
  "ron",
  "slotmap",
- "smithay-client-toolkit 0.17.0 (git+https://github.com/smithay/client-toolkit?rev=dc8c4a0)",
+ "smithay-client-toolkit 0.17.0",
  "taffy",
  "thiserror",
  "tokio",
@@ -4144,7 +4136,7 @@ checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941"
 dependencies = [
  "bitflags 1.3.2",
  "errno",
- "io-lifetimes",
+ "io-lifetimes 1.0.11",
  "libc",
  "linux-raw-sys 0.1.4",
  "windows-sys 0.45.0",
@@ -4158,7 +4150,7 @@ checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
 dependencies = [
  "bitflags 1.3.2",
  "errno",
- "io-lifetimes",
+ "io-lifetimes 1.0.11",
  "libc",
  "linux-raw-sys 0.3.8",
  "windows-sys 0.48.0",
@@ -4432,35 +4424,11 @@ dependencies = [
 [[package]]
 name = "smithay-client-toolkit"
 version = "0.17.0"
-source = "git+https://github.com/smithay/client-toolkit?rev=c9940f4#c9940f4167f0d81cc26f77b7eeef6a34068a90a5"
-dependencies = [
- "bitflags 1.3.2",
- "calloop 0.10.6",
- "cursor-icon",
- "dlib",
- "log",
- "memmap2 0.5.10",
- "nix 0.26.2",
- "pkg-config",
- "thiserror",
- "wayland-backend 0.1.2",
- "wayland-client 0.30.2",
- "wayland-csd-frame 0.1.0",
- "wayland-cursor 0.30.0",
- "wayland-protocols 0.30.1",
- "wayland-protocols-wlr 0.1.0",
- "wayland-scanner 0.30.1",
- "xkbcommon",
-]
-
-[[package]]
-name = "smithay-client-toolkit"
-version = "0.17.0"
-source = "git+https://github.com/smithay/client-toolkit?rev=dc8c4a0#dc8c4a035128208af65141fe12142a1dbc4a32bb"
+source = "git+https://github.com/smithay/client-toolkit//?rev=dc8c4a0#dc8c4a035128208af65141fe12142a1dbc4a32bb"
 dependencies = [
  "bitflags 2.4.0",
  "bytemuck",
- "calloop 0.12.2",
+ "calloop",
  "calloop-wayland-source",
  "cursor-icon",
  "dlib",
@@ -4471,7 +4439,7 @@ dependencies = [
  "thiserror",
  "wayland-backend 0.3.2",
  "wayland-client 0.31.1",
- "wayland-csd-frame 0.3.0",
+ "wayland-csd-frame",
  "wayland-cursor 0.31.0",
  "wayland-protocols 0.31.0",
  "wayland-protocols-wlr 0.2.0",
@@ -5244,12 +5212,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
 [[package]]
 name = "version-compare"
 version = "0.1.1"
@@ -5379,7 +5341,7 @@ checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8"
 dependencies = [
  "cc",
  "downcast-rs",
- "io-lifetimes",
+ "io-lifetimes 1.0.11",
  "nix 0.26.2",
  "scoped-tls",
  "smallvec",
@@ -5423,7 +5385,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8"
 dependencies = [
  "bitflags 1.3.2",
- "calloop 0.10.6",
  "nix 0.26.2",
  "wayland-backend 0.1.2",
  "wayland-scanner 0.30.1",
@@ -5453,17 +5414,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.4.0",
- "cursor-icon",
- "wayland-backend 0.1.2",
-]
-
 [[package]]
 name = "wayland-csd-frame"
 version = "0.3.0"
@@ -5486,17 +5436,6 @@ dependencies = [
  "xcursor",
 ]
 
-[[package]]
-name = "wayland-cursor"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d0c3a0d5b4b688b07b0442362d3ed6bf04724fcc16cd69ab6285b90dbc487aa"
-dependencies = [
- "nix 0.26.2",
- "wayland-client 0.30.2",
- "xcursor",
-]
-
 [[package]]
 name = "wayland-cursor"
 version = "0.31.0"
@@ -5530,7 +5469,7 @@ dependencies = [
  "wayland-backend 0.1.2",
  "wayland-client 0.30.2",
  "wayland-scanner 0.30.1",
- "wayland-server",
+ "wayland-server 0.30.1",
 ]
 
 [[package]]
@@ -5543,6 +5482,7 @@ dependencies = [
  "wayland-backend 0.3.2",
  "wayland-client 0.31.1",
  "wayland-scanner 0.31.0",
+ "wayland-server 0.31.0",
 ]
 
 [[package]]
@@ -5556,7 +5496,7 @@ dependencies = [
  "wayland-client 0.30.2",
  "wayland-protocols 0.30.1",
  "wayland-scanner 0.30.1",
- "wayland-server",
+ "wayland-server 0.30.1",
 ]
 
 [[package]]
@@ -5613,12 +5553,26 @@ checksum = "9c43c28096fe1d49fff7d1079404fdd0f669cd1a5b00c615bdfe71bb1884d23a"
 dependencies = [
  "bitflags 1.3.2",
  "downcast-rs",
- "io-lifetimes",
+ "io-lifetimes 1.0.11",
  "nix 0.26.2",
  "wayland-backend 0.1.2",
  "wayland-scanner 0.30.1",
 ]
 
+[[package]]
+name = "wayland-server"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f3f0c52a445936ca1184c98f1a69cf4ad9c9130788884531ef04428468cb1ce"
+dependencies = [
+ "bitflags 2.4.0",
+ "downcast-rs",
+ "io-lifetimes 2.0.2",
+ "nix 0.26.2",
+ "wayland-backend 0.3.2",
+ "wayland-scanner 0.31.0",
+]
+
 [[package]]
 name = "wayland-sys"
 version = "0.29.5"
diff --git a/Cargo.toml b/Cargo.toml
index a6c28ebd..145e5bf2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,10 +19,10 @@ members = [
 resolver = "2"
 
 [workspace.dependencies]
-cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "e39748e" }
+cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "5c03417" }
 cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = [
     "client",
-], rev = "e39748e" }
+], rev = "5c03417" }
 cosmic-time = { git = "https://github.com/pop-os/cosmic-time", default-features = false, features = [
     "libcosmic",
     "once_cell",
@@ -43,3 +43,5 @@ lto = "thin"
 # libcosmic = { path = "../libcosmic" }
 # [patch."https://github.com/pop-os/cosmic-config"]
 # cosmic-config = { path = "../libcosmic/cosmic-config" }
+[patch."https://github.com/Smithay/client-toolkit"]
+sctk = { git = "https://github.com/smithay/client-toolkit//", package = "smithay-client-toolkit", rev = "dc8c4a0" }
diff --git a/cosmic-applet-bluetooth/src/app.rs b/cosmic-applet-bluetooth/src/app.rs
index 99913083..041cf693 100644
--- a/cosmic-applet-bluetooth/src/app.rs
+++ b/cosmic-applet-bluetooth/src/app.rs
@@ -299,7 +299,7 @@ impl cosmic::Application for CosmicBluetoothApplet {
         let button_style = || Button::Custom {
             active: Box::new(|active, t| button::Appearance {
                 border_radius: 0.0.into(),
-                ..t.active(active, &Button::Standard)
+                ..t.active(active, &Button::Text)
             }),
             disabled: Box::new(|t| button::Appearance {
                 border_radius: 0.0.into(),
@@ -419,7 +419,7 @@ impl cosmic::Application for CosmicBluetoothApplet {
                 .width(Length::Fixed(24.0))
                 .height(Length::Fixed(24.0))
         ])
-        .style(Button::Standard)
+        .style(Button::Text)
         .padding([8, 24])
         .style(button_style())
         .on_press(Message::ToggleVisibleDevices(!self.show_visible_devices));
diff --git a/cosmic-applet-graphics/src/window.rs b/cosmic-applet-graphics/src/window.rs
index f5733080..87b8d7b9 100644
--- a/cosmic-applet-graphics/src/window.rs
+++ b/cosmic-applet-graphics/src/window.rs
@@ -242,7 +242,7 @@ impl cosmic::Application for Window {
                 .padding([0, self.core.applet.suggested_size().0 / 2])
                 .align_items(Alignment::Center),
             )
-            .style(Button::Standard)
+            .style(Button::Text)
             .on_press(Message::TogglePopup)
             .padding(8)
             .width(Length::Shrink)
diff --git a/cosmic-applet-network/src/app.rs b/cosmic-applet-network/src/app.rs
index 169300e1..b582e5ee 100644
--- a/cosmic-applet-network/src/app.rs
+++ b/cosmic-applet-network/src/app.rs
@@ -408,7 +408,7 @@ impl cosmic::Application for CosmicNetworkApplet {
         let button_style = || Button::Custom {
             active: Box::new(|active, t| button::Appearance {
                 border_radius: 0.0.into(),
-                ..t.active(active, &Button::Standard)
+                ..t.active(active, &Button::Text)
             }),
             disabled: Box::new(|t| button::Appearance {
                 border_radius: 0.0.into(),
@@ -513,7 +513,7 @@ impl cosmic::Application for CosmicNetworkApplet {
                                 .align_items(Alignment::Center)
                                 .spacing(8)
                         )
-                        .style(Button::Standard)
+                        .style(Button::Text)
                         .padding([8, 24])
                         .style(button_style())
                         .on_press(Message::Disconnect(name.clone()))]
diff --git a/cosmic-applet-power/src/main.rs b/cosmic-applet-power/src/main.rs
index b2a26b74..195bec06 100644
--- a/cosmic-applet-power/src/main.rs
+++ b/cosmic-applet-power/src/main.rs
@@ -369,7 +369,7 @@ fn power_buttons(name: &str, msg: String) -> cosmic::widget::Button<Message, Ren
     )
     .width(Length::Fill)
     .height(Length::Fixed(76.0))
-    .style(theme::Button::Standard)
+    .style(theme::Button::Text)
 }
 
 fn text_icon(name: &str, size: u16) -> cosmic::widget::Icon {
diff --git a/cosmic-applet-time/src/main.rs b/cosmic-applet-time/src/main.rs
index d41ad84c..5e2d2904 100644
--- a/cosmic-applet-time/src/main.rs
+++ b/cosmic-applet-time/src/main.rs
@@ -210,7 +210,7 @@ impl cosmic::Application for Time {
             },
         )
         .on_press(Message::TogglePopup)
-        .style(cosmic::theme::Button::Standard);
+        .style(theme::Button::Text);
 
         if let Some(tracker) = self.rectangle_tracker.as_ref() {
             tracker.container(0, button).into()