diff --git a/Cargo.lock b/Cargo.lock
index 0c65871..94cadb7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -334,12 +334,6 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
-[[package]]
-name = "as-raw-xcb-connection"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
-
 [[package]]
 name = "as-slice"
 version = "0.2.1"
@@ -784,9 +778,9 @@ dependencies = [
 
 [[package]]
 name = "brotli-decompressor"
-version = "5.0.0"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03"
+checksum = "5962523e1b92ce1b5e793d9169b9943eece10d39f62550bc04bb605d75b94924"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -998,7 +992,6 @@ dependencies = [
 [[package]]
 name = "clipboard_macos"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c"
 dependencies = [
  "objc",
  "objc-foundation",
@@ -1008,27 +1001,17 @@ dependencies = [
 [[package]]
 name = "clipboard_wayland"
 version = "0.2.2"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c"
 dependencies = [
  "dnd",
  "mime 0.1.0",
  "smithay-clipboard",
 ]
 
-[[package]]
-name = "clipboard_x11"
-version = "0.4.2"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c"
-dependencies = [
- "thiserror 1.0.69",
- "x11rb",
-]
-
 [[package]]
 name = "cmov"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f88a43d011fc4a6876cb7344703e297c71dda42494fee094d5f7c76bf13f746"
+checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a"
 
 [[package]]
 name = "cocoa"
@@ -1329,7 +1312,6 @@ dependencies = [
 [[package]]
 name = "cosmic-client-toolkit"
 version = "0.2.0"
-source = "git+https://github.com/pop-os/cosmic-protocols?rev=c253ec1#c253ec1d6804afbcdf250f5cc37ae1194bba7bd2"
 dependencies = [
  "bitflags 2.11.1",
  "cosmic-protocols",
@@ -1342,7 +1324,6 @@ dependencies = [
 [[package]]
 name = "cosmic-config"
 version = "1.0.0"
-source = "git+https://github.com/pop-os/libcosmic.git#59bebbdffeb8ed4abd3f2577c099745b9a2f2c37"
 dependencies = [
  "atomicwrites",
  "cosmic-config-derive",
@@ -1363,7 +1344,6 @@ dependencies = [
 [[package]]
 name = "cosmic-config-derive"
 version = "1.0.0"
-source = "git+https://github.com/pop-os/libcosmic.git#59bebbdffeb8ed4abd3f2577c099745b9a2f2c37"
 dependencies = [
  "quote",
  "syn 2.0.117",
@@ -1384,7 +1364,7 @@ dependencies = [
  "i18n-embed-fl",
  "icu",
  "ignore",
- "libcosmic",
+ "libcosmic-yoda",
  "log",
  "notify",
  "open",
@@ -1403,7 +1383,6 @@ dependencies = [
 [[package]]
 name = "cosmic-files"
 version = "1.0.14"
-source = "git+https://github.com/pop-os/cosmic-files.git#18eb41930a5ec7844387e48fe4fd111335f5d36b"
 dependencies = [
  "anyhow",
  "atomic_float",
@@ -1426,7 +1405,7 @@ dependencies = [
  "jiff-icu",
  "jxl-oxide",
  "libc",
- "libcosmic",
+ "libcosmic-yoda",
  "log",
  "md-5",
  "mime_guess",
@@ -1464,7 +1443,6 @@ dependencies = [
 [[package]]
 name = "cosmic-freedesktop-icons"
 version = "0.4.0"
-source = "git+https://github.com/pop-os/freedesktop-icons#cb0a2f299dbc443697ce1674065e0d4f82915c02"
 dependencies = [
  "bstr",
  "btoi",
@@ -1478,7 +1456,6 @@ dependencies = [
 [[package]]
 name = "cosmic-protocols"
 version = "0.2.0"
-source = "git+https://github.com/pop-os/cosmic-protocols?rev=c253ec1#c253ec1d6804afbcdf250f5cc37ae1194bba7bd2"
 dependencies = [
  "bitflags 2.11.1",
  "wayland-backend",
@@ -1491,8 +1468,7 @@ dependencies = [
 
 [[package]]
 name = "cosmic-settings-daemon"
-version = "0.1.0"
-source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75"
+version = "0.1.1-yoda.1"
 dependencies = [
  "zbus",
 ]
@@ -1510,8 +1486,6 @@ dependencies = [
 [[package]]
 name = "cosmic-text"
 version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be17b688510d934ce13f48a2beba700e11583e281e0fda99c22bb256a14eda73"
 dependencies = [
  "bitflags 2.11.1",
  "cosmic_undo_2",
@@ -1532,18 +1506,19 @@ dependencies = [
  "unicode-linebreak",
  "unicode-script",
  "unicode-segmentation",
+ "unicode-width",
 ]
 
 [[package]]
 name = "cosmic-theme"
 version = "1.0.0"
-source = "git+https://github.com/pop-os/libcosmic.git#59bebbdffeb8ed4abd3f2577c099745b9a2f2c37"
 dependencies = [
  "almost",
  "configparser",
  "cosmic-config",
  "csscolorparser",
  "dirs 6.0.0",
+ "hex_color",
  "palette",
  "ron",
  "serde",
@@ -1638,7 +1613,6 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 [[package]]
 name = "cryoglyph"
 version = "0.1.0"
-source = "git+https://github.com/iced-rs/cryoglyph.git?rev=e429a025df36ab8145708acb309080ae3deec17a#e429a025df36ab8145708acb309080ae3deec17a"
 dependencies = [
  "cosmic-text",
  "etagere",
@@ -1684,15 +1658,6 @@ dependencies = [
  "uncased",
 ]
 
-[[package]]
-name = "ctor"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83cf0d42651b16c6dfe68685716d18480d18a9c39c62d76e8cf3eb6ed5d8bcbf"
-dependencies = [
- "dtor",
-]
-
 [[package]]
 name = "ctutils"
 version = "0.4.2"
@@ -1919,7 +1884,6 @@ dependencies = [
 [[package]]
 name = "dnd"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c"
 dependencies = [
  "bitflags 2.11.1",
  "mime 0.1.0",
@@ -1946,52 +1910,6 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
 [[package]]
 name = "dpi"
 version = "0.1.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#f737f1f5900b3399b56951305b0f155afc9c9ee5"
-
-[[package]]
-name = "drm"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde"
-dependencies = [
- "bitflags 2.11.1",
- "bytemuck",
- "drm-ffi",
- "drm-fourcc",
- "rustix 0.38.44",
-]
-
-[[package]]
-name = "drm-ffi"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6"
-dependencies = [
- "drm-sys",
- "rustix 0.38.44",
-]
-
-[[package]]
-name = "drm-fourcc"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
-
-[[package]]
-name = "drm-sys"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176"
-dependencies = [
- "libc",
- "linux-raw-sys 0.6.5",
-]
-
-[[package]]
-name = "dtor"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edf234dd1594d6dd434a8fb8cada51ddbbc593e40e4a01556a0b31c62da2775b"
 
 [[package]]
 name = "either"
@@ -2571,16 +2489,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "gethostname"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
-dependencies = [
- "rustix 1.1.4",
- "windows-link 0.2.1",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.17"
@@ -2792,7 +2700,7 @@ dependencies = [
  "log",
  "presser",
  "thiserror 2.0.18",
- "windows 0.62.2",
+ "windows 0.61.3",
 ]
 
 [[package]]
@@ -2999,6 +2907,17 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "hex_color"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d37f101bf4c633f7ca2e4b5e136050314503dd198e78e325ea602c327c484ef0"
+dependencies = [
+ "arrayvec",
+ "rand 0.8.6",
+ "serde",
+]
+
 [[package]]
 name = "hexf-parse"
 version = "0.2.1"
@@ -3117,7 +3036,6 @@ dependencies = [
 [[package]]
 name = "iced"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic.git#59bebbdffeb8ed4abd3f2577c099745b9a2f2c37"
 dependencies = [
  "dnd",
  "iced_accessibility",
@@ -3138,7 +3056,6 @@ dependencies = [
 [[package]]
 name = "iced_accessibility"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic.git#59bebbdffeb8ed4abd3f2577c099745b9a2f2c37"
 dependencies = [
  "accesskit",
  "accesskit_winit",
@@ -3147,7 +3064,6 @@ dependencies = [
 [[package]]
 name = "iced_core"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic.git#59bebbdffeb8ed4abd3f2577c099745b9a2f2c37"
 dependencies = [
  "bitflags 2.11.1",
  "bytes",
@@ -3172,7 +3088,6 @@ dependencies = [
 [[package]]
 name = "iced_debug"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic.git#59bebbdffeb8ed4abd3f2577c099745b9a2f2c37"
 dependencies = [
  "iced_core",
  "iced_futures",
@@ -3182,7 +3097,6 @@ dependencies = [
 [[package]]
 name = "iced_futures"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic.git#59bebbdffeb8ed4abd3f2577c099745b9a2f2c37"
 dependencies = [
  "futures",
  "iced_core",
@@ -3196,7 +3110,6 @@ dependencies = [
 [[package]]
 name = "iced_graphics"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic.git#59bebbdffeb8ed4abd3f2577c099745b9a2f2c37"
 dependencies = [
  "bitflags 2.11.1",
  "bytemuck",
@@ -3217,7 +3130,6 @@ dependencies = [
 [[package]]
 name = "iced_program"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic.git#59bebbdffeb8ed4abd3f2577c099745b9a2f2c37"
 dependencies = [
  "iced_graphics",
  "iced_runtime",
@@ -3226,7 +3138,6 @@ dependencies = [
 [[package]]
 name = "iced_renderer"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic.git#59bebbdffeb8ed4abd3f2577c099745b9a2f2c37"
 dependencies = [
  "iced_graphics",
  "iced_tiny_skia",
@@ -3238,7 +3149,6 @@ dependencies = [
 [[package]]
 name = "iced_runtime"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic.git#59bebbdffeb8ed4abd3f2577c099745b9a2f2c37"
 dependencies = [
  "bytes",
  "cosmic-client-toolkit",
@@ -3253,7 +3163,6 @@ dependencies = [
 [[package]]
 name = "iced_tiny_skia"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic.git#59bebbdffeb8ed4abd3f2577c099745b9a2f2c37"
 dependencies = [
  "bytemuck",
  "cosmic-text",
@@ -3270,9 +3179,7 @@ dependencies = [
 [[package]]
 name = "iced_wgpu"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic.git#59bebbdffeb8ed4abd3f2577c099745b9a2f2c37"
 dependencies = [
- "as-raw-xcb-connection",
  "bitflags 2.11.1",
  "bytemuck",
  "cosmic-client-toolkit",
@@ -3289,19 +3196,16 @@ dependencies = [
  "rustc-hash 2.1.2",
  "rustix 0.38.44",
  "thiserror 2.0.18",
- "tiny-xlib",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
  "wayland-sys",
  "wgpu",
- "x11rb",
 ]
 
 [[package]]
 name = "iced_widget"
 version = "0.14.2"
-source = "git+https://github.com/pop-os/libcosmic.git#59bebbdffeb8ed4abd3f2577c099745b9a2f2c37"
 dependencies = [
  "cosmic-client-toolkit",
  "dnd",
@@ -3319,7 +3223,6 @@ dependencies = [
 [[package]]
 name = "iced_winit"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic.git#59bebbdffeb8ed4abd3f2577c099745b9a2f2c37"
 dependencies = [
  "cosmic-client-toolkit",
  "cursor-icon",
@@ -3970,9 +3873,9 @@ checksum = "2ceaf4c6c48465bead8cb6a0b7c4ee0c86ecbb31239032b9c66ab9a08d2f3ee1"
 
 [[package]]
 name = "jiff"
-version = "0.2.27"
+version = "0.2.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "392c70591e8749fe235ddaf513e6f58b26bce3dcc16524cecc8936f75afa161e"
+checksum = "4603d3033e49e2b0e31229fcab20a5d40089c607d975cd9c80551dc69eed9102"
 dependencies = [
  "jiff-static",
  "jiff-tzdb-platform",
@@ -3996,9 +3899,9 @@ dependencies = [
 
 [[package]]
 name = "jiff-static"
-version = "0.2.27"
+version = "0.2.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b605b0c050d845fc355bb11eb3f9a8deddc218ea60c76e61aa1f2adfb2c96a"
+checksum = "782d32378dddf207193ac91cefb848ad41abb58195c95168e1291227a0832b47"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4397,9 +4300,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
 
 [[package]]
-name = "libcosmic"
-version = "1.0.0"
-source = "git+https://github.com/pop-os/libcosmic.git#59bebbdffeb8ed4abd3f2577c099745b9a2f2c37"
+name = "libcosmic-yoda"
+version = "0.1.0-yoda.2"
 dependencies = [
  "apply",
  "ashpd 0.12.3",
@@ -4411,6 +4313,7 @@ dependencies = [
  "cosmic-theme",
  "css-color",
  "derive_setters",
+ "enumflags2",
  "float-cmp 0.10.0",
  "futures",
  "i18n-embed",
@@ -4507,12 +4410,6 @@ version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.12.1"
@@ -4725,7 +4622,6 @@ dependencies = [
 [[package]]
 name = "mime"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c"
 dependencies = [
  "smithay-clipboard",
 ]
@@ -4764,9 +4660,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1"
+checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda"
 dependencies = [
  "libc",
  "log",
@@ -5278,9 +5174,8 @@ dependencies = [
 
 [[package]]
 name = "onig_sys"
-version = "69.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e68317604e77e53b85896388e1a803c1d21b74c899ec9e5e1112db90735edd7"
+version = "69.9.4"
+source = "git+https://github.com/rust-onig/rust-onig.git?branch=main#73e63eb3eea6d93d24a4aadf7fea580287750c7d"
 dependencies = [
  "cc",
  "pkg-config",
@@ -5962,6 +5857,8 @@ version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
 dependencies = [
+ "libc",
+ "rand_chacha 0.3.1",
  "rand_core 0.6.4",
 ]
 
@@ -5971,10 +5868,20 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
 dependencies = [
- "rand_chacha",
+ "rand_chacha 0.9.0",
  "rand_core 0.9.5",
 ]
 
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "rand_chacha"
 version = "0.9.0"
@@ -5990,6 +5897,9 @@ name = "rand_core"
 version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.17",
+]
 
 [[package]]
 name = "rand_core"
@@ -6040,7 +5950,7 @@ dependencies = [
  "paste",
  "profiling",
  "rand 0.9.4",
- "rand_chacha",
+ "rand_chacha 0.9.0",
  "simd_helpers",
  "thiserror 2.0.18",
  "v_frame",
@@ -6686,7 +6596,6 @@ dependencies = [
 [[package]]
 name = "smithay-clipboard"
 version = "0.8.0"
-source = "git+https://github.com/pop-os/smithay-clipboard?tag=sctk-0.20#859b02c88f45c554049a67c6ddeec1692ce0e20b"
 dependencies = [
  "libc",
  "raw-window-handle",
@@ -6706,9 +6615,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
+checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51"
 dependencies = [
  "libc",
  "windows-sys 0.61.2",
@@ -6717,14 +6626,11 @@ dependencies = [
 [[package]]
 name = "softbuffer"
 version = "0.4.1"
-source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#c2b2c19ddb38ff17495643699f97cb1f2064a1be"
 dependencies = [
- "as-raw-xcb-connection",
  "bytemuck",
  "cfg_aliases",
  "cocoa",
  "core-graphics",
- "drm",
  "fastrand",
  "foreign-types",
  "js-sys",
@@ -6734,14 +6640,12 @@ dependencies = [
  "raw-window-handle",
  "redox_syscall 0.5.18",
  "rustix 0.38.44",
- "tiny-xlib",
  "wasm-bindgen",
  "wayland-backend",
  "wayland-client",
  "wayland-sys",
  "web-sys",
  "windows-sys 0.52.0",
- "x11rb",
 ]
 
 [[package]]
@@ -7080,19 +6984,6 @@ dependencies = [
  "strict-num",
 ]
 
-[[package]]
-name = "tiny-xlib"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a90a0ca3ee6a69f2ad28fd11621a4c3f03b371f366be500b64df260c4ffbafb4"
-dependencies = [
- "as-raw-xcb-connection",
- "ctor",
- "libloading",
- "pkg-config",
- "tracing",
-]
-
 [[package]]
 name = "tinystr"
 version = "0.8.3"
@@ -8119,12 +8010,10 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 [[package]]
 name = "window_clipboard"
 version = "0.4.1"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c"
 dependencies = [
  "clipboard-win",
  "clipboard_macos",
  "clipboard_wayland",
- "clipboard_x11",
  "dnd",
  "mime 0.1.0",
  "raw-window-handle",
@@ -8617,7 +8506,6 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 [[package]]
 name = "winit"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#f737f1f5900b3399b56951305b0f155afc9c9ee5"
 dependencies = [
  "bitflags 2.11.1",
  "cfg_aliases",
@@ -8637,13 +8525,11 @@ dependencies = [
  "winit-wayland",
  "winit-web",
  "winit-win32",
- "winit-x11",
 ]
 
 [[package]]
 name = "winit-android"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#f737f1f5900b3399b56951305b0f155afc9c9ee5"
 dependencies = [
  "android-activity",
  "bitflags 2.11.1",
@@ -8658,7 +8544,6 @@ dependencies = [
 [[package]]
 name = "winit-appkit"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#f737f1f5900b3399b56951305b0f155afc9c9ee5"
 dependencies = [
  "bitflags 2.11.1",
  "block2 0.6.2",
@@ -8680,7 +8565,6 @@ dependencies = [
 [[package]]
 name = "winit-common"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#f737f1f5900b3399b56951305b0f155afc9c9ee5"
 dependencies = [
  "memmap2 0.9.10",
  "objc2 0.6.4",
@@ -8688,14 +8572,12 @@ dependencies = [
  "smol_str",
  "tracing",
  "winit-core",
- "x11-dl",
  "xkbcommon-dl",
 ]
 
 [[package]]
 name = "winit-core"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#f737f1f5900b3399b56951305b0f155afc9c9ee5"
 dependencies = [
  "bitflags 2.11.1",
  "cursor-icon",
@@ -8709,7 +8591,6 @@ dependencies = [
 [[package]]
 name = "winit-orbital"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#f737f1f5900b3399b56951305b0f155afc9c9ee5"
 dependencies = [
  "bitflags 2.11.1",
  "dpi",
@@ -8725,7 +8606,6 @@ dependencies = [
 [[package]]
 name = "winit-uikit"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#f737f1f5900b3399b56951305b0f155afc9c9ee5"
 dependencies = [
  "bitflags 2.11.1",
  "block2 0.6.2",
@@ -8745,7 +8625,6 @@ dependencies = [
 [[package]]
 name = "winit-wayland"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#f737f1f5900b3399b56951305b0f155afc9c9ee5"
 dependencies = [
  "ahash",
  "bitflags 2.11.1",
@@ -8771,7 +8650,6 @@ dependencies = [
 [[package]]
 name = "winit-web"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#f737f1f5900b3399b56951305b0f155afc9c9ee5"
 dependencies = [
  "atomic-waker",
  "bitflags 2.11.1",
@@ -8793,7 +8671,6 @@ dependencies = [
 [[package]]
 name = "winit-win32"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#f737f1f5900b3399b56951305b0f155afc9c9ee5"
 dependencies = [
  "bitflags 2.11.1",
  "cursor-icon",
@@ -8806,29 +8683,6 @@ dependencies = [
  "winit-core",
 ]
 
-[[package]]
-name = "winit-x11"
-version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#f737f1f5900b3399b56951305b0f155afc9c9ee5"
-dependencies = [
- "bitflags 2.11.1",
- "bytemuck",
- "calloop",
- "cursor-icon",
- "dpi",
- "libc",
- "percent-encoding",
- "raw-window-handle",
- "rustix 1.1.4",
- "smol_str",
- "tracing",
- "winit-common",
- "winit-core",
- "x11-dl",
- "x11rb",
- "xkbcommon-dl",
-]
-
 [[package]]
 name = "winnow"
 version = "0.7.15"
@@ -8956,39 +8810,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "x11-dl"
-version = "2.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f"
-dependencies = [
- "libc",
- "once_cell",
- "pkg-config",
-]
-
-[[package]]
-name = "x11rb"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414"
-dependencies = [
- "as-raw-xcb-connection",
- "gethostname",
- "libc",
- "libloading",
- "once_cell",
- "rustix 1.1.4",
- "x11rb-protocol",
- "xcursor",
-]
-
-[[package]]
-name = "x11rb-protocol"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
-
 [[package]]
 name = "xattr"
 version = "1.6.1"
@@ -9500,3 +9321,12 @@ dependencies = [
  "syn 2.0.117",
  "winnow 1.0.3",
 ]
+
+[[patch.unused]]
+name = "winit-x11"
+version = "0.31.0-beta.2"
+
+[[patch.unused]]
+name = "onig"
+version = "7.0.0"
+source = "git+https://github.com/rust-onig/rust-onig.git?branch=main#73e63eb3eea6d93d24a4aadf7fea580287750c7d"
diff --git a/Cargo.toml b/Cargo.toml
index 8bc4bca..46ef935 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,21 +33,22 @@ i18n-embed-fl = "0.10"
 rust-embed = "8"
 
 [dependencies.cosmic-files]
-git = "https://github.com/pop-os/cosmic-files.git"
+path = "../cosmic-files"
 default-features = false
 
 [dependencies.cosmic-syntax-theme]
 git = "https://github.com/pop-os/cosmic-syntax-theme.git"
 
 [dependencies.cosmic-text]
-version = "0.19"
+path = "../cosmic-text"
 features = ["syntect", "vi"]
 
-[dependencies.libcosmic]
-git = "https://github.com/pop-os/libcosmic.git"
+# Yoda fork.
+[dependencies.libcosmic-yoda]
+path = "../libcosmic"
 default-features = false
 #TODO: a11y feature crashes file choser dialog
-features = ["about", "multi-window", "tokio", "winit", "surface-message"]
+features = ["about", "multi-window", "tokio", "wayland", "surface-message"]
 
 [target.'cfg(unix)'.dependencies]
 fork = "0.2"
@@ -57,16 +58,25 @@ xdgen = "0.1"
 
 [features]
 default = ["dbus-config", "gvfs", "wgpu", "wayland"]
-dbus-config = ["libcosmic/dbus-config"]
+dbus-config = ["libcosmic-yoda/dbus-config"]
 gvfs = ["cosmic-files/gvfs"]
-wgpu = ["libcosmic/wgpu", "cosmic-files/wgpu"]
-wayland = ["libcosmic/wayland", "cosmic-files/wayland"]
+wgpu = ["libcosmic-yoda/wgpu", "cosmic-files/wgpu"]
+wayland = ["libcosmic-yoda/wayland", "cosmic-files/wayland"]
 
 [profile.release-with-debug]
 inherits = "release"
 debug = true
 
-# [patch.'https://github.com/pop-os/libcosmic']
-# libcosmic = { git = "https://github.com/pop-os/libcosmic//" }
-# cosmic-config = { git = "https://github.com/pop-os/libcosmic//" }
-# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//" }
+[patch.crates-io]
+onig = { git = "https://github.com/rust-onig/rust-onig.git", branch = "main" }
+onig_sys = { git = "https://github.com/rust-onig/rust-onig.git", branch = "main" }
+
+# Yoda wayland cut v5: redirect window_clipboard to the local fork
+# (x11 gated behind opt-in feature).
+[patch.'https://forge.aditua.com/leyoda/window_clipboard.git']
+window_clipboard = { path = "/home/lionel/Projets/COSMIC/window_clipboard" }
+dnd = { path = "/home/lionel/Projets/COSMIC/window_clipboard/dnd" }
+mime = { path = "/home/lionel/Projets/COSMIC/window_clipboard/mime" }
+
+[patch.'https://github.com/pop-os/cosmic-text.git']
+cosmic-text = { path = "../cosmic-text" }
diff --git a/src/main.rs b/src/main.rs
index ec864a7..d1f17d2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1455,6 +1455,7 @@ impl Application for App {
             .author("System76")
             .comments(fl!("comment"))
             .license("GPL-3.0-only")
+            .license_url("https://spdx.org/licenses/GPL-3.0-only")
             .developers([("Jeremy Soller", "jeremy@system76.com")])
             .links([
                 (fl!("repository"), "https://github.com/pop-os/cosmic-edit"),
diff --git a/src/menu.rs b/src/menu.rs
index 7ae1fd6..629cee3 100644
--- a/src/menu.rs
+++ b/src/menu.rs
@@ -121,7 +121,7 @@ pub fn context_menu<'a>(
     entity: segmented_button::Entity,
 ) -> Element<'a, Message> {
     fn key_style(theme: &cosmic::Theme) -> TextStyle {
-        let mut color = theme.cosmic().background.component.on;
+        let mut color = theme.cosmic().background(false).component.on;
         color.alpha *= 0.75;
         TextStyle {
             color: Some(color.into()),
@@ -160,7 +160,7 @@ pub fn context_menu<'a>(
     //TODO: move style to libcosmic
     .style(|theme| {
         let cosmic = theme.cosmic();
-        let component = &cosmic.background.component;
+        let component = &cosmic.background(false).component;
         widget::container::Style {
             icon_color: Some(component.on.into()),
             text_color: Some(component.on.into()),
diff --git a/src/text_box.rs b/src/text_box.rs
index 311570b..36d35ef 100644
--- a/src/text_box.rs
+++ b/src/text_box.rs
@@ -825,7 +825,7 @@ where
             let scrollbar_color = if pressed {
                 // pressed_state_color, 0.5
                 cosmic_theme
-                    .background
+                    .background(false)
                     .component
                     .pressed
                     .without_alpha()
@@ -834,7 +834,7 @@ where
             } else if hover {
                 // hover_state_color, 0.2
                 cosmic_theme
-                    .background
+                    .background(false)
                     .component
                     .hover
                     .without_alpha()
@@ -921,7 +921,7 @@ where
             let scrollbar_color = if pressed {
                 // pressed_state_color, 0.5
                 cosmic_theme
-                    .background
+                    .background(false)
                     .component
                     .pressed
                     .without_alpha()
@@ -930,7 +930,7 @@ where
             } else if hover {
                 // hover_state_color, 0.2
                 cosmic_theme
-                    .background
+                    .background(false)
                     .component
                     .hover
                     .without_alpha()