diff --git a/Cargo.lock b/Cargo.lock
index b0754023..dc5deede 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -154,7 +154,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f2a1bb052857d5dd49572219344a7332b31b76405648eabac5bc68978251bcd"
 dependencies = [
  "android-properties",
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "cc",
  "jni",
  "libc",
@@ -183,9 +183,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.103"
+version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3"
+checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
 
 [[package]]
 name = "apply"
@@ -204,9 +204,9 @@ dependencies = [
 
 [[package]]
 name = "arc-swap"
-version = "1.9.2"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c049c0be4daef0b145cb3555416b3b8ef5b7888a38aea1a3a155801fe7b0810b"
+checksum = "6a3a1fd6f75306b68087b831f025c712524bcb19aad54e557b1129cfa0a2b207"
 dependencies = [
  "rustversion",
 ]
@@ -219,9 +219,9 @@ checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.8"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "ash"
@@ -374,7 +374,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -409,7 +409,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -467,21 +467,21 @@ dependencies = [
 
 [[package]]
 name = "auto_enums"
-version = "0.8.9"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e4487600931c9a89f8db7ffbdf3fbdd45bb7bd85e26861f659a463cd0dff966"
+checksum = "65398a2893f41bce5c9259f6e1a4f03fbae40637c1bdc755b4f387f48c613b03"
 dependencies = [
  "derive_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.5.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "base64"
@@ -521,9 +521,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.13.0"
+version = "2.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
+checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da"
 dependencies = [
  "serde_core",
 ]
@@ -536,11 +536,11 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
 
 [[package]]
 name = "block-buffer"
-version = "0.12.1"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
- "hybrid-array",
+ "generic-array",
 ]
 
 [[package]]
@@ -605,9 +605,9 @@ dependencies = [
 
 [[package]]
 name = "borsh"
-version = "1.7.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f3f6da4992df95bbcd9af42a6c7dcb994498fc9048230405f3b36ff7cd3f145"
+checksum = "cfd1e3f8955a5d7de9fab72fc8373fade9fb8a703968cb200ae3dc6cf08e185a"
 dependencies = [
  "bytes",
  "cfg_aliases",
@@ -624,13 +624,13 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.12.3"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cee35f73844aa3014bb606320a6c1f010249dbdf43342fe54b5a4f6a8ed4b79"
+checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab"
 dependencies = [
  "memchr",
  "regex-automata",
- "serde_core",
+ "serde",
 ]
 
 [[package]]
@@ -642,18 +642,11 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "build_helpers"
-version = "0.14.0"
-dependencies = [
- "cfg_aliases",
-]
-
 [[package]]
 name = "bumpalo"
-version = "3.20.3"
+version = "3.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
+checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
 
 [[package]]
 name = "by_address"
@@ -678,7 +671,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -689,9 +682,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "bytes"
-version = "1.12.1"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"
+checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
 
 [[package]]
 name = "calendrical_calculations"
@@ -709,7 +702,7 @@ version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dbf9978365bac10f54d1d4b04f7ce4427e51f71d61f2fe15e3fed5166474df7"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "polling",
  "rustix 1.1.4",
  "slab",
@@ -730,14 +723,14 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.66"
+version = "1.2.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5d6cac793997bd970000024b2934968efe83b382de4fdcf4fcb46b6ee4ad996"
+checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
  "libc",
- "shlex 2.0.1",
+ "shlex",
 ]
 
 [[package]]
@@ -754,9 +747,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chrono"
-version = "0.4.45"
+version = "0.4.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
+checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
 dependencies = [
  "iana-time-zone",
  "num-traits",
@@ -859,15 +852,9 @@ dependencies = [
 
 [[package]]
 name = "configparser"
-version = "3.2.0"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b46dec724fd22199ebde05033a0cbae453bc3b1ecff11eb6a6bb3eec4b90c6a4"
-
-[[package]]
-name = "const-oid"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c"
+checksum = "e57e3272f0190c3f1584272d613719ba5fc7df7f4942fe542e63d949cf3a649b"
 
 [[package]]
 name = "core-foundation"
@@ -925,7 +912,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "core-foundation 0.10.1",
  "libc",
 ]
@@ -953,9 +940,9 @@ dependencies = [
  "i18n-embed-fl",
  "image",
  "libcosmic-yoda",
- "memmap2 0.9.11",
+ "memmap2 0.9.10",
  "rust-embed",
- "rustc-hash 2.1.3",
+ "rustc-hash 2.1.2",
  "rustix 1.1.4",
  "switcheroo-control",
  "tokio",
@@ -1031,7 +1018,7 @@ dependencies = [
  "i18n-embed-fl",
  "libcosmic-yoda",
  "rust-embed",
- "rustc-hash 2.1.3",
+ "rustc-hash 2.1.2",
  "serde",
  "tokio",
  "tracing",
@@ -1053,7 +1040,7 @@ dependencies = [
  "i18n-embed-fl",
  "libcosmic-yoda",
  "rust-embed",
- "rustc-hash 2.1.3",
+ "rustc-hash 2.1.2",
  "tokio",
  "tracing",
  "tracing-log",
@@ -1064,9 +1051,7 @@ dependencies = [
 name = "cosmic-applet-input-sources"
 version = "1.3.0"
 dependencies = [
- "cosmic-client-toolkit",
  "cosmic-comp-config",
- "futures",
  "i18n-embed",
  "i18n-embed-fl",
  "libcosmic-yoda",
@@ -1087,7 +1072,7 @@ dependencies = [
  "i18n-embed-fl",
  "image",
  "libcosmic-yoda",
- "memmap2 0.9.11",
+ "memmap2 0.9.10",
  "rust-embed",
  "rustix 1.1.4",
  "tokio",
@@ -1109,7 +1094,7 @@ dependencies = [
  "libcosmic-yoda",
  "nmrs",
  "rust-embed",
- "rustc-hash 2.1.3",
+ "rustc-hash 2.1.2",
  "secure-string",
  "tokio",
  "tracing",
@@ -1161,7 +1146,7 @@ version = "1.3.0"
 dependencies = [
  "futures",
  "libcosmic-yoda",
- "rustc-hash 2.1.3",
+ "rustc-hash 2.1.2",
  "serde",
  "tokio",
  "tracing",
@@ -1182,7 +1167,7 @@ dependencies = [
  "i18n-embed-fl",
  "libcosmic-yoda",
  "rust-embed",
- "rustc-hash 2.1.3",
+ "rustc-hash 2.1.2",
  "tokio",
  "tracing",
  "tracing-log",
@@ -1264,7 +1249,7 @@ dependencies = [
 name = "cosmic-client-toolkit"
 version = "0.2.0"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "cosmic-protocols",
  "libc",
  "smithay-client-toolkit",
@@ -1293,7 +1278,7 @@ dependencies = [
  "iced_futures",
  "known-folders",
  "notify",
- "ron 0.12.2",
+ "ron 0.12.1",
  "serde",
  "tokio",
  "tracing",
@@ -1306,7 +1291,7 @@ name = "cosmic-config-derive"
 version = "1.0.0"
 dependencies = [
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -1324,7 +1309,7 @@ dependencies = [
  "bstr",
  "btoi",
  "memchr",
- "memmap2 0.9.11",
+ "memmap2 0.9.10",
  "thiserror 2.0.18",
  "tracing",
  "xdg",
@@ -1357,7 +1342,7 @@ version = "1.3.0"
 dependencies = [
  "cosmic-config",
  "libcosmic-yoda",
- "rustc-hash 2.1.3",
+ "rustc-hash 2.1.2",
  "serde",
  "tracing",
  "tracing-log",
@@ -1381,7 +1366,7 @@ dependencies = [
 name = "cosmic-protocols"
 version = "0.2.0"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -1422,7 +1407,7 @@ dependencies = [
  "cosmic-settings-audio-core",
  "dirs",
  "futures-util",
- "ron 0.12.2",
+ "ron 0.12.1",
  "serde",
  "tokio",
  "tokio-util",
@@ -1435,7 +1420,7 @@ name = "cosmic-settings-audio-core"
 version = "1.0.0"
 dependencies = [
  "dirs",
- "ron 0.12.2",
+ "ron 0.12.1",
  "serde",
  "zlink",
 ]
@@ -1488,15 +1473,15 @@ dependencies = [
 name = "cosmic-text"
 version = "0.19.0"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "fontdb",
  "harfrust",
  "linebender_resource_handle",
  "log",
  "rangemap",
- "rustc-hash 2.1.3",
+ "rustc-hash 2.1.2",
  "self_cell",
- "skrifa 0.40.0",
+ "skrifa",
  "smol_str",
  "swash",
  "sys-locale",
@@ -1518,7 +1503,7 @@ dependencies = [
  "dirs",
  "hex_color",
  "palette",
- "ron 0.12.2",
+ "ron 0.12.1",
  "serde",
  "serde_json",
  "thiserror 2.0.18",
@@ -1526,9 +1511,9 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.3.0"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
  "libc",
 ]
@@ -1544,9 +1529,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.22"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "crunchy"
@@ -1561,17 +1546,18 @@ dependencies = [
  "cosmic-text",
  "etagere",
  "lru",
- "rustc-hash 2.1.3",
+ "rustc-hash 2.1.2",
  "wgpu",
 ]
 
 [[package]]
 name = "crypto-common"
-version = "0.2.2"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453"
+checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
 dependencies = [
- "hybrid-array",
+ "generic-array",
+ "typenum",
 ]
 
 [[package]]
@@ -1616,7 +1602,7 @@ dependencies = [
  "darling 0.20.11",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
  "synstructure",
 ]
 
@@ -1661,7 +1647,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -1675,7 +1661,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -1688,7 +1674,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -1699,7 +1685,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core 0.20.11",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -1710,7 +1696,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
 dependencies = [
  "darling_core 0.21.3",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -1721,7 +1707,7 @@ checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
 dependencies = [
  "darling_core 0.23.0",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -1732,9 +1718,9 @@ checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376"
 
 [[package]]
 name = "dbus"
-version = "0.9.12"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab69f03cc8c4340c9c8e315114e1658e6775a9b16a04357973aa21cec22b32e"
+checksum = "b942602992bb7acfd1f51c49811c58a610ef9181b6e66f3e519d79b540a3bf73"
 dependencies = [
  "futures-channel",
  "futures-util",
@@ -1763,43 +1749,13 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "defmt"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2953bfe4f93bbd20cc71198842756f77d161884c99ebbabc41d80231ded88d1"
-dependencies = [
- "bitflags 1.3.2",
- "defmt-macros",
-]
-
-[[package]]
-name = "defmt-macros"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bad9c72e7ca2137e0dc3813245a0d282fd6daad32fd800af018306a9169b5fe8"
-dependencies = [
- "defmt-parser",
- "proc-macro2",
- "quote",
- "syn 2.0.118",
-]
-
-[[package]]
-name = "defmt-parser"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e"
-dependencies = [
- "thiserror 2.0.18",
-]
-
 [[package]]
 name = "deranged"
 version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
 dependencies = [
+ "powerfmt",
  "serde_core",
 ]
 
@@ -1812,7 +1768,7 @@ dependencies = [
  "darling 0.21.3",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -1823,17 +1779,16 @@ checksum = "362f47930db19fe7735f527e6595e4900316b893ebf6d48ad3d31be928d57dd6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
 name = "digest"
-version = "0.11.3"
+version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer",
- "const-oid",
  "crypto-common",
 ]
 
@@ -1864,7 +1819,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.6.2",
  "libc",
  "objc2 0.6.4",
@@ -1872,13 +1827,13 @@ dependencies = [
 
 [[package]]
 name = "displaydoc"
-version = "0.2.6"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -1894,7 +1849,7 @@ dependencies = [
 name = "dnd"
 version = "0.1.0"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "mime 0.1.0",
  "raw-window-handle",
  "smithay-client-toolkit",
@@ -1926,7 +1881,7 @@ version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "80bc8c5c6c2941f70a55c15f8d9f00f9710ebda3ffda98075f996a0e6c92756f"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "bytemuck",
  "drm-ffi",
  "drm-fourcc",
@@ -1968,9 +1923,9 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
 
 [[package]]
 name = "either"
-version = "1.16.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "endi"
@@ -1996,7 +1951,7 @@ checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -2171,7 +2126,7 @@ dependencies = [
  "fluent-syntax",
  "intl-memoizer",
  "intl_pluralrules",
- "rustc-hash 2.1.3",
+ "rustc-hash 2.1.2",
  "self_cell",
  "smallvec",
  "unic-langid",
@@ -2240,7 +2195,7 @@ checksum = "457e789b3d1202543297a350643cf459f836cade38934e7a4cf6a39e7cde2905"
 dependencies = [
  "fontconfig-parser",
  "log",
- "memmap2 0.9.11",
+ "memmap2 0.9.10",
  "slotmap",
  "tinyvec",
  "ttf-parser",
@@ -2264,7 +2219,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -2318,9 +2273,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.34"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a31d2a3fbaaeb2af2368bbdd904aa8e812d3c04a1ee10d3171f52d556e5d0a3"
+checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2333,9 +2288,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.34"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f9e3d69d39e4862ffed03ed071a76f9a13ba1d9109d355b0f0aa6b15e393c4"
+checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -2343,15 +2298,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.34"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e"
+checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.34"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "031b47cf1a3c6cc8bc2fc76cd437f521619387907d469316e7c0bc278f1f5432"
+checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -2360,9 +2315,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.34"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed"
+checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
 
 [[package]]
 name = "futures-lite"
@@ -2379,26 +2334,26 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.34"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44"
+checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.3",
+ "syn",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.34"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1944426bf7d03f1d14f708785e4b33efd750b36d48a157b836b3efc15ede8e1d"
+checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
 
 [[package]]
 name = "futures-task"
-version = "0.3.34"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd"
+checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
 
 [[package]]
 name = "futures-timer"
@@ -2408,9 +2363,9 @@ checksum = "af43fadb8a98512d547e37b4e92e0ced13e205c061b87b4623eff01d918d6968"
 
 [[package]]
 name = "futures-util"
-version = "0.3.34"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc"
+checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2423,6 +2378,16 @@ dependencies = [
  "slab",
 ]
 
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.2.17"
@@ -2448,13 +2413,15 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.4.3"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
+checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
 dependencies = [
  "cfg-if",
  "libc",
  "r-efi 6.0.0",
+ "wasip2",
+ "wasip3",
 ]
 
 [[package]]
@@ -2545,7 +2512,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "gpu-descriptor-types",
  "hashbrown 0.15.5",
 ]
@@ -2556,7 +2523,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
 ]
 
 [[package]]
@@ -2593,10 +2560,10 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9da2e5ae821f6e96664977bf974d6d6a2d6682f9ccee23e62ec1d134246845f9"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "bytemuck",
  "core_maths",
- "read-fonts 0.37.0",
+ "read-fonts",
  "smallvec",
 ]
 
@@ -2679,15 +2646,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
 
-[[package]]
-name = "hybrid-array"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "818356c5132c1fede50f837ca96afbe78ff42413047f4abb886217845e1b6c8c"
-dependencies = [
- "typenum",
-]
-
 [[package]]
 name = "i18n-config"
 version = "0.4.8"
@@ -2738,7 +2696,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.118",
+ "syn",
  "unic-langid",
 ]
 
@@ -2752,7 +2710,7 @@ dependencies = [
  "i18n-config",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -2783,7 +2741,6 @@ dependencies = [
 name = "iced"
 version = "0.14.0"
 dependencies = [
- "build_helpers",
  "dnd",
  "iced_accessibility",
  "iced_core",
@@ -2812,8 +2769,7 @@ dependencies = [
 name = "iced_core"
 version = "0.14.0"
 dependencies = [
- "bitflags 2.13.0",
- "build_helpers",
+ "bitflags 2.13.1",
  "bytes",
  "cosmic-client-toolkit",
  "dnd",
@@ -2824,7 +2780,7 @@ dependencies = [
  "num-traits",
  "palette",
  "raw-window-handle",
- "rustc-hash 2.1.3",
+ "rustc-hash 2.1.2",
  "serde",
  "smol_str",
  "thiserror 2.0.18",
@@ -2849,7 +2805,7 @@ dependencies = [
  "futures",
  "iced_core",
  "log",
- "rustc-hash 2.1.3",
+ "rustc-hash 2.1.2",
  "tokio",
  "wasm-bindgen-futures",
  "wasmtimer",
@@ -2859,7 +2815,7 @@ dependencies = [
 name = "iced_graphics"
 version = "0.14.0"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "bytemuck",
  "cosmic-text",
  "half",
@@ -2870,7 +2826,7 @@ dependencies = [
  "log",
  "lyon_path",
  "raw-window-handle",
- "rustc-hash 2.1.3",
+ "rustc-hash 2.1.2",
  "thiserror 2.0.18",
  "unicode-segmentation",
 ]
@@ -2898,7 +2854,6 @@ dependencies = [
 name = "iced_runtime"
 version = "0.14.0"
 dependencies = [
- "build_helpers",
  "bytes",
  "cosmic-client-toolkit",
  "dnd",
@@ -2920,7 +2875,7 @@ dependencies = [
  "kurbo 0.10.4",
  "log",
  "resvg",
- "rustc-hash 2.1.3",
+ "rustc-hash 2.1.2",
  "softbuffer",
  "tiny-skia",
 ]
@@ -2929,8 +2884,7 @@ dependencies = [
 name = "iced_wgpu"
 version = "0.14.0"
 dependencies = [
- "bitflags 2.13.0",
- "build_helpers",
+ "bitflags 2.13.1",
  "bytemuck",
  "cosmic-client-toolkit",
  "cryoglyph",
@@ -2943,7 +2897,7 @@ dependencies = [
  "lyon",
  "raw-window-handle",
  "resvg",
- "rustc-hash 2.1.3",
+ "rustc-hash 2.1.2",
  "rustix 0.38.44",
  "thiserror 2.0.18",
  "wayland-backend",
@@ -2957,7 +2911,6 @@ dependencies = [
 name = "iced_widget"
 version = "0.14.2"
 dependencies = [
- "build_helpers",
  "cosmic-client-toolkit",
  "dnd",
  "iced_renderer",
@@ -2965,7 +2918,7 @@ dependencies = [
  "log",
  "num-traits",
  "ouroboros",
- "rustc-hash 2.1.3",
+ "rustc-hash 2.1.2",
  "thiserror 2.0.18",
  "unicode-segmentation",
  "window_clipboard",
@@ -2975,7 +2928,6 @@ dependencies = [
 name = "iced_winit"
 version = "0.14.0"
 dependencies = [
- "build_helpers",
  "cosmic-client-toolkit",
  "cursor-icon",
  "dnd",
@@ -2986,7 +2938,7 @@ dependencies = [
  "iced_runtime",
  "log",
  "raw-window-handle",
- "rustc-hash 2.1.3",
+ "rustc-hash 2.1.2",
  "rustix 0.38.44",
  "thiserror 2.0.18",
  "wasm-bindgen-futures",
@@ -3075,9 +3027,9 @@ checksum = "846b0857ca091204be3c874bc93daaf89d4777e8d2d20b0d3ffe8f671d98014b"
 
 [[package]]
 name = "icu_collator"
-version = "2.2.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bbdf98e5e0aa827770acee171ebb568aaab975a36b56afdb5fd0e2f525750bb"
+checksum = "b521b92a2666061ddda902769d8a4cf730b5c9529a845cc1b69770b12a6c9a71"
 dependencies = [
  "icu_collator_data",
  "icu_collections",
@@ -3402,6 +3354,12 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f2f8aeca682d874a5247084aa4fb7d1cef9ba45d889c21209a8818dcaaa0ec9"
 
+[[package]]
+name = "id-arena"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -3494,20 +3452,20 @@ dependencies = [
 
 [[package]]
 name = "inotify"
-version = "0.11.4"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "153be1941a183ec9ccd095ddbe17a8b8d435ef6c76e9e02451b933c3999af2c8"
+checksum = "bd5b3eaf1a28b758ac0faa5a4254e8ab2705605496f1b1f3fbbc3988ad73d199"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "inotify-sys",
  "libc",
 ]
 
 [[package]]
 name = "inotify-sys"
-version = "0.1.8"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c033f80b2c113cdf91ab7a33faa9cbc014726dcad99880c8609af2a370edf37d"
+checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
 dependencies = [
  "libc",
 ]
@@ -3518,7 +3476,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9793345a65d71317763a33066b5d8351f8760dde8d4930fe9e39b5f14a7959d"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "input-sys",
  "libc",
  "log",
@@ -3581,36 +3539,35 @@ checksum = "2ceaf4c6c48465bead8cb6a0b7c4ee0c86ecbb31239032b9c66ab9a08d2f3ee1"
 
 [[package]]
 name = "jiff"
-version = "0.2.32"
+version = "0.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "961d16382652bfdd8c6f68b223b26a8c93e0d475c672f414411db31c6c5c900e"
+checksum = "f00b5dbd620d61dfdcb6007c9c1f6054ebd75319f163d886a9055cec1155073d"
 dependencies = [
- "defmt",
  "jiff-static",
  "jiff-tzdb-platform",
  "log",
  "portable-atomic",
  "portable-atomic-util",
  "serde_core",
- "windows-link 0.2.1",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "jiff-static"
-version = "0.2.32"
+version = "0.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0879bd39df99c4c5e2c6615ccc026391a423dde10532c573e6086eb94a802cc"
+checksum = "e000de030ff8022ea1da3f466fbb0f3a809f5e51ed31f6dd931c35181ad8e6d7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
 name = "jiff-tzdb"
-version = "0.1.8"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "142bd39932ad231f10513df9ab62661fead8719872150b7ad02a2df79f4e141e"
+checksum = "c900ef84826f1338a557697dc8fc601df9ca9af4ac137c7fb61d4c6f2dfd3076"
 
 [[package]]
 name = "jiff-tzdb-platform"
@@ -3648,7 +3605,7 @@ dependencies = [
  "quote",
  "rustc_version",
  "simd_cesu8",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -3676,27 +3633,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
 dependencies = [
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
 name = "jobserver"
-version = "0.1.35"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
 dependencies = [
- "getrandom 0.4.3",
+ "getrandom 0.3.4",
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.103"
+version = "0.3.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102"
+checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08"
 dependencies = [
  "cfg-if",
  "futures-util",
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -3715,7 +3673,7 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fbe853b403ae61a04233030ae8a79d94975281ed9770a1f9e246732b534b28d"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "serde",
 ]
 
@@ -3747,9 +3705,9 @@ dependencies = [
 
 [[package]]
 name = "kqueue"
-version = "1.2.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "273c0752728918e0ac4976f2b275b6fefb9ecd400585dec929419f3844cd87b5"
+checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a"
 dependencies = [
  "kqueue-sys",
  "libc",
@@ -3761,7 +3719,7 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07293a4e297ac234359b510362495713f75ea345d5307140414f20c69ffeb087"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "libc",
 ]
 
@@ -3792,6 +3750,12 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
+[[package]]
+name = "leb128fmt"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
+
 [[package]]
 name = "libc"
 version = "0.2.186"
@@ -3805,7 +3769,6 @@ dependencies = [
  "apply",
  "ashpd 0.12.3",
  "auto_enums",
- "build_helpers",
  "cosmic-client-toolkit",
  "cosmic-config",
  "cosmic-freedesktop-icons",
@@ -3839,11 +3802,11 @@ dependencies = [
  "palette",
  "phf 0.13.1",
  "rfd",
- "ron 0.12.2",
+ "ron 0.12.1",
  "rust-embed",
  "rustix 1.1.4",
  "serde",
- "shlex 1.3.0",
+ "shlex",
  "slotmap",
  "taffy",
  "thiserror 2.0.18",
@@ -3881,14 +3844,14 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
 
 [[package]]
 name = "libredox"
-version = "0.1.18"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c943259e342f1e06ff2da7a83eabdfe7f92ce10262688dbf1895ff0b3e6e4652"
+checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "libc",
  "plain",
- "redox_syscall 0.9.0",
+ "redox_syscall 0.8.1",
 ]
 
 [[package]]
@@ -4068,9 +4031,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.8.3"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
+checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
 
 [[package]]
 name = "memmap2"
@@ -4083,9 +4046,9 @@ dependencies = [
 
 [[package]]
 name = "memmap2"
-version = "0.9.11"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1219ed1b7f229ee7104d281dd01d6802fe28bb6e95d292942c4daacdeb798c0"
+checksum = "714098028fe011992e1c3962653c96b2d578c4b4bce9036e15ff220319b1e0e3"
 dependencies = [
  "libc",
 ]
@@ -4105,7 +4068,7 @@ version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7047791b5bc903b8cd963014b355f71dc9864a9a0b727057676c1dcae5cbc15"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block",
  "core-graphics-types 0.2.0",
  "foreign-types",
@@ -4127,16 +4090,6 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
-[[package]]
-name = "mime_guess"
-version = "2.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
-dependencies = [
- "mime 0.3.17",
- "unicase",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.9"
@@ -4149,9 +4102,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.2.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda"
+checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1"
 dependencies = [
  "libc",
  "log",
@@ -4195,7 +4148,7 @@ checksum = "618f667225063219ddfc61251087db8a9aec3c3f0950c916b614e403486f1135"
 dependencies = [
  "arrayvec",
  "bit-set",
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "cfg-if",
  "cfg_aliases",
  "codespan-reporting",
@@ -4219,7 +4172,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "jni-sys 0.3.1",
  "log",
  "ndk-sys",
@@ -4249,7 +4202,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -4257,13 +4210,13 @@ dependencies = [
 
 [[package]]
 name = "nmrs"
-version = "3.4.0"
+version = "3.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62c427203beda58ac05815b356d64a34eeb2fba180b3077d543ebb1472fc1269"
+checksum = "33e42c05118e18f29f55eefa2fbfd98a06b0c7a1a829bdb0f328137d358c6013"
 dependencies = [
  "async-trait",
  "base64",
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "futures",
  "futures-timer",
  "log",
@@ -4290,7 +4243,7 @@ version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "fsevent-sys",
  "inotify",
  "kqueue",
@@ -4308,7 +4261,7 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
 ]
 
 [[package]]
@@ -4322,9 +4275,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.8"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c89e69e7e0f03bea5ef08013795c25018e101932225a656383bd384495ecc367"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
  "num-integer",
  "num-traits",
@@ -4344,7 +4297,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -4396,7 +4349,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -4450,7 +4403,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.5.1",
  "libc",
  "objc2 0.5.2",
@@ -4466,7 +4419,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.6.2",
  "objc2 0.6.4",
  "objc2-core-foundation",
@@ -4479,7 +4432,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -4491,7 +4444,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.6.2",
  "dispatch2",
  "objc2 0.6.4",
@@ -4503,7 +4456,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "libc",
  "objc2-core-foundation",
 ]
@@ -4526,7 +4479,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "objc2-core-foundation",
  "objc2-core-graphics",
 ]
@@ -4543,7 +4496,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.5.1",
  "libc",
  "objc2 0.5.2",
@@ -4555,7 +4508,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.6.2",
  "objc2 0.6.4",
  "objc2-core-foundation",
@@ -4567,7 +4520,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -4579,7 +4532,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -4592,7 +4545,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
@@ -4621,9 +4574,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
 [[package]]
 name = "orbclient"
-version = "0.3.55"
+version = "0.3.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5df339f526ea9a60e371768d50efc2f2508c7203290731565d1f7a6f71d21747"
+checksum = "a570f6bca41d29acb2139229a7c873ec99bc9a313bd10804081d89bfac8ff329"
 dependencies = [
  "libc",
  "libredox",
@@ -4669,7 +4622,7 @@ dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -4703,7 +4656,7 @@ dependencies = [
  "by_address",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -4798,7 +4751,7 @@ dependencies = [
  "phf_shared 0.11.3",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -4811,7 +4764,7 @@ dependencies = [
  "phf_shared 0.13.1",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
  "uncased",
 ]
 
@@ -4857,7 +4810,7 @@ checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -4914,7 +4867,7 @@ version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "crc32fast",
  "fdeflate",
  "flate2",
@@ -4988,6 +4941,16 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
 
+[[package]]
+name = "prettyplease"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
+
 [[package]]
 name = "proc-macro-crate"
 version = "3.5.0"
@@ -5016,7 +4979,7 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -5036,7 +4999,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
  "version_check",
  "yansi",
 ]
@@ -5049,9 +5012,9 @@ checksum = "3d595e54a326bc53c1c197b32d295e14b169e3cfeaa8dc82b529f947fba6bcf5"
 
 [[package]]
 name = "pxfm"
-version = "0.1.30"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d55d956fa96f5ec02be2e13af0e20391a5aa83d6a074e3ad368959d0fab299ea"
+checksum = "e0c5ccf5294c6ccd63a74f1565028353830a9c2f5eb0c682c355c471726a6e3f"
 
 [[package]]
 name = "quick-error"
@@ -5066,13 +5029,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdcc8dd4e2f670d309a5f0e83fe36dfdc05af317008fea29144da1a2ac858e5e"
 dependencies = [
  "memchr",
+ "serde",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.46"
+version = "1.0.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
 dependencies = [
  "proc-macro2",
 ]
@@ -5177,23 +5141,13 @@ dependencies = [
  "font-types",
 ]
 
-[[package]]
-name = "read-fonts"
-version = "0.39.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4ed38b89c2c77ff968c524145ad65fb010f38af5c7a224b53b81d47ac2daa81"
-dependencies = [
- "bytemuck",
- "font-types",
-]
-
 [[package]]
 name = "redox_event"
-version = "0.4.8"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5018d583d6d2f5499352aea8d177e9067d1eb03ab17c78169d5ba7a30001b15"
+checksum = "8c07d0d6d291e3a951bd847b1cd4af32fc6243d64116cf7702838c02797688b7"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "libredox",
 ]
 
@@ -5203,16 +5157,16 @@ version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.9.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5102a6aaa05aa011a238e178e6bca86d2cb56fc9f586d37cb80f5bca6e07759"
+checksum = "5b44b894f2a6e36457d665d1e08c3866add6ed5e70050c1b4ba8a8ddedb02ce7"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
 ]
 
 [[package]]
@@ -5243,14 +5197,14 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
 name = "regex"
-version = "1.13.0"
+version = "1.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0e75113e14dc5acb068cd0786884f214f1312650a3d36d269f5c4f3cdee8a2"
+checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -5260,9 +5214,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.15"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f388202e4b80542a0921078cc23b6333bcf1409c1e3f86404cae4766a6131db"
+checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -5271,9 +5225,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.11"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
+checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
 
 [[package]]
 name = "renderdoc-sys"
@@ -5338,7 +5292,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "db09040cc89e461f1a265139777a2bde7f8d8c67c4936f700c63ce3e2904d468"
 dependencies = [
  "base64",
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "serde",
  "serde_derive",
  "unicode-ident",
@@ -5346,11 +5300,11 @@ dependencies = [
 
 [[package]]
 name = "ron"
-version = "0.12.2"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81116b9531d61eabc41aeb228e4b6b2435bcca3233b98cf3b3077d4e6e9debb3"
+checksum = "4147b952f3f819eca0e99527022f7d6a8d05f111aeb0a62960c74eb283bec8fc"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "once_cell",
  "serde",
  "serde_derive",
@@ -5366,9 +5320,9 @@ checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
 
 [[package]]
 name = "rust-embed"
-version = "8.12.0"
+version = "8.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9e7760e252aaba7b09f4be00e36476cf585bdb68a53552ac954cdf504ab4bc9"
+checksum = "04113cb9355a377d83f06ef1f0a45b8ab8cd7d8b1288160717d66df5c7988d27"
 dependencies = [
  "rust-embed-impl",
  "rust-embed-utils",
@@ -5377,23 +5331,22 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-impl"
-version = "8.12.0"
+version = "8.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bcfc4d6f53af43755f7a723e4b6b8794fcce052a178dd8c6c1dadc5f5343097"
+checksum = "da0902e4c7c8e997159ab384e6d0fc91c221375f6894346ae107f47dd0f3ccaa"
 dependencies = [
- "mime_guess",
  "proc-macro2",
  "quote",
  "rust-embed-utils",
- "syn 2.0.118",
+ "syn",
  "walkdir",
 ]
 
 [[package]]
 name = "rust-embed-utils"
-version = "8.12.0"
+version = "8.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ffa149f6aa81b58a5b3011d01a857c4ed12c7a732d2c51947a4c7c692185f0"
+checksum = "5bcdef0be6fe7f6fa333b1073c949729274b05f123a0ad7efcb8efd878e5c3b1"
 dependencies = [
  "sha2",
  "walkdir",
@@ -5407,9 +5360,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustc-hash"
-version = "2.1.3"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d"
+checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"
 
 [[package]]
 name = "rustc_version"
@@ -5426,7 +5379,7 @@ version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
@@ -5439,7 +5392,7 @@ version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "errno",
  "libc",
  "linux-raw-sys 0.12.1",
@@ -5448,9 +5401,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.23"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "rustybuzz"
@@ -5458,7 +5411,7 @@ version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd3c7c96f8a08ee34eff8857b11b49b07d71d1c3f4e88f8a88d4c9e9f90b1702"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "bytemuck",
  "core_maths",
  "log",
@@ -5529,7 +5482,7 @@ checksum = "1dd3accc0f3f4bbaf2c9e1957a030dc582028130c67660d44c0a0345a22ca69b"
 dependencies = [
  "ab_glyph",
  "log",
- "memmap2 0.9.11",
+ "memmap2 0.9.10",
  "smithay-client-toolkit",
  "tiny-skia",
 ]
@@ -5595,14 +5548,14 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.150"
+version = "1.0.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
+checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
 dependencies = [
  "indexmap 2.14.0",
  "itoa",
@@ -5620,14 +5573,14 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
 name = "serde_with"
-version = "3.21.0"
+version = "3.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76a5c54c7310e7b8b9577c286d7e399ddd876c3e12b3ed917a8aabc4b96e9e8c"
+checksum = "e72c1c2cb7b223fafb600a619537a871c2818583d619401b785e7c0b746ccde2"
 dependencies = [
  "base64",
  "bs58",
@@ -5645,14 +5598,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.21.0"
+version = "3.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84d57bc0c8b9a17920c178daa6bb924850d54a9c97ab45194bb8c17ad66bb660"
+checksum = "b90c488738ecb4fb0262f41f43bc40efc5868d9fb744319ddf5f5317f417bfac"
 dependencies = [
  "darling 0.23.0",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -5663,9 +5616,9 @@ checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d"
 
 [[package]]
 name = "sha2"
-version = "0.11.0"
+version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -5687,12 +5640,6 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
-[[package]]
-name = "shlex"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
-
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.8"
@@ -5747,17 +5694,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fbdfe3d2475fbd7ddd1f3e5cf8288a30eb3e5f95832829570cd88115a7434ac"
 dependencies = [
  "bytemuck",
- "read-fonts 0.37.0",
-]
-
-[[package]]
-name = "skrifa"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c34617370ae968efb7161bb2beb517d9084659aae19e24b89e3db25b46e4564"
-dependencies = [
- "bytemuck",
- "read-fonts 0.39.2",
+ "read-fonts",
 ]
 
 [[package]]
@@ -5777,9 +5714,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.15.2"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "smithay-client-toolkit"
@@ -5787,14 +5724,14 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0512da38f5e2b31201a93524adb8d3136276fa4fe4aafab4e1f727a82b534cc0"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "bytemuck",
  "calloop",
  "calloop-wayland-source",
  "cursor-icon",
  "libc",
  "log",
- "memmap2 0.9.11",
+ "memmap2 0.9.10",
  "pkg-config",
  "rustix 1.1.4",
  "thiserror 2.0.18",
@@ -5833,9 +5770,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.6.4"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51"
+checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
 dependencies = [
  "libc",
  "windows-sys 0.61.2",
@@ -5852,11 +5789,11 @@ dependencies = [
  "fastrand",
  "foreign-types",
  "js-sys",
- "libredox",
  "log",
- "memmap2 0.9.11",
+ "memmap2 0.9.10",
  "objc",
  "raw-window-handle",
+ "redox_syscall 0.5.18",
  "rustix 0.38.44",
  "wasm-bindgen",
  "wayland-backend",
@@ -5872,7 +5809,7 @@ version = "0.3.0+sdk-1.3.268.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
 ]
 
 [[package]]
@@ -5921,7 +5858,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -5942,11 +5879,11 @@ dependencies = [
 
 [[package]]
 name = "swash"
-version = "0.2.9"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0811b01ca2c4e8718760713911feaf4675c24f94e50530a015ec646cfb622f7c"
+checksum = "842f3cd369c2ba38966204f983eaa5e54a8e84a7d7159ed36ade2b6c335aae64"
 dependencies = [
- "skrifa 0.42.1",
+ "skrifa",
  "yazi",
  "zeno",
 ]
@@ -5960,20 +5897,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.118"
+version = "2.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5988,7 +5914,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -6025,7 +5951,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
  "fastrand",
- "getrandom 0.4.3",
+ "getrandom 0.4.2",
  "once_cell",
  "rustix 1.1.4",
  "windows-sys 0.61.2",
@@ -6066,7 +5992,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -6077,7 +6003,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -6091,11 +6017,12 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.53"
+version = "0.3.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18dfaaeddcb932337b5e7866ee7d0ce9b76d2fd092997146f187ec09b4558a50"
+checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
 dependencies = [
  "deranged",
+ "itoa",
  "num-conv",
  "powerfmt",
  "serde_core",
@@ -6105,15 +6032,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.9"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
+checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
 
 [[package]]
 name = "time-macros"
-version = "0.2.31"
+version = "0.2.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c431b87111666e491a90baa837f914fb45cd5dc3c268591b0220ff5057f2085f"
+checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
 dependencies = [
  "num-conv",
  "time-core",
@@ -6186,9 +6113,9 @@ checksum = "b130bd8a58c163224b44e217b4239ca7b927d82bf6cc2fea1fc561d15056e3f7"
 
 [[package]]
 name = "tokio"
-version = "1.53.1"
+version = "1.52.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "202caea871b69668250d242070849eb495be178ed697a3e98aebce5bc81a0bed"
+checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe"
 dependencies = [
  "bytes",
  "libc",
@@ -6210,14 +6137,14 @@ checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.19"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3d06f0b082ba57c26b79407372e57cf2a1e28124f78e9479fe80322cf53420b"
+checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -6258,9 +6185,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.25.12+spec-1.1.0"
+version = "0.25.11+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7"
+checksum = "0b59c4d22ed448339746c59b905d24568fcbb3ab65a500494f7b8c3e97739f2b"
 dependencies = [
  "indexmap 2.14.0",
  "toml_datetime",
@@ -6297,7 +6224,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -6354,7 +6281,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb30dbbd9036155e74adad6812e9898d03ec374946234fbcebd5dfc7b9187b90"
 dependencies = [
- "rustc-hash 2.1.3",
+ "rustc-hash 2.1.2",
 ]
 
 [[package]]
@@ -6365,9 +6292,9 @@ checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
 
 [[package]]
 name = "typenum"
-version = "1.20.1"
+version = "1.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
+checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de"
 
 [[package]]
 name = "udev"
@@ -6470,9 +6397,9 @@ checksum = "383ad40bb927465ec0ce7720e033cb4ca06912855fc35db31b5755d0de75b1ee"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.13.3"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8"
+checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c"
 
 [[package]]
 name = "unicode-vo"
@@ -6486,6 +6413,12 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
 [[package]]
 name = "upower_dbus"
 version = "0.3.2"
@@ -6556,11 +6489,11 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
 [[package]]
 name = "uuid"
-version = "1.23.4"
+version = "1.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf80a72845275afea99e7f2b434723d3bc7e38470fcd1c7ed39a599c73319a53"
+checksum = "bf3923a6f5c4c6382e0b653c4117f48d631ea17f38ed86e2a828e6f7412f5239"
 dependencies = [
- "getrandom 0.4.3",
+ "getrandom 0.4.2",
  "js-sys",
  "serde_core",
  "sha1_smol",
@@ -6597,18 +6530,27 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasip2"
-version = "1.0.4+wasi-0.2.12"
+version = "1.0.3+wasi-0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487"
+checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
 dependencies = [
- "wit-bindgen",
+ "wit-bindgen 0.57.1",
+]
+
+[[package]]
+name = "wasip3"
+version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
+dependencies = [
+ "wit-bindgen 0.51.0",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.126"
+version = "0.2.121"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4"
+checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -6619,9 +6561,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.76"
+version = "0.4.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62df1340f32221cb9c54d6a27b030e3dba64361d4a95bed55f9aacb44da291d"
+checksum = "96492d0d3ffba25305a7dc88720d250b1401d7edca02cc3bcd50633b424673b8"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -6629,9 +6571,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.126"
+version = "0.2.121"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1"
+checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6639,26 +6581,60 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.126"
+version = "0.2.121"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e"
+checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2"
 dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.126"
+version = "0.2.121"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24"
+checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441"
 dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "wasm-encoder"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
+dependencies = [
+ "leb128fmt",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasm-metadata"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
+dependencies = [
+ "anyhow",
+ "indexmap 2.14.0",
+ "wasm-encoder",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasmparser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
+dependencies = [
+ "bitflags 2.13.1",
+ "hashbrown 0.15.5",
+ "indexmap 2.14.0",
+ "semver",
+]
+
 [[package]]
 name = "wasmtimer"
 version = "0.4.3"
@@ -6693,7 +6669,7 @@ version = "0.31.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "rustix 1.1.4",
  "wayland-backend",
  "wayland-scanner",
@@ -6705,7 +6681,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "cursor-icon",
  "wayland-backend",
 ]
@@ -6723,11 +6699,11 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols"
-version = "0.32.13"
+version = "0.32.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d0c813de3daa2ed6520af85a3bd49b0e722a3078506899aa9686fea58dc4b6"
+checksum = "563a85523cade2429938e790815fd7319062103b9f4a2dc806e9b53b95982d8f"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "wayland-backend",
  "wayland-client",
  "wayland-scanner",
@@ -6740,7 +6716,7 @@ version = "20250721.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40a1f863128dcaaec790d7b4b396cc9b9a7a079e878e18c47e6c2d2c5a8dcbb1"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -6753,7 +6729,7 @@ version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e9567599ef23e09b8dad6e429e5738d4509dfc46b3b21f32841a304d16b29c8"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -6766,7 +6742,7 @@ version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b6d8cf1eb2c1c31ed1f5643c88a6e53538129d4af80030c8cabd1f9fa884d91"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -6779,7 +6755,7 @@ version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -6804,7 +6780,7 @@ version = "0.31.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc1846eb04c49182e04f4a099e2a830a2b745610bbc1d61246e206f29c7000a0"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "downcast-rs",
  "rustix 1.1.4",
  "wayland-backend",
@@ -6825,9 +6801,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.103"
+version = "0.3.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8622dcb61c0bcc9fffa6938bed81210af2da9a7e4a1a834b2e37a59b6dfb6141"
+checksum = "4b572dff8bcf38bad0fa19729c89bb5748b2b9b1d8be70cf90df697e3a8f32aa"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -6856,7 +6832,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9cb534d5ffd109c7d1135f34cdae29e60eab94855a625dcfe1705f8bc7ad79f"
 dependencies = [
  "arrayvec",
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "bytemuck",
  "cfg-if",
  "cfg_aliases",
@@ -6888,7 +6864,7 @@ dependencies = [
  "arrayvec",
  "bit-set",
  "bit-vec",
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "bytemuck",
  "cfg_aliases",
  "document-features",
@@ -6948,7 +6924,7 @@ dependencies = [
  "arrayvec",
  "ash",
  "bit-set",
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block",
  "bytemuck",
  "cfg-if",
@@ -6992,7 +6968,7 @@ version = "28.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e18308757e594ed2cd27dddbb16a139c42a683819d32a2e0b1b0167552f5840c"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "bytemuck",
  "js-sys",
  "log",
@@ -7142,7 +7118,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -7153,7 +7129,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -7477,7 +7453,7 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 name = "winit"
 version = "0.31.0-beta.2"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "cfg_aliases",
  "cursor-icon",
  "dpi",
@@ -7502,7 +7478,7 @@ name = "winit-android"
 version = "0.31.0-beta.2"
 dependencies = [
  "android-activity",
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "dpi",
  "ndk",
  "raw-window-handle",
@@ -7515,7 +7491,7 @@ dependencies = [
 name = "winit-appkit"
 version = "0.31.0-beta.2"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.6.2",
  "dispatch2",
  "dpi",
@@ -7536,7 +7512,7 @@ dependencies = [
 name = "winit-common"
 version = "0.31.0-beta.2"
 dependencies = [
- "memmap2 0.9.11",
+ "memmap2 0.9.10",
  "objc2 0.6.4",
  "objc2-core-foundation",
  "smol_str",
@@ -7549,7 +7525,7 @@ dependencies = [
 name = "winit-core"
 version = "0.31.0-beta.2"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "cursor-icon",
  "dpi",
  "keyboard-types",
@@ -7562,7 +7538,7 @@ dependencies = [
 name = "winit-orbital"
 version = "0.31.0-beta.2"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "dpi",
  "libredox",
  "orbclient",
@@ -7577,7 +7553,7 @@ dependencies = [
 name = "winit-uikit"
 version = "0.31.0-beta.2"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.6.2",
  "dispatch2",
  "dpi",
@@ -7597,12 +7573,12 @@ name = "winit-wayland"
 version = "0.31.0-beta.2"
 dependencies = [
  "ahash",
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "calloop",
  "cursor-icon",
  "dpi",
  "libc",
- "memmap2 0.9.11",
+ "memmap2 0.9.10",
  "raw-window-handle",
  "rustix 1.1.4",
  "sctk-adwaita",
@@ -7622,7 +7598,7 @@ name = "winit-web"
 version = "0.31.0-beta.2"
 dependencies = [
  "atomic-waker",
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "concurrent-queue",
  "cursor-icon",
  "dpi",
@@ -7642,7 +7618,7 @@ dependencies = [
 name = "winit-win32"
 version = "0.31.0-beta.2"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "cursor-icon",
  "dpi",
  "raw-window-handle",
@@ -7662,12 +7638,100 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "wit-bindgen"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
+dependencies = [
+ "wit-bindgen-rust-macro",
+]
+
 [[package]]
 name = "wit-bindgen"
 version = "0.57.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
 
+[[package]]
+name = "wit-bindgen-core"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
+dependencies = [
+ "anyhow",
+ "heck 0.5.0",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-bindgen-rust"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
+dependencies = [
+ "anyhow",
+ "heck 0.5.0",
+ "indexmap 2.14.0",
+ "prettyplease",
+ "syn",
+ "wasm-metadata",
+ "wit-bindgen-core",
+ "wit-component",
+]
+
+[[package]]
+name = "wit-bindgen-rust-macro"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
+dependencies = [
+ "anyhow",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wit-bindgen-core",
+ "wit-bindgen-rust",
+]
+
+[[package]]
+name = "wit-component"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
+dependencies = [
+ "anyhow",
+ "bitflags 2.13.1",
+ "indexmap 2.14.0",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "wasm-encoder",
+ "wasm-metadata",
+ "wasmparser",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-parser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
+dependencies = [
+ "anyhow",
+ "id-arena",
+ "indexmap 2.14.0",
+ "log",
+ "semver",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "unicode-xid",
+ "wasmparser",
+]
+
 [[package]]
 name = "write16"
 version = "1.0.0"
@@ -7743,7 +7807,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d66ca9352cbd4eecbbc40871d8a11b4ac8107cfc528a6e14d7c19c69d0e1ac9"
 dependencies = [
  "libc",
- "memmap2 0.9.11",
+ "memmap2 0.9.10",
  "xkeysym",
 ]
 
@@ -7754,7 +7818,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a974f48060a14e95705c01f24ad9c3345022f4d97441b8a36beb7ed5c4a02d"
 dependencies = [
  "libc",
- "memmap2 0.9.11",
+ "memmap2 0.9.10",
  "xkeysym",
 ]
 
@@ -7764,7 +7828,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "dlib",
  "log",
  "once_cell",
@@ -7821,9 +7885,9 @@ checksum = "e01738255b5a16e78bbb83e7fbba0a1e7dd506905cfc53f4622d89015a03fbb5"
 
 [[package]]
 name = "yoke"
-version = "0.8.3"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5"
+checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
 dependencies = [
  "stable_deref_trait",
  "yoke-derive",
@@ -7838,15 +7902,15 @@ checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
  "synstructure",
 ]
 
 [[package]]
 name = "zbus"
-version = "5.19.0"
+version = "5.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db4be7c075cb421e4b7ee645541604239bd243ba7c357511f4ff3a74b555907"
+checksum = "fe18fb60dc696039e738717b76eaea21e7a4489bbb1885020b43c94236d7e98a"
 dependencies = [
  "async-broadcast",
  "async-executor",
@@ -7896,7 +7960,7 @@ checksum = "10da05367f3a7b7553c8cdf8fa91aee6b64afebe32b51c95177957efc47ca3a0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
  "zbus-lockstep",
  "zbus_xml",
  "zvariant",
@@ -7904,14 +7968,14 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "5.19.0"
+version = "5.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2990635d09ade6df1868f72f8cac69a876a90981e8bd3c40b1be413f8dc88f40"
+checksum = "fe96480bed92df2b442a1a30df364e12d08eed03aeb061f2b8dc6afb2be91119"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 3.0.3",
+ "syn",
  "zbus_names",
  "zvariant",
  "zvariant_utils",
@@ -7930,25 +7994,16 @@ dependencies = [
 
 [[package]]
 name = "zbus_xml"
-version = "5.2.0"
+version = "5.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ab0513c0a66a60a8718d5ad712a5094845a20d95b5c1c81e2bd8e904a52b4f"
+checksum = "a8067892e940ed1727dea64690378601603b31d62dfde019a5335fbb7c0e0ed9"
 dependencies = [
+ "quick-xml",
  "serde",
- "winnow",
  "zbus_names",
  "zvariant",
 ]
 
-[[package]]
-name = "zcheapstr"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1afec51604565183aeb5c54c20aeab286120d4e4460f7f76e3e8bb8c0d99473"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "zeno"
 version = "0.3.3"
@@ -7957,22 +8012,22 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524"
 
 [[package]]
 name = "zerocopy"
-version = "0.8.54"
+version = "0.8.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7cbbc0a705a0fd05cc3676525980d2bf5a9bc4adac6d6475209a7887cf59d19"
+checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.54"
+version = "0.8.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e817b7b52d0c7358d3246da9d69935ebb18116b2b102b4230dac079b4862f5"
+checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -7992,15 +8047,15 @@ checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
  "synstructure",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.9.0"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
 
 [[package]]
 name = "zerotrie"
@@ -8034,7 +8089,7 @@ checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -8073,7 +8128,7 @@ checksum = "e6f2416a5f504dfd7e04fee49f31abafe3314a3f62b4ddaa8e9a5fd496d4dd50"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn",
 ]
 
 [[package]]
@@ -8142,50 +8197,49 @@ dependencies = [
 
 [[package]]
 name = "zvariant"
-version = "5.15.0"
+version = "5.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1d34c27cc6cdd1f458427519dd6b8612f7b7e3f7b9a0b2355d041dda9869147"
+checksum = "bee2a0bcd2a907786a456fff45aaaaf54c9ba5f50b71ae9ec1a4edd200c94911"
 dependencies = [
  "endi",
  "enumflags2",
  "serde",
  "url",
  "winnow",
- "zcheapstr",
  "zvariant_derive",
  "zvariant_utils",
 ]
 
 [[package]]
 name = "zvariant_derive"
-version = "5.15.0"
+version = "5.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "864155e69b4352db0c7f374917bf45d1e0c8d17659c8b3dbf9795f3673f8c497"
+checksum = "38a708216a18780796770bfe3f4739c7c83a3e8f789b755534bbbc06e4e23e12"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 3.0.3",
+ "syn",
  "zvariant_utils",
 ]
 
 [[package]]
 name = "zvariant_utils"
-version = "4.2.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bad0294361a320b694a328460dc73add56c306150f5cb6bfafc44446120008a3"
+checksum = "90cb9383f9b45290407a1258b202d3f8f01db719eb60b4e4055c6375af4fc7c7"
 dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 3.0.3",
+ "syn",
  "winnow",
 ]
 
-[[patch.unused]]
-name = "winit-x11"
-version = "0.31.0-beta.2"
-
 [[patch.unused]]
 name = "cosmic-settings-airplane-mode-subscription"
 version = "1.0.7"
+
+[[patch.unused]]
+name = "winit-x11"
+version = "0.31.0-beta.2"
diff --git a/Cargo.toml b/Cargo.toml
index 0e75c5bc..ccbe504a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,9 +75,13 @@ ignored = ["libcosmic"]
 # cosmic-config = { path = "../libcosmic/cosmic-config" }
 # libcosmic = { path = "../libcosmic" }
 # iced_futures = { path = "../libcosmic/iced/futures" }
-# cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }
-# libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }
-# iced_futures = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }
+# cosmic-config = { git = "https://github.com/pop-os/libcosmic//" }
+# libcosmic = { git = "https://github.com/pop-os/libcosmic//" }
+# iced_futures = { git = "https://github.com/pop-os/libcosmic//" }
+
+# [patch."https://github.com/pop-os/winit.git"]
+# winit = { git = "https://github.com/rust-windowing/winit.git", rev = "241b7a80bba96c91fa3901729cd5dec66abb9be4" }
+# winit = { path = "../winit" }
 
 [patch."https://github.com/pop-os/libcosmic"]
 cosmic-config = { path = "/home/lionel/Projets/COSMIC/libcosmic/cosmic-config" }
diff --git a/cosmic-app-list/i18n/ar/cosmic_app_list.ftl b/cosmic-app-list/i18n/ar/cosmic_app_list.ftl
index f7aae84b..1e4d25cc 100644
--- a/cosmic-app-list/i18n/ar/cosmic_app_list.ftl
+++ b/cosmic-app-list/i18n/ar/cosmic_app_list.ftl
@@ -1,6 +1,6 @@
 cosmic-app-list = دُرج التطبيقات
 pin = ثبِّت في درج التطبيقات
-quit = إنهِ
+quit = أنهِ
 quit-all = أنهِ الكل
 new-window = نافذة جديدة
 run = شغِّل
diff --git a/cosmic-app-list/i18n/cs/cosmic_app_list.ftl b/cosmic-app-list/i18n/cs/cosmic_app_list.ftl
index 5534149f..ad5b9257 100644
--- a/cosmic-app-list/i18n/cs/cosmic_app_list.ftl
+++ b/cosmic-app-list/i18n/cs/cosmic_app_list.ftl
@@ -1,5 +1,5 @@
-cosmic-app-list = Oblast aplikací
-pin = Připnout do oblasti aplikací
+cosmic-app-list = Panel aplikací
+pin = Připnout do panelu aplikací
 quit = Ukončit
 quit-all = Ukončit vše
 new-window = Nové okno
diff --git a/cosmic-app-list/i18n/da/cosmic_app_list.ftl b/cosmic-app-list/i18n/da/cosmic_app_list.ftl
index 3396ed61..e69de29b 100644
--- a/cosmic-app-list/i18n/da/cosmic_app_list.ftl
+++ b/cosmic-app-list/i18n/da/cosmic_app_list.ftl
@@ -1,8 +0,0 @@
-run = Kør
-run-on = Kør på { $gpu }
-run-on-default = (Standard)
-cosmic-app-list = Programbakke
-new-window = Nyt Vindue
-quit = Afslut
-quit-all = Forlad Alle
-pin = Fastgør til app-skuffe
diff --git a/cosmic-app-list/i18n/el/cosmic_app_list.ftl b/cosmic-app-list/i18n/el/cosmic_app_list.ftl
index 0b8a7fb6..e77f522a 100644
--- a/cosmic-app-list/i18n/el/cosmic_app_list.ftl
+++ b/cosmic-app-list/i18n/el/cosmic_app_list.ftl
@@ -1,5 +1,5 @@
 new-window = Νέο παράθυρο
-quit = Τερματισμός
+quit = Έξοδος
 cosmic-app-list = Περιοχή εφαρμογών
 run = Εκτέλεση
 run-on = Εκτέλεση με { $gpu }
diff --git a/cosmic-app-list/i18n/en-GB/cosmic_app_list.ftl b/cosmic-app-list/i18n/en-GB/cosmic_app_list.ftl
index f3afe950..e69de29b 100644
--- a/cosmic-app-list/i18n/en-GB/cosmic_app_list.ftl
+++ b/cosmic-app-list/i18n/en-GB/cosmic_app_list.ftl
@@ -1,8 +0,0 @@
-cosmic-app-list = App Tray
-new-window = New Window
-quit = Quit
-run = Run
-run-on = Run on { $gpu }
-quit-all = Quit All
-run-on-default = (Default)
-pin = Pin to app tray
diff --git a/cosmic-app-list/i18n/fa/cosmic_app_list.ftl b/cosmic-app-list/i18n/fa/cosmic_app_list.ftl
index 8d098db3..be2d279a 100644
--- a/cosmic-app-list/i18n/fa/cosmic_app_list.ftl
+++ b/cosmic-app-list/i18n/fa/cosmic_app_list.ftl
@@ -1,8 +1,8 @@
-cosmic-app-list = نوار برنامه‌ها
-pin = افزودن به نوار برنامه‌ها
-quit = خروج
-quit-all = خروج از همه
+cosmic-app-list = سینی برنامه‌ها
+pin = سنجاق کردن به سینی برنامه‌ها
+quit = بستن
+quit-all = بستن همه
 new-window = پنجره جدید
 run = اجرا
-run-on = اجرا با { $gpu }
-run-on-default = (پیش‌فرض)
+run-on = اجرا روی {$gpu}
+run-on-default = (پیش‌فرض)
\ No newline at end of file
diff --git a/cosmic-app-list/i18n/gl/cosmic_app_list.ftl b/cosmic-app-list/i18n/gl/cosmic_app_list.ftl
deleted file mode 100644
index 4fa947a7..00000000
--- a/cosmic-app-list/i18n/gl/cosmic_app_list.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-quit = Pechar
-run = Executar
-cosmic-app-list = Bandexa de aplicacións
-pin = Fixar na bandexa de aplicacións
-quit-all = Quitar todo
-new-window = Nova Xanela
-run-on = Executar en { $gpu }
-run-on-default = (Por defecto)
diff --git a/cosmic-app-list/i18n/hi/cosmic_app_list.ftl b/cosmic-app-list/i18n/hi/cosmic_app_list.ftl
index 2c6b12a3..88138ea6 100644
--- a/cosmic-app-list/i18n/hi/cosmic_app_list.ftl
+++ b/cosmic-app-list/i18n/hi/cosmic_app_list.ftl
@@ -1,8 +1,8 @@
 cosmic-app-list = ऐप ट्रे
 pin = ऐप ट्रे में पिन करें
-quit = बाहर जाएँ
+quit = बंद करें
 quit-all = सभी बंद करें
 new-window = नई विंडो
 run = चलाएँ
-run-on = { $gpu } पर चलाएँ
+run-on = {$gpu} पर चलाएँ
 run-on-default = (डिफ़ॉल्ट)
diff --git a/cosmic-app-list/i18n/it/cosmic_app_list.ftl b/cosmic-app-list/i18n/it/cosmic_app_list.ftl
index b65b4e23..96a5b575 100644
--- a/cosmic-app-list/i18n/it/cosmic_app_list.ftl
+++ b/cosmic-app-list/i18n/it/cosmic_app_list.ftl
@@ -1,8 +1,8 @@
-cosmic-app-list = Area applicazioni
+cosmic-app-list = Barra applicazioni
 pin = Fissa nella barra delle applicazioni
 quit = Esci
 quit-all = Chiudi tutto
 new-window = Nuova finestra
 run = Esegui
-run-on = Esegui su { $gpu }
-run-on-default = (Predefinito)
+run-on = Esegui usando la GPU: { $gpu }
+run-on-default = (default)
diff --git a/cosmic-app-list/i18n/lt/cosmic_app_list.ftl b/cosmic-app-list/i18n/lt/cosmic_app_list.ftl
index 25dd5990..c86f45a1 100644
--- a/cosmic-app-list/i18n/lt/cosmic_app_list.ftl
+++ b/cosmic-app-list/i18n/lt/cosmic_app_list.ftl
@@ -1,5 +1,5 @@
 new-window = Naujas Langas
-quit = Išjungti
+quit = Išeiti
 run = Paleisti
 run-on = Paleisti naudojantis { $gpu }
 run-on-default = (Numatytas)
diff --git a/cosmic-app-list/i18n/oc/cosmic_app_list.ftl b/cosmic-app-list/i18n/oc/cosmic_app_list.ftl
index 9129b9b4..e69de29b 100644
--- a/cosmic-app-list/i18n/oc/cosmic_app_list.ftl
+++ b/cosmic-app-list/i18n/oc/cosmic_app_list.ftl
@@ -1 +0,0 @@
-cosmic-app-list = Cinta d’aplicacions
diff --git a/cosmic-app-list/i18n/pa/cosmic_app_list.ftl b/cosmic-app-list/i18n/pa/cosmic_app_list.ftl
index cb202e4b..ab835da6 100644
--- a/cosmic-app-list/i18n/pa/cosmic_app_list.ftl
+++ b/cosmic-app-list/i18n/pa/cosmic_app_list.ftl
@@ -1,4 +1,4 @@
-quit = ਸਮਾਪਤ
+quit = ਬਾਹਰ
 cosmic-app-list = ਐਪ ਟਰੇ
 pin = ਐਪ ਟਰੇ ਵਿੱਚ ਟੰਗੋ
 quit-all = ਸਭ ਵਿੱਚੋਂ ਬਾਹਰ
diff --git a/cosmic-app-list/i18n/pl/cosmic_app_list.ftl b/cosmic-app-list/i18n/pl/cosmic_app_list.ftl
index d619a422..aaedc5f0 100644
--- a/cosmic-app-list/i18n/pl/cosmic_app_list.ftl
+++ b/cosmic-app-list/i18n/pl/cosmic_app_list.ftl
@@ -1,6 +1,6 @@
 cosmic-app-list = Zasobnik aplikacji
 pin = Przypnij do zasobnika aplikacji
-quit = Zakończ
+quit = Zamknij
 quit-all = Zamknij wszystkie
 new-window = Nowe okno
 run = Uruchom
diff --git a/cosmic-app-list/i18n/pt-BR/cosmic_app_list.ftl b/cosmic-app-list/i18n/pt-BR/cosmic_app_list.ftl
index 0a28b697..2b94e0e9 100644
--- a/cosmic-app-list/i18n/pt-BR/cosmic_app_list.ftl
+++ b/cosmic-app-list/i18n/pt-BR/cosmic_app_list.ftl
@@ -1,6 +1,6 @@
 cosmic-app-list = Bandeja de aplicativos
 pin = Fixar na bandeja de aplicativos
-quit = Encerrar
+quit = Sair
 quit-all = Sair de Todos
 new-window = Nova Janela
 run = Executar
diff --git a/cosmic-app-list/i18n/ru/cosmic_app_list.ftl b/cosmic-app-list/i18n/ru/cosmic_app_list.ftl
index 2b3631e9..c1195520 100644
--- a/cosmic-app-list/i18n/ru/cosmic_app_list.ftl
+++ b/cosmic-app-list/i18n/ru/cosmic_app_list.ftl
@@ -1,6 +1,6 @@
 cosmic-app-list = Область приложений
 pin = Закрепить на панели приложений
-quit = Завершить
+quit = Выйти
 quit-all = Завершить все
 new-window = Новое окно
 run = Выполнить
diff --git a/cosmic-app-list/i18n/sat/cosmic_app_list.ftl b/cosmic-app-list/i18n/sat/cosmic_app_list.ftl
deleted file mode 100644
index 32be0db1..00000000
--- a/cosmic-app-list/i18n/sat/cosmic_app_list.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-run-on = { $gpu } ᱨᱮ ᱫᱟᱹᱲ ᱟᱭ
-run-on-default = (ᱢᱩᱞ)
diff --git a/cosmic-app-list/i18n/uk/cosmic_app_list.ftl b/cosmic-app-list/i18n/uk/cosmic_app_list.ftl
index b6aea1f1..ec1833cd 100644
--- a/cosmic-app-list/i18n/uk/cosmic_app_list.ftl
+++ b/cosmic-app-list/i18n/uk/cosmic_app_list.ftl
@@ -1,6 +1,6 @@
 cosmic-app-list = Панель застосунків
 pin = Закріпити
-quit = Завершити
+quit = Вийти
 quit-all = Закрити всі
 new-window = Нове вікно
 run = Виконати
diff --git a/cosmic-app-list/i18n/zh-TW/cosmic_app_list.ftl b/cosmic-app-list/i18n/zh-TW/cosmic_app_list.ftl
index c29bd8a5..9595d3b0 100644
--- a/cosmic-app-list/i18n/zh-TW/cosmic_app_list.ftl
+++ b/cosmic-app-list/i18n/zh-TW/cosmic_app_list.ftl
@@ -1,8 +1,8 @@
-cosmic-app-list = 應用程式托盤
-pin = 釘選至應用程式托盤
-quit = 結束
+cosmic-app-list = 應用程式匣盤
+pin = 釘選至應用程式匣盤
+quit = 退出
 quit-all = 全部退出
-new-window = 新增視窗
+new-window = 新建視窗
 run = 執行
 run-on = 在 { $gpu } 上執行
 run-on-default = （預設）
diff --git a/cosmic-app-list/src/app.rs b/cosmic-app-list/src/app.rs
index 77a0acb0..55d815b8 100755
--- a/cosmic-app-list/src/app.rs
+++ b/cosmic-app-list/src/app.rs
@@ -28,28 +28,25 @@ use cosmic::{
     },
     cosmic_config::{Config, CosmicConfigEntry},
     desktop::IconSourceExt,
+    iced::runtime::{core::event, dnd::peek_dnd},
     iced::{
         self, Alignment, Background, Border, Length, Limits, Padding, Subscription,
         advanced::text::{Ellipsize, EllipsizeHeightLimit},
         clipboard::mime::{AllowedMimeTypes, AsMimeTypes},
         event::listen_with,
         platform_specific::shell::commands::popup::{destroy_popup, get_popup},
-        runtime::{core::event, dnd::peek_dnd, platform_specific::wayland::CornerRadius},
         widget::{
-            Column, Row, column, mouse_area, row,
-            rule::vertical as vertical_rule,
-            space::{horizontal as horizontal_space, vertical as vertical_space},
-            stack,
+            Column, Row, column, mouse_area, row, rule::vertical as vertical_rule,
+            space::horizontal as horizontal_space, space::vertical as vertical_space, stack,
         },
         window,
     },
-    surface::{self, action::LiveSettings},
+    surface,
     theme::{self, Button, Container},
     widget::{
         DndDestination, Image, button, container, divider, dnd_source, grid,
         icon::{self, from_name},
         image::Handle,
-        menu,
         rectangle_tracker::{RectangleTracker, RectangleUpdate, rectangle_tracker_subscription},
         scrollable, svg, text, text_input,
     },
@@ -1252,54 +1249,44 @@ impl cosmic::Application for CosmicAppList {
                     .iter()
                     .chain(self.pinned_list.iter())
                     .find(|t| t.id == id)
-                    .cloned()
                 {
-                    let Some(rectangle) = self.rectangles.get(&toplevel_group.id.into()).copied()
-                    else {
+                    let Some(rectangle) = self.rectangles.get(&toplevel_group.id.into()) else {
                         tracing::error!("No rectangle found for toplevel group");
                         return Task::none();
                     };
-                    let corners = self.core.system_theme().cosmic().corner_radii.radius_s;
-                    let popup_task =
-                        cosmic::surface::surface_task(cosmic::surface::action::app_popup(
-                            move |_| LiveSettings::default(),
-                            move |app: &mut Self| {
-                                let new_id = window::Id::unique();
-                                app.popup = Some(Popup {
-                                    parent: parent_window_id,
-                                    id: new_id,
-                                    dock_item: toplevel_group.clone(),
-                                    popup_type: PopupType::RightClickMenu,
-                                });
 
-                                let mut popup_settings = app.core.applet.get_popup_settings(
-                                    parent_window_id,
-                                    new_id,
-                                    None,
-                                    None,
-                                    None,
-                                );
-                                let iced::Rectangle {
-                                    x,
-                                    y,
-                                    width,
-                                    height,
-                                } = rectangle;
-                                popup_settings.positioner.anchor_rect = iced::Rectangle::<i32> {
-                                    x: x as i32,
-                                    y: y as i32,
-                                    width: width as i32,
-                                    height: height as i32,
-                                };
-                                popup_settings
-                            },
-                            None,
-                        ));
+                    let new_id = window::Id::unique();
+                    self.popup = Some(Popup {
+                        parent: parent_window_id,
+                        id: new_id,
+                        dock_item: toplevel_group.clone(),
+                        popup_type: PopupType::RightClickMenu,
+                    });
+
+                    let mut popup_settings = self.core.applet.get_popup_settings(
+                        parent_window_id,
+                        new_id,
+                        None,
+                        None,
+                        None,
+                    );
+                    let iced::Rectangle {
+                        x,
+                        y,
+                        width,
+                        height,
+                    } = *rectangle;
+                    popup_settings.positioner.anchor_rect = iced::Rectangle::<i32> {
+                        x: x as i32,
+                        y: y as i32,
+                        width: width as i32,
+                        height: height as i32,
+                    };
 
                     let gpu_update = Task::perform(try_get_gpus(), |gpus| {
                         cosmic::Action::App(Message::GpuRequest(gpus))
                     });
-                    return Task::batch([gpu_update, popup_task]);
+                    return Task::batch([gpu_update, get_popup(popup_settings)]);
                 }
             }
             Message::ToplevelListPopup(id, parent_window_id) => {
@@ -1330,10 +1317,10 @@ impl cosmic::Application for CosmicAppList {
                         }
                     }
 
-                    let Some(rectangle) = self.rectangles.get(&toplevel_group.id.into()).copied()
-                    else {
+                    let Some(rectangle) = self.rectangles.get(&toplevel_group.id.into()) else {
                         return Task::none();
                     };
+
                     let new_id = window::Id::unique();
                     self.popup = Some(Popup {
                         parent: parent_window_id,
@@ -1341,56 +1328,48 @@ impl cosmic::Application for CosmicAppList {
                         dock_item: toplevel_group.clone(),
                         popup_type: PopupType::ToplevelList,
                     });
-                    let popup_task =
-                        cosmic::surface::surface_task(cosmic::surface::action::app_popup(
-                            |_| Default::default(),
-                            move |app: &mut Self| {
-                                let mut popup_settings = app.core.applet.get_popup_settings(
-                                    parent_window_id,
-                                    new_id,
-                                    None,
-                                    None,
-                                    None,
-                                );
-                                let iced::Rectangle {
-                                    x,
-                                    y,
-                                    width,
-                                    height,
-                                } = rectangle;
-                                popup_settings.positioner.anchor_rect = iced::Rectangle::<i32> {
-                                    x: x as i32,
-                                    y: y as i32,
-                                    width: width as i32,
-                                    height: height as i32,
-                                };
-                                let max_windows = 7.0;
-                                let window_spacing = 8.0;
-                                popup_settings.positioner.size_limits = match app.core.applet.anchor
-                                {
-                                    PanelAnchor::Right | PanelAnchor::Left => Limits::NONE
-                                        .min_width(100.0)
-                                        .min_height(30.0)
-                                        .max_width(window_spacing * 2.0 + TOPLEVEL_BUTTON_WIDTH)
-                                        .max_height(
-                                            TOPLEVEL_BUTTON_HEIGHT * max_windows
-                                                + window_spacing * (max_windows + 1.0),
-                                        ),
-                                    PanelAnchor::Bottom | PanelAnchor::Top => Limits::NONE
-                                        .min_width(30.0)
-                                        .min_height(100.0)
-                                        .max_width(
-                                            TOPLEVEL_BUTTON_WIDTH * max_windows
-                                                + window_spacing * (max_windows + 1.0),
-                                        )
-                                        .max_height(window_spacing * 2.0 + TOPLEVEL_BUTTON_HEIGHT),
-                                };
-                                popup_settings
-                            },
-                            None,
-                        ));
 
-                    return popup_task;
+                    let mut popup_settings = self.core.applet.get_popup_settings(
+                        parent_window_id,
+                        new_id,
+                        None,
+                        None,
+                        None,
+                    );
+                    let iced::Rectangle {
+                        x,
+                        y,
+                        width,
+                        height,
+                    } = *rectangle;
+                    popup_settings.positioner.anchor_rect = iced::Rectangle::<i32> {
+                        x: x as i32,
+                        y: y as i32,
+                        width: width as i32,
+                        height: height as i32,
+                    };
+                    let max_windows = 7.0;
+                    let window_spacing = 8.0;
+                    popup_settings.positioner.size_limits = match self.core.applet.anchor {
+                        PanelAnchor::Right | PanelAnchor::Left => Limits::NONE
+                            .min_width(100.0)
+                            .min_height(30.0)
+                            .max_width(window_spacing * 2.0 + TOPLEVEL_BUTTON_WIDTH)
+                            .max_height(
+                                TOPLEVEL_BUTTON_HEIGHT * max_windows
+                                    + window_spacing * (max_windows + 1.0),
+                            ),
+                        PanelAnchor::Bottom | PanelAnchor::Top => Limits::NONE
+                            .min_width(30.0)
+                            .min_height(100.0)
+                            .max_width(
+                                TOPLEVEL_BUTTON_WIDTH * max_windows
+                                    + window_spacing * (max_windows + 1.0),
+                            )
+                            .max_height(window_spacing * 2.0 + TOPLEVEL_BUTTON_HEIGHT),
+                    };
+
+                    return get_popup(popup_settings);
                 }
             }
             Message::ToplevelHoverChanged(handle, entering) => {
@@ -2169,63 +2148,52 @@ impl cosmic::Application for CosmicAppList {
                 if create_new {
                     let new_id = window::Id::unique();
                     self.overflow_active_popup = Some(new_id);
-                    let Some(iced::Rectangle {
+                    let rectangle = self.rectangles.get(&DockItemId::ActiveOverflow);
+                    let mut popup_settings = self.core.applet.get_popup_settings(
+                        self.core.main_window_id().unwrap(),
+                        new_id,
+                        None,
+                        None,
+                        None,
+                    );
+                    if let Some(iced::Rectangle {
                         x,
                         y,
                         width,
                         height,
-                    }) = self.rectangles.get(&DockItemId::ActiveOverflow).copied()
-                    else {
-                        return Task::none();
+                    }) = rectangle
+                    {
+                        popup_settings.positioner.anchor_rect = iced::Rectangle::<i32> {
+                            x: *x as i32,
+                            y: *y as i32,
+                            width: *width as i32,
+                            height: *height as i32,
+                        };
+                    }
+                    let applet_suggested_size = self.core.applet.suggested_size(false).0
+                        + 2 * self.core.applet.suggested_padding(false).0;
+                    let (_favorite_popup_cutoff, active_popup_cutoff) =
+                        self.panel_overflow_lengths();
+                    let popup_applet_count =
+                        self.active_list.len().saturating_sub(
+                            (active_popup_cutoff.unwrap_or_default()).saturating_sub(1),
+                        ) as f32;
+                    let popup_applet_size = applet_suggested_size as f32 * popup_applet_count
+                        + 4.0 * (popup_applet_count - 1.);
+                    let (max_width, max_height) = match self.core.applet.anchor {
+                        PanelAnchor::Top | PanelAnchor::Bottom => {
+                            (popup_applet_size, applet_suggested_size as f32)
+                        }
+                        PanelAnchor::Left | PanelAnchor::Right => {
+                            (applet_suggested_size as f32, popup_applet_size)
+                        }
                     };
-
-                    let popup_task =
-                        cosmic::surface::surface_task(cosmic::surface::action::app_popup(
-                            |_| Default::default(),
-                            move |app: &mut Self| {
-                                let mut popup_settings = app.core.applet.get_popup_settings(
-                                    app.core.main_window_id().unwrap(),
-                                    new_id,
-                                    None,
-                                    None,
-                                    None,
-                                );
-
-                                popup_settings.positioner.anchor_rect = iced::Rectangle::<i32> {
-                                    x: x as i32,
-                                    y: y as i32,
-                                    width: width as i32,
-                                    height: height as i32,
-                                };
-
-                                let applet_suggested_size = app.core.applet.suggested_size(false).0
-                                    + 2 * app.core.applet.suggested_padding(false).0;
-                                let (_favorite_popup_cutoff, active_popup_cutoff) =
-                                    app.panel_overflow_lengths();
-                                let popup_applet_count = app.active_list.len().saturating_sub(
-                                    (active_popup_cutoff.unwrap_or_default()).saturating_sub(1),
-                                ) as f32;
-                                let popup_applet_size = applet_suggested_size as f32
-                                    * popup_applet_count
-                                    + 4.0 * (popup_applet_count - 1.);
-                                let (max_width, max_height) = match app.core.applet.anchor {
-                                    PanelAnchor::Top | PanelAnchor::Bottom => {
-                                        (popup_applet_size, applet_suggested_size as f32)
-                                    }
-                                    PanelAnchor::Left | PanelAnchor::Right => {
-                                        (applet_suggested_size as f32, popup_applet_size)
-                                    }
-                                };
-                                popup_settings.positioner.size_limits = Limits::NONE
-                                    .max_width(max_width)
-                                    .min_width(1.)
-                                    .max_height(max_height)
-                                    .min_height(1.);
-                                popup_settings
-                            },
-                            None,
-                        ));
-                    cmds.push(popup_task);
+                    popup_settings.positioner.size_limits = Limits::NONE
+                        .max_width(max_width)
+                        .min_width(1.)
+                        .max_height(max_height)
+                        .min_height(1.);
+                    cmds.push(get_popup(popup_settings));
                 }
                 return Task::batch(cmds);
             }
@@ -2237,63 +2205,52 @@ impl cosmic::Application for CosmicAppList {
                 if create_new {
                     let new_id = window::Id::unique();
                     self.overflow_favorites_popup = Some(new_id);
-                    let Some(iced::Rectangle {
+                    let rectangle = self.rectangles.get(&DockItemId::FavoritesOverflow);
+                    let mut popup_settings = self.core.applet.get_popup_settings(
+                        self.core.main_window_id().unwrap(),
+                        new_id,
+                        None,
+                        None,
+                        None,
+                    );
+                    if let Some(iced::Rectangle {
                         x,
                         y,
                         width,
                         height,
-                    }) = self.rectangles.get(&DockItemId::FavoritesOverflow).copied()
-                    else {
-                        return Task::none();
+                    }) = rectangle
+                    {
+                        popup_settings.positioner.anchor_rect = iced::Rectangle::<i32> {
+                            x: *x as i32,
+                            y: *y as i32,
+                            width: *width as i32,
+                            height: *height as i32,
+                        };
+                    }
+                    let applet_suggested_size = self.core.applet.suggested_size(false).0
+                        + 2 * self.core.applet.suggested_padding(false).0;
+                    let (favorite_popup_cutoff, _active_popup_cutoff) =
+                        self.panel_overflow_lengths();
+                    let popup_applet_count =
+                        self.pinned_list.len().saturating_sub(
+                            favorite_popup_cutoff.unwrap_or_default().saturating_sub(1),
+                        ) as f32;
+                    let popup_applet_size = applet_suggested_size as f32 * popup_applet_count
+                        + 4.0 * (popup_applet_count - 1.);
+                    let (max_width, max_height) = match self.core.applet.anchor {
+                        PanelAnchor::Top | PanelAnchor::Bottom => {
+                            (popup_applet_size, applet_suggested_size as f32)
+                        }
+                        PanelAnchor::Left | PanelAnchor::Right => {
+                            (applet_suggested_size as f32, popup_applet_size)
+                        }
                     };
-
-                    let popup_task =
-                        cosmic::surface::surface_task(cosmic::surface::action::app_popup(
-                            |_| Default::default(),
-                            move |app: &mut Self| {
-                                let mut popup_settings = app.core.applet.get_popup_settings(
-                                    app.core.main_window_id().unwrap(),
-                                    new_id,
-                                    None,
-                                    None,
-                                    None,
-                                );
-
-                                popup_settings.positioner.anchor_rect = iced::Rectangle::<i32> {
-                                    x: x as i32,
-                                    y: y as i32,
-                                    width: width as i32,
-                                    height: height as i32,
-                                };
-
-                                let applet_suggested_size = app.core.applet.suggested_size(false).0
-                                    + 2 * app.core.applet.suggested_padding(false).0;
-                                let (favorite_popup_cutoff, _active_popup_cutoff) =
-                                    app.panel_overflow_lengths();
-                                let popup_applet_count = app.pinned_list.len().saturating_sub(
-                                    favorite_popup_cutoff.unwrap_or_default().saturating_sub(1),
-                                ) as f32;
-                                let popup_applet_size = applet_suggested_size as f32
-                                    * popup_applet_count
-                                    + 4.0 * (popup_applet_count - 1.);
-                                let (max_width, max_height) = match app.core.applet.anchor {
-                                    PanelAnchor::Top | PanelAnchor::Bottom => {
-                                        (popup_applet_size, applet_suggested_size as f32)
-                                    }
-                                    PanelAnchor::Left | PanelAnchor::Right => {
-                                        (applet_suggested_size as f32, popup_applet_size)
-                                    }
-                                };
-                                popup_settings.positioner.size_limits = Limits::NONE
-                                    .max_width(max_width)
-                                    .min_width(1.)
-                                    .max_height(max_height)
-                                    .min_height(1.);
-                                popup_settings
-                            },
-                            None,
-                        ));
-                    cmds.push(popup_task);
+                    popup_settings.positioner.size_limits = Limits::NONE
+                        .max_width(max_width)
+                        .min_width(1.)
+                        .max_height(max_height)
+                        .min_height(1.);
+                    cmds.push(get_popup(popup_settings));
                 }
                 return Task::batch(cmds);
             }
@@ -2703,8 +2660,7 @@ impl cosmic::Application for CosmicAppList {
                             .width(Length::Fill)
                     }
 
-                    let mut content =
-                        menu::menu_column::MenuColumn::with_capacity(4).align_x(Alignment::Center);
+                    let mut content = column![].align_x(Alignment::Center);
 
                     if let Some(exec) = desktop_info.exec() {
                         if !toplevels.is_empty() {
@@ -2828,6 +2784,22 @@ impl cosmic::Application for CosmicAppList {
                         .popup_container(
                             container(content)
                                 .padding(1)
+                                //TODO: move style to libcosmic
+                                .class(theme::Container::custom(|theme| {
+                                    let cosmic = theme.cosmic();
+                                    let component = &cosmic.background(false).component;
+                                    container::Style {
+                                        icon_color: Some(component.on.into()),
+                                        text_color: Some(component.on.into()),
+                                        background: Some(Background::Color(component.base.into())),
+                                        border: Border {
+                                            radius: cosmic.radius_s().into(),
+                                            width: 1.0,
+                                            color: component.divider.into(),
+                                        },
+                                        ..Default::default()
+                                    }
+                                }))
                                 .height(Length::Shrink)
                                 .width(Length::Fill),
                         )
diff --git a/cosmic-applet-a11y/i18n/ca/cosmic_applet_a11y.ftl b/cosmic-applet-a11y/i18n/ca/cosmic_applet_a11y.ftl
index 25383cbe..e69de29b 100644
--- a/cosmic-applet-a11y/i18n/ca/cosmic_applet_a11y.ftl
+++ b/cosmic-applet-a11y/i18n/ca/cosmic_applet_a11y.ftl
@@ -1,6 +0,0 @@
-magnifier = Lupa
-screen-reader = Narrador
-invert-colors = Colors invertits
-settings = Configuració d'accessibilitat...
-filter-colors = Filtres de colors
-high-contrast = Mode d'alt contrast
diff --git a/cosmic-applet-a11y/i18n/da/cosmic_applet_a11y.ftl b/cosmic-applet-a11y/i18n/da/cosmic_applet_a11y.ftl
index 85729331..e69de29b 100644
--- a/cosmic-applet-a11y/i18n/da/cosmic_applet_a11y.ftl
+++ b/cosmic-applet-a11y/i18n/da/cosmic_applet_a11y.ftl
@@ -1,6 +0,0 @@
-screen-reader = Skærmlæser
-invert-colors = Invertér farver
-high-contrast = Høj kontrast
-filter-colors = Filtrér farver
-settings = Tilgængelighedsindstillinger...
-magnifier = Forstørrelsesglas
diff --git a/cosmic-applet-a11y/i18n/de/cosmic_applet_a11y.ftl b/cosmic-applet-a11y/i18n/de/cosmic_applet_a11y.ftl
index 0a5413a5..84e24922 100644
--- a/cosmic-applet-a11y/i18n/de/cosmic_applet_a11y.ftl
+++ b/cosmic-applet-a11y/i18n/de/cosmic_applet_a11y.ftl
@@ -1,6 +1,6 @@
 screen-reader = Bildschirmleser
 magnifier = Vergrößerungsglas
 invert-colors = Farben invertieren
-settings = Barrierefreiheitseinstellungen ...
+settings = Barrierefreiheitseinstellungen…
 filter-colors = Farben filtern
 high-contrast = Hoher Kontrast
diff --git a/cosmic-applet-a11y/i18n/en-GB/cosmic_applet_a11y.ftl b/cosmic-applet-a11y/i18n/en-GB/cosmic_applet_a11y.ftl
index b504adf2..e69de29b 100644
--- a/cosmic-applet-a11y/i18n/en-GB/cosmic_applet_a11y.ftl
+++ b/cosmic-applet-a11y/i18n/en-GB/cosmic_applet_a11y.ftl
@@ -1,6 +0,0 @@
-screen-reader = Screen reader
-invert-colors = Invert colours
-high-contrast = High contrast
-filter-colors = Filter colours
-settings = Accessibility settings...
-magnifier = Magnifier
diff --git a/cosmic-applet-a11y/i18n/fa/cosmic_applet_a11y.ftl b/cosmic-applet-a11y/i18n/fa/cosmic_applet_a11y.ftl
index 66820364..e43e3a1d 100644
--- a/cosmic-applet-a11y/i18n/fa/cosmic_applet_a11y.ftl
+++ b/cosmic-applet-a11y/i18n/fa/cosmic_applet_a11y.ftl
@@ -1,6 +1,6 @@
 screen-reader = صفحه‌خوان
 magnifier = ذره‌بین
-invert-colors = وارونه کردن رنگ‌ها
+invert-colors = وارونه‌سازی رنگ‌ها
 settings = تنظیمات دسترسی‌پذیری...
 filter-colors = فیلتر رنگ‌ها
 high-contrast = کنتراست بالا
diff --git a/cosmic-applet-a11y/i18n/gl/cosmic_applet_a11y.ftl b/cosmic-applet-a11y/i18n/gl/cosmic_applet_a11y.ftl
deleted file mode 100644
index d0da1ab5..00000000
--- a/cosmic-applet-a11y/i18n/gl/cosmic_applet_a11y.ftl
+++ /dev/null
@@ -1,6 +0,0 @@
-screen-reader = Lector de pantalla
-magnifier = Lupa
-invert-colors = Invertir cores
-settings = Configuración de accesibilidade...
-filter-colors = Filtro de cores
-high-contrast = Alto contraste
diff --git a/cosmic-applet-a11y/i18n/hi/cosmic_applet_a11y.ftl b/cosmic-applet-a11y/i18n/hi/cosmic_applet_a11y.ftl
index 97aace4d..a43e2110 100644
--- a/cosmic-applet-a11y/i18n/hi/cosmic_applet_a11y.ftl
+++ b/cosmic-applet-a11y/i18n/hi/cosmic_applet_a11y.ftl
@@ -1,6 +1,4 @@
 screen-reader = स्क्रीन रीडर
-filter-colors = रंग फ़िल्टर करें
-settings = एक्सेसिबिलिटी सेटिंग्स..।
-magnifier = मैग्नीफायर
-high-contrast = उच्च कंट्रास्ट
-invert-colors = रंग उल्टे करें
+filter-colors = रंग फ़िल्टर
+settings = सुलभता सेटिंग..।
+magnifier = आवर्धक
diff --git a/cosmic-applet-a11y/i18n/it/cosmic_applet_a11y.ftl b/cosmic-applet-a11y/i18n/it/cosmic_applet_a11y.ftl
index 11e6a115..2902795c 100644
--- a/cosmic-applet-a11y/i18n/it/cosmic_applet_a11y.ftl
+++ b/cosmic-applet-a11y/i18n/it/cosmic_applet_a11y.ftl
@@ -2,5 +2,5 @@ screen-reader = Lettore dello schermo
 magnifier = Lente di ingrandimento
 invert-colors = Inverti colori
 settings = Impostazioni accessibilità...
-filter-colors = Filtri colore
+filter-colors = Filtra colori
 high-contrast = Contrasto elevato
diff --git a/cosmic-applet-a11y/i18n/sat/cosmic_applet_a11y.ftl b/cosmic-applet-a11y/i18n/sat/cosmic_applet_a11y.ftl
deleted file mode 100644
index 8c46d41c..00000000
--- a/cosmic-applet-a11y/i18n/sat/cosmic_applet_a11y.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-screen-reader = ᱥᱠᱨᱤᱱ ᱨᱤᱰᱟᱨ
-invert-colors = ᱨᱚᱝ ᱩᱞᱴᱟᱹ ᱪᱷᱚ
diff --git a/cosmic-applet-a11y/src/app.rs b/cosmic-applet-a11y/src/app.rs
index 652f3b24..6a328339 100644
--- a/cosmic-applet-a11y/src/app.rs
+++ b/cosmic-applet-a11y/src/app.rs
@@ -133,27 +133,20 @@ impl cosmic::Application for CosmicA11yApplet {
             }
             Message::TogglePopup => {
                 if let Some(p) = self.popup.take() {
-                    return cosmic::surface::surface_task(cosmic::surface::action::destroy_popup(
-                        p,
-                    ));
+                    return destroy_popup(p);
                 } else {
-                    return cosmic::surface::surface_task(cosmic::surface::action::app_popup(
-                        |_| Default::default(),
-                        |app: &mut CosmicA11yApplet| {
-                            let new_id = window::Id::unique();
-                            app.popup.replace(new_id);
+                    let new_id = window::Id::unique();
+                    self.popup.replace(new_id);
 
-                            let popup_settings = app.core.applet.get_popup_settings(
-                                app.core.main_window_id().unwrap(),
-                                new_id,
-                                Some((1, 1)),
-                                None,
-                                None,
-                            );
-                            popup_settings
-                        },
+                    let popup_settings = self.core.applet.get_popup_settings(
+                        self.core.main_window_id().unwrap(),
+                        new_id,
+                        Some((1, 1)),
                         None,
-                    ));
+                        None,
+                    );
+
+                    return get_popup(popup_settings);
                 }
             }
             Message::CloseRequested(id) => {
diff --git a/cosmic-applet-audio/i18n/ca/cosmic_applet_audio.ftl b/cosmic-applet-audio/i18n/ca/cosmic_applet_audio.ftl
index 0bbe1d5f..e69de29b 100644
--- a/cosmic-applet-audio/i18n/ca/cosmic_applet_audio.ftl
+++ b/cosmic-applet-audio/i18n/ca/cosmic_applet_audio.ftl
@@ -1,7 +0,0 @@
-output = Sortida
-show-media-controls = Mostra els controls multimèdia a la barra
-disconnected = PulseAudio desconnectat
-no-device = No s'ha seleccionat cap dispositiu
-input = Entrada
-unknown-artist = Desconegut
-sound-settings = Configuració de so...
diff --git a/cosmic-applet-audio/i18n/da/cosmic_applet_audio.ftl b/cosmic-applet-audio/i18n/da/cosmic_applet_audio.ftl
index 7cdb3d06..e69de29b 100644
--- a/cosmic-applet-audio/i18n/da/cosmic_applet_audio.ftl
+++ b/cosmic-applet-audio/i18n/da/cosmic_applet_audio.ftl
@@ -1,7 +0,0 @@
-show-media-controls = Vis mediekontrol på panel
-disconnected = PulseAudio Afbrudt
-no-device = Ingen enhed valgt
-input = Indgang
-output = Udgang
-unknown-artist = Ukendt
-sound-settings = Lydindstillinger...
diff --git a/cosmic-applet-audio/i18n/de/cosmic_applet_audio.ftl b/cosmic-applet-audio/i18n/de/cosmic_applet_audio.ftl
index 1b535907..a0128f53 100644
--- a/cosmic-applet-audio/i18n/de/cosmic_applet_audio.ftl
+++ b/cosmic-applet-audio/i18n/de/cosmic_applet_audio.ftl
@@ -1,7 +1,7 @@
 output = Ausgabe
 input = Eingabe
 show-media-controls = Mediensteuerung im Panel anzeigen
-sound-settings = Klang-Einstellungen ...
+sound-settings = Klang-Einstellungen...
 disconnected = PulseAudio getrennt
 no-device = Kein Gerät ausgewählt
 unknown-artist = Unbekannt
diff --git a/cosmic-applet-audio/i18n/en-GB/cosmic_applet_audio.ftl b/cosmic-applet-audio/i18n/en-GB/cosmic_applet_audio.ftl
index cb19412d..e69de29b 100644
--- a/cosmic-applet-audio/i18n/en-GB/cosmic_applet_audio.ftl
+++ b/cosmic-applet-audio/i18n/en-GB/cosmic_applet_audio.ftl
@@ -1,7 +0,0 @@
-show-media-controls = Show media controls on panel
-disconnected = PulseAudio Disconnected
-no-device = No device selected
-input = Input
-output = Output
-unknown-artist = Unknown
-sound-settings = Sound Settings...
diff --git a/cosmic-applet-audio/i18n/gl/cosmic_applet_audio.ftl b/cosmic-applet-audio/i18n/gl/cosmic_applet_audio.ftl
deleted file mode 100644
index c0a90f1e..00000000
--- a/cosmic-applet-audio/i18n/gl/cosmic_applet_audio.ftl
+++ /dev/null
@@ -1,7 +0,0 @@
-output = Saída
-input = Entrada
-show-media-controls = Mostrar os controis multimedia no panel
-sound-settings = Axustes do son...
-disconnected = PulseAudio Desconectado
-no-device = Ningún dipositivo seleccionado
-unknown-artist = Descoñecido
diff --git a/cosmic-applet-audio/i18n/it/cosmic_applet_audio.ftl b/cosmic-applet-audio/i18n/it/cosmic_applet_audio.ftl
index 46f61b33..f48e0ac2 100644
--- a/cosmic-applet-audio/i18n/it/cosmic_applet_audio.ftl
+++ b/cosmic-applet-audio/i18n/it/cosmic_applet_audio.ftl
@@ -4,4 +4,4 @@ show-media-controls = Mostra controlli multimediali nel pannello in alto
 sound-settings = Impostazioni audio...
 disconnected = PulseAudio Disconnesso
 no-device = Nessun dispositivo selezionato
-unknown-artist = Sconosciuto
+unknown-artist = Sconosciuto
\ No newline at end of file
diff --git a/cosmic-applet-audio/i18n/lt/cosmic_applet_audio.ftl b/cosmic-applet-audio/i18n/lt/cosmic_applet_audio.ftl
index 3152f388..4e96ec80 100644
--- a/cosmic-applet-audio/i18n/lt/cosmic_applet_audio.ftl
+++ b/cosmic-applet-audio/i18n/lt/cosmic_applet_audio.ftl
@@ -4,4 +4,4 @@ no-device = Nepasirinktas įrenginys
 input = Įvestis
 output = Išvestis
 unknown-artist = Nežinomas atlikėjas
-sound-settings = Garso Nuostatos...
+sound-settings = Garso Nustatymai...
diff --git a/cosmic-applet-audio/i18n/sat/cosmic_applet_audio.ftl b/cosmic-applet-audio/i18n/sat/cosmic_applet_audio.ftl
deleted file mode 100644
index b248256d..00000000
--- a/cosmic-applet-audio/i18n/sat/cosmic_applet_audio.ftl
+++ /dev/null
@@ -1 +0,0 @@
-output = ᱟᱨᱡᱟᱣ
diff --git a/cosmic-applet-audio/src/lib.rs b/cosmic-applet-audio/src/lib.rs
index daa54ef9..7647100d 100644
--- a/cosmic-applet-audio/src/lib.rs
+++ b/cosmic-applet-audio/src/lib.rs
@@ -33,15 +33,10 @@ use cosmic::{
 };
 use cosmic_settings_audio_client::{self as audio_client, CosmicAudioProxy};
 use futures::SinkExt;
+use iced::platform_specific::shell::wayland::commands::popup::{destroy_popup, get_popup};
 use mpris_subscription::{MprisRequest, MprisUpdate};
 use mpris2_zbus::player::PlaybackStatus;
-use std::{
-    sync::{
-        Arc,
-        atomic::{self, AtomicU32},
-    },
-    time::Duration,
-};
+use std::{cell::RefCell, rc::Rc, sync::Arc};
 
 mod config;
 mod mpris_subscription;
@@ -63,15 +58,11 @@ pub struct Audio {
     /// Track the applet's popup window.
     popup: Option<window::Id>,
     /// Varlink connection to `com.system76.CosmicSettings.Audio`.
-    audio_client: Option<audio_client::Client>,
+    audio_client: Option<Rc<RefCell<audio_client::Client>>>,
     /// Known audio device state
     model: model::Model,
     /// Whether to expand the revealer of a source or sink device.
     is_open: IsOpen,
-    /// Used to debounce sink volume updates.
-    applied_sink_volume: Arc<AtomicU32>,
-    /// Used to deboune source volume updates.
-    applied_source_volume: Arc<AtomicU32>,
     /// Max slider volume for the sink device, as determined by the amplification property.
     max_sink_volume: u32,
     /// Max slider volume for the source device, as determined by the amplification property.
@@ -149,27 +140,26 @@ enum IsOpen {
 pub enum Message {
     /// Connection to `com.system76.CosmicSettings`.
     Client(Arc<audio_client::Client>),
-    CloseRequested(window::Id),
-    ConfigChanged(AudioAppletConfig),
     Ignore,
-    InputToggle,
-    Mpris(mpris_subscription::MprisUpdate),
-    MprisRequest(MprisRequest),
-    OpenSettings,
-    OutputToggle,
-    ReattachClient(Arc<audio_client::Client>),
-    Rectangle(RectangleUpdate<u32>),
-    SetDefaultSink(usize),
-    SetDefaultSource(usize),
     SetSinkVolume(u32),
     SetSourceVolume(u32),
-    Subscription(audio_client::Event),
-    Surface(surface::Action),
-    ToggleMediaControlsInTopPanel(bool),
-    TogglePopup,
     ToggleSinkMute,
     ToggleSourceMute,
+    SetDefaultSink(usize),
+    SetDefaultSource(usize),
+    OutputToggle,
+    InputToggle,
+    TogglePopup,
+    CloseRequested(window::Id),
+    ToggleMediaControlsInTopPanel(bool),
+    ConfigChanged(AudioAppletConfig),
+    Mpris(mpris_subscription::MprisUpdate),
+    MprisRequest(MprisRequest),
     Token(TokenUpdate),
+    OpenSettings,
+    Subscription(audio_client::Event),
+    Surface(surface::Action),
+    Rectangle(RectangleUpdate<u32>),
 }
 
 // TODO
@@ -312,45 +302,32 @@ impl cosmic::Application for Audio {
                     self.rectangle_tracker.replace(tracker);
                 }
             },
-            Message::ReattachClient(client) => {
-                if let Some(client) = Arc::into_inner(client) {
-                    self.audio_client = Some(client);
-                }
-            }
             Message::Ignore => {}
             Message::TogglePopup => {
                 if let Some(p) = self.popup.take() {
-                    return cosmic::surface::surface_task(cosmic::surface::action::destroy_popup(
-                        p,
-                    ));
+                    return destroy_popup(p);
                 } else {
-                    return cosmic::surface::surface_task(cosmic::surface::action::app_popup(
-                        |_| Default::default(),
-                        |app: &mut Self| {
-                            let new_id = window::Id::unique();
-                            app.popup.replace(new_id);
+                    let new_id = window::Id::unique();
+                    self.popup.replace(new_id);
 
-                            app.refresh_volume_limits();
+                    self.refresh_volume_limits();
 
-                            let mut popup_settings = app.core.applet.get_popup_settings(
-                                app.core.main_window_id().unwrap(),
-                                new_id,
-                                None,
-                                None,
-                                None,
-                            );
-                            if let Some(r) = app.rectangle {
-                                popup_settings.positioner.anchor_rect = Rectangle {
-                                    x: r.x as i32,
-                                    y: r.y as i32,
-                                    width: r.width as i32,
-                                    height: r.height as i32,
-                                };
-                            }
-                            popup_settings
-                        },
+                    let mut popup_settings = self.core.applet.get_popup_settings(
+                        self.core.main_window_id().unwrap(),
+                        new_id,
                         None,
-                    ));
+                        None,
+                        None,
+                    );
+                    if let Some(r) = self.rectangle {
+                        popup_settings.positioner.anchor_rect = Rectangle {
+                            x: r.x as i32,
+                            y: r.y as i32,
+                            width: r.width as i32,
+                            height: r.height as i32,
+                        };
+                    }
+                    return get_popup(popup_settings);
                 }
             }
 
@@ -378,7 +355,7 @@ impl cosmic::Application for Audio {
                     && let Some(client) = self.audio_client.as_mut()
                 {
                     futures::executor::block_on(async {
-                        _ = client.conn.set_default(node_id, true).await;
+                        _ = client.borrow_mut().conn.set_default(node_id, true).await;
                     });
                 }
             }
@@ -389,7 +366,7 @@ impl cosmic::Application for Audio {
                     && let Some(client) = self.audio_client.as_mut()
                 {
                     futures::executor::block_on(async {
-                        _ = client.conn.set_default(node_id, true).await;
+                        _ = client.borrow_mut().conn.set_default(node_id, true).await;
                     });
                 }
             }
@@ -397,7 +374,7 @@ impl cosmic::Application for Audio {
             Message::ToggleSinkMute => {
                 if let Some(ref mut client) = self.audio_client {
                     futures::executor::block_on(async {
-                        _ = client.conn.sink_mute_toggle().await;
+                        _ = client.borrow_mut().conn.sink_mute_toggle().await;
                     });
                 }
             }
@@ -405,43 +382,27 @@ impl cosmic::Application for Audio {
             Message::ToggleSourceMute => {
                 if let Some(ref mut client) = self.audio_client {
                     futures::executor::block_on(async {
-                        _ = client.conn.source_mute_toggle().await;
+                        _ = client.borrow_mut().conn.source_mute_toggle().await;
                     });
                 }
             }
 
             Message::SetSinkVolume(volume) => {
-                self.applied_sink_volume
-                    .store(volume, atomic::Ordering::Relaxed);
-                self.model.active_sink.volume = volume;
-                self.model.active_sink.volume_text = volume.to_string();
-                if let Some(mut client) = self.audio_client.take() {
-                    let volume = Arc::clone(&self.applied_sink_volume);
-                    return cosmic::Task::future(async move {
-                        tokio::time::sleep(Duration::from_millis(128)).await;
-                        _ = client
-                            .conn
-                            .set_sink_volume(volume.load(atomic::Ordering::Relaxed))
-                            .await;
-                        Message::ReattachClient(Arc::new(client)).into()
+                if let Some(ref mut client) = self.audio_client {
+                    self.model.active_sink.volume = volume;
+                    self.model.active_sink.volume_text = volume.to_string();
+                    futures::executor::block_on(async {
+                        _ = client.borrow_mut().conn.set_sink_volume(volume).await;
                     });
                 }
             }
 
             Message::SetSourceVolume(volume) => {
-                self.applied_source_volume
-                    .store(volume, atomic::Ordering::Relaxed);
-                self.model.active_source.volume = volume;
-                self.model.active_source.volume_text = volume.to_string();
-                if let Some(mut client) = self.audio_client.take() {
-                    let volume = Arc::clone(&self.applied_source_volume);
-                    return cosmic::Task::future(async move {
-                        tokio::time::sleep(Duration::from_millis(128)).await;
-                        _ = client
-                            .conn
-                            .set_sink_volume(volume.load(atomic::Ordering::Relaxed))
-                            .await;
-                        Message::ReattachClient(Arc::new(client)).into()
+                if let Some(ref mut client) = self.audio_client {
+                    self.model.active_source.volume = volume;
+                    self.model.active_source.volume_text = volume.to_string();
+                    futures::executor::block_on(async {
+                        _ = client.borrow_mut().conn.set_source_volume(volume).await;
                     });
                 }
             }
@@ -552,7 +513,7 @@ impl cosmic::Application for Audio {
             }
             Message::Client(client) => {
                 if let Some(client) = Arc::into_inner(client) {
-                    self.audio_client = Some(client);
+                    self.audio_client = Some(Rc::new(RefCell::new(client)));
                     self.model = model::Model::default();
                 }
             }
diff --git a/cosmic-applet-battery/i18n/da/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/da/cosmic_applet_battery.ftl
index 28cf327a..e69de29b 100644
--- a/cosmic-applet-battery/i18n/da/cosmic_applet_battery.ftl
+++ b/cosmic-applet-battery/i18n/da/cosmic_applet_battery.ftl
@@ -1,14 +0,0 @@
-power-settings = Strøm- og Batteriindstillinger...
-hours = t
-until-empty = indtil tom
-battery-desc = Reduceret strømforbrug og ydeevne.
-max-charge = Forøg dit batteris levetid, ved at angive en maksimal opladningsværdi på 80%
-balanced = Balanceret
-battery = Batteri
-seconds = s
-dgpu-running = Diskret GPU er aktiv og kan reducere batterilevetiden
-performance = Høj Ydeevne
-performance-desc = Høj ydeevne og strømforbrug.
-minutes = m
-balanced-desc = Standard ydeevne og batteriforbrug.
-dgpu-applications = Applikationer som bruger { $gpu_name } diskret GPU
diff --git a/cosmic-applet-battery/i18n/de/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/de/cosmic_applet_battery.ftl
index 283930e2..ec518e5f 100644
--- a/cosmic-applet-battery/i18n/de/cosmic_applet_battery.ftl
+++ b/cosmic-applet-battery/i18n/de/cosmic_applet_battery.ftl
@@ -9,6 +9,6 @@ seconds = s
 minutes = m
 hours = h
 until-empty = bis leer
-power-settings = Energie- und Akkueinstellungen ...
+power-settings = Energie- und Akkueinstellungen...
 dgpu-running = Dedizierte GPU ist aktiv und kann die Akkulaufzeit reduzieren
 dgpu-applications = Anwendungen, welche die dedizierte GPU { $gpu_name } nutzen
diff --git a/cosmic-applet-battery/i18n/en-GB/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/en-GB/cosmic_applet_battery.ftl
index 11833e03..e69de29b 100644
--- a/cosmic-applet-battery/i18n/en-GB/cosmic_applet_battery.ftl
+++ b/cosmic-applet-battery/i18n/en-GB/cosmic_applet_battery.ftl
@@ -1,14 +0,0 @@
-power-settings = Power & Battery settings...
-hours = h
-until-empty = until empty
-battery-desc = Reduced power usage and performance.
-max-charge = Increase the lifespan of your battery by setting a maximum charge value of 80%
-balanced = Balanced
-battery = Battery
-seconds = s
-dgpu-running = Discrete GPU is active and can reduce battery life
-performance = High Performance
-performance-desc = High performance and power usage.
-minutes = m
-balanced-desc = Standard performance and battery usage.
-dgpu-applications = Applications using { $gpu_name } discrete GPU
diff --git a/cosmic-applet-battery/i18n/gl/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/gl/cosmic_applet_battery.ftl
deleted file mode 100644
index 0146556a..00000000
--- a/cosmic-applet-battery/i18n/gl/cosmic_applet_battery.ftl
+++ /dev/null
@@ -1,14 +0,0 @@
-battery = Batería
-battery-desc = Reduce o consumo de enerxía e o rendemento.
-balanced = Balanceado
-balanced-desc = Rendemento e consumo de batería estándar.
-performance = Alto rendemento
-performance-desc = Alto rendemento e maior consumo de enerxía.
-max-charge = Aumenta a vida útil da batería limitando a carga máxima ao 80 %
-seconds = s
-minutes = m
-hours = h
-until-empty = ata baleirar
-power-settings = Axustes de enexía e batería...
-dgpu-running = A GPU dedicada está activa e pode reducir a duración da batería
-dgpu-applications = Aplicacións que están a usar a GPU dedicada { $gpu_name }
diff --git a/cosmic-applet-battery/i18n/it/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/it/cosmic_applet_battery.ftl
index 375e29e0..6f3bbd9c 100644
--- a/cosmic-applet-battery/i18n/it/cosmic_applet_battery.ftl
+++ b/cosmic-applet-battery/i18n/it/cosmic_applet_battery.ftl
@@ -1,14 +1,14 @@
-battery = Batteria
-battery-desc = Prestazioni e consumo energetico ridotti.
-balanced = Equilibrato
-balanced-desc = Prestazioni e consumo energetico normali.
-performance = Prestazioni elevate
-performance-desc = Prestazioni elevate e consumo energetico.
-max-charge = Aumenta la durata della batteria impostando un valore massimo di carica dell’80%
+battery = Risparmio energetico
+battery-desc = Consumi minimi, performance ridotta.
+balanced = Bilanciato
+balanced-desc = Consumi bilanciati, performance dinamica.
+performance = Performance
+performance-desc = Consumi alti, performance massima.
+max-charge = Migliora la durata di vita della batteria caricandola fino all'80%
 seconds = s
 minutes = m
 hours = h
-until-empty = finché non è vuoto
+until-empty = fino alla scarica
 power-settings = Impostazioni energetiche...
 dgpu-running = La GPU discreta è attiva e può ridurre la durata della batteria
 dgpu-applications = Applicazioni che stanno usando la GPU discreta { $gpu_name }
diff --git a/cosmic-applet-battery/i18n/kmr/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/kmr/cosmic_applet_battery.ftl
index 4f531fec..8c0d92d1 100644
--- a/cosmic-applet-battery/i18n/kmr/cosmic_applet_battery.ftl
+++ b/cosmic-applet-battery/i18n/kmr/cosmic_applet_battery.ftl
@@ -2,7 +2,7 @@ battery = Betarî
 seconds = ç
 minutes = x
 hours = d
-until-empty = heya vala dibe
+until-empty = Heya vala dibe
 power-settings = Sazkariyên hêz û betariyê...
 battery-desc = Bikaranîna hêzê kêmkirî û performans.
 balanced = Hevseng
diff --git a/cosmic-applet-battery/i18n/pt-BR/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/pt-BR/cosmic_applet_battery.ftl
index 49565b54..e5a72d03 100644
--- a/cosmic-applet-battery/i18n/pt-BR/cosmic_applet_battery.ftl
+++ b/cosmic-applet-battery/i18n/pt-BR/cosmic_applet_battery.ftl
@@ -1,14 +1,14 @@
-battery = Economia de energia
+battery = Bateria
 battery-desc = Uso reduzido de energia e desempenho limitado.
 balanced = Balanceado
 balanced-desc = Desempenho padrão e uso de bateria moderado.
-performance = Alto desempenho
+performance = Alto Desempenho
 performance-desc = Máximo desempenho e alto uso de energia.
 max-charge = Aumente a vida útil da sua bateria definindo um valor máximo de carga de 80%
 seconds = s
 minutes = m
 hours = h
-until-empty = até ficar descarregada
+until-empty = até esvaziar
 power-settings = Configurações de energia e bateria...
-dgpu-running = A GPU dedicada está ativa e pode reduzir a vida útil da bateria
-dgpu-applications = Aplicativos usando a GPU dedicada { $gpu_name }
+dgpu-running = GPU discreta está ativa e pode reduzir a vida útil da bateria
+dgpu-applications = Aplicativos usando GPU discreta { $gpu_name }
diff --git a/cosmic-applet-battery/i18n/sat/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/sat/cosmic_applet_battery.ftl
deleted file mode 100644
index e69de29b..00000000
diff --git a/cosmic-applet-battery/i18n/zh-TW/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/zh-TW/cosmic_applet_battery.ftl
index 13f245e7..f5378e27 100644
--- a/cosmic-applet-battery/i18n/zh-TW/cosmic_applet_battery.ftl
+++ b/cosmic-applet-battery/i18n/zh-TW/cosmic_applet_battery.ftl
@@ -6,9 +6,9 @@ performance = 高效能
 performance-desc = 高效能與高耗電量。
 max-charge = 將電池充電上限設定為 80%，以延長電池使用壽命
 seconds = 秒
-minutes = 分鍾
-hours = 小時
+minutes = 分
+hours = 時
 until-empty = 直到電量耗盡
 power-settings = 電源與電池設定…
 dgpu-running = 獨立顯示卡已啟用，可能會縮短電池續航力
-dgpu-applications = 使用獨立顯示卡 { $gpu_name } 的應用程式
+dgpu-applications = 使用 { $gpu_name } 獨立顯示卡的應用程式
diff --git a/cosmic-applet-battery/src/app.rs b/cosmic-applet-battery/src/app.rs
index a8936c42..22d9e6cc 100644
--- a/cosmic-applet-battery/src/app.rs
+++ b/cosmic-applet-battery/src/app.rs
@@ -366,31 +366,23 @@ impl cosmic::Application for CosmicBatteryApplet {
                         let _ = tx.send(KeyboardBacklightRequest::Get);
                     }
 
+                    let new_id = window::Id::unique();
+                    self.popup.replace(new_id);
+
+                    let popup_settings = self.core.applet.get_popup_settings(
+                        self.core.main_window_id().unwrap(),
+                        new_id,
+                        Some((1, 1)),
+                        None,
+                        None,
+                    );
                     if let Some(tx) = self.power_profile_sender.as_ref() {
                         let _ = tx.send(PowerProfileRequest::Get);
                     }
                     if let Some(tx) = self.update_trigger.as_ref() {
                         let _ = tx.send(());
                     }
-                    let mut tasks = vec![cosmic::surface::surface_task(
-                        cosmic::surface::action::app_popup(
-                            |_| Default::default(),
-                            |app: &mut Self| {
-                                let new_id = window::Id::unique();
-                                app.popup.replace(new_id);
-
-                                let popup_settings = app.core.applet.get_popup_settings(
-                                    app.core.main_window_id().unwrap(),
-                                    new_id,
-                                    Some((1, 1)),
-                                    None,
-                                    None,
-                                );
-                                popup_settings
-                            },
-                            None,
-                        ),
-                    )];
+                    let mut tasks = vec![get_popup(popup_settings)];
                     if let Some(tx) = &self.settings_daemon_sender {
                         let _ = tx.send(settings_daemon::Request::GetDisplayBrightness);
                         let _ = tx.send(settings_daemon::Request::GetMaxDisplayBrightness);
diff --git a/cosmic-applet-bluetooth/i18n/da/cosmic_applet_bluetooth.ftl b/cosmic-applet-bluetooth/i18n/da/cosmic_applet_bluetooth.ftl
index f95158bb..e69de29b 100644
--- a/cosmic-applet-bluetooth/i18n/da/cosmic_applet_bluetooth.ftl
+++ b/cosmic-applet-bluetooth/i18n/da/cosmic_applet_bluetooth.ftl
@@ -1,12 +0,0 @@
-cancel = Annuller
-confirm-pin = Bekræft venligst, at følgende pinkode matcher den, der vises på { $deviceName }
-bluetooth = Bluetooth
-unsuccessful = Parring Mislykkedes
-pairable = Parbare
-try-again = Prøv Igen
-check-device = Sørg for, at { $deviceName } er slået til, inden for rækkevidde og klar til parring.
-other-devices = Andre Bluetooth-enheder
-connected = Forbundet
-confirm = Bekræft
-settings = Bluetooth-indstillinger...
-discoverable = Synlig
diff --git a/cosmic-applet-bluetooth/i18n/de/cosmic_applet_bluetooth.ftl b/cosmic-applet-bluetooth/i18n/de/cosmic_applet_bluetooth.ftl
index 79e52b06..1fa64ced 100644
--- a/cosmic-applet-bluetooth/i18n/de/cosmic_applet_bluetooth.ftl
+++ b/cosmic-applet-bluetooth/i18n/de/cosmic_applet_bluetooth.ftl
@@ -1,6 +1,6 @@
 bluetooth = Bluetooth
 other-devices = Andere Bluetooth-Geräte
-settings = Bluetooth-Einstellungen ...
+settings = Bluetooth-Einstellungen...
 connected = Verbunden
 confirm-pin = Bitte bestätige, dass die folgende PIN mit der auf { $deviceName } angezeigten PIN übereinstimmt
 confirm = Bestätigen
diff --git a/cosmic-applet-bluetooth/i18n/en-GB/cosmic_applet_bluetooth.ftl b/cosmic-applet-bluetooth/i18n/en-GB/cosmic_applet_bluetooth.ftl
index 9d6e5223..e69de29b 100644
--- a/cosmic-applet-bluetooth/i18n/en-GB/cosmic_applet_bluetooth.ftl
+++ b/cosmic-applet-bluetooth/i18n/en-GB/cosmic_applet_bluetooth.ftl
@@ -1,12 +0,0 @@
-cancel = Cancel
-confirm-pin = Please confirm that the following PIN matches the one displayed on { $deviceName }
-bluetooth = Bluetooth
-unsuccessful = Pairing Unsuccessful
-pairable = Pairable
-try-again = Try Again
-check-device = Make sure { $deviceName } is turned on, in range, and is ready to pair.
-other-devices = Other Bluetooth devices
-connected = Connected
-confirm = Confirm
-settings = Bluetooth settings...
-discoverable = Discoverable
diff --git a/cosmic-applet-bluetooth/i18n/fa/cosmic_applet_bluetooth.ftl b/cosmic-applet-bluetooth/i18n/fa/cosmic_applet_bluetooth.ftl
index 76ff0338..01262e21 100644
--- a/cosmic-applet-bluetooth/i18n/fa/cosmic_applet_bluetooth.ftl
+++ b/cosmic-applet-bluetooth/i18n/fa/cosmic_applet_bluetooth.ftl
@@ -2,11 +2,11 @@ bluetooth = بلوتوث
 other-devices = سایر دستگاه‌های بلوتوث
 settings = تنظیمات بلوتوث...
 connected = متصل
-confirm-pin = لطفاً تأیید کنید که پین زیر با پین نمایش داده شده در { $deviceName } یکسان است.
+confirm-pin = لطفاً تأیید کنید که پین زیر با پین نمایش داده شده در {$deviceName} یکسان است.
 confirm = تأیید
 cancel = لغو
 unsuccessful = جفت‌سازی ناموفق بود
-check-device = مطمئن شوید که { $deviceName } روشن، در محدوده و آماده جفت‌سازی است.
+check-device = مطمئن شوید که {$deviceName} روشن، در محدوده و آماده جفت‌سازی است.
 try-again = تلاش دوباره
 discoverable = قابل شناسایی
 pairable = قابل جفت‌سازی
diff --git a/cosmic-applet-bluetooth/i18n/gl/cosmic_applet_bluetooth.ftl b/cosmic-applet-bluetooth/i18n/gl/cosmic_applet_bluetooth.ftl
deleted file mode 100644
index c2424610..00000000
--- a/cosmic-applet-bluetooth/i18n/gl/cosmic_applet_bluetooth.ftl
+++ /dev/null
@@ -1,12 +0,0 @@
-cancel = Cancelar
-bluetooth = Bluetooth
-other-devices = Outros dispositivos Bluetooth
-settings = Axustes Bluetooth…
-connected = Conectado
-confirm-pin = Por favor, confirme que o seguinte PIN coincide co que se mostra en{ $deviceName }
-confirm = Confirmar
-unsuccessful = Enparellamento non exitoso
-check-device = Asegurate de que { $deviceName } está acendido, dentro do alcance e listo para emparellar.
-try-again = Reintentar
-discoverable = Atopable
-pairable = Emparellable
diff --git a/cosmic-applet-bluetooth/i18n/hi/cosmic_applet_bluetooth.ftl b/cosmic-applet-bluetooth/i18n/hi/cosmic_applet_bluetooth.ftl
index f568bb11..ca46bd08 100644
--- a/cosmic-applet-bluetooth/i18n/hi/cosmic_applet_bluetooth.ftl
+++ b/cosmic-applet-bluetooth/i18n/hi/cosmic_applet_bluetooth.ftl
@@ -2,11 +2,11 @@ bluetooth = ब्लूटूथ
 other-devices = अन्य ब्लूटूथ उपकरण
 settings = ब्लूटूथ सेटिंग्स...
 connected = जुड़े हुए
-confirm-pin = कृपया सुनिश्चित करें कि निम्नलिखित PIN { $deviceName } पर प्रदर्शित PIN से मेल खाता है
+confirm-pin = कृपया सुनिश्चित करें कि निम्नलिखित PIN {$deviceName} पर प्रदर्शित PIN से मेल खाता है
 confirm = पुष्टि करें
 cancel = रद्द करें
 unsuccessful = पेयरिंग असफल
-check-device = सुनिश्चित करें कि { $deviceName } चालू है, रेंज में है, और पेयर करने के लिए तैयार है।
+check-device = सुनिश्चित करें कि {$deviceName} चालू है, रेंज में है, और पेयर करने के लिए तैयार है।
 try-again = फिर से प्रयास करें
 discoverable = खोजने योग्य
 pairable = पेयर करने योग्य
diff --git a/cosmic-applet-bluetooth/i18n/it/cosmic_applet_bluetooth.ftl b/cosmic-applet-bluetooth/i18n/it/cosmic_applet_bluetooth.ftl
index 4e3d7233..f1ac3a22 100644
--- a/cosmic-applet-bluetooth/i18n/it/cosmic_applet_bluetooth.ftl
+++ b/cosmic-applet-bluetooth/i18n/it/cosmic_applet_bluetooth.ftl
@@ -2,11 +2,11 @@ bluetooth = Bluetooth
 other-devices = Altri dispositivi Bluetooth
 settings = Impostazioni Bluetooth...
 connected = Connesso
-confirm-pin = Per favore conferma che il seguente PIN corrisponda a quello visualizzato nel dispositivo { $deviceName }
+confirm-pin = Per favore conferma che il seguente PIN corrisponda a quello visualizzato nel dispositivo {$deviceName}
 confirm = Conferma
 cancel = Annulla
 unsuccessful = Accoppiamento fallito
-check-device = Assicurati che il dispositivo { $deviceName } sia acceso, a portata e pronto per l'accoppiamento.
+check-device = Assicurati che il dispositivo {$deviceName} sia acceso, a portata e pronto per l'accoppiamento.
 try-again = Riprova
 discoverable = Visibile
-pairable = Accoppiabile
+pairable = Accoppiabile
\ No newline at end of file
diff --git a/cosmic-applet-bluetooth/i18n/sat/cosmic_applet_bluetooth.ftl b/cosmic-applet-bluetooth/i18n/sat/cosmic_applet_bluetooth.ftl
deleted file mode 100644
index 67f522ad..00000000
--- a/cosmic-applet-bluetooth/i18n/sat/cosmic_applet_bluetooth.ftl
+++ /dev/null
@@ -1 +0,0 @@
-cancel = ᱵᱟᱹᱛᱤᱞ
diff --git a/cosmic-applet-bluetooth/i18n/zh-TW/cosmic_applet_bluetooth.ftl b/cosmic-applet-bluetooth/i18n/zh-TW/cosmic_applet_bluetooth.ftl
index 781a39ec..fa1426a5 100644
--- a/cosmic-applet-bluetooth/i18n/zh-TW/cosmic_applet_bluetooth.ftl
+++ b/cosmic-applet-bluetooth/i18n/zh-TW/cosmic_applet_bluetooth.ftl
@@ -1,7 +1,7 @@
 bluetooth = 藍牙
 other-devices = 其他藍牙裝置
 settings = 藍牙設定…
-connected = 已連線
+connected = 已經連線
 confirm-pin = 請確認此 PIN 碼與 { $deviceName } 上顯示的是否相符
 confirm = 確認
 cancel = 取消
diff --git a/cosmic-applet-bluetooth/src/app.rs b/cosmic-applet-bluetooth/src/app.rs
index 816c73c3..484b8bf3 100644
--- a/cosmic-applet-bluetooth/src/app.rs
+++ b/cosmic-applet-bluetooth/src/app.rs
@@ -121,25 +121,20 @@ impl cosmic::Application for CosmicBluetoothApplet {
                 } else {
                     set_discovery(true);
 
-                    let get_popup_task =
-                        cosmic::surface::surface_task(cosmic::surface::action::app_popup(
-                            |_| Default::default(),
-                            move |app: &mut Self| {
-                                let new_id = window::Id::unique();
-                                app.popup.replace(new_id);
-                                app.core.applet.get_popup_settings(
-                                    app.core.main_window_id().unwrap(),
-                                    new_id,
-                                    None,
-                                    None,
-                                    None,
-                                )
-                            },
-                            None,
-                        ));
+                    // TODO request update of state maybe
+                    let new_id = window::Id::unique();
+                    self.popup.replace(new_id);
+
+                    let popup_settings = self.core.applet.get_popup_settings(
+                        self.core.main_window_id().unwrap(),
+                        new_id,
+                        None,
+                        None,
+                        None,
+                    );
 
                     return Task::batch([
-                        get_popup_task,
+                        get_popup(popup_settings),
                         cosmic::task::future(set_tick(Duration::from_secs(3)))
                             .map(|()| cosmic::Action::App(Message::Ignore)),
                     ]);
diff --git a/cosmic-applet-input-sources/Cargo.toml b/cosmic-applet-input-sources/Cargo.toml
index c8c49af5..fdc1ea24 100644
--- a/cosmic-applet-input-sources/Cargo.toml
+++ b/cosmic-applet-input-sources/Cargo.toml
@@ -5,9 +5,7 @@ edition = "2024"
 license = "GPL-3.0-only"
 
 [dependencies]
-cctk.workspace = true
 cosmic-comp-config.workspace = true
-futures.workspace = true
 i18n-embed-fl.workspace = true
 i18n-embed.workspace = true
 cosmic.workspace = true
diff --git a/cosmic-applet-input-sources/data/com.system76.CosmicAppletInputSources.desktop b/cosmic-applet-input-sources/data/com.system76.CosmicAppletInputSources.desktop
index 73aeccf0..ea0f667b 100644
--- a/cosmic-applet-input-sources/data/com.system76.CosmicAppletInputSources.desktop
+++ b/cosmic-applet-input-sources/data/com.system76.CosmicAppletInputSources.desktop
@@ -12,5 +12,4 @@ NoDisplay=true
 X-CosmicApplet=true
 X-CosmicShrinkable=true
 X-CosmicHoverPopup=Auto
-X-HostWaylandDisplay=true
 X-OverflowPriority=10
diff --git a/cosmic-applet-input-sources/i18n/ca/cosmic_applet_input_sources.ftl b/cosmic-applet-input-sources/i18n/ca/cosmic_applet_input_sources.ftl
index 12a2de28..e69de29b 100644
--- a/cosmic-applet-input-sources/i18n/ca/cosmic_applet_input_sources.ftl
+++ b/cosmic-applet-input-sources/i18n/ca/cosmic_applet_input_sources.ftl
@@ -1,2 +0,0 @@
-show-keyboard-layout = Mostra la disposició de teclat...
-keyboard-settings = Configuració de teclat...
diff --git a/cosmic-applet-input-sources/i18n/da/cosmic_applet_input_sources.ftl b/cosmic-applet-input-sources/i18n/da/cosmic_applet_input_sources.ftl
index 9759ea2a..e69de29b 100644
--- a/cosmic-applet-input-sources/i18n/da/cosmic_applet_input_sources.ftl
+++ b/cosmic-applet-input-sources/i18n/da/cosmic_applet_input_sources.ftl
@@ -1,2 +0,0 @@
-show-keyboard-layout = Vis Tastaturopsætning...
-keyboard-settings = Tastaturindstillinger...
diff --git a/cosmic-applet-input-sources/i18n/de/cosmic_applet_input_sources.ftl b/cosmic-applet-input-sources/i18n/de/cosmic_applet_input_sources.ftl
index ddc457d7..6be93fc6 100644
--- a/cosmic-applet-input-sources/i18n/de/cosmic_applet_input_sources.ftl
+++ b/cosmic-applet-input-sources/i18n/de/cosmic_applet_input_sources.ftl
@@ -1,2 +1,2 @@
-show-keyboard-layout = Tastaturbelegung anzeigen ...
-keyboard-settings = Tastatureinstellungen ...
+show-keyboard-layout = Tastaturbelegung anzeigen...
+keyboard-settings = Tastatureinstellungen...
diff --git a/cosmic-applet-input-sources/i18n/gl/cosmic_applet_input_sources.ftl b/cosmic-applet-input-sources/i18n/gl/cosmic_applet_input_sources.ftl
deleted file mode 100644
index 85e8072c..00000000
--- a/cosmic-applet-input-sources/i18n/gl/cosmic_applet_input_sources.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-show-keyboard-layout = Mostrar a disposición do teclado...
-keyboard-settings = Axustes do teclado...
diff --git a/cosmic-applet-input-sources/i18n/sat/cosmic_applet_input_sources.ftl b/cosmic-applet-input-sources/i18n/sat/cosmic_applet_input_sources.ftl
deleted file mode 100644
index e69de29b..00000000
diff --git a/cosmic-applet-input-sources/src/lib.rs b/cosmic-applet-input-sources/src/lib.rs
index 3109c888..2c845de1 100644
--- a/cosmic-applet-input-sources/src/lib.rs
+++ b/cosmic-applet-input-sources/src/lib.rs
@@ -3,23 +3,19 @@
 
 mod localize;
 
-use cctk::{
-    cosmic_protocols::keyboard_layout::v1::client::zcosmic_keyboard_layout_v1::ZcosmicKeyboardLayoutV1,
-    wayland_client::{Connection, Proxy, backend::Backend},
-};
 use cosmic::{
     app,
     app::Core,
     applet::{self},
+    cosmic_config::{self, ConfigSet, CosmicConfigEntry},
     cosmic_theme::Spacing,
     iced::Subscription,
-    iced::core::window,
     iced::{
-        self, Rectangle, Task,
-        event::wayland::{Event as WaylandEvent, OutputEvent},
+        Rectangle, Task,
         platform_specific::shell::commands::popup::{destroy_popup, get_popup},
         window::Id,
     },
+    iced::core::window,
     prelude::*,
     surface, theme,
     widget::{
@@ -27,35 +23,14 @@ use cosmic::{
         rectangle_tracker::{RectangleTracker, RectangleUpdate, rectangle_tracker_subscription},
     },
 };
-use cosmic_comp_config::{CosmicCompConfig, XkbConfig};
-use std::{
-    os::unix::{
-        io::{FromRawFd, RawFd},
-        net::UnixStream,
-    },
-    sync::LazyLock,
-};
+use cosmic_comp_config::CosmicCompConfig;
+use std::sync::LazyLock;
 use xkb_data::KeyboardLayout;
 
-mod wayland;
-
 static AUTOSIZE_MAIN_ID: LazyLock<widget::Id> = LazyLock::new(|| widget::Id::new("autosize-main"));
 pub const ID: &str = "com.system76.CosmicAppletInputSources";
 
 pub fn run() -> cosmic::iced::Result {
-    let socket = std::env::var("X_PRIVILEGED_WAYLAND_SOCKET")
-        .ok()
-        .and_then(|fd| {
-            fd.parse::<RawFd>()
-                .ok()
-                .map(|fd| unsafe { UnixStream::from_raw_fd(fd) })
-        });
-    let wayland_connection = if let Some(socket) = socket {
-        Some(Connection::from_socket(socket).unwrap())
-    } else {
-        None
-    };
-
     localize::localize();
 
     let layouts = match xkb_data::all_keyboard_layouts() {
@@ -66,8 +41,27 @@ pub fn run() -> cosmic::iced::Result {
         }
     };
 
+    let (comp_config_handler, comp_config) =
+        match cosmic_config::Config::new("com.system76.CosmicComp", CosmicCompConfig::VERSION) {
+            Ok(config_handler) => {
+                let config = match CosmicCompConfig::get_entry(&config_handler) {
+                    Ok(ok) => ok,
+                    Err((errs, config)) => {
+                        tracing::error!("errors loading config: {:?}", errs);
+                        config
+                    }
+                };
+                (Some(config_handler), config)
+            }
+            Err(err) => {
+                tracing::error!("failed to create config handler: {}", err);
+                (None, CosmicCompConfig::default())
+            }
+        };
+
     cosmic::applet::run::<Window>(Flags {
-        wayland_connection,
+        comp_config,
+        comp_config_handler,
         layouts: layouts.layout_list.layout,
     })
 }
@@ -82,13 +76,12 @@ pub struct ActiveLayout {
 pub struct Window {
     core: Core,
     popup: Option<Id>,
+    comp_config: CosmicCompConfig,
+    comp_config_handler: Option<cosmic_config::Config>,
     layouts: Vec<KeyboardLayout>,
     active_layouts: Vec<ActiveLayout>,
     rectangle_tracker: Option<RectangleTracker<u32>>,
     rectangle: Rectangle,
-    wayland_connection: Option<Connection>,
-    keyboard_layout: Option<ZcosmicKeyboardLayoutV1>,
-    current_layout: usize,
 }
 
 #[derive(Clone, Debug)]
@@ -100,13 +93,12 @@ pub enum Message {
     KeyboardSettings,
     Surface(surface::Action),
     Rectangle(RectangleUpdate<u32>),
-    WaylandConnection(Backend),
-    Wayland(wayland::Event),
 }
 
 #[derive(Debug)]
 pub struct Flags {
-    wayland_connection: Option<Connection>,
+    pub comp_config: CosmicCompConfig,
+    pub comp_config_handler: Option<cosmic_config::Config>,
     pub layouts: Vec<KeyboardLayout>,
 }
 
@@ -127,15 +119,14 @@ impl cosmic::Application for Window {
 
     fn init(core: Core, flags: Self::Flags) -> (Self, app::Task<Self::Message>) {
         let window = Window {
+            comp_config_handler: flags.comp_config_handler,
             layouts: flags.layouts,
             core,
             popup: None,
+            comp_config: flags.comp_config,
             active_layouts: Vec::new(),
             rectangle_tracker: None,
             rectangle: Rectangle::default(),
-            wayland_connection: flags.wayland_connection,
-            keyboard_layout: None,
-            current_layout: 0,
         };
         (window, Task::none())
     }
@@ -148,24 +139,19 @@ impl cosmic::Application for Window {
         match message {
             Message::TogglePopup => {
                 return if let Some(p) = self.popup.take() {
-                    return crate::surface::surface_task(crate::surface::action::destroy_popup(p));
+                    destroy_popup(p)
                 } else {
-                    return crate::surface::surface_task(crate::surface::action::app_popup(
-                        |_| Default::default(),
-                        |app: &mut Window| {
-                            let new_id = Id::unique();
-                            app.popup.replace(new_id);
-                            let popup_settings = app.core.applet.get_popup_settings(
-                                app.core.main_window_id().unwrap(),
-                                new_id,
-                                None,
-                                None,
-                                None,
-                            );
-                            popup_settings
-                        },
+                    let new_id = Id::unique();
+                    self.popup.replace(new_id);
+                    let popup_settings = self.core.applet.get_popup_settings(
+                        self.core.main_window_id().unwrap(),
+                        new_id,
                         None,
-                    ));
+                        None,
+                        None,
+                    );
+
+                    get_popup(popup_settings)
                 };
             }
             Message::PopupClosed(id) => {
@@ -174,7 +160,8 @@ impl cosmic::Application for Window {
                 }
             }
             Message::CompConfig(config) => {
-                self.active_layouts = self.update_xkb(&config.xkb_config);
+                self.comp_config = *config;
+                self.active_layouts = self.update_xkb();
             }
             Message::KeyboardSettings => {
                 let mut cmd = std::process::Command::new("cosmic-settings");
@@ -182,10 +169,31 @@ impl cosmic::Application for Window {
                 tokio::spawn(cosmic::process::spawn(cmd));
             }
             Message::SetActiveLayout(pos) => {
-                if let Some(keyboard_layout) = &self.keyboard_layout {
-                    keyboard_layout.set_group(pos as u32);
-                    if let Some(backend) = keyboard_layout.backend().upgrade() {
-                        let _ = backend.flush();
+                if pos == 0 {
+                    return Task::none();
+                }
+
+                self.active_layouts.swap(0, pos);
+                let mut new_layout = String::new();
+                let mut new_variant = String::new();
+
+                for layout in &self.active_layouts {
+                    new_layout.push_str(&layout.layout);
+                    new_layout.push(',');
+                    new_variant.push_str(&layout.variant);
+                    new_variant.push(',');
+                }
+
+                let _excess_comma = new_layout.pop();
+                let _excess_comma = new_variant.pop();
+
+                self.comp_config.xkb_config.layout = new_layout;
+                self.comp_config.xkb_config.variant = new_variant;
+                if let Some(comp_config_handler) = &self.comp_config_handler {
+                    if let Err(err) =
+                        comp_config_handler.set("xkb_config", &self.comp_config.xkb_config)
+                    {
+                        tracing::error!("Failed to set config 'xkb_config' {err}");
                     }
                 }
             }
@@ -202,26 +210,13 @@ impl cosmic::Application for Window {
                     self.rectangle_tracker = Some(tracker);
                 }
             },
-            Message::WaylandConnection(backend) => {
-                if self.wayland_connection.is_none() {
-                    self.wayland_connection = Some(Connection::from_backend(backend));
-                }
-            }
-            Message::Wayland(w) => match w {
-                wayland::Event::KeyboardLayout(keyboard_layout) => {
-                    self.keyboard_layout = Some(keyboard_layout);
-                }
-                wayland::Event::Group(group) => {
-                    self.current_layout = group as usize;
-                }
-            },
         }
 
         Task::none()
     }
 
     fn view(&self) -> Element<'_, Self::Message> {
-        let applet_text = if let Some(l) = self.active_layouts.get(self.current_layout) {
+        let applet_text = if let Some(l) = self.active_layouts.first() {
             if !l.variant.is_empty() {
                 format!("{} ({})", l.layout, l.variant)
             } else {
@@ -254,13 +249,8 @@ impl cosmic::Application for Window {
         let mut content_list =
             widget::column::with_capacity(4 + self.active_layouts.len()).padding([8, 0]);
         for (id, layout) in self.active_layouts.iter().enumerate() {
-            let font = if id == self.current_layout {
-                cosmic::font::bold()
-            } else {
-                cosmic::font::default()
-            };
             let group = widget::column::with_capacity(2)
-                .push(widget::text::body(layout.description.as_str()).font(font))
+                .push(widget::text::body(layout.description.as_str()))
                 .push(widget::text::caption(layout.layout.as_str()));
             content_list = content_list
                 .push(applet::menu_button(group).on_press(Message::SetActiveLayout(id)));
@@ -281,7 +271,7 @@ impl cosmic::Application for Window {
     }
 
     fn subscription(&self) -> Subscription<Self::Message> {
-        let mut subscriptions = vec![
+        Subscription::batch(vec![
             rectangle_tracker_subscription(0).map(|e| Message::Rectangle(e.1)),
             self.core
                 .watch_config("com.system76.CosmicComp")
@@ -295,23 +285,7 @@ impl cosmic::Application for Window {
                     }
                     Message::CompConfig(Box::new(update.config))
                 }),
-        ];
-        subscriptions.push(if let Some(connection) = &self.wayland_connection {
-            wayland::subscription(connection.clone()).map(Message::Wayland)
-        } else {
-            iced::event::listen_with(|evt, _, _| match evt {
-                iced::Event::PlatformSpecific(iced::event::PlatformSpecific::Wayland(evt)) => {
-                    if let WaylandEvent::Output(OutputEvent::Created(_), output) = evt {
-                        if let Some(backend) = output.backend().upgrade() {
-                            return Some(Message::WaylandConnection(backend));
-                        }
-                    }
-                    None
-                }
-                _ => None,
-            })
-        });
-        Subscription::batch(subscriptions)
+        ])
     }
 
     fn style(&self) -> Option<cosmic::iced::theme::Style> {
@@ -319,8 +293,9 @@ impl cosmic::Application for Window {
     }
 }
 impl Window {
-    fn update_xkb(&self, xkb: &XkbConfig) -> Vec<ActiveLayout> {
+    fn update_xkb(&self) -> Vec<ActiveLayout> {
         let mut active_layouts = Vec::new();
+        let xkb = &self.comp_config.xkb_config;
 
         let layouts = xkb.layout.split_terminator(',');
 
diff --git a/cosmic-applet-input-sources/src/wayland.rs b/cosmic-applet-input-sources/src/wayland.rs
deleted file mode 100644
index 7bee2245..00000000
--- a/cosmic-applet-input-sources/src/wayland.rs
+++ /dev/null
@@ -1,157 +0,0 @@
-use cctk::{
-    cosmic_protocols::keyboard_layout::v1::client::zcosmic_keyboard_layout_v1::ZcosmicKeyboardLayoutV1,
-    keyboard_layout::{KeyboardLayoutHandler, KeyboardLayoutState},
-    sctk::{
-        self,
-        registry::{ProvidesRegistryState, RegistryState},
-        seat::{Capability, SeatHandler, SeatState},
-    },
-    wayland_client::{
-        Connection, QueueHandle, delegate_noop,
-        globals::registry_queue_init,
-        protocol::{wl_keyboard, wl_seat},
-    },
-};
-use cosmic::iced;
-use futures::{SinkExt, channel::mpsc, executor::block_on};
-use std::{hash::Hash, thread};
-
-#[derive(Clone, Debug)]
-pub enum Event {
-    KeyboardLayout(ZcosmicKeyboardLayoutV1),
-    Group(usize),
-}
-
-pub fn subscription(connection: Connection) -> iced::Subscription<Event> {
-    #[derive(Clone)]
-    struct WaylandSubscription(Connection);
-    impl Hash for WaylandSubscription {
-        fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-            self.0.backend().display_id().hash(state);
-        }
-    }
-    iced::Subscription::run_with(
-        WaylandSubscription(connection),
-        |WaylandSubscription(connection)| {
-            let connection = connection.clone();
-            iced::stream::channel(8, move |sender| async move {
-                thread::spawn(move || thread(connection, sender));
-            })
-        },
-    )
-}
-
-struct Keyboard {
-    seat: wl_seat::WlSeat,
-    keyboard_layout: ZcosmicKeyboardLayoutV1,
-}
-
-impl Drop for Keyboard {
-    fn drop(&mut self) {
-        self.keyboard_layout.destroy();
-    }
-}
-
-struct AppData {
-    seat_state: SeatState,
-    registry_state: RegistryState,
-    keyboard_layout_state: KeyboardLayoutState,
-    keyboard: Option<Keyboard>,
-    sender: mpsc::Sender<Event>,
-}
-
-impl KeyboardLayoutHandler for AppData {
-    fn group(
-        &mut self,
-        _conn: &Connection,
-        _qh: &QueueHandle<Self>,
-        _keyboard: &wl_keyboard::WlKeyboard,
-        _keyboard_layout: &ZcosmicKeyboardLayoutV1,
-        group: u32,
-    ) {
-        let _ = block_on(self.sender.send(Event::Group(group as usize)));
-    }
-}
-
-impl ProvidesRegistryState for AppData {
-    fn registry(&mut self) -> &mut RegistryState {
-        &mut self.registry_state
-    }
-
-    sctk::registry_handlers![SeatState,];
-}
-
-impl SeatHandler for AppData {
-    fn seat_state(&mut self) -> &mut SeatState {
-        &mut self.seat_state
-    }
-
-    fn new_seat(&mut self, _: &Connection, _: &QueueHandle<Self>, _: wl_seat::WlSeat) {}
-
-    fn new_capability(
-        &mut self,
-        _conn: &Connection,
-        qh: &QueueHandle<Self>,
-        seat: wl_seat::WlSeat,
-        capability: Capability,
-    ) {
-        if capability == Capability::Keyboard && self.keyboard.is_none() {
-            let keyboard = seat.get_keyboard(qh, ());
-            let keyboard_layout = self
-                .keyboard_layout_state
-                .get_keyboard_layout(&keyboard, qh);
-            keyboard.release();
-
-            if let Some(keyboard_layout) = keyboard_layout {
-                let _ = block_on(
-                    self.sender
-                        .send(Event::KeyboardLayout(keyboard_layout.clone())),
-                );
-                self.keyboard = Some(Keyboard {
-                    seat,
-                    keyboard_layout,
-                });
-            } else {
-                keyboard.release();
-            }
-        }
-    }
-
-    fn remove_capability(
-        &mut self,
-        _conn: &Connection,
-        _: &QueueHandle<Self>,
-        seat: wl_seat::WlSeat,
-        _capability: Capability,
-    ) {
-        self.keyboard.take_if(|x| x.seat == seat);
-    }
-
-    fn remove_seat(&mut self, _: &Connection, _: &QueueHandle<Self>, seat: wl_seat::WlSeat) {
-        self.keyboard.take_if(|x| x.seat == seat);
-    }
-}
-
-fn thread(conn: Connection, sender: mpsc::Sender<Event>) {
-    let (globals, mut event_queue) = registry_queue_init(&conn).unwrap();
-    let qh = event_queue.handle();
-    let registry_state = RegistryState::new(&globals);
-    let seat_state = SeatState::new(&globals, &qh);
-    let keyboard_layout_state = KeyboardLayoutState::new(&registry_state, &qh);
-
-    let mut app_data = AppData {
-        seat_state,
-        registry_state,
-        keyboard_layout_state,
-        keyboard: None,
-        sender,
-    };
-    loop {
-        event_queue.blocking_dispatch(&mut app_data).unwrap();
-    }
-}
-
-sctk::delegate_registry!(AppData);
-sctk::delegate_seat!(AppData);
-cctk::delegate_keyboard_layout!(AppData);
-delegate_noop!(AppData: ignore wl_keyboard::WlKeyboard);
diff --git a/cosmic-applet-minimize/src/lib.rs b/cosmic-applet-minimize/src/lib.rs
index 089cc67e..307762b5 100644
--- a/cosmic-applet-minimize/src/lib.rs
+++ b/cosmic-applet-minimize/src/lib.rs
@@ -248,48 +248,40 @@ impl cosmic::Application for Minimize {
             }
             Message::OpenOverflowPopup => {
                 if let Some(id) = self.overflow_popup.take() {
-                    return cosmic::surface::surface_task(cosmic::surface::action::destroy_popup(
-                        id,
-                    ));
+                    return destroy_popup(id);
                 } else {
-                    return cosmic::surface::surface_task(cosmic::surface::action::app_popup(
-                        |_| Default::default(),
-                        |app: &mut Self| {
-                            let new_id = window::Id::unique();
-                            let pos = app.max_icon_count().unwrap_or_default();
+                    let new_id = window::Id::unique();
+                    let pos = self.max_icon_count().unwrap_or_default();
 
-                            app.overflow_popup = Some(new_id);
-                            let icon_size = app.core.applet.suggested_size(true).0 as u32
-                                + 2 * app.core.applet.suggested_padding(true).1 as u32;
-                            let spacing = app.core.system_theme().cosmic().space_xxs() as u32;
-                            let major_axis_len =
-                                (icon_size + spacing) * (pos.saturating_sub(1) as u32);
-                            let rectangle = match app.core.applet.anchor {
-                                PanelAnchor::Top | PanelAnchor::Bottom => iced::Rectangle {
-                                    x: major_axis_len as i32,
-                                    y: 0,
-                                    width: icon_size as i32,
-                                    height: icon_size as i32,
-                                },
-                                PanelAnchor::Left | PanelAnchor::Right => iced::Rectangle {
-                                    x: 0,
-                                    y: major_axis_len as i32,
-                                    width: icon_size as i32,
-                                    height: icon_size as i32,
-                                },
-                            };
-                            let mut popup_settings = app.core.applet.get_popup_settings(
-                                app.core.main_window_id().unwrap(),
-                                new_id,
-                                None,
-                                None,
-                                None,
-                            );
-                            popup_settings.positioner.anchor_rect = rectangle;
-                            popup_settings
+                    self.overflow_popup = Some(new_id);
+                    let icon_size = self.core.applet.suggested_size(true).0 as u32
+                        + 2 * self.core.applet.suggested_padding(true).1 as u32;
+                    let spacing = self.core.system_theme().cosmic().space_xxs() as u32;
+                    let major_axis_len = (icon_size + spacing) * (pos.saturating_sub(1) as u32);
+                    let rectangle = match self.core.applet.anchor {
+                        PanelAnchor::Top | PanelAnchor::Bottom => iced::Rectangle {
+                            x: major_axis_len as i32,
+                            y: 0,
+                            width: icon_size as i32,
+                            height: icon_size as i32,
                         },
+                        PanelAnchor::Left | PanelAnchor::Right => iced::Rectangle {
+                            x: 0,
+                            y: major_axis_len as i32,
+                            width: icon_size as i32,
+                            height: icon_size as i32,
+                        },
+                    };
+                    let mut popup_settings = self.core.applet.get_popup_settings(
+                        self.core.main_window_id().unwrap(),
+                        new_id,
                         None,
-                    ));
+                        None,
+                        None,
+                    );
+                    popup_settings.positioner.anchor_rect = rectangle;
+
+                    return get_popup(popup_settings);
                 }
             }
             Message::CloseOverflowPopup => todo!(),
diff --git a/cosmic-applet-network/i18n/da/cosmic_applet_network.ftl b/cosmic-applet-network/i18n/da/cosmic_applet_network.ftl
index 23aecd3d..e69de29b 100644
--- a/cosmic-applet-network/i18n/da/cosmic_applet_network.ftl
+++ b/cosmic-applet-network/i18n/da/cosmic_applet_network.ftl
@@ -1,6 +0,0 @@
-cancel = Annuller
-connected = Forbundet
-connect = Opret forbindelse
-wifi = Wi-Fi
-identity = Identitet
-network = Netværk
diff --git a/cosmic-applet-network/i18n/de/cosmic_applet_network.ftl b/cosmic-applet-network/i18n/de/cosmic_applet_network.ftl
index fe267462..0a913c0b 100644
--- a/cosmic-applet-network/i18n/de/cosmic_applet_network.ftl
+++ b/cosmic-applet-network/i18n/de/cosmic_applet_network.ftl
@@ -12,7 +12,7 @@ connected = Verbunden
 connecting = Wird verbunden
 connect = Verbinden
 cancel = Abbrechen
-settings = Netzwerkeinstellungen ...
+settings = Netzwerkeinstellungen...
 visible-wireless-networks = Sichtbare Drahtlosnetzwerke
 enter-password = Gib das Passwort oder den Verschlüsselungsschlüssel ein
 router-wps-button = Du kannst dich auch verbinden, indem du die Taste „WPS” am Router drückst
diff --git a/cosmic-applet-network/i18n/en-GB/cosmic_applet_network.ftl b/cosmic-applet-network/i18n/en-GB/cosmic_applet_network.ftl
index 72b1d8d4..e69de29b 100644
--- a/cosmic-applet-network/i18n/en-GB/cosmic_applet_network.ftl
+++ b/cosmic-applet-network/i18n/en-GB/cosmic_applet_network.ftl
@@ -1,2 +0,0 @@
-cancel = Cancel
-connected = Connected
diff --git a/cosmic-applet-network/i18n/fr/cosmic_applet_network.ftl b/cosmic-applet-network/i18n/fr/cosmic_applet_network.ftl
index 427f8e96..f2c0025d 100644
--- a/cosmic-applet-network/i18n/fr/cosmic_applet_network.ftl
+++ b/cosmic-applet-network/i18n/fr/cosmic_applet_network.ftl
@@ -9,7 +9,7 @@ mac = MAC
 megabits-per-second = Mbps
 connected = Connecté
 connecting = Connexion
-connect = Se connecter
+connect = Connecter
 cancel = Annuler
 settings = Paramètres réseaux...
 visible-wireless-networks = Réseaux Wi-Fi disponibles
diff --git a/cosmic-applet-network/i18n/gl/cosmic_applet_network.ftl b/cosmic-applet-network/i18n/gl/cosmic_applet_network.ftl
deleted file mode 100644
index 33d76626..00000000
--- a/cosmic-applet-network/i18n/gl/cosmic_applet_network.ftl
+++ /dev/null
@@ -1,24 +0,0 @@
-cancel = Cancelar
-connected = Conectado
-connect = Conectar
-identity = Identidade
-wifi = Wi-Fi
-network = Rede
-airplane-mode = Modo avión
-airplane-mode-on = O modo avión está activo
-turn-off-airplane-mode = Desactívao para activar a wifi, o Bluetooth e a banda larga móbil.
-ipv4 = Dirección IPv4
-ipv6 = Dirección IPv6
-mac = MAC
-megabits-per-second = Mbps
-gigabits-per-second = Gbps
-terabits-per-second = Tbps
-connecting = Conectando
-settings = Axustes da rede...
-visible-wireless-networks = Redes sen fíos visibles
-vpn-connections = Conexións VPN
-enter-password = Introduce o contrasinal ou a chave de cifrado
-router-wps-button = Tamén podes conectarte premendo o botón "WPS" do router
-unable-to-connect = Non se puido conectar á rede
-check-wifi-connection = Asegúrate de que a wifi está conectada a Internet e de que o contrasinal é correcto
-reset = Restablecer
diff --git a/cosmic-applet-network/i18n/sat/cosmic_applet_network.ftl b/cosmic-applet-network/i18n/sat/cosmic_applet_network.ftl
deleted file mode 100644
index 67f522ad..00000000
--- a/cosmic-applet-network/i18n/sat/cosmic_applet_network.ftl
+++ /dev/null
@@ -1 +0,0 @@
-cancel = ᱵᱟᱹᱛᱤᱞ
diff --git a/cosmic-applet-network/i18n/zh-TW/cosmic_applet_network.ftl b/cosmic-applet-network/i18n/zh-TW/cosmic_applet_network.ftl
index fb7946e6..23234d4d 100644
--- a/cosmic-applet-network/i18n/zh-TW/cosmic_applet_network.ftl
+++ b/cosmic-applet-network/i18n/zh-TW/cosmic_applet_network.ftl
@@ -8,7 +8,7 @@ ipv4 = IPv4 位址
 ipv6 = IPv6 位址
 mac = MAC
 megabits-per-second = Mbps
-connected = 已連線
+connected = 已經連線
 connecting = 連線中
 connect = 連線
 cancel = 取消
diff --git a/cosmic-applet-notifications/i18n/de/cosmic_applet_notifications.ftl b/cosmic-applet-notifications/i18n/de/cosmic_applet_notifications.ftl
index e40af6aa..6f103ed6 100644
--- a/cosmic-applet-notifications/i18n/de/cosmic_applet_notifications.ftl
+++ b/cosmic-applet-notifications/i18n/de/cosmic_applet_notifications.ftl
@@ -15,5 +15,5 @@ show-more = { $more } weitere anzeigen
 clear-group = Gruppe leeren
 clear-all = Alle Benachrichtigungen leeren
 do-not-disturb = Nicht stören
-notification-settings = Benachrichtigungseinstellungen ...
+notification-settings = Benachrichtigungseinstellungen...
 no-notifications = Keine Benachrichtigungen
diff --git a/cosmic-applet-notifications/i18n/gl/cosmic_applet_notifications.ftl b/cosmic-applet-notifications/i18n/gl/cosmic_applet_notifications.ftl
deleted file mode 100644
index 411d92c1..00000000
--- a/cosmic-applet-notifications/i18n/gl/cosmic_applet_notifications.ftl
+++ /dev/null
@@ -1,19 +0,0 @@
-hours-ago =
-    { $duration ->
-        [0] Xusto agora
-        [one] Hai 1 hora
-       *[other] Hai { $duration } horas
-    }
-minutes-ago =
-    { $duration ->
-        [0] Xusto agora
-        [one] Hai 1 minuto
-       *[other] Hai { $duration } minutos
-    }
-show-less = Mostrar menos
-show-more = Mostrar { $more } máis
-clear-group = Limpar grupo
-clear-all = Limpar todas as notificacións
-do-not-disturb = Non Molestar
-notification-settings = Configuración das notificacións...
-no-notifications = Sen notificacións
diff --git a/cosmic-applet-notifications/i18n/sat/cosmic_applet_notifications.ftl b/cosmic-applet-notifications/i18n/sat/cosmic_applet_notifications.ftl
deleted file mode 100644
index e69de29b..00000000
diff --git a/cosmic-applet-notifications/src/lib.rs b/cosmic-applet-notifications/src/lib.rs
index 720f8d63..438696b9 100644
--- a/cosmic-applet-notifications/src/lib.rs
+++ b/cosmic-applet-notifications/src/lib.rs
@@ -157,23 +157,18 @@ impl cosmic::Application for Notifications {
                 if let Some(p) = self.popup.take() {
                     return destroy_popup(p);
                 } else {
-                    return cosmic::surface::surface_task(cosmic::surface::action::app_popup(
-                        |_| Default::default(),
-                        |app: &mut Self| {
-                            let new_id = window::Id::unique();
-                            app.popup.replace(new_id);
+                    let new_id = window::Id::unique();
+                    self.popup.replace(new_id);
 
-                            let popup_settings = app.core.applet.get_popup_settings(
-                                app.core.main_window_id().unwrap(),
-                                new_id,
-                                None,
-                                None,
-                                None,
-                            );
-                            popup_settings
-                        },
+                    let popup_settings = self.core.applet.get_popup_settings(
+                        self.core.main_window_id().unwrap(),
+                        new_id,
                         None,
-                    ));
+                        None,
+                        None,
+                    );
+
+                    return get_popup(popup_settings);
                 }
             }
             Message::DoNotDisturb(b) => {
diff --git a/cosmic-applet-power/i18n/ca/cosmic_applet_power.ftl b/cosmic-applet-power/i18n/ca/cosmic_applet_power.ftl
index 8fcd19ec..c1084630 100644
--- a/cosmic-applet-power/i18n/ca/cosmic_applet_power.ftl
+++ b/cosmic-applet-power/i18n/ca/cosmic_applet_power.ftl
@@ -2,35 +2,3 @@ cancel = Cancel·lar
 confirm = Confirmar
 restart = Reinicia
 suspend = Suspèn
-confirm-button =
-    { $action ->
-        [restart] { restart }
-        [suspend] { suspend }
-        [shutdown] Apaga
-        [log-out] { log-out }
-       *[other] { confirm }
-    }
-power = Energia
-confirm-body =
-    { $action ->
-        [restart] L'ordinador es reiniciarà
-        [suspend] L'ordinador se suspendrà
-        [shutdown] L'ordinador s'apagarà
-        [lock-screen] La pantalla es bloquejarà
-        [log-out] La sessió es tancarà
-       *[other] L'acció seleccionada es durà a terme
-    } automàticament d'aquí a { $countdown } segons.
-lock-screen = Bloqueja la pantalla
-shutdown = Apaga
-log-out = Tanca la sessió
-log-out-shortcut = Súper + Majús + Esc
-settings = Configuració...
-lock-screen-shortcut = Súper + Esc
-confirm-title =
-    ¿{ $action ->
-        [restart] { restart }
-        [suspend] { suspend }
-        [shutdown] { shutdown }
-        [log-out] Voleu tancar totes les aplicacions i tancar la sessió
-       *[other] Voleu dur a terme l'acció seleccionada
-    }?
diff --git a/cosmic-applet-power/i18n/de/cosmic_applet_power.ftl b/cosmic-applet-power/i18n/de/cosmic_applet_power.ftl
index f630d8e4..652e2f9b 100644
--- a/cosmic-applet-power/i18n/de/cosmic_applet_power.ftl
+++ b/cosmic-applet-power/i18n/de/cosmic_applet_power.ftl
@@ -1,5 +1,5 @@
 power = Energie
-settings = Einstellungen ...
+settings = Einstellungen...
 lock-screen = Sperrbildschirm
 lock-screen-shortcut = Super + Esc
 log-out = Abmelden
diff --git a/cosmic-applet-power/i18n/gl/cosmic_applet_power.ftl b/cosmic-applet-power/i18n/gl/cosmic_applet_power.ftl
deleted file mode 100644
index 50aff75b..00000000
--- a/cosmic-applet-power/i18n/gl/cosmic_applet_power.ftl
+++ /dev/null
@@ -1,36 +0,0 @@
-power = Enerxía
-settings = Axustes...
-lock-screen = Pantalla de Bloqueo
-lock-screen-shortcut = Super + Esc
-log-out = Pechar Sesión
-log-out-shortcut = Super + Maiús + Esc
-suspend = Suspender
-restart = Reiniciar
-shutdown = Apagar
-confirm = Confirmar
-cancel = Cancelar
-confirm-button =
-    { $action ->
-        [restart] { restart }
-        [suspend] { suspend }
-        [shutdown] Apagar
-        [log-out] { log-out }
-       *[other] { confirm }
-    }
-confirm-title =
-    { $action ->
-        [restart] { restart } agora?
-        [suspend] { suspend } agora?
-        [shutdown] { shutdown } agora?
-        [log-out] Pechar todas as aplicacións e pechar a sesión agora?
-       *[other] Aplicar a acción seleccionada agora
-    }
-confirm-body =
-    O sistema { $action ->
-        [restart] reiniciarase
-        [suspend] suspenderase
-        [shutdown] apagarase
-        [lock-screen] bloqueará a pantalla
-        [log-out] pechará a sesión
-       *[other] aplicará a acción seleccionada
-    } automaticamente en { $countdown } segundos.
diff --git a/cosmic-applet-power/i18n/sat/cosmic_applet_power.ftl b/cosmic-applet-power/i18n/sat/cosmic_applet_power.ftl
deleted file mode 100644
index e69de29b..00000000
diff --git a/cosmic-applet-power/src/lib.rs b/cosmic-applet-power/src/lib.rs
index aa07ff3b..4a5829df 100644
--- a/cosmic-applet-power/src/lib.rs
+++ b/cosmic-applet-power/src/lib.rs
@@ -115,27 +115,20 @@ impl cosmic::Application for Power {
         match message {
             Message::TogglePopup => {
                 if let Some(p) = self.popup.take() {
-                    return cosmic::surface::surface_task(cosmic::surface::action::destroy_popup(
-                        p,
-                    ));
+                    return destroy_popup(p);
                 } else {
-                    return cosmic::surface::surface_task(cosmic::surface::action::app_popup(
-                        |_| Default::default(),
-                        |app: &mut Power| {
-                            let new_id = window::Id::unique();
-                            app.popup.replace(new_id);
+                    let new_id = window::Id::unique();
+                    self.popup.replace(new_id);
 
-                            let popup_settings = app.core.applet.get_popup_settings(
-                                app.core.main_window_id().unwrap(),
-                                new_id,
-                                None,
-                                None,
-                                None,
-                            );
-                            popup_settings
-                        },
+                    let popup_settings = self.core.applet.get_popup_settings(
+                        self.core.main_window_id().unwrap(),
+                        new_id,
                         None,
-                    ));
+                        None,
+                        None,
+                    );
+
+                    return get_popup(popup_settings);
                 }
             }
             Message::OpenSettings => {
diff --git a/cosmic-applet-status-area/src/components/app.rs b/cosmic-applet-status-area/src/components/app.rs
index d98cc117..7bedc653 100644
--- a/cosmic-applet-status-area/src/components/app.rs
+++ b/cosmic-applet-status-area/src/components/app.rs
@@ -246,49 +246,38 @@ impl cosmic::Application for App {
                     if let Some(popup_id) = self.popup.take() {
                         cmds.push(destroy_popup(popup_id));
                     }
+                    let popup_id = self.next_popup_id();
+                    let i = self.menus.keys().position(|&i| i == id).unwrap();
+                    let (i, parent) = self
+                        .overflow_index()
+                        .and_then(|overflow_i| {
+                            if overflow_i <= i {
+                                Some(i - overflow_i).zip(self.overflow_popup)
+                            } else {
+                                Some((i, self.core.main_window_id().unwrap()))
+                            }
+                        })
+                        .unwrap_or((i, self.core.main_window_id().unwrap()));
 
-                    let popup_task =
-                        cosmic::surface::surface_task(cosmic::surface::action::app_popup(
-                            |_| Default::default(),
-                            move |app: &mut Self| {
-                                let popup_id = app.next_popup_id();
-                                let i = app.menus.keys().position(|&i| i == id).unwrap();
-                                let (i, parent) = app
-                                    .overflow_index()
-                                    .and_then(|overflow_i| {
-                                        if overflow_i <= i {
-                                            Some(i - overflow_i).zip(app.overflow_popup)
-                                        } else {
-                                            Some((i, app.core.main_window_id().unwrap()))
-                                        }
-                                    })
-                                    .unwrap_or((i, app.core.main_window_id().unwrap()));
+                    let mut popup_settings = self
+                        .core
+                        .applet
+                        .get_popup_settings(parent, popup_id, None, None, None);
+                    self.popup = Some(popup_id);
 
-                                let mut popup_settings = app
-                                    .core
-                                    .applet
-                                    .get_popup_settings(parent, popup_id, None, None, None);
-                                app.popup = Some(popup_id);
-
-                                if matches!(
-                                    app.core.applet.anchor,
-                                    PanelAnchor::Left | PanelAnchor::Right
-                                ) {
-                                    let suggested_size = app.core.applet.suggested_size(false).1
-                                        + 2 * app.core.applet.suggested_padding(false).1;
-                                    popup_settings.positioner.anchor_rect.y =
-                                        i as i32 * suggested_size as i32;
-                                } else {
-                                    let suggested_size = app.core.applet.suggested_size(false).0
-                                        + 2 * app.core.applet.suggested_padding(false).1;
-                                    popup_settings.positioner.anchor_rect.x =
-                                        i as i32 * suggested_size as i32;
-                                }
-                                popup_settings
-                            },
-                            None,
-                        ));
-                    cmds.push(popup_task);
+                    if matches!(
+                        self.core.applet.anchor,
+                        PanelAnchor::Left | PanelAnchor::Right
+                    ) {
+                        let suggested_size = self.core.applet.suggested_size(false).1
+                            + 2 * self.core.applet.suggested_padding(false).1;
+                        popup_settings.positioner.anchor_rect.y = i as i32 * suggested_size as i32;
+                    } else {
+                        let suggested_size = self.core.applet.suggested_size(false).0
+                            + 2 * self.core.applet.suggested_padding(false).1;
+                        popup_settings.positioner.anchor_rect.x = i as i32 * suggested_size as i32;
+                    }
+                    cmds.push(get_popup(popup_settings));
                     return app::Task::batch(cmds);
                 } else if let Some(popup_id) = self.popup {
                     self.menus[&id].closed();
@@ -350,49 +339,39 @@ impl cosmic::Application for App {
                 } else {
                     return Task::none();
                 }
-                let popup_task = cosmic::surface::surface_task(cosmic::surface::action::app_popup(
-                    |_| Default::default(),
-                    move |app: &mut Self| {
-                        let popup_id = app.next_popup_id();
-                        let i = app.menus.keys().position(|&i| i == id).unwrap();
+                let popup_id = self.next_popup_id();
+                let i = self.menus.keys().position(|&i| i == id).unwrap();
 
-                        let (i, parent) = app
-                            .overflow_index()
-                            .and_then(|overflow_i| {
-                                if overflow_i <= i {
-                                    Some(i - overflow_i).zip(app.overflow_popup)
-                                } else {
-                                    Some((i, app.core.main_window_id().unwrap()))
-                                }
-                            })
-                            .unwrap_or((i, app.core.main_window_id().unwrap()));
-
-                        let mut popup_settings = app
-                            .core
-                            .applet
-                            .get_popup_settings(parent, popup_id, None, None, None);
-                        app.popup = Some(popup_id);
-
-                        if matches!(
-                            app.core.applet.anchor,
-                            PanelAnchor::Left | PanelAnchor::Right
-                        ) {
-                            let suggested_size = app.core.applet.suggested_size(true).1
-                                + 2 * app.core.applet.suggested_padding(true).1;
-                            popup_settings.positioner.anchor_rect.y =
-                                i as i32 * suggested_size as i32;
+                let (i, parent) = self
+                    .overflow_index()
+                    .and_then(|overflow_i| {
+                        if overflow_i <= i {
+                            Some(i - overflow_i).zip(self.overflow_popup)
                         } else {
-                            let suggested_size = app.core.applet.suggested_size(true).0
-                                + 2 * app.core.applet.suggested_padding(true).0;
-                            popup_settings.positioner.anchor_rect.x =
-                                i as i32 * suggested_size as i32;
+                            Some((i, self.core.main_window_id().unwrap()))
                         }
-                        popup_settings
-                    },
-                    None,
-                ));
-                cmds.push(popup_task);
+                    })
+                    .unwrap_or((i, self.core.main_window_id().unwrap()));
 
+                let mut popup_settings = self
+                    .core
+                    .applet
+                    .get_popup_settings(parent, popup_id, None, None, None);
+                self.popup = Some(popup_id);
+
+                if matches!(
+                    self.core.applet.anchor,
+                    PanelAnchor::Left | PanelAnchor::Right
+                ) {
+                    let suggested_size = self.core.applet.suggested_size(true).1
+                        + 2 * self.core.applet.suggested_padding(true).1;
+                    popup_settings.positioner.anchor_rect.y = i as i32 * suggested_size as i32;
+                } else {
+                    let suggested_size = self.core.applet.suggested_size(true).0
+                        + 2 * self.core.applet.suggested_padding(true).0;
+                    popup_settings.positioner.anchor_rect.x = i as i32 * suggested_size as i32;
+                }
+                cmds.push(get_popup(popup_settings));
                 Task::batch(cmds)
             }
             Msg::WheelScrolled(delta) => {
@@ -420,41 +399,33 @@ impl cosmic::Application for App {
                     return destroy_popup(popup_id);
                 } else if let Some(overflow_index) = self.overflow_index() {
                     // If we don't have an overflow, create it
-                    let popup_task =
-                        cosmic::surface::surface_task(cosmic::surface::action::app_popup(
-                            |_| Default::default(),
-                            move |app: &mut Self| {
-                                let popup_id = app.next_popup_id();
-                                let mut popup_settings = app.core.applet.get_popup_settings(
-                                    app.core.main_window_id().unwrap(),
-                                    popup_id,
-                                    None,
-                                    None,
-                                    None,
-                                );
-                                popup_settings.close_with_children = false;
+                    let popup_id = self.next_popup_id();
+                    let mut popup_settings = self.core.applet.get_popup_settings(
+                        self.core.main_window_id().unwrap(),
+                        popup_id,
+                        None,
+                        None,
+                        None,
+                    );
+                    popup_settings.close_with_children = false;
 
-                                if matches!(
-                                    app.core.applet.anchor,
-                                    PanelAnchor::Left | PanelAnchor::Right
-                                ) {
-                                    let suggested_size = app.core.applet.suggested_size(true).1
-                                        + 2 * app.core.applet.suggested_padding(true).1;
-                                    popup_settings.positioner.anchor_rect.y =
-                                        overflow_index as i32 * suggested_size as i32;
-                                } else {
-                                    let suggested_size = app.core.applet.suggested_size(true).0
-                                        + 2 * app.core.applet.suggested_padding(true).0;
-                                    popup_settings.positioner.anchor_rect.x =
-                                        overflow_index as i32 * suggested_size as i32;
-                                }
+                    if matches!(
+                        self.core.applet.anchor,
+                        PanelAnchor::Left | PanelAnchor::Right
+                    ) {
+                        let suggested_size = self.core.applet.suggested_size(true).1
+                            + 2 * self.core.applet.suggested_padding(true).1;
+                        popup_settings.positioner.anchor_rect.y =
+                            overflow_index as i32 * suggested_size as i32;
+                    } else {
+                        let suggested_size = self.core.applet.suggested_size(true).0
+                            + 2 * self.core.applet.suggested_padding(true).0;
+                        popup_settings.positioner.anchor_rect.x =
+                            overflow_index as i32 * suggested_size as i32;
+                    }
 
-                                app.overflow_popup = Some(popup_id);
-                                popup_settings
-                            },
-                            None,
-                        ));
-                    return popup_task;
+                    self.overflow_popup = Some(popup_id);
+                    return get_popup(popup_settings);
                 } else {
                     return Task::none();
                 }
@@ -473,41 +444,34 @@ impl cosmic::Application for App {
                 } else {
                     return Task::none();
                 }
+
+                let popup_id = self.next_popup_id();
+                let mut popup_settings = self.core.applet.get_popup_settings(
+                    self.core.main_window_id().unwrap(),
+                    popup_id,
+                    None,
+                    None,
+                    None,
+                );
+                self.popup = Some(popup_id);
+
                 let Some(i) = self.overflow_index() else {
                     return Task::batch(cmds);
                 };
-                let popup_task = cosmic::surface::surface_task(cosmic::surface::action::app_popup(
-                    |_| Default::default(),
-                    move |app: &mut Self| {
-                        let popup_id = app.next_popup_id();
-                        let mut popup_settings = app.core.applet.get_popup_settings(
-                            app.core.main_window_id().unwrap(),
-                            popup_id,
-                            None,
-                            None,
-                            None,
-                        );
-                        app.popup = Some(popup_id);
 
-                        if matches!(
-                            app.core.applet.anchor,
-                            PanelAnchor::Left | PanelAnchor::Right
-                        ) {
-                            let suggested_size = app.core.applet.suggested_size(false).1
-                                + 2 * app.core.applet.suggested_padding(false).1;
-                            popup_settings.positioner.anchor_rect.y =
-                                i as i32 * suggested_size as i32;
-                        } else {
-                            let suggested_size = app.core.applet.suggested_size(false).0
-                                + 2 * app.core.applet.suggested_padding(false).1;
-                            popup_settings.positioner.anchor_rect.x =
-                                i as i32 * suggested_size as i32;
-                        }
-                        popup_settings
-                    },
-                    None,
-                ));
-                cmds.push(popup_task);
+                if matches!(
+                    self.core.applet.anchor,
+                    PanelAnchor::Left | PanelAnchor::Right
+                ) {
+                    let suggested_size = self.core.applet.suggested_size(false).1
+                        + 2 * self.core.applet.suggested_padding(false).1;
+                    popup_settings.positioner.anchor_rect.y = i as i32 * suggested_size as i32;
+                } else {
+                    let suggested_size = self.core.applet.suggested_size(false).0
+                        + 2 * self.core.applet.suggested_padding(false).1;
+                    popup_settings.positioner.anchor_rect.x = i as i32 * suggested_size as i32;
+                }
+                cmds.push(get_popup(popup_settings));
                 Task::batch(cmds)
             }
         }
@@ -692,7 +656,7 @@ fn menu_icon_button<'a>(
                 .class(if symbolic {
                     cosmic::theme::Svg::Custom(std::rc::Rc::new(|theme| {
                         cosmic::iced::widget::svg::Style {
-                            color: Some(theme.cosmic().background(theme.transparent).on.into()),
+                            color: Some(theme.cosmic().background(false).on.into()),
                         }
                     }))
                 } else {
diff --git a/cosmic-applet-status-area/src/components/status_menu.rs b/cosmic-applet-status-area/src/components/status_menu.rs
index a228d745..e706f37b 100644
--- a/cosmic-applet-status-area/src/components/status_menu.rs
+++ b/cosmic-applet-status-area/src/components/status_menu.rs
@@ -232,11 +232,7 @@ fn layout_view(layout: &Layout, expanded: Option<i32>) -> cosmic::Element<'_, Ms
             }
             if let Some(icon_data) = i.icon_data() {
                 let handle = iced::widget::image::Handle::from_bytes(icon_data.to_vec());
-                let icon = iced::widget::Image::new(handle)
-                    .width(iced::Length::Fixed(14.0))
-                    .height(iced::Length::Fixed(14.0))
-                    .content_fit(iced::core::ContentFit::Contain);
-                children.insert(0, icon.into());
+                children.insert(0, iced::widget::Image::new(handle).into());
             } else if let Some(icon_name) = i.icon_name() {
                 let icon = cosmic::widget::icon::from_name(icon_name)
                     .size(14)
diff --git a/cosmic-applet-tiling/i18n/ca/cosmic_applet_tiling.ftl b/cosmic-applet-tiling/i18n/ca/cosmic_applet_tiling.ftl
index 4160088d..e69de29b 100644
--- a/cosmic-applet-tiling/i18n/ca/cosmic_applet_tiling.ftl
+++ b/cosmic-applet-tiling/i18n/ca/cosmic_applet_tiling.ftl
@@ -1,2 +0,0 @@
-tile-windows = Organitza les finestres en mosaic automàticament
-shortcuts = Dreceres
diff --git a/cosmic-applet-tiling/i18n/de/cosmic_applet_tiling.ftl b/cosmic-applet-tiling/i18n/de/cosmic_applet_tiling.ftl
index 4e367370..2f41f75e 100644
--- a/cosmic-applet-tiling/i18n/de/cosmic_applet_tiling.ftl
+++ b/cosmic-applet-tiling/i18n/de/cosmic_applet_tiling.ftl
@@ -4,11 +4,11 @@ shortcuts = Tastenkombinationen
 navigate-windows = Fenster navigieren
 move-window = Fenster verschieben
 toggle-floating-window = Schwebendes Fenster umschalten
-view-all-shortcuts = Alle Tastenkombinationen ansehen ...
+view-all-shortcuts = Alle Tastenkombinationen ansehen...
 active-hint = Aktiv-Hinweis
 gaps = Lücken
-floating-window-exceptions = Ausnahmen für schwebende Fenster ...
-window-management-settings = Einstellungen für die Fensterverwaltung ...
+floating-window-exceptions = Ausnahmen für schwebende Fenster...
+window-management-settings = Einstellungen für die Fensterverwaltung...
 all-workspaces = Alle Arbeitsflächen
 per-workspace = Pro Arbeitsfläche
 super = Super
diff --git a/cosmic-applet-tiling/i18n/gl/cosmic_applet_tiling.ftl b/cosmic-applet-tiling/i18n/gl/cosmic_applet_tiling.ftl
deleted file mode 100644
index 1bd9f731..00000000
--- a/cosmic-applet-tiling/i18n/gl/cosmic_applet_tiling.ftl
+++ /dev/null
@@ -1,20 +0,0 @@
-tile-windows = Dispoñer as xanelas en mosaico automaticamente
-tile-current = Dispoñer en mosaico o espazo de traballo actual
-shortcuts = Atallos
-navigate-windows = Navergar polas xanelas
-move-window = Mover a xanela
-toggle-floating-window = Alternar xanela flotante
-view-all-shortcuts = Ver todos os atallos...
-active-hint = Indicador de foco activo
-gaps = Espazos
-floating-window-exceptions = Excepcións de xanelas flotantes...
-window-management-settings = Axustes da xestión de xanelas...
-all-workspaces = Todos os espazos de traballo
-per-workspace = Por espazo de traballo
-super = Super
-shift = Maiús
-arrow-keys = frechas
-tiled = En mosaico
-floating = Flotante
-autotile-behavior = Organizar as xanelas en mosaico nos espazos de traballo
-new-workspace = Comportamento dos novos espazos de traballo
diff --git a/cosmic-applet-tiling/i18n/nl/cosmic_applet_tiling.ftl b/cosmic-applet-tiling/i18n/nl/cosmic_applet_tiling.ftl
index 9b2c50bf..fcae7910 100644
--- a/cosmic-applet-tiling/i18n/nl/cosmic_applet_tiling.ftl
+++ b/cosmic-applet-tiling/i18n/nl/cosmic_applet_tiling.ftl
@@ -3,9 +3,9 @@ tile-current = Huidig werkblad tegelen
 shortcuts = Sneltoetsen
 navigate-windows = Tussen vensters schakelen
 move-window = Venster verplaatsen
-toggle-floating-window = Zweven aan- of uitzetten voor venster
+toggle-floating-window = Zet zwevende vensters aan/uit
 view-all-shortcuts = Alle sneltoetsen bekijken…
-active-hint = Vensterfocus-aanduiding
+active-hint = Visuele hint actief venster
 gaps = Ruimte rond getegelde vensters
 floating-window-exceptions = Uitzonderingen voor zwevende vensters…
 window-management-settings = Instellingen voor vensterbeheer…
diff --git a/cosmic-applet-tiling/i18n/sat/cosmic_applet_tiling.ftl b/cosmic-applet-tiling/i18n/sat/cosmic_applet_tiling.ftl
deleted file mode 100644
index e69de29b..00000000
diff --git a/cosmic-applet-tiling/src/window.rs b/cosmic-applet-tiling/src/window.rs
index 912b3059..7da430e3 100644
--- a/cosmic-applet-tiling/src/window.rs
+++ b/cosmic-applet-tiling/src/window.rs
@@ -147,22 +147,17 @@ impl cosmic::Application for Window {
                 return if let Some(p) = self.popup.take() {
                     destroy_popup(p)
                 } else {
-                    return cosmic::surface::surface_task(cosmic::surface::action::app_popup(
-                        |_| Default::default(),
-                        |app: &mut Self| {
-                            let new_id = Id::unique();
-                            app.popup = Some(new_id);
-                            let popup_settings = app.core.applet.get_popup_settings(
-                                app.core.main_window_id().unwrap(),
-                                new_id,
-                                Some((1, 1)),
-                                None,
-                                None,
-                            );
-                            popup_settings
-                        },
+                    let new_id = Id::unique();
+                    self.popup = Some(new_id);
+                    let popup_settings = self.core.applet.get_popup_settings(
+                        self.core.main_window_id().unwrap(),
+                        new_id,
+                        Some((1, 1)),
                         None,
-                    ));
+                        None,
+                    );
+
+                    get_popup(popup_settings)
                 };
             }
             Message::PopupClosed(id) => {
diff --git a/cosmic-applet-time/i18n/ca/cosmic_applet_time.ftl b/cosmic-applet-time/i18n/ca/cosmic_applet_time.ftl
index daed32e1..e69de29b 100644
--- a/cosmic-applet-time/i18n/ca/cosmic_applet_time.ftl
+++ b/cosmic-applet-time/i18n/ca/cosmic_applet_time.ftl
@@ -1 +0,0 @@
-datetime-settings = Configuració de data, hora i calendari...
diff --git a/cosmic-applet-time/i18n/de/cosmic_applet_time.ftl b/cosmic-applet-time/i18n/de/cosmic_applet_time.ftl
index e4e6c44a..e08a855a 100644
--- a/cosmic-applet-time/i18n/de/cosmic_applet_time.ftl
+++ b/cosmic-applet-time/i18n/de/cosmic_applet_time.ftl
@@ -1 +1 @@
-datetime-settings = Datum, Uhrzeit und Kalendereinstellungen ...
+datetime-settings = Datum, Uhrzeit und Kalendereinstellungen...
diff --git a/cosmic-applet-time/i18n/gl/cosmic_applet_time.ftl b/cosmic-applet-time/i18n/gl/cosmic_applet_time.ftl
deleted file mode 100644
index d00079ad..00000000
--- a/cosmic-applet-time/i18n/gl/cosmic_applet_time.ftl
+++ /dev/null
@@ -1 +0,0 @@
-datetime-settings = Axustes de data, hora e calendario...
diff --git a/cosmic-applet-time/i18n/sat/cosmic_applet_time.ftl b/cosmic-applet-time/i18n/sat/cosmic_applet_time.ftl
deleted file mode 100644
index e69de29b..00000000
diff --git a/cosmic-applet-time/src/window.rs b/cosmic-applet-time/src/window.rs
index e103498b..ddd37d31 100644
--- a/cosmic-applet-time/src/window.rs
+++ b/cosmic-applet-time/src/window.rs
@@ -521,40 +521,35 @@ impl cosmic::Application for Window {
                 if let Some(p) = self.popup.take() {
                     destroy_popup(p)
                 } else {
-                    return cosmic::surface::surface_task(cosmic::surface::action::app_popup(
-                        |_| Default::default(),
-                        |app: &mut Self| {
-                            app.date_today = app.now.date();
-                            app.date_selected = app.date_today;
+                    self.date_today = self.now.date();
+                    self.date_selected = self.date_today;
 
-                            let new_id = window::Id::unique();
-                            app.popup = Some(new_id);
+                    let new_id = window::Id::unique();
+                    self.popup = Some(new_id);
 
-                            let mut popup_settings = app.core.applet.get_popup_settings(
-                                app.core.main_window_id().unwrap(),
-                                new_id,
-                                None,
-                                None,
-                                None,
-                            );
-                            let Rectangle {
-                                x,
-                                y,
-                                width,
-                                height,
-                            } = app.rectangle;
-                            popup_settings.positioner.anchor_rect = Rectangle::<i32> {
-                                x: x.max(1.) as i32,
-                                y: y.max(1.) as i32,
-                                width: width.max(1.) as i32,
-                                height: height.max(1.) as i32,
-                            };
-
-                            popup_settings.positioner.size = None;
-                            popup_settings
-                        },
+                    let mut popup_settings = self.core.applet.get_popup_settings(
+                        self.core.main_window_id().unwrap(),
+                        new_id,
                         None,
-                    ));
+                        None,
+                        None,
+                    );
+                    let Rectangle {
+                        x,
+                        y,
+                        width,
+                        height,
+                    } = self.rectangle;
+                    popup_settings.positioner.anchor_rect = Rectangle::<i32> {
+                        x: x.max(1.) as i32,
+                        y: y.max(1.) as i32,
+                        width: width.max(1.) as i32,
+                        height: height.max(1.) as i32,
+                    };
+
+                    popup_settings.positioner.size = None;
+
+                    get_popup(popup_settings)
                 }
             }
             Message::Tick => {
diff --git a/cosmic-applet-workspaces/i18n/ca/cosmic_applet_workspaces.ftl b/cosmic-applet-workspaces/i18n/ca/cosmic_applet_workspaces.ftl
index 3844b7a8..e69de29b 100644
--- a/cosmic-applet-workspaces/i18n/ca/cosmic_applet_workspaces.ftl
+++ b/cosmic-applet-workspaces/i18n/ca/cosmic_applet_workspaces.ftl
@@ -1 +0,0 @@
-cosmic-applet-workspaces = Espais de treball del COSMIC
diff --git a/cosmic-applet-workspaces/i18n/gl/cosmic_applet_workspaces.ftl b/cosmic-applet-workspaces/i18n/gl/cosmic_applet_workspaces.ftl
deleted file mode 100644
index a56114fd..00000000
--- a/cosmic-applet-workspaces/i18n/gl/cosmic_applet_workspaces.ftl
+++ /dev/null
@@ -1 +0,0 @@
-cosmic-applet-workspaces = Espazos de traballo de COSMIC
diff --git a/cosmic-applet-workspaces/i18n/sat/cosmic_applet_workspaces.ftl b/cosmic-applet-workspaces/i18n/sat/cosmic_applet_workspaces.ftl
deleted file mode 100644
index e69de29b..00000000
diff --git a/cosmic-applet-workspaces/src/components/app.rs b/cosmic-applet-workspaces/src/components/app.rs
index ddfcca20..a9bafb79 100644
--- a/cosmic-applet-workspaces/src/components/app.rs
+++ b/cosmic-applet-workspaces/src/components/app.rs
@@ -203,20 +203,24 @@ impl cosmic::Application for IcedWorkspacesApplet {
             let content = column!(content, space::horizontal().width(Length::Fixed(width)))
                 .align_x(Alignment::Center);
 
-            let btn = button(content)
-                .padding(if horizontal {
-                    [0, self.core.applet.suggested_padding(true).1]
+            let btn = button(
+                container(content)
+                    .align_x(Alignment::Center)
+                    .align_y(Alignment::Center),
+            )
+            .padding(if horizontal {
+                [0, self.core.applet.suggested_padding(true).1]
+            } else {
+                [self.core.applet.suggested_padding(true).1, 0]
+            })
+            .on_press(
+                if w.state.contains(ext_workspace_handle_v1::State::Active) {
+                    Message::WorkspaceOverview
                 } else {
-                    [self.core.applet.suggested_padding(true).1, 0]
-                })
-                .on_press(
-                    if w.state.contains(ext_workspace_handle_v1::State::Active) {
-                        Message::WorkspaceOverview
-                    } else {
-                        Message::WorkspacePressed(w.handle.clone())
-                    },
-                )
-                .padding(0);
+                    Message::WorkspacePressed(w.handle.clone())
+                },
+            )
+            .padding(0);
 
             btn.class(
                 if w.state.contains(ext_workspace_handle_v1::State::Active) {
diff --git a/cosmic-panel-button/src/lib.rs b/cosmic-panel-button/src/lib.rs
index 609fe096..5c875719 100644
--- a/cosmic-panel-button/src/lib.rs
+++ b/cosmic-panel-button/src/lib.rs
@@ -66,7 +66,7 @@ impl Button {
                     .class(if symbolic {
                         cosmic::theme::Svg::Custom(std::rc::Rc::new(|theme| {
                             cosmic::iced::widget::svg::Style {
-                                color: Some(theme.cosmic().background(theme.transparent).on.into()),
+                                color: Some(theme.cosmic().background(false).on.into()),
                             }
                         }))
                     } else {
diff --git a/i18n/ca/desktop_entries.ftl b/i18n/ca/desktop_entries.ftl
index 167c3614..8e680471 100644
--- a/i18n/ca/desktop_entries.ftl
+++ b/i18n/ca/desktop_entries.ftl
@@ -1,2 +1 @@
 cosmic-app-list = Safata d'Aplicacions
-cosmic-app-list-comment = Inicieu aplicacions ancorades i gestioneu les finestres obertes
diff --git a/i18n/cs/desktop_entries.ftl b/i18n/cs/desktop_entries.ftl
index fc451530..44354f34 100644
--- a/i18n/cs/desktop_entries.ftl
+++ b/i18n/cs/desktop_entries.ftl
@@ -1,4 +1,4 @@
-cosmic-app-list = Oblast aplikací
+cosmic-app-list = Panel aplikací
 cosmic-applet-a11y = Přístupnost
 cosmic-applet-audio = Zvuk
 cosmic-applet-battery = Napájení a baterie
@@ -8,7 +8,7 @@ cosmic-applet-minimize = Minimalizovaná okna
 cosmic-applet-network = Síť
 cosmic-applet-notifications = Centrum oznámení
 cosmic-applet-power = Uživatelská relace
-cosmic-applet-status-area = Oznamovací oblast
+cosmic-applet-status-area = Panel oznámení
 cosmic-applet-tiling = Dlaždicový režim oken
 cosmic-applet-time = Datum, čas a kalendář
 cosmic-applet-workspaces = Číslované pracovní plochy
@@ -26,9 +26,9 @@ cosmic-applet-network-comment = Správa síťových připojení
 cosmic-applet-network-keywords = COSMIC;Applet;Síť;
 cosmic-applet-notifications-comment = Správa oznámení a režimu Nerušit
 cosmic-applet-notifications-keywords = COSMIC;Applet;Oznámení;
-cosmic-applet-status-area-keywords = COSMIC;Applet;Aplikace;Indikátory;Oznámení;Notifikace;Oblast;Status;Stav;
+cosmic-applet-status-area-keywords = COSMIC;Applet;Aplikace;Indikátory;Oznámení;Notifikace;Panel;Status;Stav;
 cosmic-app-list-comment = Správa otevřených oken a spouštění připnutých aplikací
-cosmic-app-list-keywords = COSMIC;Applet;Aplikace;Oblast;Seznam;Úloha;Úlohy;Lišta;
+cosmic-app-list-keywords = COSMIC;Applet;Aplikace;Panel;Seznam;Úloha;Úlohy;Lišta;
 cosmic-applet-a11y-comment = Konfigurace nastavení přístupnosti z panelu
 cosmic-applet-a11y-keywords = COSMIC;Applet;Přístupnost;A11y;Obrazovka;Obrazovky;Čtečka;Lupa;Kontrast;Barva;Barvy;
 cosmic-applet-audio-comment = Výběr zvukového zařízení, ovládání hlasitosti a ovládání médií MPRIS
@@ -43,9 +43,9 @@ cosmic-applet-time-keywords = COSMIC;Applet;Datumy;Časy;Kalendář;Hodiny;
 cosmic-applet-workspaces-comment = Přepínání mezi číslovanými pracovními plochami v panelu
 cosmic-applet-workspaces-keywords = COSMIC;Applet;Pracovní;Plocha;Plochy;
 cosmic-panel-app-button-comment = Přístup ke knihovně pro spouštění nainstalovaných aplikací
-cosmic-panel-app-button-keywords = COSMIC;Applet;Aplikace;Knihovna;Oblast;Spuštění;Spouštění;
+cosmic-panel-app-button-keywords = COSMIC;Applet;Aplikace;Knihovna;Panel;Spuštění;Spouštění;
 cosmic-panel-launcher-button-comment = Přístup ke spouštěči pro vyhledávání aplikací a spouštění příkazů
 cosmic-panel-launcher-button-keywords = COSMIC;Applet;Spouštěč;Vyhledávání;Příkazy;
 cosmic-panel-workspaces-button-comment = Přístup k přehledu pracovních ploch pro jejich správu a přepínání
 cosmic-panel-workspaces-button-keywords = COSMIC;Applet;Pracovní;Plocha;Plochy;Přehled;
-cosmic-applet-status-area-comment = Ikony aplikací, které mohou zobrazovat nabídky na panelu
+cosmic-applet-status-area-comment = Indikátory aplikací, které mohou exportovat menu do panelu
diff --git a/i18n/da/desktop_entries.ftl b/i18n/da/desktop_entries.ftl
index 6026b028..e69de29b 100644
--- a/i18n/da/desktop_entries.ftl
+++ b/i18n/da/desktop_entries.ftl
@@ -1,51 +0,0 @@
-cosmic-app-list = Programbakke
-cosmic-app-list-comment = Start fastgjorte apps og håndter åbne vinduer
-cosmic-app-list-keywords = COSMIC;Applet;App;Statusområde;Liste;Opgave;Bjælke;
-cosmic-applet-a11y = Tilgængelighed
-cosmic-applet-a11y-comment = Konfigurer tilgængelighedsindstillinger fra panelet
-cosmic-applet-a11y-keywords = COSMIC;Applet;Tilgængelighed;A11y;Skærm;Skærmlæser;Forstørrelsesglas;Kontrast;Farve;
-cosmic-applet-audio = Lyd
-cosmic-applet-audio-comment = Valg af lydenhed, lydstyrkekontrol og MPRIS-mediekontrol
-cosmic-applet-audio-keywords = COSMIC;Applet;Lyd;Lyd;MPRIS;
-cosmic-applet-battery = Strøm og batteri
-cosmic-applet-battery-comment = Strømtilstande og strømspareindstillinger
-cosmic-applet-battery-keywords = COSMIC;Applet;Strøm;Batteri;
-cosmic-applet-bluetooth = Bluetooth
-cosmic-applet-bluetooth-comment = Administrer Bluetooth-enheder
-cosmic-applet-bluetooth-keywords = COSMIC;Applet;Bluetooth;
-cosmic-applet-input-sources = Inputkilder
-cosmic-applet-input-sources-comment = Skift mellem inputkilder
-cosmic-applet-input-sources-keywords = COSMIC;Applet;Input;Kilde;
-cosmic-applet-minimize = Minimerede vinduer
-cosmic-applet-minimize-comment = Administrer minimerede vinduer
-cosmic-applet-minimize-keywords = COSMIC;Applet;Minimer;
-cosmic-applet-network = Netværk
-cosmic-applet-network-comment = Administrer netværksforbindelser
-cosmic-applet-network-keywords = COSMIC;Applet;Netværk;
-cosmic-applet-notifications = Notifikationscenter
-cosmic-applet-notifications-comment = Administrer notifikationer og Forstyr ikke
-cosmic-applet-notifications-keywords = COSMIC;Applet;Notifikation;
-cosmic-applet-power = Brugersession
-cosmic-applet-power-comment = Låseskærm, log ud, dvale, genstart og luk ned
-cosmic-applet-power-keywords = COSMIC;Applet;Bruger;Session;Lås;Log;Genstart;Luk ned;Dvale;
-cosmic-applet-status-area = Notifikationsområde
-cosmic-applet-status-area-comment = Programindikatorer, som kan eksportere menuer til panelet
-cosmic-applet-status-area-keywords = COSMIC;Applet;App;Indikator;Notifikation;Statusområde;Status;
-cosmic-applet-tiling = Opdeling
-cosmic-applet-tiling-comment = Administrer aktiv hint samt automatisk opdeling for aktuelt og pr. arbejdsområde
-cosmic-applet-tiling-keywords = COSMIC;Applet;Opdeling;Hint;Arbejdsområde;
-cosmic-applet-time = Dato, tid og kalender
-cosmic-applet-time-comment = Vis den aktuelle tid i panelet med en kalenderpopup
-cosmic-applet-time-keywords = COSMIC;Applet;Dato;Tid;Kalender;
-cosmic-applet-workspaces = Nummererede arbejdsområder
-cosmic-applet-workspaces-comment = Skift mellem nummererede arbejdsområder i panelet
-cosmic-applet-workspaces-keywords = COSMIC;Applet;Arbejdsområde;
-cosmic-panel-app-button = Appbibliotek-knap
-cosmic-panel-app-button-comment = Åbn applikationsbiblioteket for at starte installerede programmer
-cosmic-panel-app-button-keywords = COSMIC;Applet;App;Bibliotek;Statusområde;
-cosmic-panel-launcher-button = Starterknap
-cosmic-panel-launcher-button-keywords = COSMIC;Applet;Starter;Kører;
-cosmic-panel-workspaces-button = Arbejdsområdeknap
-cosmic-panel-workspaces-button-comment = Åbn oversigten over arbejdsområder for at administrere og skifte mellem arbejdsområder
-cosmic-panel-workspaces-button-keywords = COSMIC;Applet;Arbejdsområde;Oversigt;
-cosmic-panel-launcher-button-comment = Åbn starteren for at søge efter programmer og køre kommandoer
diff --git a/i18n/de/desktop_entries.ftl b/i18n/de/desktop_entries.ftl
index fd41e5be..6cb50a22 100644
--- a/i18n/de/desktop_entries.ftl
+++ b/i18n/de/desktop_entries.ftl
@@ -37,7 +37,7 @@ cosmic-app-list-comment = Angeheftete Apps starten und geöffnete Fenster verwal
 cosmic-applet-a11y-comment = Einstellungen für Barrierefreiheit über das Panel konfigurieren
 cosmic-applet-power-comment = Bildschirm sperren, abmelden, anhalten, neu starten und herunterfahren
 cosmic-applet-status-area = Benachrichtigungsübersicht
-cosmic-applet-time-comment = Aktuelle Uhrzeit im Panel mit einem Kalender-Popup anzeigen
+cosmic-applet-time-comment = Aktuelle Uhrzeit im Fenster mit einem Kalender-Popup anzeigen
 cosmic-panel-app-button-comment = Öffne die Anwendungsbibliothek, um installierte Anwendungen zu starten
 cosmic-panel-launcher-button-comment = Öffne den Starter, um nach Anwendungen zu suchen und Befehle auszuführen
 cosmic-panel-workspaces-button-comment = Öffne die Arbeitsflächenübersicht, um Arbeitsflächen zu verwalten und zwischen ihnen zu wechseln
diff --git a/i18n/en-GB/desktop_entries.ftl b/i18n/en-GB/desktop_entries.ftl
index 87f50a21..e69de29b 100644
--- a/i18n/en-GB/desktop_entries.ftl
+++ b/i18n/en-GB/desktop_entries.ftl
@@ -1,51 +0,0 @@
-cosmic-app-list = App Tray
-cosmic-app-list-comment = Launch pinned apps and manage open windows
-cosmic-app-list-keywords = COSMIC;Applet;App;Tray;List;Task;Bar;
-cosmic-applet-a11y = Accessibility
-cosmic-applet-a11y-comment = Configure accessibility settings from the panel
-cosmic-applet-a11y-keywords = COSMIC;Applet;Accessibility;A11y;Screen;Reader;Magnifier;Contrast;Colour;
-cosmic-applet-audio = Sound
-cosmic-applet-audio-comment = Audio device selection, volume control, and MPRIS media controls
-cosmic-applet-audio-keywords = COSMIC;Applet;Sound;Audio;MPRIS;
-cosmic-applet-battery = Power & Battery
-cosmic-applet-battery-comment = Power modes and power saving options
-cosmic-applet-battery-keywords = COSMIC;Applet;Power;Battery;
-cosmic-applet-bluetooth = Bluetooth
-cosmic-applet-bluetooth-comment = Manage Bluetooth devices
-cosmic-applet-bluetooth-keywords = COSMIC;Applet;Bluetooth;
-cosmic-applet-input-sources = Input Sources
-cosmic-applet-input-sources-comment = Switch between input sources
-cosmic-applet-input-sources-keywords = COSMIC;Applet;Input;Source;
-cosmic-applet-minimize = Minimised Windows
-cosmic-applet-minimize-comment = Manage minimised windows
-cosmic-applet-minimize-keywords = COSMIC;Applet;Minimise;
-cosmic-applet-network = Network
-cosmic-applet-network-comment = Manage network connections
-cosmic-applet-network-keywords = COSMIC;Applet;Network;
-cosmic-applet-notifications = Notifications Centre
-cosmic-applet-notifications-comment = Manage notifications and Do Not Disturb
-cosmic-applet-notifications-keywords = COSMIC;Applet;Notification;
-cosmic-applet-power = User Session
-cosmic-applet-power-comment = Lock screen, log out, suspend, reboot, and shutdown
-cosmic-applet-power-keywords = COSMIC;Applet;User;Session;Lock;Log out;Reboot;Shutdown;Suspend;
-cosmic-applet-status-area = Notifications Tray
-cosmic-applet-status-area-comment = Application indicators which may export menus to the panel
-cosmic-applet-status-area-keywords = COSMIC;Applet;App;Indicator;Notification;Tray;Status;
-cosmic-applet-tiling = Tiling
-cosmic-applet-tiling-comment = Manage the active hint, current & per-workspace auto-tiling
-cosmic-applet-tiling-keywords = COSMIC;Applet;Tiling;Hint;Workspace;
-cosmic-applet-time = Date, Time & Calendar
-cosmic-applet-time-comment = Display the current time in the panel with a calendar popup
-cosmic-applet-time-keywords = COSMIC;Applet;Date;Time;Calendar;
-cosmic-applet-workspaces = Numbered Workspaces
-cosmic-applet-workspaces-comment = Switch between numbered workspaces in the panel
-cosmic-applet-workspaces-keywords = COSMIC;Applet;Workspace;
-cosmic-panel-app-button = App Library Button
-cosmic-panel-app-button-comment = Open the application library for launching installed applications
-cosmic-panel-app-button-keywords = COSMIC;Applet;App;Library;Tray;
-cosmic-panel-launcher-button = Launcher Button
-cosmic-panel-launcher-button-comment = Open the launcher to search applications and run commands
-cosmic-panel-launcher-button-keywords = COSMIC;Applet;Launcher;Runner;
-cosmic-panel-workspaces-button = Workspaces Button
-cosmic-panel-workspaces-button-comment = Open the workspaces overview to manage and switch workspaces
-cosmic-panel-workspaces-button-keywords = COSMIC;Applet;Workspace;Overview;
diff --git a/i18n/fa/desktop_entries.ftl b/i18n/fa/desktop_entries.ftl
index 91683d53..e69de29b 100644
--- a/i18n/fa/desktop_entries.ftl
+++ b/i18n/fa/desktop_entries.ftl
@@ -1,5 +0,0 @@
-cosmic-app-list = نوار برنامه‌ها
-cosmic-applet-a11y = دسترسی‌پذیری
-cosmic-applet-audio = صدا
-cosmic-applet-bluetooth = بلوتوث
-cosmic-applet-bluetooth-comment = مدیریت دستگاه‌های بلوتوث
diff --git a/i18n/gl/desktop_entries.ftl b/i18n/gl/desktop_entries.ftl
deleted file mode 100644
index 01a642f4..00000000
--- a/i18n/gl/desktop_entries.ftl
+++ /dev/null
@@ -1,51 +0,0 @@
-cosmic-app-list = Bandexa de aplicacións
-cosmic-app-list-comment = Inicia as aplicacións fixadas e xestiona as xanelas abertas
-cosmic-app-list-keywords = COSMIC;Miniaplicación;Aplicación;Bandexa;Lista;Tarefa;Barra;
-cosmic-applet-a11y = Accesibilidade
-cosmic-applet-a11y-comment = Configurar os axustes de accesibilidade dende o panel
-cosmic-applet-a11y-keywords = COSMIC;Miniaplicación;Accesibilidade;A11y;Pantalla;Lector;Lupa;Contraste;Cor;
-cosmic-applet-audio = Son
-cosmic-applet-audio-comment = Selección do dispositivo de son, control do volume e controis multimedia MPRIS
-cosmic-applet-audio-keywords = COSMIC;Miniaplicación;Son;Audio;MPRIS;
-cosmic-applet-battery = Enerxía e Batería
-cosmic-applet-battery-comment = Modos de enerxía e opcións de aforro enerxético
-cosmic-applet-battery-keywords = COSMIC;Miniaplicación;Enerxía;Batería;
-cosmic-applet-bluetooth = Bluetooth
-cosmic-applet-bluetooth-comment = Xestionar dispositivos Bluetooth
-cosmic-applet-bluetooth-keywords = COSMIC;Miniaplicación;Bluetooth;
-cosmic-applet-input-sources = Fontes de Entrada
-cosmic-applet-input-sources-comment = Cambiar entre fontes de entrada
-cosmic-applet-input-sources-keywords = COSMIC;Miniaplicación;Entrada;Fonte;
-cosmic-applet-minimize = Xanelas minimizadas
-cosmic-applet-minimize-comment = Xestionar xanelas minimizadas
-cosmic-applet-minimize-keywords = COSMIC;Miniaplicación;Minimizar;
-cosmic-applet-network = Rede
-cosmic-applet-network-comment = Xestionar as conexións de rede
-cosmic-applet-network-keywords = COSMIC;Miniaplicación;Rede;
-cosmic-applet-notifications = Centro de notificacións
-cosmic-applet-notifications-comment = Xestionar as notificacións e o modo Non molestar
-cosmic-applet-notifications-keywords = COSMIC;Miniaplicación;Notificación;
-cosmic-applet-power = Sesión de usuario
-cosmic-applet-power-comment = Bloquear a pantalla, pechar a sesión, suspender, reiniciar e apagar
-cosmic-applet-power-keywords = COSMIC;Miniaplicación;Usuario;Sesión;Bloquear;Pechar sesión;Reiniciar;Apagar;Suspender;
-cosmic-applet-status-area = Bandexa de Notificacións
-cosmic-applet-status-area-comment = Indicadores de aplicación que poden exportar menús ao panel
-cosmic-applet-status-area-keywords = COSMIC;Miniaplicación;Aplicación;Indicador;Notificación;Bandexa;Estado;
-cosmic-applet-tiling = Mosaico
-cosmic-applet-tiling-comment = Xestiona a indicación activa e o mosaico automático actual e por espazo de traballo
-cosmic-applet-tiling-keywords = COSMIC;Miniaplicación;Mosaico;Indicación;Espazo de traballo;
-cosmic-applet-time = Data, hora e calendario
-cosmic-applet-time-comment = Mostra a hora actual no panel cun calendario emerxente
-cosmic-applet-time-keywords = COSMIC;Miniaplicación;Data;Hora;Calendario;
-cosmic-applet-workspaces = Espazos de traballo numerados
-cosmic-applet-workspaces-comment = Cambia entre os espazos de traballo numerados desde o panel
-cosmic-applet-workspaces-keywords = COSMIC;Miniaplicación;Espazo de traballo;
-cosmic-panel-app-button = Botón da biblioteca de aplicacións
-cosmic-panel-app-button-comment = Abre a biblioteca de aplicacións para iniciar as aplicacións instaladas
-cosmic-panel-app-button-keywords = COSMIC;Miniaplicación;Aplicación;Biblioteca;Bandexa;
-cosmic-panel-launcher-button = Botón do lanzador
-cosmic-panel-launcher-button-comment = Abre o lanzador para buscar aplicacións e executar ordes
-cosmic-panel-launcher-button-keywords = COSMIC;Miniaplicación;Lanzador;Executor de ordes;
-cosmic-panel-workspaces-button = Botón dos espazos de traballo
-cosmic-panel-workspaces-button-comment = Abre a vista xeral dos espazos de traballo para xestionalos e cambiar entre eles
-cosmic-panel-workspaces-button-keywords = COSMIC;Miniaplicación;Espazo de traballo;Vista xeral;
diff --git a/i18n/hi/desktop_entries.ftl b/i18n/hi/desktop_entries.ftl
index 3ece3b53..e69de29b 100644
--- a/i18n/hi/desktop_entries.ftl
+++ b/i18n/hi/desktop_entries.ftl
@@ -1,34 +0,0 @@
-cosmic-applet-a11y = अभिगम्यता
-cosmic-applet-a11y-comment = पैनल से अभिगम्यता सेटिंग्स विन्यस्त करें
-cosmic-applet-audio = ध्वनि
-cosmic-applet-audio-comment = ऑडियो उपकरण चयन, ध्वनि स्तर नियंत्रण और MPRIS मीडिया नियंत्रण
-cosmic-applet-battery = पावर और बैटरी
-cosmic-applet-battery-comment = पावर मोड और ऊर्जा बचत विकल्प
-cosmic-applet-battery-keywords = COSMIC;ऐपलेट;पावर;बैटरी
-cosmic-applet-bluetooth = ब्लूटूथ
-cosmic-applet-bluetooth-comment = ब्लूटूथ डिवाइस प्रबंधित करें
-cosmic-applet-input-sources = इनपुट स्रोत
-cosmic-applet-input-sources-comment = इनपुट स्रोतों के बीच स्विच करें
-cosmic-applet-input-sources-keywords = COSMIC; Applet; इनपुट; स्रोत;
-cosmic-applet-minimize = न्यूनतम की गई विंडोज़
-cosmic-applet-minimize-comment = न्यूनतम की गई विंडोज़ प्रबंधित करें
-cosmic-applet-network = नेटवर्क
-cosmic-applet-network-comment = नेटवर्क कनेक्शन प्रबंधित करें
-cosmic-applet-notifications = नोटिफ़िकेशन सेंटर
-cosmic-applet-notifications-comment = नोटिफ़िकेशन और डु नॉट डिस्टर्ब प्रबंधित करें
-cosmic-applet-power = यूज़र सेशन
-cosmic-applet-power-comment = स्क्रीन लॉक करें, लॉग आउट करें, सस्पेंड करें, रीबूट करें और शटडाउन करें
-cosmic-applet-status-area = नोटिफ़िकेशन ट्रे
-cosmic-applet-status-area-comment = एप्लिकेशन इंडिकेटर जो पैनल में मेनू एक्सपोर्ट कर सकते हैं
-cosmic-applet-tiling = टाइलिंग
-cosmic-applet-tiling-comment = सक्रिय हिंट, वर्तमान और प्रति-वर्कस्पेस ऑटो-टाइलिंग प्रबंधित करें
-cosmic-applet-time = दिनांक, समय और कैलेंडर
-cosmic-applet-time-comment = पैनल में कैलेंडर पॉपअप के साथ वर्तमान समय प्रदर्शित करें
-cosmic-applet-workspaces = क्रमांकित वर्कस्पेस
-cosmic-applet-workspaces-comment = पैनल में क्रमांकित वर्कस्पेस के बीच स्विच करें
-cosmic-panel-app-button = ऐप लाइब्रेरी बटन
-cosmic-panel-app-button-comment = इंस्टॉल किए गए एप्लिकेशन लॉन्च करने के लिए ऐप लाइब्रेरी खोलें
-cosmic-panel-launcher-button = लॉन्चर बटन
-cosmic-panel-launcher-button-comment = एप्लिकेशन खोजने और कमांड चलाने के लिए लॉन्चर खोलें
-cosmic-panel-workspaces-button = वर्कस्पेस बटन
-cosmic-panel-workspaces-button-comment = वर्कस्पेस प्रबंधित करने और उनके बीच स्विच करने के लिए वर्कस्पेस ओवरव्यू खोलें
diff --git a/i18n/hu/desktop_entries.ftl b/i18n/hu/desktop_entries.ftl
index 1799fcb4..82b4bfdb 100644
--- a/i18n/hu/desktop_entries.ftl
+++ b/i18n/hu/desktop_entries.ftl
@@ -1,16 +1,16 @@
 cosmic-app-list = Alkalmazástálca
 cosmic-applet-a11y = Akadálymentesség
 cosmic-applet-audio = Hang
-cosmic-applet-battery = Energia és akkumulátor
+cosmic-applet-battery = Energia és Akkumulátor
 cosmic-applet-bluetooth = Bluetooth
-cosmic-applet-input-sources = Beviteli források
+cosmic-applet-input-sources = Beviteli Források
 cosmic-applet-minimize = Minimalizált ablakok
 cosmic-applet-network = Hálózat
 cosmic-applet-notifications = Értesítési központ
-cosmic-applet-power = Felhasználói munkamenet
+cosmic-applet-power = Felhasználói Munkamenet
 cosmic-applet-status-area = Értesítési terület
 cosmic-applet-tiling = Csempézés
-cosmic-applet-time = Dátum, idő és naptár
+cosmic-applet-time = Dátum, Idő és Naptár
 cosmic-applet-workspaces = Számozott Munkaterületek
 cosmic-panel-app-button = Alkalmazáskönyvtár gomb
 cosmic-panel-launcher-button = Indító gomb
@@ -21,7 +21,7 @@ cosmic-applet-audio-keywords = COSMIC;kisalkalmazás;hang;MPRIS;
 cosmic-applet-battery-keywords = COSMIC;kisalkalmazás;energia;akkumulátor;
 cosmic-applet-bluetooth-comment = Bluetooth-eszközök kezelése
 cosmic-applet-bluetooth-keywords = COSMIC;kisalkalmazás;bluetooth;
-cosmic-applet-input-sources-keywords = COSMIC;kisalkalmazás;beviteli;forrás;
+cosmic-applet-input-sources-keywords = COSMIC;kisalkalmazás;beviteli forrás;
 cosmic-applet-minimize-keywords = COSMIC;kisalkalmazás;minimizálás;
 cosmic-applet-network-keywords = COSMIC;kisalkalmazás;hálózat;internet;
 cosmic-applet-notifications-keywords = COSMIC;kisalkalmazás;értesítések;
diff --git a/i18n/it/desktop_entries.ftl b/i18n/it/desktop_entries.ftl
index e15f8291..d7ca6b16 100644
--- a/i18n/it/desktop_entries.ftl
+++ b/i18n/it/desktop_entries.ftl
@@ -1,50 +1,16 @@
 cosmic-app-list = Area applicazioni
 cosmic-applet-a11y = Accessibilità
-cosmic-applet-audio = Suono
-cosmic-applet-battery = Potenza e batteria
+cosmic-applet-audio = Audio
+cosmic-applet-battery = Alimentazione e batteria
 cosmic-applet-bluetooth = Bluetooth
-cosmic-applet-input-sources = Sorgenti di input
+cosmic-applet-input-sources = Sorgenti di immissione
 cosmic-applet-minimize = Finestre minimizzate
 cosmic-applet-network = Rete
 cosmic-applet-notifications = Centro notifiche
 cosmic-applet-power = Sessione utente
 cosmic-applet-status-area = Area notifiche
-cosmic-applet-tiling = Affiancamento finestre
+cosmic-applet-tiling = Tiling
 cosmic-applet-time = Data, ora e calendario
-cosmic-applet-workspaces = Aree di lavoro numerate
-cosmic-panel-launcher-button = Pulsante del launcher
-cosmic-panel-workspaces-button = Pulsante aree di lavoro
-cosmic-app-list-comment = Avvia le app fissate e gestisci le finestre aperte
-cosmic-applet-a11y-comment = Configura le impostazioni di accessibilità dal pannello
-cosmic-applet-audio-comment = Selezione dispositivi audio, controllo del volume e controlli multimediali MPRIS
-cosmic-applet-battery-comment = Modalità di alimentazione e opzioni di risparmio energetico
-cosmic-applet-bluetooth-comment = Gestione di dispositivi Bluetooth
-cosmic-applet-input-sources-comment = Passa da una sorgente di input all’altra
-cosmic-applet-minimize-comment = Gestisci le finestre minimizzate
-cosmic-applet-network-comment = Gestisci le connessioni di rete
-cosmic-applet-notifications-comment = Gestisci le notifiche e “Non disturbare”
-cosmic-applet-power-comment = Blocca lo schermo, termina la sessione, sospendi, riavvia e spegni
-cosmic-applet-status-area-comment = Indicatori di applicazioni che possono esportare menu nel pannello
-cosmic-applet-tiling-comment = Gestisci il suggerimento attivo e l’affiancamento automatico corrente e per aree di lavoro
-cosmic-applet-time-comment = Mostra l’ora corrente nel pannello con popup del calendario
-cosmic-applet-workspaces-comment = Passa tra aree di lavoro numerate nel pannello
-cosmic-panel-app-button = Pulsante della libreria delle applicazioni
-cosmic-panel-app-button-comment = Apri la libreria delle applicazioni per avviare le applicazioni installate
-cosmic-panel-launcher-button-comment = Apri il launcher per cercare applicazioni ed eseguire comandi
-cosmic-panel-workspaces-button-comment = Apri la panoramica delle aree di lavoro per gestirle e passare da una all’altra
-cosmic-app-list-keywords = COSMIC;Applet;Applicazione;Area di notifica;Elenco;Attività;Barra;
-cosmic-applet-a11y-keywords = COSMIC;Applet;Accessibilità;A11y;Lettore di schermo;Lente d'ingrandimento;Contrasto;Colore;
-cosmic-applet-audio-keywords = COSMIC;Applet;Suono;Audio;MPRIS;
-cosmic-applet-battery-keywords = COSMIC;Applet;Potenza;Batteria;
-cosmic-applet-bluetooth-keywords = COSMIC;Applet; Bluetooth;
-cosmic-applet-input-sources-keywords = COSMIC;Applet;Input;Sorgente;
-cosmic-applet-minimize-keywords = COSMIC;Applet;Minimizzare;
-cosmic-applet-network-keywords = COSMIC;Applet;Rete;
-cosmic-applet-notifications-keywords = COSMIC;Applet;Notifiche;
-cosmic-applet-power-keywords = COSMIC;Applet;Utente;Sessione;Blocca;Termina sessione;Riavvia;Spegni;Sospendi;
-cosmic-applet-status-area-keywords = COSMIC;Applet;Applicazione;Indicatore;Notifiche;Area;Stato;
-cosmic-applet-tiling-keywords = COSMIC;Applet;Affiancamento;Suggerimento;Area di lavoro;
-cosmic-applet-time-keywords = COSMIC;Applet;Data;Ora;Calendario;
-cosmic-applet-workspaces-keywords = COSMIC;Applet;Area di lavoro;
-cosmic-panel-app-button-keywords = COSMIC;Applet;App;Libreria;Tray;
-cosmic-panel-launcher-button-keywords = COSMIC;Applet;Launcher;Runner;
+cosmic-applet-workspaces = Spazi di lavoro numerati
+cosmic-panel-launcher-button = Tasto Launcher
+cosmic-panel-workspaces-button = Tasto Spazi di lavoro
diff --git a/i18n/nl/desktop_entries.ftl b/i18n/nl/desktop_entries.ftl
index aee16383..6a65d46b 100644
--- a/i18n/nl/desktop_entries.ftl
+++ b/i18n/nl/desktop_entries.ftl
@@ -8,44 +8,10 @@ cosmic-applet-minimize = Geminimaliseerde vensters
 cosmic-applet-network = Netwerk
 cosmic-applet-notifications = Meldingscentrum
 cosmic-applet-power = Gebruikerssessie
-cosmic-applet-status-area = Statusvak
+cosmic-applet-status-area = Meldingsvlak
 cosmic-applet-tiling = Vensters tegelen
-cosmic-applet-time = Datum, tijd, en agenda
+cosmic-applet-time = Datum, tijd en agenda
 cosmic-applet-workspaces = Genummerde werkbladen
-cosmic-panel-app-button = Toepassingskiezersknop
-cosmic-panel-launcher-button = Snelstarterknop
-cosmic-panel-workspaces-button = Werkbladoverzichtsknop
-cosmic-applet-battery-comment = Instellingen voor prestaties en energieverbruik
-cosmic-applet-a11y-comment = Pas toegankelijkheidsinstellingen aan via het paneel
-cosmic-applet-input-sources-comment = Schakel tussen invoerbronnen
-cosmic-applet-workspaces-comment = Schakel tussen genummerde werkbladen via het paneel
-cosmic-app-list-comment = Start vastgemaakte toepassingen en beheer openstaande vensters
-cosmic-applet-audio-comment = Beheer audioapparaten, volume-instellingen, en mediaspelers
-cosmic-applet-audio-keywords = COSMIC;Applet;Geluid;Audio;MPRIS;
-cosmic-applet-battery-keywords = COSMIC;Applet;Energie;Verbruik;Energieverbruik;Batterij;Stroom;
-cosmic-applet-bluetooth-comment = Beheer Bluetooth-apparaten
-cosmic-applet-bluetooth-keywords = COSMIC;Applet;Bluetooth;
-cosmic-applet-input-sources-keywords = COSMIC;Applet;Invoer;Bron;Methode;Invoerbron;Invoermethode;
-cosmic-applet-minimize-comment = Beheer geminimaliseerde vensters
-cosmic-applet-network-comment = Beheer netwerkverbindingen
-cosmic-applet-network-keywords = COSMIC;Applet;Netwerk;
-cosmic-applet-notifications-comment = Beheer meldingen en niet storen
-cosmic-applet-notifications-keywords = COSMIC;Applet;Melding;
-cosmic-applet-power-comment = Vergrendel scherm, afmelden, slaapstand, herstarten, en afsluiten
-cosmic-app-list-keywords = COSMIC;Applet;Toepassing;Taakbalk;Lijst;Taken;Balk;
-cosmic-applet-a11y-keywords = COSMIC;Applets;Toegankelijkheid;A11y;Schermlezer;Vergrootglas;Contrast;Kleur;
-cosmic-applet-minimize-keywords = COSMIC;Applet;Minimaliseer;Geminimaliseerd;
-cosmic-applet-power-keywords = COSMIC;Applet;Gebruiker;Sessie;Vergrendelen;Afmelden;Opnieuw;Opstarten;Herstarten;Afsluiten;Slaapstand;
-cosmic-applet-status-area-comment = Statusindicators met contextmenu's van toepassingen
-cosmic-applet-tiling-comment = Beheer de vensterfocus-aanduiding en tegelen voor huidige en nieuwe werkbladen
-cosmic-applet-tiling-keywords = COSMIC;Applet;Tegelen;Venster;Focus;Aanduiding;Werkblad;
-cosmic-applet-time-comment = Toon de huidige datum en tijd met een pop-upagenda in het paneel
-cosmic-applet-time-keywords = COSMIC;Applet;Datum;Tijd;Agenda;
-cosmic-applet-workspaces-keywords = COSMIC;Applet;Werkblad;
-cosmic-panel-app-button-comment = Open de toepassingskiezer om geïnstalleerde toepassingen te starten
-cosmic-panel-app-button-keywords = COSMIC;Applet;Toepassing;Kiezer;Toepassingskiezer;
-cosmic-panel-launcher-button-comment = Open de snelstarter om toepassingen te zoeken en commando's uit te voeren
-cosmic-panel-launcher-button-keywords = COSMIC;Applet;Snelstarter;Uitvoeren;
-cosmic-panel-workspaces-button-comment = Open het werkbladoverzicht om tussen werkbladen te schakelen en ze te beheren
-cosmic-panel-workspaces-button-keywords = COSMIC;Applet;Werkblad;Overzicht;Werkbladoverzicht;
-cosmic-applet-status-area-keywords = COSMIC;Applet;Toepassing;Indicator;Status;Vak;
+cosmic-panel-app-button = Knop appbibliotheek
+cosmic-panel-launcher-button = Knop snelstarter
+cosmic-panel-workspaces-button = Knop werkbladenoverzicht
diff --git a/i18n/oc/desktop_entries.ftl b/i18n/oc/desktop_entries.ftl
index 894d5e1d..e69de29b 100644
--- a/i18n/oc/desktop_entries.ftl
+++ b/i18n/oc/desktop_entries.ftl
@@ -1,19 +0,0 @@
-cosmic-app-list = Cinta d’aplicacions
-cosmic-app-list-comment = Lançar d’aplicacions penjadas e gerir las fenèstras dobèrtas
-cosmic-app-list-keywords = COSMIC;Applet;Ajuston;Microaplicacion;Miniaplicacion;App;Aplicacion;Cinta;Lista;Prètzfach;Prètzfait;Barra;
-cosmic-applet-a11y = Accessibilitat
-cosmic-applet-a11y-comment = Configurar los paramètres d’accessibilitat del panèl estant
-cosmic-applet-audio = Son
-cosmic-applet-battery = Energia e batariá
-cosmic-applet-battery-comment = Mòdes d’energia e opcions d’estalvi d’energia
-cosmic-applet-bluetooth = Bluetooth
-cosmic-applet-bluetooth-comment = Gerir los aparelhs Bluetooth
-cosmic-applet-input-sources = Fonts d’entrada
-cosmic-applet-network = Ret
-cosmic-applet-network-comment = Gerir las connexion ret
-cosmic-applet-notifications = Centre de notificacions
-cosmic-applet-notifications-comment = Gerir las notificacions e lo mòde Destorbar pas
-cosmic-applet-power = Session utilizaire
-cosmic-applet-status-area = Cinta de notificacions
-cosmic-applet-time = Data, ora e calendièr
-cosmic-applet-workspaces = Espacis de trabalha numerotats
diff --git a/i18n/pt/desktop_entries.ftl b/i18n/pt/desktop_entries.ftl
index 68cc145a..1fe912c3 100644
--- a/i18n/pt/desktop_entries.ftl
+++ b/i18n/pt/desktop_entries.ftl
@@ -21,7 +21,7 @@ cosmic-applet-workspaces-keywords = COSMIC;Miniaplicação;Applet;Área;Trabalho
 cosmic-panel-workspaces-button-comment = Abrir a visão geral das áreas de trabalho para gerir e alternar entre elas
 cosmic-panel-workspaces-button-keywords = COSMIC;Miniaplicação;Applet;Área;Trabalho;Visão;Geral;
 cosmic-applet-a11y-comment = Configurar definições de acessibilidade a partir do painel
-cosmic-applet-battery = Energia e bateria
+cosmic-applet-battery = Energia e Bateria
 cosmic-app-list-keywords = COSMIC;Miniaplicação;Applet;Aplicação;Bandeja;Lista;Tarefa;Barra;
 cosmic-applet-a11y-keywords = COSMIC;Miniaplicação;Applet;Acessibilidade;A11y;Ecrã;Leitor;Lupa;Ampliador;Contraste;Cor;
 cosmic-applet-audio-keywords = COSMIC;Miniaplicação;Applet;Som;Áudio;MPRIS;
diff --git a/i18n/sat/desktop_entries.ftl b/i18n/sat/desktop_entries.ftl
deleted file mode 100644
index 3bef0114..00000000
--- a/i18n/sat/desktop_entries.ftl
+++ /dev/null
@@ -1,10 +0,0 @@
-cosmic-applet-a11y-keywords = COSMIC; ᱮᱯᱞᱮᱴ; ᱮᱠᱥᱮᱥᱤᱵᱤᱞᱤᱴᱤ; A11y; ᱥᱠᱨᱤᱱ; ᱨᱤᱰᱟᱨ; ᱢᱮᱜᱽᱱᱤᱯᱷᱟᱭᱟᱨ; ᱠᱚᱱᱴᱨᱟᱥᱴ; ᱨᱚᱝ;
-cosmic-applet-bluetooth-comment = ᱵᱞᱩᱴᱩᱛᱷ ᱥᱟᱫᱷᱚᱱ ᱠᱚ ᱥᱚᱢᱵᱷᱲᱟᱣ ᱢᱮ
-cosmic-applet-input-sources-comment = ᱤᱱᱯᱩᱴ ᱥᱚᱨᱥ ᱠᱚ ᱛᱟᱞᱟ ᱨᱮ ᱵᱚᱫᱚᱞ ᱢᱮ
-cosmic-applet-input-sources-keywords = ᱠᱚᱥᱢᱤᱠ; ᱮᱯᱞᱮᱴ; ᱤᱱᱯᱩᱴ; ᱥᱨᱚᱛ;
-cosmic-applet-minimize = ᱦᱩᱰᱤᱧ ᱟᱠᱟᱱ ᱡᱟᱨᱞᱟ
-cosmic-applet-status-area = ᱱᱚᱴᱤᱯᱷᱤᱠᱮᱥᱚᱱ ᱴᱨᱮ
-cosmic-applet-status-area-comment = ᱮᱯᱞᱤᱠᱮᱥᱚᱱ ᱤᱱᱰᱤᱠᱮᱴᱚᱨ ᱚᱠᱟ ᱫᱚ ᱯᱮᱱᱮᱞ ᱨᱮ ᱢᱮᱱᱭᱩᱥ ᱮ ᱮᱠᱥᱯᱚᱨᱴ ᱫᱟᱲᱮᱭᱟᱜᱼᱟ
-cosmic-applet-status-area-keywords = ᱠᱚᱥᱢᱤᱠ; ᱮᱯᱞᱮᱴ; ᱮᱯ; ᱤᱱᱰᱤᱠᱮᱴᱚᱨ; ᱱᱚᱴᱤᱯᱷᱤᱠᱮᱥᱚᱱ; ᱴᱨᱮ; ᱥᱴᱮᱴᱟᱥ;
-cosmic-applet-time = ᱢᱟᱦᱟᱸ, ᱚᱠᱛᱚ ᱟᱨ ᱠᱮᱞᱮᱱᱰᱟᱨ
-cosmic-panel-launcher-button = ᱞᱚᱱᱪᱟᱨ ᱵᱩᱛᱟᱢ
diff --git a/i18n/zh-Hant/desktop_entries.ftl b/i18n/zh-Hant/desktop_entries.ftl
index ef886f04..7bac138d 100644
--- a/i18n/zh-Hant/desktop_entries.ftl
+++ b/i18n/zh-Hant/desktop_entries.ftl
@@ -1,31 +1,31 @@
-cosmic-applet-a11y-keywords = COSMIC;小程式;無障礙;螢幕;閱讀器;放大鏡;對比;顏色;
-cosmic-applet-audio-keywords = COSMIC;小程式;音效;音訊;MPRIS;
-cosmic-applet-battery-keywords = COSMIC;小程式;電源;電池;
-cosmic-applet-bluetooth-keywords = COSMIC;小程式;藍牙;
-cosmic-applet-input-sources-keywords = COSMIC;小程式;輸入;輸入源;
-cosmic-applet-minimize-keywords = COSMIC;小程式;最小化;
+cosmic-applet-a11y-keywords = COSMIC;工具程式;無障礙;螢幕;閱讀器;放大鏡;對比;顏色;
+cosmic-applet-audio-keywords = COSMIC;工具程式;音響;音頻;MPRIS;
+cosmic-applet-battery-keywords = COSMIC;工具程式;電源;電池;
+cosmic-applet-bluetooth-keywords = COSMIC;工具程式;藍牙;
+cosmic-applet-input-sources-keywords = COSMIC;工具程式;輸入;輸入源;
+cosmic-applet-minimize-keywords = COSMIC;工具程式;最小化;
 cosmic-applet-network-keywords = COSMIC;工具程式;網路;
 cosmic-applet-notifications-keywords = COSMIC;工具程式;通知;
 cosmic-applet-power-keywords = COSMIC;工具程式;使用者;工作階段;鎖定;登入;登出;重新啟動;關閉電源;休眠;
-cosmic-app-list = 應用程式托盤
-cosmic-applet-status-area = 通知托盤
-cosmic-applet-status-area-keywords = COSMIC;小程式;應用程式;指示器;通知;托盤;狀態;
+cosmic-app-list = 應用程式匣盤
+cosmic-applet-status-area = 通知匣盤
+cosmic-applet-status-area-keywords = COSMIC;工具程式;应用;應用程式;指示器;通知;匣盤;狀態;
 cosmic-applet-status-area-comment = 可能在面板上顯示的應用指示器
-cosmic-panel-app-button-keywords = COSMIC;小程式;應用;應用程式;庫;托盤;
+cosmic-panel-app-button-keywords = COSMIC;工具程式;應用;應用程式;庫;匣盤;
 cosmic-panel-workspaces-button = 工作區按鈕
 cosmic-applet-tiling-comment = 管理啟用提示、當前和每個工作區自動視窗平鋪
-cosmic-applet-tiling-keywords = COSMIC;小程式;平鋪;提示;工作區;
+cosmic-applet-tiling-keywords = COSMIC;工具程式;平鋪;提示;工作區;
 cosmic-applet-time = 日期、時間與行事曆
-cosmic-applet-time-comment = 在面板上顯示目前時間，並附帶彈出式日曆視窗
-cosmic-applet-time-keywords = COSMIC;小程式;日期;時間;日曆;行事曆;
+cosmic-applet-time-comment = 在面板上顯示時間以及彈出日曆
+cosmic-applet-time-keywords = COSMIC;工具程式;日期;時間;日曆;行事曆;
 cosmic-applet-workspaces = 工作區編號
 cosmic-applet-workspaces-comment = 在面板上切換帶有編號的工作區
-cosmic-applet-workspaces-keywords = COSMIC;小程式;工作區;
+cosmic-applet-workspaces-keywords = COSMIC;工具程式;工作區;
 cosmic-panel-app-button = 應用程式庫按鈕
 cosmic-panel-app-button-comment = 啟動應用程式庫來啟動已安裝的應用程式
 cosmic-panel-launcher-button = 啟動器按鈕
 cosmic-panel-launcher-button-comment = 開啟啟動器以搜尋應用程式以及執行命令
-cosmic-panel-launcher-button-keywords = COSMIC;小程式;啟動器;
+cosmic-panel-launcher-button-keywords = COSMIC;工具程式;啟動器;
 cosmic-applet-notifications-comment = 管理通知和勿擾模式
 cosmic-applet-a11y = 無障礙
 cosmic-applet-bluetooth-comment = 管理藍牙裝置
@@ -35,11 +35,11 @@ cosmic-applet-notifications = 通知中心
 cosmic-applet-network-comment = 管理網路連接
 cosmic-applet-minimize-comment = 管理最小化的視窗
 cosmic-applet-bluetooth = 藍牙
-cosmic-applet-audio = 音效
+cosmic-applet-audio = 音響
 cosmic-applet-minimize = 最小化視窗
 cosmic-app-list-comment = 啟動釘板的應用程式並管理開啟視窗
-cosmic-app-list-keywords = COSMIC;小程式;應用程式;匣盤;列表;任務;列;
-cosmic-applet-a11y-comment = 從面板設定無障礙功能
+cosmic-app-list-keywords = COSMIC;工具程式;應用程式;匣盤;列表;任務;列;
+cosmic-applet-a11y-comment = 從面板調設無障礙設定
 cosmic-applet-audio-comment = 音訊裝置選擇、音量控制及 MPRIS 媒體控制
 cosmic-applet-input-sources = 輸入來源
 cosmic-applet-input-sources-comment = 切換各輸入來源
@@ -48,4 +48,4 @@ cosmic-applet-power = 使用者工作階段
 cosmic-applet-power-comment = 鎖定畫面、登出、休眠、重新啟動及關機
 cosmic-applet-tiling = 平鋪
 cosmic-panel-workspaces-button-comment = 啟動工作區總覽以管理和切換工作區
-cosmic-panel-workspaces-button-keywords = COSMIC;小程式;工作區;總覽;
+cosmic-panel-workspaces-button-keywords = COSMIC;工具程式;工作區;總覽;