diff --git a/applets/cosmic-applet-time/Cargo.lock b/applets/cosmic-applet-time/Cargo.lock
index cf829c37..ed1a371b 100644
--- a/applets/cosmic-applet-time/Cargo.lock
+++ b/applets/cosmic-applet-time/Cargo.lock
@@ -41,6 +41,15 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "aho-corasick"
+version = "0.7.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "aliasable"
 version = "0.1.3"
@@ -58,9 +67,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.66"
+version = "1.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
+checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
 
 [[package]]
 name = "apply"
@@ -341,9 +350,6 @@ name = "cosmic-applet-time"
 version = "0.1.0"
 dependencies = [
  "chrono",
- "iced 0.5.2 (git+https://github.com/pop-os/iced.git?branch=sctk-cosmic)",
- "iced_futures 0.5.1 (git+https://github.com/pop-os/iced.git?branch=sctk-cosmic)",
- "iced_native 0.6.1 (git+https://github.com/pop-os/iced.git?branch=sctk-cosmic)",
  "icon-loader",
  "libcosmic",
  "nix 0.24.3",
@@ -353,7 +359,7 @@ dependencies = [
 [[package]]
 name = "cosmic-panel-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-panel#c20dd262e25adfbc5dd5a8c2e85dc61b1f498387"
+source = "git+https://github.com/pop-os/cosmic-panel#671492242ce64dbec8644d4b51f732a814c994bd"
 dependencies = [
  "anyhow",
  "ron",
@@ -362,6 +368,26 @@ dependencies = [
  "xdg",
 ]
 
+[[package]]
+name = "cosmic-text"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab5d29bcf58238b07dc456ba16b012513ad1f21eb25dd738fcf833bc4f6a1442"
+dependencies = [
+ "fontdb 0.10.0",
+ "libm",
+ "log",
+ "ouroboros 0.15.5",
+ "rangemap",
+ "rustybuzz 0.6.0",
+ "swash",
+ "sys-locale",
+ "unicode-bidi",
+ "unicode-linebreak",
+ "unicode-script",
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "cosmic-theme"
 version = "0.1.0"
@@ -452,9 +478,9 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
 
 [[package]]
 name = "cxx"
-version = "1.0.83"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf"
+checksum = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd"
 dependencies = [
  "cc",
  "cxxbridge-flags",
@@ -464,9 +490,9 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.83"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39"
+checksum = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0"
 dependencies = [
  "cc",
  "codespan-reporting",
@@ -479,15 +505,15 @@ dependencies = [
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.83"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12"
+checksum = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.83"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6"
+checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -752,6 +778,17 @@ dependencies = [
  "ttf-parser 0.12.3",
 ]
 
+[[package]]
+name = "fontdb"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8131752b3f3b876a20f42b3d08233ad177d6e7ec6d18aaa6954489a201071be5"
+dependencies = [
+ "log",
+ "memmap2 0.5.8",
+ "ttf-parser 0.17.1",
+]
+
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
@@ -944,9 +981,9 @@ dependencies = [
 
 [[package]]
 name = "glutin"
-version = "0.30.0-beta.3"
+version = "0.30.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8ad8ba6f4be6b573f2da485715baaae46a6fae00ba1ae683117f58f1da29c09"
+checksum = "524d807cd49a0c56a53ef9a6738cd15e7c8c4e9d37a3b7fdb3c250c1cd5bf7a3"
 dependencies = [
  "bitflags",
  "cfg_aliases",
@@ -1102,9 +1139,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.19"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
 dependencies = [
  "libc",
 ]
@@ -1141,50 +1178,23 @@ dependencies = [
 
 [[package]]
 name = "iced"
-version = "0.5.2"
-source = "git+https://github.com/pop-os/libcosmic/?branch=master#c2625ef450c0b7d33dcc61ede04d79f88981f6c0"
+version = "0.6.0"
 dependencies = [
- "iced_core 0.6.1 (git+https://github.com/pop-os/libcosmic/?branch=master)",
- "iced_futures 0.5.1 (git+https://github.com/pop-os/libcosmic/?branch=master)",
- "iced_glow 0.4.1 (git+https://github.com/pop-os/libcosmic/?branch=master)",
- "iced_graphics 0.4.0 (git+https://github.com/pop-os/libcosmic/?branch=master)",
- "iced_native 0.6.1 (git+https://github.com/pop-os/libcosmic/?branch=master)",
- "iced_sctk 0.1.0 (git+https://github.com/pop-os/libcosmic/?branch=master)",
- "iced_wgpu 0.6.1 (git+https://github.com/pop-os/libcosmic/?branch=master)",
- "image",
- "thiserror",
-]
-
-[[package]]
-name = "iced"
-version = "0.5.2"
-source = "git+https://github.com/pop-os/iced.git?branch=sctk-cosmic#8ce93dd2922aebfe134b43302209f78f93c43546"
-dependencies = [
- "iced_core 0.6.1 (git+https://github.com/pop-os/iced.git?branch=sctk-cosmic)",
- "iced_futures 0.5.1 (git+https://github.com/pop-os/iced.git?branch=sctk-cosmic)",
- "iced_glow 0.4.1 (git+https://github.com/pop-os/iced.git?branch=sctk-cosmic)",
- "iced_graphics 0.4.0 (git+https://github.com/pop-os/iced.git?branch=sctk-cosmic)",
- "iced_native 0.6.1 (git+https://github.com/pop-os/iced.git?branch=sctk-cosmic)",
- "iced_sctk 0.1.0 (git+https://github.com/pop-os/iced.git?branch=sctk-cosmic)",
- "iced_wgpu 0.6.1 (git+https://github.com/pop-os/iced.git?branch=sctk-cosmic)",
+ "iced_core",
+ "iced_futures",
+ "iced_glow",
+ "iced_graphics",
+ "iced_native",
+ "iced_sctk",
+ "iced_swbuf",
+ "iced_wgpu",
  "image",
  "thiserror",
 ]
 
 [[package]]
 name = "iced_core"
-version = "0.6.1"
-source = "git+https://github.com/pop-os/libcosmic/?branch=master#c2625ef450c0b7d33dcc61ede04d79f88981f6c0"
-dependencies = [
- "bitflags",
- "palette",
- "wasm-timer",
-]
-
-[[package]]
-name = "iced_core"
-version = "0.6.1"
-source = "git+https://github.com/pop-os/iced.git?branch=sctk-cosmic#8ce93dd2922aebfe134b43302209f78f93c43546"
+version = "0.6.2"
 dependencies = [
  "bitflags",
  "palette",
@@ -1194,19 +1204,6 @@ dependencies = [
 [[package]]
 name = "iced_futures"
 version = "0.5.1"
-source = "git+https://github.com/pop-os/libcosmic/?branch=master#c2625ef450c0b7d33dcc61ede04d79f88981f6c0"
-dependencies = [
- "futures",
- "log",
- "tokio",
- "wasm-bindgen-futures",
- "wasm-timer",
-]
-
-[[package]]
-name = "iced_futures"
-version = "0.5.1"
-source = "git+https://github.com/pop-os/iced.git?branch=sctk-cosmic#8ce93dd2922aebfe134b43302209f78f93c43546"
 dependencies = [
  "futures",
  "log",
@@ -1217,64 +1214,27 @@ dependencies = [
 
 [[package]]
 name = "iced_glow"
-version = "0.4.1"
-source = "git+https://github.com/pop-os/libcosmic/?branch=master#c2625ef450c0b7d33dcc61ede04d79f88981f6c0"
+version = "0.5.1"
 dependencies = [
  "bytemuck",
  "euclid",
  "glow",
  "glow_glyph",
  "glyph_brush",
- "iced_graphics 0.4.0 (git+https://github.com/pop-os/libcosmic/?branch=master)",
- "iced_native 0.6.1 (git+https://github.com/pop-os/libcosmic/?branch=master)",
- "log",
-]
-
-[[package]]
-name = "iced_glow"
-version = "0.4.1"
-source = "git+https://github.com/pop-os/iced.git?branch=sctk-cosmic#8ce93dd2922aebfe134b43302209f78f93c43546"
-dependencies = [
- "bytemuck",
- "euclid",
- "glow",
- "glow_glyph",
- "glyph_brush",
- "iced_graphics 0.4.0 (git+https://github.com/pop-os/iced.git?branch=sctk-cosmic)",
- "iced_native 0.6.1 (git+https://github.com/pop-os/iced.git?branch=sctk-cosmic)",
+ "iced_graphics",
+ "iced_native",
  "log",
 ]
 
 [[package]]
 name = "iced_graphics"
-version = "0.4.0"
-source = "git+https://github.com/pop-os/libcosmic/?branch=master#c2625ef450c0b7d33dcc61ede04d79f88981f6c0"
+version = "0.5.0"
 dependencies = [
  "bitflags",
  "bytemuck",
  "glam",
- "iced_native 0.6.1 (git+https://github.com/pop-os/libcosmic/?branch=master)",
- "iced_style 0.5.0 (git+https://github.com/pop-os/libcosmic/?branch=master)",
- "image",
- "kamadak-exif",
- "log",
- "raw-window-handle",
- "resvg",
- "thiserror",
- "tiny-skia",
- "usvg",
-]
-
-[[package]]
-name = "iced_graphics"
-version = "0.4.0"
-source = "git+https://github.com/pop-os/iced.git?branch=sctk-cosmic#8ce93dd2922aebfe134b43302209f78f93c43546"
-dependencies = [
- "bitflags",
- "bytemuck",
- "glam",
- "iced_native 0.6.1 (git+https://github.com/pop-os/iced.git?branch=sctk-cosmic)",
- "iced_style 0.5.0 (git+https://github.com/pop-os/iced.git?branch=sctk-cosmic)",
+ "iced_native",
+ "iced_style",
  "image",
  "kamadak-exif",
  "log",
@@ -1287,35 +1247,19 @@ dependencies = [
 
 [[package]]
 name = "iced_lazy"
-version = "0.2.0"
-source = "git+https://github.com/pop-os/libcosmic/?branch=master#c2625ef450c0b7d33dcc61ede04d79f88981f6c0"
+version = "0.3.0"
 dependencies = [
- "iced_native 0.6.1 (git+https://github.com/pop-os/libcosmic/?branch=master)",
- "ouroboros",
+ "iced_native",
+ "ouroboros 0.13.0",
 ]
 
 [[package]]
 name = "iced_native"
-version = "0.6.1"
-source = "git+https://github.com/pop-os/libcosmic/?branch=master#c2625ef450c0b7d33dcc61ede04d79f88981f6c0"
+version = "0.7.0"
 dependencies = [
- "iced_core 0.6.1 (git+https://github.com/pop-os/libcosmic/?branch=master)",
- "iced_futures 0.5.1 (git+https://github.com/pop-os/libcosmic/?branch=master)",
- "iced_style 0.5.0 (git+https://github.com/pop-os/libcosmic/?branch=master)",
- "num-traits",
- "smithay-client-toolkit",
- "twox-hash",
- "unicode-segmentation",
-]
-
-[[package]]
-name = "iced_native"
-version = "0.6.1"
-source = "git+https://github.com/pop-os/iced.git?branch=sctk-cosmic#8ce93dd2922aebfe134b43302209f78f93c43546"
-dependencies = [
- "iced_core 0.6.1 (git+https://github.com/pop-os/iced.git?branch=sctk-cosmic)",
- "iced_futures 0.5.1 (git+https://github.com/pop-os/iced.git?branch=sctk-cosmic)",
- "iced_style 0.5.0 (git+https://github.com/pop-os/iced.git?branch=sctk-cosmic)",
+ "iced_core",
+ "iced_futures",
+ "iced_style",
  "num-traits",
  "smithay-client-toolkit",
  "twox-hash",
@@ -1325,15 +1269,14 @@ dependencies = [
 [[package]]
 name = "iced_sctk"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic/?branch=master#c2625ef450c0b7d33dcc61ede04d79f88981f6c0"
 dependencies = [
  "enum-repr",
  "futures",
  "glow",
  "glutin",
- "iced_futures 0.5.1 (git+https://github.com/pop-os/libcosmic/?branch=master)",
- "iced_graphics 0.4.0 (git+https://github.com/pop-os/libcosmic/?branch=master)",
- "iced_native 0.6.1 (git+https://github.com/pop-os/libcosmic/?branch=master)",
+ "iced_futures",
+ "iced_graphics",
+ "iced_native",
  "log",
  "raw-window-handle",
  "smithay-client-toolkit",
@@ -1342,48 +1285,31 @@ dependencies = [
 ]
 
 [[package]]
-name = "iced_sctk"
+name = "iced_style"
+version = "0.5.1"
+dependencies = [
+ "iced_core",
+ "once_cell",
+ "palette",
+]
+
+[[package]]
+name = "iced_swbuf"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/iced.git?branch=sctk-cosmic#8ce93dd2922aebfe134b43302209f78f93c43546"
 dependencies = [
- "enum-repr",
- "futures",
- "glow",
- "glutin",
- "iced_futures 0.5.1 (git+https://github.com/pop-os/iced.git?branch=sctk-cosmic)",
- "iced_graphics 0.4.0 (git+https://github.com/pop-os/iced.git?branch=sctk-cosmic)",
- "iced_native 0.6.1 (git+https://github.com/pop-os/iced.git?branch=sctk-cosmic)",
+ "cosmic-text",
+ "iced_graphics",
+ "iced_native",
+ "lazy_static",
  "log",
+ "raqote",
  "raw-window-handle",
- "smithay-client-toolkit",
- "thiserror",
- "wayland-backend",
-]
-
-[[package]]
-name = "iced_style"
-version = "0.5.0"
-source = "git+https://github.com/pop-os/libcosmic/?branch=master#c2625ef450c0b7d33dcc61ede04d79f88981f6c0"
-dependencies = [
- "iced_core 0.6.1 (git+https://github.com/pop-os/libcosmic/?branch=master)",
- "once_cell",
- "palette",
-]
-
-[[package]]
-name = "iced_style"
-version = "0.5.0"
-source = "git+https://github.com/pop-os/iced.git?branch=sctk-cosmic#8ce93dd2922aebfe134b43302209f78f93c43546"
-dependencies = [
- "iced_core 0.6.1 (git+https://github.com/pop-os/iced.git?branch=sctk-cosmic)",
- "once_cell",
- "palette",
+ "swbuf",
 ]
 
 [[package]]
 name = "iced_wgpu"
-version = "0.6.1"
-source = "git+https://github.com/pop-os/libcosmic/?branch=master#c2625ef450c0b7d33dcc61ede04d79f88981f6c0"
+version = "0.7.0"
 dependencies = [
  "bitflags",
  "bytemuck",
@@ -1392,28 +1318,8 @@ dependencies = [
  "glam",
  "glyph_brush",
  "guillotiere",
- "iced_graphics 0.4.0 (git+https://github.com/pop-os/libcosmic/?branch=master)",
- "iced_native 0.6.1 (git+https://github.com/pop-os/libcosmic/?branch=master)",
- "log",
- "raw-window-handle",
- "wgpu",
- "wgpu_glyph",
-]
-
-[[package]]
-name = "iced_wgpu"
-version = "0.6.1"
-source = "git+https://github.com/pop-os/iced.git?branch=sctk-cosmic#8ce93dd2922aebfe134b43302209f78f93c43546"
-dependencies = [
- "bitflags",
- "bytemuck",
- "encase",
- "futures",
- "glam",
- "glyph_brush",
- "guillotiere",
- "iced_graphics 0.4.0 (git+https://github.com/pop-os/iced.git?branch=sctk-cosmic)",
- "iced_native 0.6.1 (git+https://github.com/pop-os/iced.git?branch=sctk-cosmic)",
+ "iced_graphics",
+ "iced_native",
  "log",
  "raw-window-handle",
  "wgpu",
@@ -1477,12 +1383,12 @@ dependencies = [
 
 [[package]]
 name = "io-lifetimes"
-version = "1.0.0-rc1"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f65dae1d3aa98e6877917ab4e6fdbfdfb00e95885ea7c4f4f29e3a5dfc08fdf"
+checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
 dependencies = [
  "libc",
- "windows-sys 0.36.1",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -1565,19 +1471,18 @@ checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
 [[package]]
 name = "libcosmic"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic/?branch=master#c2625ef450c0b7d33dcc61ede04d79f88981f6c0"
 dependencies = [
  "apply",
  "cosmic-panel-config",
  "cosmic-theme",
  "derive_setters",
  "freedesktop-icons",
- "iced 0.5.2 (git+https://github.com/pop-os/libcosmic/?branch=master)",
- "iced_core 0.6.1 (git+https://github.com/pop-os/libcosmic/?branch=master)",
- "iced_glow 0.4.1 (git+https://github.com/pop-os/libcosmic/?branch=master)",
+ "iced",
+ "iced_core",
+ "iced_glow",
  "iced_lazy",
- "iced_native 0.6.1 (git+https://github.com/pop-os/libcosmic/?branch=master)",
- "iced_style 0.5.0 (git+https://github.com/pop-os/libcosmic/?branch=master)",
+ "iced_native",
+ "iced_style",
  "lazy_static",
  "palette",
  "smithay-client-toolkit",
@@ -1594,10 +1499,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "link-cplusplus"
-version = "1.0.7"
+name = "libm"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369"
+checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
+
+[[package]]
+name = "link-cplusplus"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
 dependencies = [
  "cc",
 ]
@@ -1627,6 +1538,17 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "lyon_geom"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce4e12203c428a58200b8cf1c0a3aad1cda907008ea11310bb3729593e5f933"
+dependencies = [
+ "arrayvec 0.5.2",
+ "euclid",
+ "num-traits",
+]
+
 [[package]]
 name = "malloc_buf"
 version = "0.0.6"
@@ -1785,6 +1707,20 @@ dependencies = [
  "memoffset 0.6.5",
 ]
 
+[[package]]
+name = "nix"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "libc",
+ "memoffset 0.7.1",
+ "pin-utils",
+ "static_assertions",
+]
+
 [[package]]
 name = "nom"
 version = "7.1.1"
@@ -1827,9 +1763,9 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
+checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
 dependencies = [
  "hermit-abi",
  "libc",
@@ -1886,10 +1822,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f357ef82d1b4db66fbed0b8d542cbd3c22d0bf5b393b3c257b9ba4568e70c9c3"
 dependencies = [
  "aliasable",
- "ouroboros_macro",
+ "ouroboros_macro 0.13.0",
  "stable_deref_trait",
 ]
 
+[[package]]
+name = "ouroboros"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfbb50b356159620db6ac971c6d5c9ab788c9cc38a6f49619fca2a27acb062ca"
+dependencies = [
+ "aliasable",
+ "ouroboros_macro 0.15.5",
+]
+
 [[package]]
 name = "ouroboros_macro"
 version = "0.13.0"
@@ -1903,6 +1849,19 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "ouroboros_macro"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a0d9d1a6191c4f391f87219d1ea42b23f09ee84d64763cd05ee6ea88d9f384d"
+dependencies = [
+ "Inflector",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "owned_ttf_parser"
 version = "0.17.1"
@@ -1967,7 +1926,7 @@ dependencies = [
  "cfg-if",
  "instant",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
  "smallvec",
  "winapi",
 ]
@@ -1980,7 +1939,7 @@ checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
  "smallvec",
  "windows-sys 0.42.0",
 ]
@@ -2115,9 +2074,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.47"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
 dependencies = [
  "unicode-ident",
 ]
@@ -2139,9 +2098,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.21"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
 dependencies = [
  "proc-macro2",
 ]
@@ -2182,6 +2141,24 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63e935c45e09cc6dcf00d2f0b2d630a58f4095320223d47fc68918722f0538b6"
 
+[[package]]
+name = "rangemap"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ed5f515fe4093fa60900ac1918c9ea73f18189114588ec9b99941e22cc2aedd"
+
+[[package]]
+name = "raqote"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8d728aa565b374ac3a2109401af5707e941f7189914f5bb64fc416abcbd08ff"
+dependencies = [
+ "euclid",
+ "lyon_geom",
+ "sw-composite",
+ "typed-arena",
+]
+
 [[package]]
 name = "raw-window-handle"
 version = "0.5.0"
@@ -2228,6 +2205,15 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb02a9aee8e8c7ad8d86890f1e16b49e0bbbffc9961ff3788c31d57c98bcbf03"
+dependencies = [
+ "bitflags",
+]
+
 [[package]]
 name = "redox_users"
 version = "0.4.3"
@@ -2235,10 +2221,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
  "getrandom",
- "redox_syscall",
+ "redox_syscall 0.2.16",
  "thiserror",
 ]
 
+[[package]]
+name = "regex"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+
 [[package]]
 name = "renderdoc-sys"
 version = "0.7.1"
@@ -2318,7 +2321,24 @@ dependencies = [
  "ttf-parser 0.12.3",
  "unicode-bidi-mirroring",
  "unicode-ccc",
- "unicode-general-category",
+ "unicode-general-category 0.4.0",
+ "unicode-script",
+]
+
+[[package]]
+name = "rustybuzz"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab9e34ecf6900625412355a61bda0bd68099fe674de707c67e5e4aed2c05e489"
+dependencies = [
+ "bitflags",
+ "bytemuck",
+ "libm",
+ "smallvec",
+ "ttf-parser 0.17.1",
+ "unicode-bidi-mirroring",
+ "unicode-ccc",
+ "unicode-general-category 0.6.0",
  "unicode-script",
 ]
 
@@ -2351,24 +2371,24 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "scratch"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
+checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
 
 [[package]]
 name = "serde"
-version = "1.0.150"
+version = "1.0.151"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91"
+checksum = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.150"
+version = "1.0.151"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e"
+checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2432,7 +2452,7 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
 [[package]]
 name = "smithay-client-toolkit"
 version = "0.16.0"
-source = "git+https://github.com/Smithay/client-toolkit?rev=f1d9c3e#f1d9c3ef9cfbd508d986f7f98b2fc267fcc39b84"
+source = "git+https://github.com/Smithay/client-toolkit?rev=73346019952f82ec7e4d4d15f5d66841b54e8b61#73346019952f82ec7e4d4d15f5d66841b54e8b61"
 dependencies = [
  "bitflags",
  "calloop",
@@ -2525,16 +2545,66 @@ dependencies = [
 ]
 
 [[package]]
-name = "syn"
-version = "1.0.105"
+name = "sw-composite"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
+checksum = "0b8d4f1dd38540e3f62c393ae78e874c94491c403025368183b018e3fb098b1f"
+
+[[package]]
+name = "swash"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bb18e5888a9b5f0a89ea3ebdf6883dc479347ca9183b6c51a8f9cf2041f23a0"
+dependencies = [
+ "yazi",
+ "zeno",
+]
+
+[[package]]
+name = "swbuf"
+version = "0.1.1"
+source = "git+https://github.com/rust-windowing/swbuf?rev=9b8641fc#9b8641fc0700e2e19eb68fda30b7a92772ac0150"
+dependencies = [
+ "cocoa",
+ "core-graphics",
+ "foreign-types",
+ "nix 0.26.1",
+ "objc",
+ "raw-window-handle",
+ "redox_syscall 0.3.4",
+ "thiserror",
+ "wasm-bindgen",
+ "wayland-backend",
+ "wayland-client",
+ "web-sys",
+ "windows-sys 0.42.0",
+ "x11-dl",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
+[[package]]
+name = "sys-locale"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3358acbb4acd4146138b9bda219e904a6bb5aaaa237f8eed06f4d6bc1580ecee"
+dependencies = [
+ "js-sys",
+ "libc",
+ "wasm-bindgen",
+ "web-sys",
+ "winapi",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.1.3"
@@ -2546,18 +2616,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
+checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
+checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2672,6 +2742,12 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "typed-arena"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0685c84d5d54d1c26f7d3eb96cd41550adb97baed141a761cf335d3d33bcd0ae"
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.8"
@@ -2697,10 +2773,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07547e3ee45e28326cc23faac56d44f58f16ab23e413db526debce3b0bfd2742"
 
 [[package]]
-name = "unicode-ident"
-version = "1.0.5"
+name = "unicode-general-category"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+
+[[package]]
+name = "unicode-linebreak"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137"
+dependencies = [
+ "hashbrown",
+ "regex",
+]
 
 [[package]]
 name = "unicode-script"
@@ -2742,13 +2834,13 @@ dependencies = [
  "data-url",
  "flate2",
  "float-cmp",
- "fontdb",
+ "fontdb 0.6.2",
  "kurbo",
  "log",
  "pico-args",
  "rctree",
  "roxmltree",
- "rustybuzz",
+ "rustybuzz 0.4.0",
  "simplecss",
  "siphasher",
  "svgtypes",
@@ -2866,9 +2958,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-backend"
-version = "0.1.0-beta.13"
+version = "0.1.0-beta.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3f96c52ca34b33e6bb55497327428be54dad648973aa5d3d1e02982d2fcc298"
+checksum = "50598bd298e1e01de02ad3cdcfcfcdb961189e40fea41d9325bc07ba81f8740d"
 dependencies = [
  "cc",
  "downcast-rs",
@@ -2881,9 +2973,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-client"
-version = "0.30.0-beta.13"
+version = "0.30.0-beta.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f6ab5911cc8a28e9d781933c1afe0f97ffa6885ad8941294784d025f06e5ad9"
+checksum = "ae06ffbf163db5cc6b40f9aa0ec66e7e1c22b979a327daf209814277f18834e1"
 dependencies = [
  "bitflags",
  "futures-channel",
@@ -2896,9 +2988,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-cursor"
-version = "0.30.0-beta.13"
+version = "0.30.0-beta.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa5ce1bbc13a3d806648974cba1d53481fea2ac29483eb147e4cce1250fc5263"
+checksum = "1e0ca2f99754a70feaddd3cb14acb152186db32841b7ac312487788ea33a78b1"
 dependencies = [
  "nix 0.25.1",
  "wayland-client",
@@ -2907,9 +2999,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols"
-version = "0.30.0-beta.13"
+version = "0.30.0-beta.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e32104ba51988754f4429dbb59c7b7fd2ccf1feaa0009bb59e49a5e2f91e985d"
+checksum = "8491945e2705791d58695ae166bb05bfb1f01f2b7b848faa73966e3462269a2f"
 dependencies = [
  "bitflags",
  "wayland-backend",
@@ -2919,9 +3011,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-wlr"
-version = "0.1.0-beta.13"
+version = "0.1.0-beta.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "130613a48629204e4ab50ea4b5de2efa2e17c58f71a5af15b39535f99421f8c3"
+checksum = "90968fc47879437fa8519182e07e25eb8173e866767728f2936cd28153f3444c"
 dependencies = [
  "bitflags",
  "wayland-backend",
@@ -2932,9 +3024,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-scanner"
-version = "0.30.0-beta.13"
+version = "0.30.0-beta.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb55ca28710dcc155078db4e2bd29aacf24bd311261c48750f38c6c5430bf1f"
+checksum = "28407261ad2bab693652acd84e8abcf1d2bef7270b5cc840ec8c6bed7c715838"
 dependencies = [
  "proc-macro2",
  "quick-xml",
@@ -2944,9 +3036,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-sys"
-version = "0.30.0-beta.13"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "882bda56e8397384ad66ec0ebe763e0b3b53153a6327344f7d74b85981a271e1"
+checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06"
 dependencies = [
  "dlib",
  "lazy_static",
@@ -3269,3 +3361,15 @@ name = "xmlwriter"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
+
+[[package]]
+name = "yazi"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c03b3e19c937b5b9bd8e52b1c88f30cce5c0d33d676cf174866175bb794ff658"
+
+[[package]]
+name = "zeno"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c110ba09c9b3a43edd4803d570df0da2414fed6e822e22b976a4e3ef50860701"
diff --git a/applets/cosmic-applet-time/Cargo.toml b/applets/cosmic-applet-time/Cargo.toml
index 4c87f18a..8821818a 100644
--- a/applets/cosmic-applet-time/Cargo.toml
+++ b/applets/cosmic-applet-time/Cargo.toml
@@ -8,8 +8,5 @@ license = "GPL-3.0-or-later"
 icon-loader = { version = "0.3.6", features = ["gtk"] }
 tokio = { version = "1.20.1", features=["full"] }
 libcosmic = { git = "https://github.com/pop-os/libcosmic/", branch = "master", default-features = false, features = ["wayland", "applet"] }
-# libcosmic = { path = "../../../../libcosmic", default-features = false, features = ["wayland", "applet"] }
-# iced_sctk = { git = "https://github.com/pop-os/iced-sctk" }
-# sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", commit = "f1d9c3ef9cfbd508d986f7f98b2fc267fcc39b84" }
 nix = "0.24.1"
 chrono = { version = "0.4.23", features = ["clock"] }
diff --git a/applets/cosmic-applet-time/src/main.rs b/applets/cosmic-applet-time/src/main.rs
index 5b2c2c84..9ac79330 100644
--- a/applets/cosmic-applet-time/src/main.rs
+++ b/applets/cosmic-applet-time/src/main.rs
@@ -6,16 +6,18 @@ use cosmic::iced::wayland::{
 use cosmic::iced::{
     executor, time,
     widget::{button, column, text},
-    window, Alignment, Application, Color, Command, Subscription,
+    window, Alignment, Application, Color, Command, Length, Subscription,
 };
 use cosmic::iced_style::application::{self, Appearance};
+use cosmic::theme;
 use cosmic::{Element, Theme};
 
 use chrono::{DateTime, Local, Timelike};
 use std::time::Duration;
 
 pub fn main() -> cosmic::iced::Result {
-    let helper = CosmicAppletHelper::default();
+    let mut helper = CosmicAppletHelper::default();
+    helper.window_size(120, 16);
     Time::run(helper.window_settings())
 }
 
@@ -119,7 +121,7 @@ impl Application for Time {
                         window::Id::new(0),
                         new_id,
                         (400, 300),
-                        None,
+                        Some(60),
                         None,
                     );
                     get_popup(popup_settings)
@@ -136,11 +138,15 @@ impl Application for Time {
     fn view(&self, id: SurfaceIdWrapper) -> Element<Message> {
         match id {
             SurfaceIdWrapper::LayerSurface(_) => unimplemented!(),
-            SurfaceIdWrapper::Window(_) => {
-                button(text(self.now.format("%b %-d %-I:%M %p").to_string()))
-                    .on_press(Message::TogglePopup)
-                    .into()
-            }
+            SurfaceIdWrapper::Window(_) => button(
+                column![text(self.now.format("%b %-d %-I:%M %p").to_string())]
+                    .width(Length::Fill)
+                    .align_items(Alignment::Center),
+            )
+            .on_press(Message::TogglePopup)
+            .style(theme::Button::Text)
+            .width(Length::Units(120))
+            .into(),
             SurfaceIdWrapper::Popup(_) => {
                 use std::os::unix::process::ExitStatusExt;
                 let calendar = std::str::from_utf8(