diff --git a/Cargo.lock b/Cargo.lock
index b53b532..9f314ed 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -267,7 +267,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -388,7 +388,7 @@ checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
 dependencies = [
  "async-task",
  "concurrent-queue",
- "fastrand 2.1.0",
+ "fastrand 2.1.1",
  "futures-lite 2.3.0",
  "slab",
 ]
@@ -437,7 +437,7 @@ dependencies = [
  "futures-lite 2.3.0",
  "parking",
  "polling 3.7.3",
- "rustix 0.38.34",
+ "rustix 0.38.35",
  "slab",
  "tracing",
  "windows-sys 0.59.0",
@@ -487,7 +487,7 @@ dependencies = [
  "cfg-if",
  "event-listener 3.1.0",
  "futures-lite 1.13.0",
- "rustix 0.38.34",
+ "rustix 0.38.35",
  "windows-sys 0.48.0",
 ]
 
@@ -506,7 +506,7 @@ dependencies = [
  "cfg-if",
  "event-listener 5.3.1",
  "futures-lite 2.3.0",
- "rustix 0.38.34",
+ "rustix 0.38.35",
  "tracing",
  "windows-sys 0.59.0",
 ]
@@ -519,7 +519,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -534,7 +534,7 @@ dependencies = [
  "cfg-if",
  "futures-core",
  "futures-io",
- "rustix 0.38.34",
+ "rustix 0.38.35",
  "signal-hook-registry",
  "slab",
  "windows-sys 0.59.0",
@@ -554,7 +554,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -568,7 +568,7 @@ name = "atomicwrites"
 version = "0.4.2"
 source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768"
 dependencies = [
- "rustix 0.38.34",
+ "rustix 0.38.35",
  "tempfile",
  "windows-sys 0.48.0",
 ]
@@ -704,7 +704,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -745,9 +745,9 @@ dependencies = [
 
 [[package]]
 name = "bitstream-io"
-version = "2.5.2"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b80895c12b34217892edc4718b2293748796b6570c6ff9f0935df8e10e26534"
+checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452"
 
 [[package]]
 name = "bitvec"
@@ -825,10 +825,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b"
 dependencies = [
  "once_cell",
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.2.0",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
  "syn_derive",
 ]
 
@@ -885,9 +885,9 @@ dependencies = [
 
 [[package]]
 name = "bytemuck"
-version = "1.17.0"
+version = "1.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31"
+checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2"
 dependencies = [
  "bytemuck_derive",
 ]
@@ -900,7 +900,7 @@ checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -940,7 +940,7 @@ dependencies = [
  "bitflags 2.6.0",
  "log",
  "polling 3.7.3",
- "rustix 0.38.34",
+ "rustix 0.38.35",
  "slab",
  "thiserror",
 ]
@@ -954,7 +954,7 @@ dependencies = [
  "bitflags 2.6.0",
  "log",
  "polling 3.7.3",
- "rustix 0.38.34",
+ "rustix 0.38.35",
  "slab",
  "thiserror",
 ]
@@ -966,7 +966,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02"
 dependencies = [
  "calloop 0.12.4",
- "rustix 0.38.34",
+ "rustix 0.38.35",
  "wayland-backend",
  "wayland-client",
 ]
@@ -978,16 +978,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20"
 dependencies = [
  "calloop 0.13.0",
- "rustix 0.38.34",
+ "rustix 0.38.35",
  "wayland-backend",
  "wayland-client",
 ]
 
 [[package]]
 name = "cc"
-version = "1.1.13"
+version = "1.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48"
+checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
 dependencies = [
  "jobserver",
  "libc",
@@ -1105,7 +1105,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -1406,7 +1406,7 @@ dependencies = [
 [[package]]
 name = "cosmic-bg-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-bg#ed9ea6cc15638b08c848fda042ec2df3ff69865f"
+source = "git+https://github.com/pop-os/cosmic-bg#e5e91d93fb7cd7e917922eceaddd4d412df46f93"
 dependencies = [
  "colorgrad",
  "cosmic-config",
@@ -1431,7 +1431,7 @@ dependencies = [
 [[package]]
 name = "cosmic-comp-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-comp#7d0d878ad1f23353b78e5d4e7c8a6712ec79d60f"
+source = "git+https://github.com/pop-os/cosmic-comp#ed64e26faf4b97221f0883bc1113f997acbadc50"
 dependencies = [
  "cosmic-config",
  "input",
@@ -1441,7 +1441,7 @@ dependencies = [
 [[package]]
 name = "cosmic-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#ba7001ee5922105a4000c4a432acaabb5befb300"
+source = "git+https://github.com/pop-os/libcosmic#0a1922d4b378de23f55b117b07bad23dda0d64d0"
 dependencies = [
  "atomicwrites",
  "cosmic-config-derive",
@@ -1463,7 +1463,7 @@ dependencies = [
 [[package]]
 name = "cosmic-config-derive"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#ba7001ee5922105a4000c4a432acaabb5befb300"
+source = "git+https://github.com/pop-os/libcosmic#0a1922d4b378de23f55b117b07bad23dda0d64d0"
 dependencies = [
  "quote",
  "syn 1.0.109",
@@ -1578,6 +1578,7 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "udev 0.9.0",
+ "upower_dbus",
  "url",
  "xkb-data",
  "zbus 4.4.0",
@@ -1586,7 +1587,7 @@ dependencies = [
 [[package]]
 name = "cosmic-settings-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-settings-daemon#93c5494b3d01ff4fe745b12ccc4826b00f2e6897"
+source = "git+https://github.com/pop-os/cosmic-settings-daemon#add1cb3c4a6c3557c78085d51eff9b1b80035020"
 dependencies = [
  "cosmic-config",
  "serde",
@@ -1599,7 +1600,7 @@ dependencies = [
 [[package]]
 name = "cosmic-settings-daemon"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/dbus-settings-bindings#cd21ddcb1b5cbfc80ab84b34d3c8b1ff3d81179a"
+source = "git+https://github.com/pop-os/dbus-settings-bindings#7aedc25e3295b95a90eb710f443029d4ec920aa8"
 dependencies = [
  "zbus 4.4.0",
 ]
@@ -1629,7 +1630,7 @@ dependencies = [
  "libpulse-binding",
  "log",
  "pipewire",
- "rustix 0.38.34",
+ "rustix 0.38.35",
  "tokio",
  "tokio-stream",
  "upower_dbus",
@@ -1690,7 +1691,7 @@ dependencies = [
 [[package]]
 name = "cosmic-theme"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#ba7001ee5922105a4000c4a432acaabb5befb300"
+source = "git+https://github.com/pop-os/libcosmic#0a1922d4b378de23f55b117b07bad23dda0d64d0"
 dependencies = [
  "almost",
  "cosmic-config",
@@ -1831,7 +1832,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -1842,7 +1843,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -1895,7 +1896,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -1953,7 +1954,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -2002,7 +2003,7 @@ dependencies = [
  "bytemuck",
  "drm-ffi",
  "drm-fourcc",
- "rustix 0.38.34",
+ "rustix 0.38.35",
 ]
 
 [[package]]
@@ -2012,7 +2013,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6"
 dependencies = [
  "drm-sys",
- "rustix 0.38.34",
+ "rustix 0.38.35",
 ]
 
 [[package]]
@@ -2072,7 +2073,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -2109,9 +2110,9 @@ dependencies = [
 
 [[package]]
 name = "euclid"
-version = "0.22.10"
+version = "0.22.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20"
+checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48"
 dependencies = [
  "num-traits",
 ]
@@ -2197,9 +2198,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
 
 [[package]]
 name = "fdeflate"
@@ -2212,9 +2213,9 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.24"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
 dependencies = [
  "cfg-if",
  "libc",
@@ -2244,9 +2245,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.32"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666"
+checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
 dependencies = [
  "crc32fast",
  "miniz_oxide 0.8.0",
@@ -2376,7 +2377,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -2406,9 +2407,9 @@ dependencies = [
 
 [[package]]
 name = "freedesktop-desktop-entry"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7ff0a60b6975d1fed8dc8a2678f83e8abf30dfc0dabb26a8181adb2b4d98be0"
+checksum = "d7e6dc222403f11572b39d551948ce4e9ff860a9bdf3307bb6018d4454a8e034"
 dependencies = [
  "dirs",
  "gettext-rs",
@@ -2518,7 +2519,7 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
 dependencies = [
- "fastrand 2.1.0",
+ "fastrand 2.1.1",
  "futures-core",
  "futures-io",
  "parking",
@@ -2533,7 +2534,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -2868,7 +2869,7 @@ checksum = "f558a64ac9af88b5ba400d99b579451af0d39c6d360980045b91aac966d705e2"
 [[package]]
 name = "hostname1-zbus"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/dbus-settings-bindings#cd21ddcb1b5cbfc80ab84b34d3c8b1ff3d81179a"
+source = "git+https://github.com/pop-os/dbus-settings-bindings#7aedc25e3295b95a90eb710f443029d4ec920aa8"
 dependencies = [
  "zbus 4.4.0",
 ]
@@ -2926,7 +2927,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.75",
+ "syn 2.0.76",
  "unic-langid",
 ]
 
@@ -2940,7 +2941,7 @@ dependencies = [
  "i18n-config",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -2969,7 +2970,7 @@ dependencies = [
 [[package]]
 name = "iced"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#ba7001ee5922105a4000c4a432acaabb5befb300"
+source = "git+https://github.com/pop-os/libcosmic#0a1922d4b378de23f55b117b07bad23dda0d64d0"
 dependencies = [
  "dnd",
  "iced_accessibility",
@@ -2988,7 +2989,7 @@ dependencies = [
 [[package]]
 name = "iced_accessibility"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#ba7001ee5922105a4000c4a432acaabb5befb300"
+source = "git+https://github.com/pop-os/libcosmic#0a1922d4b378de23f55b117b07bad23dda0d64d0"
 dependencies = [
  "accesskit",
  "accesskit_unix",
@@ -2997,7 +2998,7 @@ dependencies = [
 [[package]]
 name = "iced_core"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#ba7001ee5922105a4000c4a432acaabb5befb300"
+source = "git+https://github.com/pop-os/libcosmic#0a1922d4b378de23f55b117b07bad23dda0d64d0"
 dependencies = [
  "bitflags 2.6.0",
  "dnd",
@@ -3019,7 +3020,7 @@ dependencies = [
 [[package]]
 name = "iced_futures"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#ba7001ee5922105a4000c4a432acaabb5befb300"
+source = "git+https://github.com/pop-os/libcosmic#0a1922d4b378de23f55b117b07bad23dda0d64d0"
 dependencies = [
  "futures",
  "iced_core",
@@ -3032,7 +3033,7 @@ dependencies = [
 [[package]]
 name = "iced_graphics"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#ba7001ee5922105a4000c4a432acaabb5befb300"
+source = "git+https://github.com/pop-os/libcosmic#0a1922d4b378de23f55b117b07bad23dda0d64d0"
 dependencies = [
  "bitflags 2.6.0",
  "bytemuck",
@@ -3056,7 +3057,7 @@ dependencies = [
 [[package]]
 name = "iced_renderer"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#ba7001ee5922105a4000c4a432acaabb5befb300"
+source = "git+https://github.com/pop-os/libcosmic#0a1922d4b378de23f55b117b07bad23dda0d64d0"
 dependencies = [
  "iced_graphics",
  "iced_tiny_skia",
@@ -3068,7 +3069,7 @@ dependencies = [
 [[package]]
 name = "iced_runtime"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#ba7001ee5922105a4000c4a432acaabb5befb300"
+source = "git+https://github.com/pop-os/libcosmic#0a1922d4b378de23f55b117b07bad23dda0d64d0"
 dependencies = [
  "dnd",
  "iced_accessibility",
@@ -3082,7 +3083,7 @@ dependencies = [
 [[package]]
 name = "iced_sctk"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#ba7001ee5922105a4000c4a432acaabb5befb300"
+source = "git+https://github.com/pop-os/libcosmic#0a1922d4b378de23f55b117b07bad23dda0d64d0"
 dependencies = [
  "enum-repr",
  "float-cmp",
@@ -3108,7 +3109,7 @@ dependencies = [
 [[package]]
 name = "iced_style"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#ba7001ee5922105a4000c4a432acaabb5befb300"
+source = "git+https://github.com/pop-os/libcosmic#0a1922d4b378de23f55b117b07bad23dda0d64d0"
 dependencies = [
  "iced_core",
  "once_cell",
@@ -3118,7 +3119,7 @@ dependencies = [
 [[package]]
 name = "iced_tiny_skia"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#ba7001ee5922105a4000c4a432acaabb5befb300"
+source = "git+https://github.com/pop-os/libcosmic#0a1922d4b378de23f55b117b07bad23dda0d64d0"
 dependencies = [
  "bytemuck",
  "cosmic-text",
@@ -3135,7 +3136,7 @@ dependencies = [
 [[package]]
 name = "iced_wgpu"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#ba7001ee5922105a4000c4a432acaabb5befb300"
+source = "git+https://github.com/pop-os/libcosmic#0a1922d4b378de23f55b117b07bad23dda0d64d0"
 dependencies = [
  "as-raw-xcb-connection",
  "bitflags 2.6.0",
@@ -3150,7 +3151,7 @@ dependencies = [
  "once_cell",
  "raw-window-handle",
  "resvg",
- "rustix 0.38.34",
+ "rustix 0.38.35",
  "smithay-client-toolkit 0.19.2",
  "tiny-xlib",
  "wayland-backend",
@@ -3164,7 +3165,7 @@ dependencies = [
 [[package]]
 name = "iced_widget"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#ba7001ee5922105a4000c4a432acaabb5befb300"
+source = "git+https://github.com/pop-os/libcosmic#0a1922d4b378de23f55b117b07bad23dda0d64d0"
 dependencies = [
  "dnd",
  "iced_renderer",
@@ -3181,7 +3182,7 @@ dependencies = [
 [[package]]
 name = "iced_winit"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#ba7001ee5922105a4000c4a432acaabb5befb300"
+source = "git+https://github.com/pop-os/libcosmic#0a1922d4b378de23f55b117b07bad23dda0d64d0"
 dependencies = [
  "dnd",
  "iced_graphics",
@@ -3555,7 +3556,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -3774,7 +3775,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -3994,7 +3995,7 @@ checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
 [[package]]
 name = "libcosmic"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#ba7001ee5922105a4000c4a432acaabb5befb300"
+source = "git+https://github.com/pop-os/libcosmic#0a1922d4b378de23f55b117b07bad23dda0d64d0"
 dependencies = [
  "apply",
  "ashpd 0.9.1",
@@ -4396,7 +4397,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -4666,7 +4667,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -4735,10 +4736,10 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
 dependencies = [
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.2.0",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -4873,7 +4874,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -4919,7 +4920,7 @@ dependencies = [
  "by_address",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -5018,7 +5019,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -5055,7 +5056,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
 dependencies = [
  "atomic-waker",
- "fastrand 2.1.0",
+ "fastrand 2.1.1",
  "futures-io",
 ]
 
@@ -5132,7 +5133,7 @@ dependencies = [
  "concurrent-queue",
  "hermit-abi 0.4.0",
  "pin-project-lite",
- "rustix 0.38.34",
+ "rustix 0.38.35",
  "tracing",
  "windows-sys 0.59.0",
 ]
@@ -5176,11 +5177,11 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.1.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
 dependencies = [
- "toml_edit 0.21.1",
+ "toml_edit 0.22.20",
 ]
 
 [[package]]
@@ -5232,7 +5233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
 dependencies = [
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -5281,9 +5282,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -5664,7 +5665,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rust-embed-utils",
- "syn 2.0.75",
+ "syn 2.0.76",
  "walkdir",
 ]
 
@@ -5732,9 +5733,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.34"
+version = "0.38.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f"
 dependencies = [
  "bitflags 2.6.0",
  "errno",
@@ -5845,9 +5846,9 @@ checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a"
 
 [[package]]
 name = "serde"
-version = "1.0.208"
+version = "1.0.209"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
+checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
 dependencies = [
  "serde_derive",
 ]
@@ -5866,20 +5867,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.208"
+version = "1.0.209"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
+checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.125"
+version = "1.0.127"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed"
+checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
 dependencies = [
  "indexmap 2.4.0",
  "itoa",
@@ -5896,7 +5897,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -5935,7 +5936,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -6067,7 +6068,7 @@ dependencies = [
  "libc",
  "log",
  "memmap2 0.9.4",
- "rustix 0.38.34",
+ "rustix 0.38.35",
  "thiserror",
  "wayland-backend",
  "wayland-client",
@@ -6094,7 +6095,7 @@ dependencies = [
  "log",
  "memmap2 0.9.4",
  "pkg-config",
- "rustix 0.38.34",
+ "rustix 0.38.35",
  "thiserror",
  "wayland-backend",
  "wayland-client",
@@ -6158,7 +6159,7 @@ dependencies = [
  "cocoa",
  "core-graphics",
  "drm",
- "fastrand 2.1.0",
+ "fastrand 2.1.1",
  "foreign-types",
  "js-sys",
  "log",
@@ -6166,7 +6167,7 @@ dependencies = [
  "objc",
  "raw-window-handle",
  "redox_syscall 0.4.1",
- "rustix 0.38.34",
+ "rustix 0.38.35",
  "tiny-xlib",
  "wasm-bindgen",
  "wayland-backend",
@@ -6299,9 +6300,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.75"
+version = "2.0.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9"
+checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6317,7 +6318,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -6328,7 +6329,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -6342,9 +6343,9 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.31.2"
+version = "0.31.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4115055da5f572fff541dd0c4e61b0262977f453cc9fe04be83aba25a89bdab"
+checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -6417,9 +6418,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
 dependencies = [
  "cfg-if",
- "fastrand 2.1.0",
+ "fastrand 2.1.1",
  "once_cell",
- "rustix 0.38.34",
+ "rustix 0.38.35",
  "windows-sys 0.59.0",
 ]
 
@@ -6455,7 +6456,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -6513,7 +6514,7 @@ dependencies = [
 [[package]]
 name = "timedate-zbus"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/dbus-settings-bindings#cd21ddcb1b5cbfc80ab84b34d3c8b1ff3d81179a"
+source = "git+https://github.com/pop-os/dbus-settings-bindings#7aedc25e3295b95a90eb710f443029d4ec920aa8"
 dependencies = [
  "zbus 4.4.0",
 ]
@@ -6593,9 +6594,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.39.3"
+version = "1.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
 dependencies = [
  "backtrace",
  "bytes",
@@ -6617,7 +6618,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -6672,17 +6673,6 @@ dependencies = [
  "winnow 0.5.40",
 ]
 
-[[package]]
-name = "toml_edit"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
-dependencies = [
- "indexmap 2.4.0",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
 [[package]]
 name = "toml_edit"
 version = "0.22.20"
@@ -6715,7 +6705,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -6944,7 +6934,7 @@ checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
 [[package]]
 name = "upower_dbus"
 version = "0.3.2"
-source = "git+https://github.com/pop-os/dbus-settings-bindings#cd21ddcb1b5cbfc80ab84b34d3c8b1ff3d81179a"
+source = "git+https://github.com/pop-os/dbus-settings-bindings#7aedc25e3295b95a90eb710f443029d4ec920aa8"
 dependencies = [
  "serde",
  "serde_repr",
@@ -7133,7 +7123,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
  "wasm-bindgen-shared",
 ]
 
@@ -7167,7 +7157,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -7201,7 +7191,7 @@ checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993"
 dependencies = [
  "cc",
  "downcast-rs",
- "rustix 0.38.34",
+ "rustix 0.38.35",
  "scoped-tls",
  "smallvec",
  "wayland-sys",
@@ -7214,7 +7204,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943"
 dependencies = [
  "bitflags 2.6.0",
- "rustix 0.38.34",
+ "rustix 0.38.35",
  "wayland-backend",
  "wayland-scanner",
 ]
@@ -7236,7 +7226,7 @@ version = "0.31.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ef9489a8df197ebf3a8ce8a7a7f0a2320035c3743f3c1bd0bdbccf07ce64f95"
 dependencies = [
- "rustix 0.38.34",
+ "rustix 0.38.35",
  "wayland-client",
  "xcursor",
 ]
@@ -7326,7 +7316,7 @@ dependencies = [
  "bitflags 2.6.0",
  "downcast-rs",
  "io-lifetimes 2.0.3",
- "rustix 0.38.34",
+ "rustix 0.38.35",
  "wayland-backend",
  "wayland-scanner",
 ]
@@ -7581,7 +7571,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -7592,7 +7582,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -7846,7 +7836,7 @@ dependencies = [
  "percent-encoding",
  "raw-window-handle",
  "redox_syscall 0.3.5",
- "rustix 0.38.34",
+ "rustix 0.38.35",
  "sctk-adwaita",
  "smithay-client-toolkit 0.18.1",
  "smol_str",
@@ -7929,7 +7919,7 @@ dependencies = [
  "libc",
  "libloading 0.8.5",
  "once_cell",
- "rustix 0.38.34",
+ "rustix 0.38.35",
  "x11rb-protocol",
 ]
 
@@ -8066,7 +8056,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
  "synstructure",
 ]
 
@@ -8165,10 +8155,10 @@ version = "4.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e"
 dependencies = [
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.2.0",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
  "zvariant_utils 2.1.0",
 ]
 
@@ -8218,7 +8208,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -8238,7 +8228,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
  "synstructure",
 ]
 
@@ -8272,7 +8262,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -8346,10 +8336,10 @@ version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449"
 dependencies = [
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.2.0",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
  "zvariant_utils 2.1.0",
 ]
 
@@ -8372,5 +8362,5 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
diff --git a/cosmic-settings/src/pages/desktop/appearance.rs b/cosmic-settings/src/pages/desktop/appearance.rs
index 4ede9df..77e1f38 100644
--- a/cosmic-settings/src/pages/desktop/appearance.rs
+++ b/cosmic-settings/src/pages/desktop/appearance.rs
@@ -431,7 +431,7 @@ impl Page {
         model: impl Fn(&Self) -> &ColorPickerModel,
     ) -> Element<'_, crate::pages::Message> {
         cosmic::widget::column()
-            .push_maybe(description.map(|description| text(description).width(Length::Fill)))
+            .push_maybe(description.map(|description| text::body(description).width(Length::Fill)))
             .push(
                 model(self)
                     .builder(on_update)
@@ -1175,7 +1175,7 @@ pub fn mode_and_colors() -> Section<crate::pages::Message> {
                                 .padding([8, 0])
                                 .selected(page.theme_mode.is_dark)
                                 .on_press(Message::DarkMode(true)),
-                                text(&descriptions[dark])
+                                text::body(&descriptions[dark])
                             ]
                             .spacing(8)
                             .width(Length::FillPortion(1))
@@ -1190,7 +1190,7 @@ pub fn mode_and_colors() -> Section<crate::pages::Message> {
                                 .selected(!page.theme_mode.is_dark)
                                 .padding([8, 0])
                                 .on_press(Message::DarkMode(false)),
-                                text(&descriptions[light])
+                                text::body(&descriptions[light])
                             ]
                             .spacing(8)
                             .width(Length::FillPortion(1))
@@ -1221,7 +1221,7 @@ pub fn mode_and_colors() -> Section<crate::pages::Message> {
                 )
                 .add(
                     cosmic::iced::widget::column![
-                        text(&descriptions[accent_color]),
+                        text::body(&descriptions[accent_color]),
                         scrollable(
                             cosmic::iced::widget::row![
                                 color_button(
@@ -1420,7 +1420,7 @@ pub fn style() -> Section<crate::pages::Message> {
                                 .style(button::Style::Image)
                                 .padding(8)
                                 .on_press(Message::Roundness(Roundness::Round)),
-                                text(&descriptions[round])
+                                text::body(&descriptions[round])
                             ]
                             .spacing(8)
                             .width(Length::FillPortion(1))
@@ -1442,7 +1442,7 @@ pub fn style() -> Section<crate::pages::Message> {
                                 .style(button::Style::Image)
                                 .padding(8)
                                 .on_press(Message::Roundness(Roundness::SlightlyRound)),
-                                text(&descriptions[slightly_round])
+                                text::body(&descriptions[slightly_round])
                             ]
                             .spacing(8)
                             .width(Length::FillPortion(1))
@@ -1465,7 +1465,7 @@ pub fn style() -> Section<crate::pages::Message> {
                                 .style(button::Style::Image)
                                 .padding(8)
                                 .on_press(Message::Roundness(Roundness::Square)),
-                                text(&descriptions[square])
+                                text::body(&descriptions[square])
                             ]
                             .spacing(8)
                             .align_items(cosmic::iced_core::Alignment::Center)
@@ -1877,7 +1877,7 @@ fn icon_theme_button(
             }),
         )
         .push(
-            text(if name.len() > ICON_NAME_TRUNC {
+            text::body(if name.len() > ICON_NAME_TRUNC {
                 format!("{name:.ICON_NAME_TRUNC$}...")
             } else {
                 name.into()
diff --git a/cosmic-settings/src/pages/desktop/dock/mod.rs b/cosmic-settings/src/pages/desktop/dock/mod.rs
index fe6894d..c708ae6 100644
--- a/cosmic-settings/src/pages/desktop/dock/mod.rs
+++ b/cosmic-settings/src/pages/desktop/dock/mod.rs
@@ -152,7 +152,7 @@ pub(crate) fn enable() -> Section<crate::pages::Message> {
         .view::<Page>(move |_binder, page, section| {
             let descriptions = &section.descriptions;
             let Some(container_config) = page.inner.container_config.as_ref() else {
-                return Element::from(text(fl!("unknown")));
+                return Element::from(text::body(fl!("unknown")));
             };
             settings::view_section(&section.title)
                 .add(settings::item(
diff --git a/cosmic-settings/src/pages/desktop/panel/applets_inner.rs b/cosmic-settings/src/pages/desktop/panel/applets_inner.rs
index eff8177..be2dc52 100644
--- a/cosmic-settings/src/pages/desktop/panel/applets_inner.rs
+++ b/cosmic-settings/src/pages/desktop/panel/applets_inner.rs
@@ -264,12 +264,12 @@ impl Page {
                 row::with_children(vec![
                     icon::from_name(&*info.icon).size(32).icon().into(),
                     column::with_capacity(2)
-                        .push(text(info.name.clone()))
-                        .push(text(info.description.clone()).size(10))
+                        .push(text::body(info.name.clone()))
+                        .push(text::caption(info.description.clone()))
                         .spacing(spacing.space_xxxs)
                         .width(Length::Fill)
                         .into(),
-                    button(text(fl!("add")))
+                    button(text::body(fl!("add")))
                         .style(button::Style::Custom {
                             active: Box::new(|focused, theme| {
                                 let mut style = theme.active(focused, false, &button::Style::Text);
@@ -305,7 +305,7 @@ impl Page {
         }
         if !has_some {
             list_column = list_column.add(
-                text(fl!("no-applets-found"))
+                text::body(fl!("no-applets-found"))
                     .width(Length::Fill)
                     .horizontal_alignment(Horizontal::Center),
             );
@@ -472,12 +472,12 @@ pub fn lists<
         let spacing = cosmic::theme::active().cosmic().spacing;
         let page = page.inner();
         let Some(config) = page.current_config.as_ref() else {
-            return Element::from(text(fl!("unknown")));
+            return Element::from(text::body(fl!("unknown")));
         };
 
         column::with_children(vec![
             column::with_children(vec![
-                text(fl!("start-segment")).into(),
+                text::body(fl!("start-segment")).into(),
                 AppletReorderList::new(
                     config
                         .plugins_wings
@@ -509,7 +509,7 @@ pub fn lists<
             .spacing(spacing.space_xxs)
             .into(),
             column::with_children(vec![
-                text(fl!("center-segment")).into(),
+                text::body(fl!("center-segment")).into(),
                 AppletReorderList::new(
                     config
                         .plugins_center
@@ -540,7 +540,7 @@ pub fn lists<
             .spacing(spacing.space_xxs)
             .into(),
             column::with_children(vec![
-                text(fl!("end-segment")).into(),
+                text::body(fl!("end-segment")).into(),
                 AppletReorderList::new(
                     config
                         .plugins_wings
@@ -689,7 +689,7 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
                         column::with_capacity(2)
                             .spacing(spacing.space_xxxs)
                             .width(Length::Fill)
-                            .push(text(info.name))
+                            .push(text::body(info.name))
                             .push_maybe(if info.description.is_empty() {
                                 None
                             } else {
@@ -730,7 +730,7 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
             surface_ids,
             inner: if active_dnd.is_some() && applet_buttons.is_empty() {
                 container(
-                    text(fl!("drop-here"))
+                    text::body(fl!("drop-here"))
                         .width(Length::Fill)
                         .height(Length::Fill)
                         .vertical_alignment(Vertical::Center)
@@ -778,7 +778,7 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
                         column::with_capacity(2)
                             .spacing(4.0)
                             .width(Length::Fill)
-                            .push(text(info.name))
+                            .push(text::body(info.name))
                             .push(text::caption(info.description))
                             .into(),
                         button::icon(icon::from_name("edit-delete-symbolic"))
diff --git a/cosmic-settings/src/pages/desktop/panel/inner.rs b/cosmic-settings/src/pages/desktop/panel/inner.rs
index 307f68b..867713d 100644
--- a/cosmic-settings/src/pages/desktop/panel/inner.rs
+++ b/cosmic-settings/src/pages/desktop/panel/inner.rs
@@ -107,7 +107,7 @@ pub(crate) fn behavior_and_position<
             let descriptions = &section.descriptions;
             let page = page.inner();
             let Some(panel_config) = page.panel_config.as_ref() else {
-                return Element::from(text(fl!("unknown")));
+                return Element::from(text::body(fl!("unknown")));
             };
             settings::view_section(&section.title)
                 .add(settings::item(
@@ -163,7 +163,7 @@ pub(crate) fn style<
             let descriptions = &section.descriptions;
             let inner = page.inner();
             let Some(panel_config) = inner.panel_config.as_ref() else {
-                return Element::from(text(fl!("unknown")));
+                return Element::from(text::body(fl!("unknown")));
             };
             settings::view_section(&section.title)
                 .add(settings::item(
@@ -195,7 +195,7 @@ pub(crate) fn style<
                     &descriptions[size],
                     // TODO custom discrete slider variant
                     row::with_children(vec![
-                        text(fl!("small")).into(),
+                        text::body(fl!("small")).into(),
                         slider(
                             0..=4,
                             match panel_config.size {
@@ -220,20 +220,20 @@ pub(crate) fn style<
                             },
                         )
                         .into(),
-                        text(fl!("large")).into(),
+                        text::body(fl!("large")).into(),
                     ])
                     .spacing(12),
                 ))
                 .add(settings::flex_item(
                     &descriptions[background_opacity],
                     row::with_children(vec![
-                        text(fl!("number", HashMap::from_iter(vec![("number", 0)]))).into(),
+                        text::body(fl!("number", HashMap::from_iter(vec![("number", 0)]))).into(),
                         slider(0..=100, (panel_config.opacity * 100.0) as i32, |v| {
                             Message::Opacity(v as f32 / 100.0)
                         })
                         .breakpoints(&[50])
                         .into(),
-                        text(fl!("number", HashMap::from_iter(vec![("number", 100)]))).into(),
+                        text::body(fl!("number", HashMap::from_iter(vec![("number", 100)]))).into(),
                     ])
                     .spacing(12),
                 ))
diff --git a/cosmic-settings/src/pages/desktop/workspaces.rs b/cosmic-settings/src/pages/desktop/workspaces.rs
index 744aa24..ddaec96 100644
--- a/cosmic-settings/src/pages/desktop/workspaces.rs
+++ b/cosmic-settings/src/pages/desktop/workspaces.rs
@@ -3,10 +3,9 @@
 
 // TODO make settings work
 
-use cosmic::widget::settings;
 use cosmic::{
     cosmic_config::{self, ConfigGet, ConfigSet},
-    widget::radio,
+    widget::{radio, settings, text},
     Apply, Element,
 };
 use cosmic_comp_config::workspace::{WorkspaceConfig, WorkspaceLayout, WorkspaceMode};
@@ -136,14 +135,14 @@ fn multi_behavior() -> Section<crate::pages::Message> {
             let descriptions = &section.descriptions;
             settings::view_section(&section.title)
                 .add(settings::item_row(vec![radio(
-                    &descriptions[span],
+                    text::body(&descriptions[span]),
                     WorkspaceMode::Global,
                     Some(page.comp_workspace_config.workspace_mode),
                     Message::SetWorkspaceMode,
                 )
                 .into()]))
                 .add(settings::item_row(vec![radio(
-                    &descriptions[separate],
+                    text::body(&descriptions[separate]),
                     WorkspaceMode::OutputBound,
                     Some(page.comp_workspace_config.workspace_mode),
                     Message::SetWorkspaceMode,
@@ -167,14 +166,14 @@ fn workspace_orientation() -> Section<crate::pages::Message> {
             let descriptions = &section.descriptions;
             settings::view_section(&section.title)
                 .add(settings::item_row(vec![radio(
-                    &*descriptions[vertical],
+                    text::body(&descriptions[vertical]),
                     WorkspaceLayout::Vertical,
                     Some(page.comp_workspace_config.workspace_layout),
                     Message::SetWorkspaceLayout,
                 )
                 .into()]))
                 .add(settings::item_row(vec![radio(
-                    &*descriptions[horizontal],
+                    text::body(&descriptions[horizontal]),
                     WorkspaceLayout::Horizontal,
                     Some(page.comp_workspace_config.workspace_layout),
                     Message::SetWorkspaceLayout,
diff --git a/cosmic-settings/src/pages/input/keyboard/mod.rs b/cosmic-settings/src/pages/input/keyboard/mod.rs
index 2d8583d..89237c1 100644
--- a/cosmic-settings/src/pages/input/keyboard/mod.rs
+++ b/cosmic-settings/src/pages/input/keyboard/mod.rs
@@ -133,7 +133,7 @@ fn popover_menu_row(
     label: String,
     message: impl Fn(DefaultKey) -> SourceContext + 'static,
 ) -> cosmic::Element<'static, Message> {
-    widget::text(label)
+    widget::text::body(label)
         .apply(widget::container)
         .style(cosmic::theme::Container::custom(|theme| {
             iced_style::container::Appearance {
diff --git a/cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs b/cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs
index 2565158..adadcd5 100644
--- a/cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs
+++ b/cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs
@@ -544,11 +544,11 @@ fn shortcut_item(custom: bool, id: usize, data: &ShortcutModel) -> Element<Short
         .iter()
         .take(3)
         .filter(|(_, shortcut)| shortcut.binding.is_set())
-        .map(|(_, shortcut)| widget::text::body(shortcut.binding.to_string()).into())
+        .map(|(_, shortcut)| text::body(shortcut.binding.to_string()).into())
         .collect::<Vec<_>>();
 
     let shortcuts: Element<LocalMessage> = if bindings.is_empty() {
-        widget::text::body(fl!("disabled")).into()
+        text::body(fl!("disabled")).into()
     } else {
         widget::column::with_children(bindings)
             .align_items(Alignment::End)
@@ -558,7 +558,7 @@ fn shortcut_item(custom: bool, id: usize, data: &ShortcutModel) -> Element<Short
     let modified = if data.modified == 0 {
         None
     } else {
-        Some(widget::text::body(fl!("modified", count = data.modified)))
+        Some(text::body(fl!("modified", count = data.modified)))
     };
 
     let control = widget::row::with_capacity(4)
diff --git a/cosmic-settings/src/pages/input/mouse.rs b/cosmic-settings/src/pages/input/mouse.rs
index 869b57e..2bea4e2 100644
--- a/cosmic-settings/src/pages/input/mouse.rs
+++ b/cosmic-settings/src/pages/input/mouse.rs
@@ -81,7 +81,7 @@ fn mouse() -> Section<crate::pages::Message> {
                         row::with_capacity(2)
                             .align_items(Alignment::Center)
                             .spacing(theme.cosmic().space_s())
-                            .push(text(format!("{:.0}", value.round())))
+                            .push(text::body(format!("{:.0}", value.round())))
                             .push(slider)
                     }),
                 )
@@ -140,7 +140,7 @@ fn scrolling() -> Section<crate::pages::Message> {
                     row::with_capacity(2)
                         .align_items(Alignment::Center)
                         .spacing(theme.cosmic().space_s())
-                        .push(text(format!("{:.0}", value.round())))
+                        .push(text::body(format!("{:.0}", value.round())))
                         .push(slider)
                 }))
                 .add(
diff --git a/cosmic-settings/src/pages/input/touchpad.rs b/cosmic-settings/src/pages/input/touchpad.rs
index 08cc192..38d3453 100644
--- a/cosmic-settings/src/pages/input/touchpad.rs
+++ b/cosmic-settings/src/pages/input/touchpad.rs
@@ -104,7 +104,7 @@ fn touchpad() -> Section<crate::pages::Message> {
                         row::with_capacity(2)
                             .align_items(Alignment::Center)
                             .spacing(theme.cosmic().space_s())
-                            .push(text(format!("{:.0}", value.round())))
+                            .push(text::body(format!("{:.0}", value.round())))
                             .push(slider)
                     }),
                 )
@@ -151,7 +151,7 @@ fn click_behavior() -> Section<crate::pages::Message> {
             settings::view_section(&*section.title)
                 // Secondary click via two fingers, and middle-click via three fingers
                 .add(settings::item_row(vec![widget::radio(
-                    &descriptions[click_finger],
+                    text::body(&descriptions[click_finger]),
                     ClickMethod::Clickfinger,
                     page.input_touchpad.click_method,
                     |option| Message::SetSecondaryClickBehavior(Some(option), true),
@@ -159,7 +159,7 @@ fn click_behavior() -> Section<crate::pages::Message> {
                 .into()]))
                 // Secondary and middle-click via button areas.
                 .add(settings::item_row(vec![widget::radio(
-                    &descriptions[button_areas],
+                    text::body(&descriptions[button_areas]),
                     ClickMethod::ButtonAreas,
                     page.input_touchpad.click_method,
                     |option| Message::SetSecondaryClickBehavior(Some(option), true),
@@ -201,7 +201,7 @@ fn scrolling() -> Section<crate::pages::Message> {
             settings::view_section(&section.title)
                 // Two-finger scrolling toggle
                 .add(settings::item_row(vec![widget::radio(
-                    &descriptions[two_finger],
+                    text::body(&descriptions[two_finger]),
                     ScrollMethod::TwoFinger,
                     page.input_touchpad
                         .scroll_config
@@ -212,7 +212,7 @@ fn scrolling() -> Section<crate::pages::Message> {
                 .into()]))
                 // Edge scrolling toggle
                 .add(settings::item_row(vec![widget::radio(
-                    &descriptions[edge],
+                    text::body(&descriptions[edge]),
                     ScrollMethod::Edge,
                     page.input_touchpad
                         .scroll_config
@@ -244,7 +244,7 @@ fn scrolling() -> Section<crate::pages::Message> {
                     row::with_capacity(2)
                         .align_items(Alignment::Center)
                         .spacing(theme.cosmic().space_s())
-                        .push(text(format!("{:.0}", value.round())))
+                        .push(text::body(format!("{:.0}", value.round())))
                         .push(slider)
                 }))
                 // Natural scrolling toggle
@@ -273,24 +273,24 @@ fn gestures() -> Section<crate::pages::Message> {
     // let four_finger_up = descriptions.insert(fl!("gestures", "four-finger-up"));
     // let three_finger_any = descriptions.insert(fl!("gestures", "three-finger-any"));
 
-    let switch_workspaces = descriptions.insert(fl!("switch-workspaces"));
-    let switch_workspaces_horizontal = descriptions.insert(fl!("switch-workspaces", "horizontal"));
-    let switch_workspaces_vertical = descriptions.insert(fl!("switch-workspaces", "vertical"));
-
     // let open_application_library = descriptions.insert(fl!("open-application-library"));
     // let open_workspaces_view = descriptions.insert(fl!("open-workspaces-view"));
     // let switch_between_windows = descriptions.insert(fl!("switch-between-windows"));
 
+    let switch_workspaces = descriptions.insert(fl!("switch-workspaces"));
+    let switch_workspaces_horizontal = descriptions.insert(fl!("switch-workspaces", "horizontal"));
+    let switch_workspaces_vertical = descriptions.insert(fl!("switch-workspaces", "vertical"));
+
     Section::default()
         .title(fl!("gestures"))
         .descriptions(descriptions)
         .view::<Page>(move |_binder, page, section| {
             let descriptions = &section.descriptions;
 
-            settings::view_section(&*section.title)
+            settings::view_section(&section.title)
                 // .add(
                 //     settings::item::builder(&descriptions[three_finger_any])
-                //         .flex_control(text(&descriptions[switch_between_windows])),
+                //         .flex_control(text::body(&descriptions[switch_between_windows])),
                 // )
                 .add(
                     settings::item::builder(
@@ -299,7 +299,7 @@ fn gestures() -> Section<crate::pages::Message> {
                             WorkspaceLayout::Vertical => switch_workspaces_vertical,
                         }],
                     )
-                    .flex_control(text(&descriptions[switch_workspaces])),
+                    .flex_control(text::body(&descriptions[switch_workspaces])),
                 )
                 // .add(
                 //     settings::item::builder(
@@ -308,7 +308,7 @@ fn gestures() -> Section<crate::pages::Message> {
                 //             WorkspaceLayout::Vertical => four_finger_right,
                 //         }],
                 //     )
-                //     .flex_control(text(&descriptions[open_workspaces_view])),
+                //     .flex_control(text::body(&descriptions[open_workspaces_view])),
                 // )
                 // .add(
                 //     settings::item::builder(
@@ -317,7 +317,7 @@ fn gestures() -> Section<crate::pages::Message> {
                 //             WorkspaceLayout::Vertical => four_finger_left,
                 //         }],
                 //     )
-                //     .flex_control(text(&descriptions[open_application_library])),
+                //     .flex_control(text::body(&descriptions[open_application_library])),
                 // )
                 .apply(Element::from)
                 .map(crate::pages::Message::Input)
diff --git a/cosmic-settings/src/pages/power/mod.rs b/cosmic-settings/src/pages/power/mod.rs
index 00ba360..195e01a 100644
--- a/cosmic-settings/src/pages/power/mod.rs
+++ b/cosmic-settings/src/pages/power/mod.rs
@@ -78,10 +78,10 @@ fn battery_info() -> Section<crate::pages::Message> {
         .show_while::<Page>(|page| page.battery.is_present)
         .view::<Page>(move |_binder, page, section| {
             let battery_icon = widget::icon::from_name(page.battery.icon_name.clone());
-            let battery_percent = widget::text(format!("{}%", page.battery.percent));
+            let battery_percent = widget::text::body(format!("{}%", page.battery.percent));
 
             let battery_time =
-                widget::text(if page.battery.remaining_duration > TimeDelta::zero() {
+                widget::text::body(if page.battery.remaining_duration > TimeDelta::zero() {
                     &page.battery.remaining_time
                 } else {
                     ""
@@ -134,7 +134,7 @@ fn profiles() -> Section<crate::pages::Message> {
                     })
                     .fold(section, settings::Section::add);
             } else {
-                let item = widget::text::body(fl!("power-mode", "nobackend"));
+                let item = text::body(fl!("power-mode", "nobackend"));
                 section = section.add(item);
             }
 
diff --git a/cosmic-settings/src/pages/sound.rs b/cosmic-settings/src/pages/sound.rs
index 3c2e372..e83e1ee 100644
--- a/cosmic-settings/src/pages/sound.rs
+++ b/cosmic-settings/src/pages/sound.rs
@@ -719,8 +719,8 @@ fn output() -> Section<crate::pages::Message> {
 //         .descriptions(descriptions)
 //         .view::<Page>(move |_binder, _page, section| {
 //             settings::view_section(&section.title)
-//                 .add(settings::item(&section.descriptions[volume], text("TODO")))
-//                 .add(settings::item(&section.descriptions[sound], text("TODO")))
+//                 .add(settings::item(&section.descriptions[volume], text::body("TODO")))
+//                 .add(settings::item(&section.descriptions[sound], text::body("TODO")))
 //                 .into()
 //         })
 // }
@@ -737,7 +737,7 @@ fn output() -> Section<crate::pages::Message> {
 //             settings::view_section(&section.title)
 //                 .add(settings::item(
 //                     &*section.descriptions[applications],
-//                     text("TODO"),
+//                     text::body("TODO"),
 //                 ))
 //                 .into()
 //         })
diff --git a/cosmic-settings/src/pages/system/about.rs b/cosmic-settings/src/pages/system/about.rs
index de6fd0b..32fbb8e 100644
--- a/cosmic-settings/src/pages/system/about.rs
+++ b/cosmic-settings/src/pages/system/about.rs
@@ -153,23 +153,29 @@ fn hardware() -> Section<crate::pages::Message> {
             let sections = settings::view_section(&section.title)
                 .add(settings::flex_item(
                     &*desc[model],
-                    text(&page.info.hardware_model),
+                    text::body(&page.info.hardware_model),
+                ))
+                .add(settings::flex_item(
+                    &*desc[memory],
+                    text::body(&page.info.memory),
                 ))
-                .add(settings::flex_item(&*desc[memory], text(&page.info.memory)))
                 .add(settings::flex_item(
                     &*desc[processor],
-                    text(&page.info.processor),
+                    text::body(&page.info.processor),
                 ));
 
             page.info
                 .graphics
                 .iter()
                 .fold(sections, |sections, card| {
-                    sections.add(settings::flex_item(&*desc[graphics], text(card.as_str())))
+                    sections.add(settings::flex_item(
+                        &*desc[graphics],
+                        text::body(card.as_str()),
+                    ))
                 })
                 .add(settings::flex_item(
                     &*desc[disk_capacity],
-                    text(&page.info.disk_capacity),
+                    text::body(&page.info.disk_capacity),
                 ))
                 .into()
         })
@@ -191,19 +197,19 @@ fn os() -> Section<crate::pages::Message> {
             settings::view_section(&section.title)
                 .add(settings::flex_item(
                     &*desc[os],
-                    text(&page.info.operating_system),
+                    text::body(&page.info.operating_system),
                 ))
                 .add(settings::flex_item(
                     &*desc[os_arch],
-                    text(&page.info.os_architecture),
+                    text::body(&page.info.os_architecture),
                 ))
                 .add(settings::flex_item(
                     &*desc[desktop],
-                    text(&page.info.desktop_environment),
+                    text::body(&page.info.desktop_environment),
                 ))
                 .add(settings::flex_item(
                     &*desc[windowing_system],
-                    text(&page.info.windowing_system),
+                    text::body(&page.info.windowing_system),
                 ))
                 .into()
         })
@@ -216,7 +222,7 @@ fn os() -> Section<crate::pages::Message> {
 //         .descriptions(vec![fl!("about-related", "support").into()])
 //         .view::<Page>(move |_binder, _page, section| {
 //             settings::view_section(&section.title)
-//                 .add(settings::item(&*section.descriptions[0], text("TODO")))
+//                 .add(settings::item(&*section.descriptions[0], text::body("TODO")))
 //                 .into()
 //         })
 // }
diff --git a/cosmic-settings/src/pages/time/date.rs b/cosmic-settings/src/pages/time/date.rs
index fcc078f..b2204af 100644
--- a/cosmic-settings/src/pages/time/date.rs
+++ b/cosmic-settings/src/pages/time/date.rs
@@ -380,7 +380,7 @@ fn date() -> Section<crate::pages::Message> {
                 .add(
                     settings::item::builder(&*section.descriptions[title])
                         .description(fl!("time-date", "auto-ntp"))
-                        .control(widget::text(&page.formatted_date)),
+                        .control(widget::text::body(&page.formatted_date)),
                 )
                 .apply(cosmic::Element::from)
                 .map(crate::pages::Message::DateAndTime)
@@ -452,7 +452,7 @@ fn timezone() -> Section<crate::pages::Message> {
             let timezone_context_button = widget::row::with_capacity(2)
                 .spacing(12)
                 .push(
-                    widget::text(
+                    widget::text::body(
                         page.timezone
                             .map(|id| &*page.timezone_list[id])
                             .unwrap_or_default(),
diff --git a/cosmic-settings/src/widget/mod.rs b/cosmic-settings/src/widget/mod.rs
index c220ffd..8f0a672 100644
--- a/cosmic-settings/src/widget/mod.rs
+++ b/cosmic-settings/src/widget/mod.rs
@@ -23,8 +23,7 @@ pub fn search_header<Message>(
         let parent_meta = &pages.info[parent];
 
         column_children.push(
-            text(parent_meta.title.as_str())
-                .size(14)
+            text::body(parent_meta.title.as_str())
                 .apply(container)
                 .padding([0, 0, 0, 6])
                 .into(),
@@ -58,7 +57,7 @@ pub fn page_title<Message: 'static>(page: &page::Info) -> Element<Message> {
 #[must_use]
 pub fn unimplemented_page<Message: 'static>() -> Element<'static, Message> {
     settings::view_section("")
-        .add(text("We haven't created that panel yet, and/or it is using a similar idea as current Pop! designs."))
+        .add(text::body("We haven't created that panel yet, and/or it is using a similar idea as current Pop! designs."))
         .into()
 }
 
@@ -126,7 +125,7 @@ pub fn sub_page_header<'a, Message: 'static + Clone>(
 
 pub fn go_next_item<Msg: Clone + 'static>(description: &str, msg: Msg) -> cosmic::Element<'_, Msg> {
     settings::item_row(vec![
-        text(description).wrap(Wrap::Word).into(),
+        text::body(description).wrap(Wrap::Word).into(),
         horizontal_space(Length::Fill).into(),
         icon::from_name("go-next-symbolic").size(16).icon().into(),
     ])
diff --git a/i18n/en/cosmic_settings.ftl b/i18n/en/cosmic_settings.ftl
index 63defa8..e7bb412 100644
--- a/i18n/en/cosmic_settings.ftl
+++ b/i18n/en/cosmic_settings.ftl
@@ -179,8 +179,8 @@ super-key = Super key
     .applications = Open Applications
 
 window-controls = Window Controls
-    .minimize = Show minimize button
     .maximize = Show maximize button
+    .minimize = Show minimize button
 
 ## Desktop: Workspaces
 
diff --git a/i18n/sr-Cyrl/cosmic_settings.ftl b/i18n/sr-Cyrl/cosmic_settings.ftl
index 230f92a..7f3226a 100644
--- a/i18n/sr-Cyrl/cosmic_settings.ftl
+++ b/i18n/sr-Cyrl/cosmic_settings.ftl
@@ -179,8 +179,8 @@ super-key = Super тастер
     .applications = Отвори Апликације
 
 window-controls = Контрола прозора
-    .minimize = Прикажи дугме за минимизовање
     .maximize = Прикажи дугме за максимизовање
+    .minimize = Прикажи дугме за минимизовање
 
 ## Desktop: Workspaces
 
diff --git a/i18n/sr-Latn/cosmic_settings.ftl b/i18n/sr-Latn/cosmic_settings.ftl
index 5f49f55..90de92b 100644
--- a/i18n/sr-Latn/cosmic_settings.ftl
+++ b/i18n/sr-Latn/cosmic_settings.ftl
@@ -179,8 +179,8 @@ super-key = Super taster
     .applications = Otvori Aplikacije
 
 window-controls = Kontrole prozora
-    .minimize = Prikaži dugme za minimizovanje
     .maximize = Prikaži dugme za maksimizovanje
+    .minimize = Prikaži dugme za minimizovanje
 
 ## Desktop: Workspaces