diff --git a/Cargo.lock b/Cargo.lock
index c774d7d..0f6b3dc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -189,9 +189,9 @@ checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
 
 [[package]]
 name = "alloc-stdlib"
-version = "0.2.4"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e76a019e91224d279006ff972f1e984179a6e9feb050adba6ce8274aef23195"
+checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
 dependencies = [
  "alloc-no-stdlib",
 ]
@@ -215,7 +215,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f2a1bb052857d5dd49572219344a7332b31b76405648eabac5bc68978251bcd"
 dependencies = [
  "android-properties",
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "cc",
  "jni",
  "libc",
@@ -294,9 +294,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"
@@ -321,9 +321,9 @@ checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
 
 [[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",
 ]
@@ -336,7 +336,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -347,9 +347,9 @@ checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.7"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f02882884d3e1bc524fb12c79f107f6ad0e1cfd498c536ffb494301740995dfe"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "as-raw-xcb-connection"
@@ -506,7 +506,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -541,7 +541,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -596,14 +596,14 @@ 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 2.0.117",
 ]
 
 [[package]]
@@ -727,9 +727,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.13.0"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
+checksum = "84d7ced0ae9557296835c32bf1b1e02b44c746701f898460fb000d7eaa84f00a"
 dependencies = [
  "serde_core",
 ]
@@ -840,9 +840,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 0.2.1",
@@ -850,9 +850,9 @@ dependencies = [
 
 [[package]]
 name = "brotli-decompressor"
-version = "5.0.3"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a32acac15fe1967bc3986b2a6347dffc965602354ea6f450ad07e8bfd253583"
+checksum = "5962523e1b92ce1b5e793d9169b9943eece10d39f62550bc04bb605d75b94924"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -869,13 +869,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]]
@@ -928,7 +928,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -945,9 +945,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "bytes"
-version = "1.12.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae3f5d315924270530207e2a68396c3cc547f6dca3fbdca317cfb1a51edb593"
+checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
 
 [[package]]
 name = "calendrical_calculations"
@@ -965,7 +965,7 @@ version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dbf9978365bac10f54d1d4b04f7ce4427e51f71d61f2fe15e3fed5166474df7"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "polling",
  "rustix 1.1.4",
  "slab",
@@ -995,9 +995,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.65"
+version = "1.2.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e228eec9be7c17ccb640b59b36a5cd805ea2a564a4c5e162c2f659fea30d3b96"
+checksum = "556e016178bb5662a08681bbe0f00f8e17631781a4dfc8c45e466e4b185ec27f"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -1108,7 +1108,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -1256,9 +1256,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"
+checksum = "e57e3272f0190c3f1584272d613719ba5fc7df7f4942fe542e63d949cf3a649b"
 
 [[package]]
 name = "core-foundation"
@@ -1316,7 +1316,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "core-foundation 0.10.1",
  "libc",
 ]
@@ -1333,7 +1333,7 @@ dependencies = [
 [[package]]
 name = "cosmic-bg-config"
 version = "1.0.3"
-source = "git+https://github.com/pop-os/cosmic-bg#71bb96b3eaad167c3cb639979d2edb7559866c2f"
+source = "git+https://github.com/pop-os/cosmic-bg#b1ca4c180ab29dd185472b777ab0abdb1f96ccaf"
 dependencies = [
  "cosmic-config",
  "derive_setters",
@@ -1344,10 +1344,10 @@ dependencies = [
 
 [[package]]
 name = "cosmic-client-toolkit"
-version = "0.2.0"
-source = "git+https://github.com/pop-os/cosmic-protocols//?rev=32283d7#32283d76a8d0342da74c4cc022a533c52dcf378f"
+version = "0.1.0"
+source = "git+https://github.com/pop-os/cosmic-protocols//?rev=d0e95be#d0e95be25e423cfe523b11111a3666ed7aaf0dc4"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "cosmic-protocols",
  "libc",
  "smithay-client-toolkit",
@@ -1358,11 +1358,11 @@ dependencies = [
 [[package]]
 name = "cosmic-comp-config"
 version = "1.0.0"
-source = "git+https://github.com/pop-os/cosmic-comp#f5e0ba1594e428954f2a1647b03564be1afaec4a"
+source = "git+https://github.com/pop-os/cosmic-comp#2f7c34f29ae8d1d5b7d147bdb69ae443bd630e98"
 dependencies = [
  "cosmic-config",
  "input",
- "ron 0.12.2",
+ "ron 0.12.1",
  "serde",
  "tracing",
 ]
@@ -1370,7 +1370,7 @@ dependencies = [
 [[package]]
 name = "cosmic-config"
 version = "1.0.0"
-source = "git+https://github.com/pop-os/libcosmic#20dfd7c236208930634881ec52d22e7a353206dd"
+source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a"
 dependencies = [
  "atomicwrites",
  "cosmic-config-derive",
@@ -1380,7 +1380,7 @@ dependencies = [
  "iced_futures",
  "known-folders",
  "notify",
- "ron 0.12.2",
+ "ron 0.12.1",
  "serde",
  "tokio",
  "tracing",
@@ -1391,10 +1391,10 @@ dependencies = [
 [[package]]
 name = "cosmic-config-derive"
 version = "1.0.0"
-source = "git+https://github.com/pop-os/libcosmic#20dfd7c236208930634881ec52d22e7a353206dd"
+source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a"
 dependencies = [
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -1410,7 +1410,7 @@ name = "cosmic-dbus-networkmanager"
 version = "0.1.0"
 source = "git+https://github.com/pop-os/dbus-settings-bindings#eed01dd3609e90e3c8cd043656734c500956c793"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "derive_builder",
  "jiff",
  "procfs",
@@ -1421,12 +1421,12 @@ dependencies = [
 [[package]]
 name = "cosmic-freedesktop-icons"
 version = "0.4.0"
-source = "git+https://github.com/pop-os/freedesktop-icons#ab4c57b8e416c6af9297cb04d101889896fd9a92"
+source = "git+https://github.com/pop-os/freedesktop-icons#cb0a2f299dbc443697ce1674065e0d4f82915c02"
 dependencies = [
  "bstr",
  "btoi",
  "memchr",
- "memmap2 0.9.11",
+ "memmap2 0.9.10",
  "thiserror 2.0.18",
  "tracing",
  "xdg",
@@ -1457,7 +1457,7 @@ dependencies = [
 [[package]]
 name = "cosmic-panel-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-panel#45f03a3864a9385349be3ca13202553280e667d4"
+source = "git+https://github.com/pop-os/cosmic-panel#546a6c45210574caed9a3e51446aa8ad622d3627"
 dependencies = [
  "anyhow",
  "cosmic-config",
@@ -1470,10 +1470,10 @@ dependencies = [
 
 [[package]]
 name = "cosmic-protocols"
-version = "0.2.0"
-source = "git+https://github.com/pop-os/cosmic-protocols//?rev=32283d7#32283d76a8d0342da74c4cc022a533c52dcf378f"
+version = "0.1.0"
+source = "git+https://github.com/pop-os/cosmic-protocols//?rev=d0e95be#d0e95be25e423cfe523b11111a3666ed7aaf0dc4"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -1567,7 +1567,7 @@ dependencies = [
  "num-traits",
  "pwhash",
  "regex",
- "ron 0.12.2",
+ "ron 0.12.1",
  "rust-embed",
  "rustix 1.1.4",
  "secure-string",
@@ -1633,12 +1633,12 @@ dependencies = [
 [[package]]
 name = "cosmic-settings-audio-client"
 version = "1.0.0"
-source = "git+https://github.com/pop-os/cosmic-settings-daemon#276fef9834b05c57b67e8ba36b74bea1ba690cee"
+source = "git+https://github.com/pop-os/cosmic-settings-daemon#e7936f0d4f01c8c5a436908c7ee9f6ad43e6a7d8"
 dependencies = [
  "cosmic-settings-audio-core",
  "dirs",
  "futures-util",
- "ron 0.12.2",
+ "ron 0.12.1",
  "serde",
  "tokio",
  "tokio-util",
@@ -1649,10 +1649,10 @@ dependencies = [
 [[package]]
 name = "cosmic-settings-audio-core"
 version = "1.0.0"
-source = "git+https://github.com/pop-os/cosmic-settings-daemon#276fef9834b05c57b67e8ba36b74bea1ba690cee"
+source = "git+https://github.com/pop-os/cosmic-settings-daemon#e7936f0d4f01c8c5a436908c7ee9f6ad43e6a7d8"
 dependencies = [
  "dirs",
- "ron 0.12.2",
+ "ron 0.12.1",
  "serde",
  "zlink",
 ]
@@ -1672,7 +1672,7 @@ dependencies = [
 [[package]]
 name = "cosmic-settings-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-settings-daemon#276fef9834b05c57b67e8ba36b74bea1ba690cee"
+source = "git+https://github.com/pop-os/cosmic-settings-daemon#e7936f0d4f01c8c5a436908c7ee9f6ad43e6a7d8"
 dependencies = [
  "cosmic-config",
  "ron 0.11.0",
@@ -1693,7 +1693,7 @@ dependencies = [
 [[package]]
 name = "cosmic-settings-daemon-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-settings-daemon#276fef9834b05c57b67e8ba36b74bea1ba690cee"
+source = "git+https://github.com/pop-os/cosmic-settings-daemon#e7936f0d4f01c8c5a436908c7ee9f6ad43e6a7d8"
 dependencies = [
  "cosmic-config",
  "serde",
@@ -1715,7 +1715,7 @@ dependencies = [
 name = "cosmic-settings-network-manager-subscription"
 version = "1.0.7"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "cosmic-dbus-networkmanager",
  "futures",
  "iced_futures",
@@ -1791,7 +1791,7 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be17b688510d934ce13f48a2beba700e11583e281e0fda99c22bb256a14eda73"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "fontdb",
  "harfrust",
  "linebender_resource_handle",
@@ -1799,7 +1799,7 @@ dependencies = [
  "rangemap",
  "rustc-hash 2.1.2",
  "self_cell",
- "skrifa 0.40.0",
+ "skrifa",
  "smol_str",
  "swash",
  "sys-locale",
@@ -1812,16 +1812,15 @@ dependencies = [
 [[package]]
 name = "cosmic-theme"
 version = "1.0.0"
-source = "git+https://github.com/pop-os/libcosmic#20dfd7c236208930634881ec52d22e7a353206dd"
+source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef"
 dependencies = [
  "almost",
  "configparser",
  "cosmic-config",
  "csscolorparser",
  "dirs",
- "hex_color",
  "palette",
- "ron 0.12.2",
+ "ron 0.12.1",
  "serde",
  "serde_json",
  "thiserror 2.0.18",
@@ -1982,7 +1981,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -1996,7 +1995,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -2009,7 +2008,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -2020,7 +2019,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core 0.20.11",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -2031,7 +2030,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
 dependencies = [
  "darling_core 0.21.3",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -2042,7 +2041,7 @@ checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
 dependencies = [
  "darling_core 0.23.0",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -2058,7 +2057,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ee89cb860616069c67520dcd66cacdb900b57c799f634a0eb6d91f6e2a82b61"
 dependencies = [
  "av-data",
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "dav1d-sys",
  "static_assertions",
 ]
@@ -2073,44 +2072,13 @@ dependencies = [
  "system-deps",
 ]
 
-[[package]]
-name = "defmt"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6e524506490a1953d237cb87b1cfc1e46f88c18f10a22dfe0f507dc6bfc7f7f"
-dependencies = [
- "bitflags 1.3.2",
- "defmt-macros",
-]
-
-[[package]]
-name = "defmt-macros"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0a27770e9c8f719a79d8b638281f4d828f77d8fd61e0bd94451b9b85e576a0b"
-dependencies = [
- "defmt-parser",
- "proc-macro-error2",
- "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",
 ]
 
@@ -2132,7 +2100,7 @@ dependencies = [
  "darling 0.20.11",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -2142,7 +2110,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
 dependencies = [
  "derive_builder_core",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -2154,7 +2122,7 @@ dependencies = [
  "darling 0.21.3",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -2165,7 +2133,7 @@ checksum = "362f47930db19fe7735f527e6595e4900316b893ebf6d48ad3d31be928d57dd6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -2215,7 +2183,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "block2 0.6.2",
  "libc",
  "objc2 0.6.4",
@@ -2229,7 +2197,7 @@ checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -2246,7 +2214,7 @@ name = "dnd"
 version = "0.1.0"
 source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "mime 0.1.0",
  "raw-window-handle",
  "smithay-client-toolkit",
@@ -2285,7 +2253,7 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "bytemuck",
  "drm-ffi",
  "drm-fourcc",
@@ -2360,7 +2328,7 @@ checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -2380,7 +2348,7 @@ checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -2396,7 +2364,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2660,7 +2628,7 @@ checksum = "457e789b3d1202543297a350643cf459f836cade38934e7a4cf6a39e7cde2905"
 dependencies = [
  "fontconfig-parser",
  "log",
- "memmap2 0.9.11",
+ "memmap2 0.9.10",
  "slotmap",
  "tinyvec",
  "ttf-parser",
@@ -2684,7 +2652,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -2815,7 +2783,7 @@ checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -2886,21 +2854,10 @@ checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
  "libc",
- "r-efi 5.3.0",
+ "r-efi",
  "wasip2",
 ]
 
-[[package]]
-name = "getrandom"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
-dependencies = [
- "cfg-if",
- "libc",
- "r-efi 6.0.0",
-]
-
 [[package]]
 name = "gettext-rs"
 version = "0.7.7"
@@ -2995,7 +2952,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "gpu-descriptor-types",
  "hashbrown 0.15.5",
 ]
@@ -3006,7 +2963,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
 ]
 
 [[package]]
@@ -3043,10 +3000,10 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9da2e5ae821f6e96664977bf974d6d6a2d6682f9ccee23e62ec1d134246845f9"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "bytemuck",
  "core_maths",
- "read-fonts 0.37.0",
+ "read-fonts",
  "smallvec",
 ]
 
@@ -3121,17 +3078,6 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
-[[package]]
-name = "hex_color"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d37f101bf4c633f7ca2e4b5e136050314503dd198e78e325ea602c327c484ef0"
-dependencies = [
- "arrayvec",
- "rand 0.8.6",
- "serde",
-]
-
 [[package]]
 name = "hexf-parse"
 version = "0.2.1"
@@ -3230,7 +3176,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.118",
+ "syn 2.0.117",
  "unic-langid",
 ]
 
@@ -3244,7 +3190,7 @@ dependencies = [
  "i18n-config",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -3274,7 +3220,7 @@ dependencies = [
 [[package]]
 name = "iced"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#20dfd7c236208930634881ec52d22e7a353206dd"
+source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef"
 dependencies = [
  "dnd",
  "iced_accessibility",
@@ -3295,7 +3241,7 @@ dependencies = [
 [[package]]
 name = "iced_accessibility"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#20dfd7c236208930634881ec52d22e7a353206dd"
+source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a"
 dependencies = [
  "accesskit",
  "accesskit_winit",
@@ -3304,9 +3250,9 @@ dependencies = [
 [[package]]
 name = "iced_core"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#20dfd7c236208930634881ec52d22e7a353206dd"
+source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "bytes",
  "cosmic-client-toolkit",
  "dnd",
@@ -3330,7 +3276,7 @@ dependencies = [
 [[package]]
 name = "iced_debug"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#20dfd7c236208930634881ec52d22e7a353206dd"
+source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef"
 dependencies = [
  "iced_core",
  "iced_futures",
@@ -3340,7 +3286,7 @@ dependencies = [
 [[package]]
 name = "iced_futures"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#20dfd7c236208930634881ec52d22e7a353206dd"
+source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a"
 dependencies = [
  "futures",
  "iced_core",
@@ -3354,9 +3300,9 @@ dependencies = [
 [[package]]
 name = "iced_graphics"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#20dfd7c236208930634881ec52d22e7a353206dd"
+source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "bytemuck",
  "cosmic-text",
  "half",
@@ -3375,7 +3321,7 @@ dependencies = [
 [[package]]
 name = "iced_program"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#20dfd7c236208930634881ec52d22e7a353206dd"
+source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef"
 dependencies = [
  "iced_graphics",
  "iced_runtime",
@@ -3384,7 +3330,7 @@ dependencies = [
 [[package]]
 name = "iced_renderer"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#20dfd7c236208930634881ec52d22e7a353206dd"
+source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef"
 dependencies = [
  "iced_graphics",
  "iced_tiny_skia",
@@ -3396,7 +3342,7 @@ dependencies = [
 [[package]]
 name = "iced_runtime"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#20dfd7c236208930634881ec52d22e7a353206dd"
+source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef"
 dependencies = [
  "bytes",
  "cosmic-client-toolkit",
@@ -3412,7 +3358,7 @@ dependencies = [
 [[package]]
 name = "iced_tiny_skia"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#20dfd7c236208930634881ec52d22e7a353206dd"
+source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef"
 dependencies = [
  "bytemuck",
  "cosmic-text",
@@ -3429,10 +3375,10 @@ dependencies = [
 [[package]]
 name = "iced_wgpu"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#20dfd7c236208930634881ec52d22e7a353206dd"
+source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef"
 dependencies = [
  "as-raw-xcb-connection",
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "bytemuck",
  "cosmic-client-toolkit",
  "cryoglyph",
@@ -3460,7 +3406,7 @@ dependencies = [
 [[package]]
 name = "iced_widget"
 version = "0.14.2"
-source = "git+https://github.com/pop-os/libcosmic#20dfd7c236208930634881ec52d22e7a353206dd"
+source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef"
 dependencies = [
  "cosmic-client-toolkit",
  "dnd",
@@ -3480,7 +3426,7 @@ dependencies = [
 [[package]]
 name = "iced_winit"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#20dfd7c236208930634881ec52d22e7a353206dd"
+source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef"
 dependencies = [
  "cosmic-client-toolkit",
  "cursor-icon",
@@ -3582,9 +3528,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",
@@ -3984,9 +3930,9 @@ checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285"
 
 [[package]]
 name = "imgref"
-version = "1.12.2"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89194689a993ab15268672e99e7b0e19da2da3268ac682e8f02d29d4d1434cd7"
+checksum = "40fac9d56ed6437b198fddba683305e8e2d651aa42647f00f5ae542e7f5c94a2"
 
 [[package]]
 name = "indenter"
@@ -4032,16 +3978,16 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "533e68a5842e734946fe159fb03fc9bbbb254f590dd0d8ad321ae5ff7beca2c1"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "inotify-sys",
  "libc",
 ]
 
 [[package]]
 name = "inotify-sys"
-version = "0.1.6"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fda9741ca16536952da2ecaa6105c2f4653fa6f0724681df6d2414c4106d0b0"
+checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
 dependencies = [
  "libc",
 ]
@@ -4062,7 +4008,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9793345a65d71317763a33066b5d8351f8760dde8d4930fe9e39b5f14a7959d"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "input-sys",
  "libc",
  "log",
@@ -4083,7 +4029,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -4151,11 +4097,10 @@ checksum = "2ceaf4c6c48465bead8cb6a0b7c4ee0c86ecbb31239032b9c66ab9a08d2f3ee1"
 
 [[package]]
 name = "jiff"
-version = "0.2.31"
+version = "0.2.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccfe6121cbe750cf81efa362d85c0bde7ea298ec43092d3a193baca59cdbd634"
+checksum = "4603d3033e49e2b0e31229fcab20a5d40089c607d975cd9c80551dc69eed9102"
 dependencies = [
- "defmt",
  "jiff-static",
  "jiff-tzdb-platform",
  "log",
@@ -4167,13 +4112,13 @@ dependencies = [
 
 [[package]]
 name = "jiff-static"
-version = "0.2.31"
+version = "0.2.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e165e897f662d428f3cd3828a919dbe067c2d42bb1031eede74ef9d27ecdedd2"
+checksum = "782d32378dddf207193ac91cefb848ad41abb58195c95168e1291227a0832b47"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -4218,7 +4163,7 @@ dependencies = [
  "quote",
  "rustc_version",
  "simd_cesu8",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -4246,7 +4191,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
 dependencies = [
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -4261,12 +4206,13 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.103"
+version = "0.3.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102"
+checksum = "142bc4740e452c1e57ade0cbc129f139c9093e354346f0872ef985f4f5cf5f11"
 dependencies = [
  "cfg-if",
  "futures-util",
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -4476,7 +4422,7 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fbe853b403ae61a04233030ae8a79d94975281ed9770a1f9e246732b534b28d"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "serde",
 ]
 
@@ -4522,7 +4468,7 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07293a4e297ac234359b510362495713f75ea345d5307140414f20c69ffeb087"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "libc",
 ]
 
@@ -4568,7 +4514,7 @@ checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
 [[package]]
 name = "libcosmic"
 version = "1.0.0"
-source = "git+https://github.com/pop-os/libcosmic#20dfd7c236208930634881ec52d22e7a353206dd"
+source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef"
 dependencies = [
  "apply",
  "ashpd 0.12.3",
@@ -4581,7 +4527,6 @@ dependencies = [
  "cosmic-theme",
  "css-color",
  "derive_setters",
- "enumflags2",
  "float-cmp 0.10.0",
  "freedesktop-desktop-entry",
  "futures",
@@ -4606,7 +4551,7 @@ dependencies = [
  "palette",
  "phf 0.13.1",
  "rfd",
- "ron 0.12.2",
+ "ron 0.12.1",
  "rust-embed",
  "rustix 1.1.4",
  "serde",
@@ -4649,14 +4594,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.12.1",
  "libc",
  "plain",
- "redox_syscall 0.9.0",
+ "redox_syscall 0.8.1",
 ]
 
 [[package]]
@@ -4757,9 +4702,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.33"
+version = "0.4.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
+checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"
 
 [[package]]
 name = "loop9"
@@ -4869,9 +4814,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.8.2"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4"
+checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8"
 
 [[package]]
 name = "memmap2"
@@ -4884,9 +4829,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",
 ]
@@ -4906,7 +4851,7 @@ version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7047791b5bc903b8cd963014b355f71dc9864a9a0b727057676c1dcae5cbc15"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "block",
  "core-graphics-types 0.2.0",
  "foreign-types",
@@ -4999,7 +4944,7 @@ checksum = "618f667225063219ddfc61251087db8a9aec3c3f0950c916b614e403486f1135"
 dependencies = [
  "arrayvec",
  "bit-set",
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "cfg-if",
  "cfg_aliases 0.2.1",
  "codespan-reporting",
@@ -5023,7 +4968,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "jni-sys 0.3.1",
  "log",
  "ndk-sys",
@@ -5091,7 +5036,7 @@ version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "fsevent-sys",
  "inotify",
  "kqueue",
@@ -5109,7 +5054,7 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
 ]
 
 [[package]]
@@ -5177,7 +5122,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -5240,7 +5185,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -5294,7 +5239,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "block2 0.5.1",
  "libc",
  "objc2 0.5.2",
@@ -5310,7 +5255,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "block2 0.6.2",
  "objc2 0.6.4",
  "objc2-core-foundation",
@@ -5323,7 +5268,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -5335,7 +5280,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "block2 0.6.2",
  "dispatch2",
  "objc2 0.6.4",
@@ -5347,7 +5292,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "libc",
  "objc2-core-foundation",
 ]
@@ -5370,7 +5315,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "objc2-core-foundation",
  "objc2-core-graphics",
 ]
@@ -5387,7 +5332,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "block2 0.5.1",
  "libc",
  "objc2 0.5.2",
@@ -5399,7 +5344,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "block2 0.6.2",
  "objc2 0.6.4",
  "objc2-core-foundation",
@@ -5421,7 +5366,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -5433,7 +5378,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -5446,7 +5391,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
@@ -5544,7 +5489,7 @@ dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -5584,7 +5529,7 @@ dependencies = [
  "by_address",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -5685,7 +5630,7 @@ dependencies = [
  "phf_shared 0.11.3",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -5698,7 +5643,7 @@ dependencies = [
  "phf_shared 0.13.1",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
  "uncased",
 ]
 
@@ -5744,7 +5689,7 @@ checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -5801,7 +5746,7 @@ version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "crc32fast",
  "fdeflate",
  "flate2",
@@ -5903,7 +5848,7 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -5923,7 +5868,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
  "version_check",
  "yansi",
 ]
@@ -5934,7 +5879,7 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "procfs-core",
  "rustix 1.1.4",
 ]
@@ -5945,7 +5890,7 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "hex",
 ]
 
@@ -5965,7 +5910,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4488a4a36b9a4ba6b9334a32a39971f77c1436ec82c38707bce707699cc3bbcb"
 dependencies = [
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -6022,9 +5967,9 @@ dependencies = [
 
 [[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",
 ]
@@ -6035,12 +5980,6 @@ version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
-[[package]]
-name = "r-efi"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
-
 [[package]]
 name = "rand"
 version = "0.8.6"
@@ -6199,23 +6138,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.12.1",
  "libredox",
 ]
 
@@ -6225,16 +6154,16 @@ version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.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.12.1",
 ]
 
 [[package]]
@@ -6265,14 +6194,14 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "regex"
-version = "1.12.4"
+version = "1.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba"
+checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -6293,9 +6222,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"
@@ -6360,7 +6289,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "db09040cc89e461f1a265139777a2bde7f8d8c67c4936f700c63ce3e2904d468"
 dependencies = [
  "base64",
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "serde",
  "serde_derive",
  "unicode-ident",
@@ -6368,11 +6297,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.12.1",
  "once_cell",
  "serde",
  "serde_derive",
@@ -6406,7 +6335,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rust-embed-utils",
- "syn 2.0.118",
+ "syn 2.0.117",
  "walkdir",
 ]
 
@@ -6453,11 +6382,11 @@ version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -6466,11 +6395,11 @@ version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "errno",
  "libc",
  "linux-raw-sys 0.12.1",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -6485,7 +6414,7 @@ version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd3c7c96f8a08ee34eff8857b11b49b07d71d1c3f4e88f8a88d4c9e9f90b1702"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "bytemuck",
  "core_maths",
  "log",
@@ -6556,7 +6485,7 @@ checksum = "1dd3accc0f3f4bbaf2c9e1957a030dc582028130c67660d44c0a0345a22ca69b"
 dependencies = [
  "ab_glyph",
  "log",
- "memmap2 0.9.11",
+ "memmap2 0.9.10",
  "smithay-client-toolkit",
  "tiny-skia",
 ]
@@ -6641,7 +6570,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -6666,7 +6595,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -6707,7 +6636,7 @@ dependencies = [
  "darling 0.23.0",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -6831,17 +6760,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]]
@@ -6861,9 +6780,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"
@@ -6871,14 +6790,14 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0512da38f5e2b31201a93524adb8d3136276fa4fe4aafab4e1f727a82b534cc0"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.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",
@@ -6941,7 +6860,7 @@ dependencies = [
  "foreign-types",
  "js-sys",
  "log",
- "memmap2 0.9.11",
+ "memmap2 0.9.10",
  "objc",
  "raw-window-handle",
  "redox_syscall 0.5.18",
@@ -6962,7 +6881,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.12.1",
 ]
 
 [[package]]
@@ -7053,11 +6972,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",
 ]
@@ -7075,9 +6994,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"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7092,7 +7011,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -7162,10 +7081,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
  "fastrand",
- "getrandom 0.4.3",
+ "getrandom 0.3.4",
  "once_cell",
  "rustix 1.1.4",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -7203,7 +7122,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -7214,7 +7133,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -7228,11 +7147,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",
@@ -7242,15 +7162,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",
@@ -7354,7 +7274,7 @@ checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -7462,7 +7382,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -7743,9 +7663,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.23.4"
+version = "1.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf80a72845275afea99e7f2b434723d3bc7e38470fcd1c7ed39a599c73319a53"
+checksum = "d258b83ceec21034727ecee8c382cfa6c3e133699b0742c64571814fb420c9f7"
 dependencies = [
  "js-sys",
  "serde_core",
@@ -7799,18 +7719,18 @@ 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",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.126"
+version = "0.2.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4"
+checksum = "3ed04576f974d2b2fba0f38c51dbc5518011e38c36bf1143164be765528fd409"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -7821,9 +7741,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.76"
+version = "0.4.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62df1340f32221cb9c54d6a27b030e3dba64361d4a95bed55f9aacb44da291d"
+checksum = "9473dbd2991ae90b6291c3c32c30c6187ac49aa32f9905d1cce280ec1e110b0f"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -7831,9 +7751,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.126"
+version = "0.2.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1"
+checksum = "916151b09da36bd82f6615cbf3a419e2f0ba23a03c6160e8e92eb6bd4aa1dec6"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -7841,22 +7761,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.126"
+version = "0.2.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e"
+checksum = "299047362ccbfce148b67ab7e73349f77748e00c8296f9542adfad2ad82c5c5e"
 dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.126"
+version = "0.2.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24"
+checksum = "9a929b2c61f11ba3e9bc35b50c1f25cb38e0e892c0c231ae2b8cf78d5dad4437"
 dependencies = [
  "unicode-ident",
 ]
@@ -7895,7 +7815,7 @@ version = "0.31.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "rustix 1.1.4",
  "wayland-backend",
  "wayland-scanner",
@@ -7907,7 +7827,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "cursor-icon",
  "wayland-backend",
 ]
@@ -7925,11 +7845,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.12.1",
  "wayland-backend",
  "wayland-client",
  "wayland-scanner",
@@ -7942,7 +7862,7 @@ version = "20250721.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40a1f863128dcaaec790d7b4b396cc9b9a7a079e878e18c47e6c2d2c5a8dcbb1"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -7955,7 +7875,7 @@ version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e9567599ef23e09b8dad6e429e5738d4509dfc46b3b21f32841a304d16b29c8"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -7968,7 +7888,7 @@ version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b6d8cf1eb2c1c31ed1f5643c88a6e53538129d4af80030c8cabd1f9fa884d91"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -7981,7 +7901,7 @@ version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -8006,7 +7926,7 @@ version = "0.31.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc1846eb04c49182e04f4a099e2a830a2b745610bbc1d61246e206f29c7000a0"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "downcast-rs 1.2.1",
  "rustix 1.1.4",
  "wayland-backend",
@@ -8027,9 +7947,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.103"
+version = "0.3.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8622dcb61c0bcc9fffa6938bed81210af2da9a7e4a1a834b2e37a59b6dfb6141"
+checksum = "6d621441cfc37b84979402712047321980c178f299193a3589d05b99e8763436"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -8058,7 +7978,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9cb534d5ffd109c7d1135f34cdae29e60eab94855a625dcfe1705f8bc7ad79f"
 dependencies = [
  "arrayvec",
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "bytemuck",
  "cfg-if",
  "cfg_aliases 0.2.1",
@@ -8090,7 +8010,7 @@ dependencies = [
  "arrayvec",
  "bit-set",
  "bit-vec",
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "bytemuck",
  "cfg_aliases 0.2.1",
  "document-features",
@@ -8150,7 +8070,7 @@ dependencies = [
  "arrayvec",
  "ash",
  "bit-set",
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "block",
  "bytemuck",
  "cfg-if",
@@ -8194,7 +8114,7 @@ version = "28.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e18308757e594ed2cd27dddbb16a139c42a683819d32a2e0b1b0167552f5840c"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "bytemuck",
  "js-sys",
  "log",
@@ -8203,9 +8123,9 @@ dependencies = [
 
 [[package]]
 name = "which"
-version = "8.0.4"
+version = "8.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d7cd18d4acb58fb3cdfe9ea54e6cd96a4e7d4cc45c56338b236e82dad47248"
+checksum = "81995fafaaaf6ae47a7d0cc83c67caf92aeb7e5331650ae6ff856f7c0c60c459"
 dependencies = [
  "libc",
 ]
@@ -8232,7 +8152,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -8355,7 +8275,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -8366,7 +8286,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -8691,7 +8611,7 @@ name = "winit"
 version = "0.31.0-beta.2"
 source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#f737f1f5900b3399b56951305b0f155afc9c9ee5"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "cfg_aliases 0.2.1",
  "cursor-icon",
  "dpi",
@@ -8718,7 +8638,7 @@ version = "0.31.0-beta.2"
 source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#f737f1f5900b3399b56951305b0f155afc9c9ee5"
 dependencies = [
  "android-activity",
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "dpi",
  "ndk",
  "raw-window-handle",
@@ -8732,7 +8652,7 @@ name = "winit-appkit"
 version = "0.31.0-beta.2"
 source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#f737f1f5900b3399b56951305b0f155afc9c9ee5"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "block2 0.6.2",
  "dispatch2",
  "dpi",
@@ -8754,7 +8674,7 @@ name = "winit-common"
 version = "0.31.0-beta.2"
 source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#f737f1f5900b3399b56951305b0f155afc9c9ee5"
 dependencies = [
- "memmap2 0.9.11",
+ "memmap2 0.9.10",
  "objc2 0.6.4",
  "objc2-core-foundation",
  "smol_str",
@@ -8769,7 +8689,7 @@ name = "winit-core"
 version = "0.31.0-beta.2"
 source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#f737f1f5900b3399b56951305b0f155afc9c9ee5"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "cursor-icon",
  "dpi",
  "keyboard-types",
@@ -8783,7 +8703,7 @@ name = "winit-orbital"
 version = "0.31.0-beta.2"
 source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#f737f1f5900b3399b56951305b0f155afc9c9ee5"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "dpi",
  "libredox",
  "orbclient",
@@ -8799,7 +8719,7 @@ name = "winit-uikit"
 version = "0.31.0-beta.2"
 source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#f737f1f5900b3399b56951305b0f155afc9c9ee5"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "block2 0.6.2",
  "dispatch2",
  "dpi",
@@ -8820,12 +8740,12 @@ version = "0.31.0-beta.2"
 source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#f737f1f5900b3399b56951305b0f155afc9c9ee5"
 dependencies = [
  "ahash",
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "calloop",
  "cursor-icon",
  "dpi",
  "libc",
- "memmap2 0.9.11",
+ "memmap2 0.9.10",
  "raw-window-handle",
  "rustix 1.1.4",
  "sctk-adwaita",
@@ -8846,7 +8766,7 @@ version = "0.31.0-beta.2"
 source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#f737f1f5900b3399b56951305b0f155afc9c9ee5"
 dependencies = [
  "atomic-waker",
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "concurrent-queue",
  "cursor-icon",
  "dpi",
@@ -8867,7 +8787,7 @@ name = "winit-win32"
 version = "0.31.0-beta.2"
 source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#f737f1f5900b3399b56951305b0f155afc9c9ee5"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "cursor-icon",
  "dpi",
  "raw-window-handle",
@@ -8883,7 +8803,7 @@ name = "winit-x11"
 version = "0.31.0-beta.2"
 source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#f737f1f5900b3399b56951305b0f155afc9c9ee5"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "bytemuck",
  "calloop",
  "cursor-icon",
@@ -8988,7 +8908,7 @@ checksum = "2fb433233f2df9344722454bc7e96465c9d03bff9d77c248f9e7523fe79585b5"
 [[package]]
 name = "xdg-shell-wrapper-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-panel#45f03a3864a9385349be3ca13202553280e667d4"
+source = "git+https://github.com/pop-os/cosmic-panel#546a6c45210574caed9a3e51446aa8ad622d3627"
 dependencies = [
  "serde",
  "wayland-protocols-wlr",
@@ -9034,7 +8954,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d66ca9352cbd4eecbbc40871d8a11b4ac8107cfc528a6e14d7c19c69d0e1ac9"
 dependencies = [
  "libc",
- "memmap2 0.9.11",
+ "memmap2 0.9.10",
  "xkeysym",
 ]
 
@@ -9045,7 +8965,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a974f48060a14e95705c01f24ad9c3345022f4d97441b8a36beb7ed5c4a02d"
 dependencies = [
  "libc",
- "memmap2 0.9.11",
+ "memmap2 0.9.10",
  "xkeysym",
 ]
 
@@ -9055,7 +8975,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.12.1",
  "dlib",
  "log",
  "once_cell",
@@ -9135,7 +9055,7 @@ checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
  "synstructure",
 ]
 
@@ -9193,7 +9113,7 @@ checksum = "10da05367f3a7b7553c8cdf8fa91aee6b64afebe32b51c95177957efc47ca3a0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
  "zbus-lockstep",
  "zbus_xml",
  "zvariant",
@@ -9208,7 +9128,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
  "zbus_names",
  "zvariant",
  "zvariant_utils",
@@ -9258,22 +9178,22 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524"
 
 [[package]]
 name = "zerocopy"
-version = "0.8.52"
+version = "0.8.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f"
+checksum = "3b065d4f0e55f82fae73202e189638116a87c55ab6b8e6c2721e13dd9d854ad1"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.52"
+version = "0.8.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930"
+checksum = "0b631b19d36a892ab55420c92dbc83ccd79274f25be714855d3074aa71cab639"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -9293,15 +9213,15 @@ checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
  "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"
@@ -9335,7 +9255,7 @@ checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -9374,7 +9294,7 @@ checksum = "e6f2416a5f504dfd7e04fee49f31abafe3314a3f62b4ddaa8e9a5fd496d4dd50"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -9474,7 +9394,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.117",
  "zvariant_utils",
 ]
 
@@ -9487,6 +9407,6 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 2.0.118",
+ "syn 2.0.117",
  "winnow 1.0.3",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 4c31c2d..493991d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -70,8 +70,8 @@ debug = true
 # cosmic-text = { git = "https://github.com/pop-os/cosmic-text//", rev = "b017d7c" }
 
 [patch.'https://github.com/pop-os/cosmic-protocols']
-cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "32283d7" }
-cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "32283d7" }
+cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "d0e95be" }
+cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "d0e95be" }
 
 # [patch.'https://github.com/pop-os/cosmic-settings-daemon']
 # cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon//", branch = "input_nobuild" }
@@ -83,11 +83,12 @@ cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//",
 # cosmic-theme = { path = "../libcosmic/cosmic-theme" }
 # iced_futures = { path = "../libcosmic/iced/futures" }
 # iced_winit = { path = "../libcosmic/iced/winit" }
-# iced_futures = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }
-# libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }
-# cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }
-# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }
-# iced_winit = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }
+
+# libcosmic = { git = "https://github.com/pop-os/libcosmic//" }
+# cosmic-config = { git = "https://github.com/pop-os/libcosmic//" }
+# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//" }
+# iced_futures = { git = "https://github.com/pop-os/libcosmic//" }
+# iced_winit = { git = "https://github.com/pop-os/libcosmic//" }
 
 # [patch.'https://github.com/pop-os/dbus-settings-bindings']
 # cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" }
diff --git a/cosmic-settings/src/pages/desktop/appearance/drawer.rs b/cosmic-settings/src/pages/desktop/appearance/drawer.rs
index 4d8334f..3bfca74 100644
--- a/cosmic-settings/src/pages/desktop/appearance/drawer.rs
+++ b/cosmic-settings/src/pages/desktop/appearance/drawer.rs
@@ -2,10 +2,9 @@ use cosmic::app::{ContextDrawer, context_drawer};
 use cosmic::config::CosmicTk;
 use cosmic::cosmic_config::{Config, ConfigSet};
 use cosmic::cosmic_theme::Spacing;
-use cosmic::iced::Alignment;
 use cosmic::iced::core::{Color, Length};
 use cosmic::widget::color_picker::ColorPickerUpdate;
-use cosmic::widget::{ColorPickerModel, container, flex_row, row, settings, slider, text};
+use cosmic::widget::{ColorPickerModel, container, flex_row, settings, text};
 use cosmic::{Apply, Element, Task, task, widget};
 use cosmic_config::ConfigGet;
 use std::sync::Arc;
@@ -36,12 +35,6 @@ pub struct Content {
     icon_themes: IconThemes,
     icon_handles: IconHandles,
     tk_config: Option<Config>,
-    frosted: u8,
-    glass: f32,
-    frosted_system_interface: bool,
-    frosted_windows: bool,
-    frosted_panel: bool,
-    frosted_applets: bool,
 
     comp_config: cosmic_config::Config,
     #[cfg(feature = "cosmic-comp-config")]
@@ -96,7 +89,7 @@ impl From<&theme_manager::Manager> for Content {
             application_background: ColorPickerModel::new(
                 &*HEX,
                 &*RGB,
-                Some(theme.background(false).base.into()),
+                Some(theme.background.base.into()),
                 theme_manager.get_color(&ContextView::ApplicationBackground),
             ),
             container_background: ColorPickerModel::new(
@@ -108,7 +101,7 @@ impl From<&theme_manager::Manager> for Content {
             interface_text: ColorPickerModel::new(
                 &*HEX,
                 &*RGB,
-                Some(theme.background(false).on.into()),
+                Some(theme.background.on.into()),
                 theme_manager.get_color(&ContextView::InterfaceText),
             ),
             control_component: ColorPickerModel::new(
@@ -124,12 +117,6 @@ impl From<&theme_manager::Manager> for Content {
                 theme_manager.get_color(&ContextView::AccentWindowHint),
             ),
             font_config: font_config::Model::new(),
-            frosted: theme.frosted as u8,
-            glass: theme.alpha_map.guess_offset(),
-            frosted_system_interface: theme.frosted_system_interface,
-            frosted_windows: theme.frosted_windows,
-            frosted_panel: theme.frosted_panel,
-            frosted_applets: theme.frosted_applets,
             icons_fetched: false,
             icon_global: cosmic::config::apply_theme_global(),
             icon_fetch_handle: None,
@@ -293,40 +280,6 @@ impl Content {
         Task::none()
     }
 
-    pub fn update_frosted_system_interface(&mut self, v: bool) -> Task<app::Message> {
-        self.frosted_system_interface = v;
-
-        Task::none()
-    }
-
-    pub fn update_frosted_windows(&mut self, v: bool) -> Task<app::Message> {
-        self.frosted_windows = v;
-
-        Task::none()
-    }
-
-    pub fn update_frosted_panel(&mut self, v: bool) -> Task<app::Message> {
-        self.frosted_panel = v;
-
-        Task::none()
-    }
-
-    pub fn update_frosted_applets(&mut self, v: bool) -> Task<app::Message> {
-        self.frosted_applets = v;
-
-        Task::none()
-    }
-
-    pub fn update_blur(&mut self, v: u8) -> Task<app::Message> {
-        self.frosted = v;
-        Task::none()
-    }
-
-    pub fn update_glass(&mut self, v: f32) -> Task<app::Message> {
-        self.glass = v;
-        Task::none()
-    }
-
     pub fn on_open(&mut self, context_view: &ContextView) -> Task<app::Message> {
         match *context_view {
             ContextView::IconsAndToolkit => {
@@ -374,7 +327,7 @@ impl Content {
         self.application_background = ColorPickerModel::new(
             &*HEX,
             &*RGB,
-            Some(manager.theme().background(false).base.into()),
+            Some(manager.theme().background.base.into()),
             manager.get_color(&ContextView::ApplicationBackground),
         );
         self.custom_accent = ColorPickerModel::new(
@@ -392,7 +345,7 @@ impl Content {
         self.interface_text = ColorPickerModel::new(
             &*HEX,
             &*RGB,
-            Some(manager.theme().background(false).on.into()),
+            Some(manager.theme().background.on.into()),
             manager.get_color(&ContextView::InterfaceText),
         );
         self.control_component = ColorPickerModel::new(
@@ -518,10 +471,6 @@ impl Content {
                 self.shadow_and_corners(),
                 crate::pages::Message::CloseContextDrawer,
             ),
-            ContextView::FrostedGlass => context_drawer(
-                self.frosted_glass(),
-                crate::pages::Message::CloseContextDrawer,
-            ),
         })
     }
 
@@ -605,66 +554,4 @@ impl Content {
         .apply(Element::from)
         .map(crate::pages::Message::Appearance)
     }
-
-    pub fn frosted_glass(&self) -> Element<'_, crate::pages::Message> {
-        settings::section()
-            .add(
-                settings::item::builder(fl!("style", "frosted-panels"))
-                    .description(fl!("style", "frosted-panels-desc"))
-                    .toggler(self.frosted_panel, Message::FrostedPanel),
-            )
-            .add(
-                settings::item::builder(fl!("style", "frosted-applets"))
-                    .description(fl!("style", "frosted-applets-desc"))
-                    .toggler(self.frosted_applets, Message::FrostedApplets),
-            )
-            .add(
-                settings::item::builder(fl!("style", "frosted-system-interface"))
-                    .description(fl!("style", "frosted-system-interface-desc"))
-                    .toggler(
-                        self.frosted_system_interface,
-                        Message::FrostedSystemInterface,
-                    ),
-            )
-            .add(
-                settings::item::builder(fl!("style", "frosted-windows"))
-                    .description(fl!("style", "frosted-windows-desc"))
-                    .toggler(self.frosted_windows, Message::FrostedWindows),
-            )
-            .add(
-                settings::item::builder(fl!("style", "frosted-thickness")).flex_control({
-                    row::with_children(vec![
-                        text::body(fl!("style", "less")).into(),
-                        slider(0..=13, self.frosted, Message::Blur)
-                            .width(Length::Fill)
-                            .apply(cosmic::widget::container)
-                            .max_width(250)
-                            .into(),
-                        text::body(fl!("style", "more")).into(),
-                    ])
-                    .align_y(Alignment::Center)
-                    .spacing(8)
-                    .width(Length::Fill)
-                }),
-            )
-            .add(
-                settings::item::builder(fl!("style", "glass-opacity")).flex_control({
-                    row::with_children(vec![
-                        text::body(fl!("style", "less")).into(),
-                        slider(0.0..=1.0, self.glass, Message::Glass)
-                            .step(0.05)
-                            .width(Length::Fill)
-                            .apply(cosmic::widget::container)
-                            .max_width(250)
-                            .into(),
-                        text::body(fl!("style", "more")).into(),
-                    ])
-                    .align_y(Alignment::Center)
-                    .spacing(8)
-                    .width(Length::Fill)
-                }),
-            )
-            .apply(Element::from)
-            .map(crate::pages::Message::Appearance)
-    }
 }
diff --git a/cosmic-settings/src/pages/desktop/appearance/mod.rs b/cosmic-settings/src/pages/desktop/appearance/mod.rs
index 594656e..4eadb07 100644
--- a/cosmic-settings/src/pages/desktop/appearance/mod.rs
+++ b/cosmic-settings/src/pages/desktop/appearance/mod.rs
@@ -41,7 +41,6 @@ pub enum ContextView {
     ApplicationBackground,
     ContainerBackground,
     ControlComponent,
-    FrostedGlass,
     #[cfg(feature = "cosmic-comp-config")]
     ShadowAndCorners,
     CustomAccent,
@@ -160,12 +159,6 @@ pub enum Message {
     UseDefaultWindowHint(bool),
     WindowHintSize(u32),
     Daytime(bool),
-    Blur(u8),
-    Glass(f32),
-    FrostedPanel(bool),
-    FrostedApplets(bool),
-    FrostedSystemInterface(bool),
-    FrostedWindows(bool),
 }
 
 impl From<Message> for crate::app::Message {
@@ -200,7 +193,6 @@ impl Page {
 
             Message::DrawerOpen(context_view) => {
                 self.context_view = Some(context_view);
-                self.drawer = drawer::Content::from(&self.theme_manager);
                 tasks.push(cosmic::task::message(
                     crate::app::Message::OpenContextDrawer(self.entity),
                 ));
@@ -536,66 +528,6 @@ impl Page {
                     });
                 }
             }
-            Message::Blur(b) => {
-                let Ok(blur_strength) = b.try_into() else {
-                    tracing::error!("Invalid blur strength: {b}");
-                    return Task::none();
-                };
-                theme_staged = self.theme_manager.set_frosted(blur_strength).map(|_| {
-                    self.drawer.reset(&self.theme_manager);
-                    theme_manager::ThemeStaged::Current
-                });
-
-                tasks.push(self.drawer.update_blur(blur_strength as u8));
-            }
-            Message::Glass(glass) => {
-                let mut alpha_map = cosmic::cosmic_theme::AlphaMap::default();
-                let glass_offset_min = alpha_map.extremely_high_2;
-                let glass_offset_max = 1.0 - alpha_map.extremely_low;
-                let offset = (glass - 0.5) / 0.5
-                    * if glass < 0.5 {
-                        glass_offset_min
-                    } else {
-                        glass_offset_max
-                    };
-                alpha_map = alpha_map.offset(offset);
-
-                // TODO optimize and apply to both light and dark themes
-                theme_staged = self.theme_manager.set_glass(alpha_map).map(|_| {
-                    self.drawer.reset(&self.theme_manager);
-                    theme_manager::ThemeStaged::Current
-                });
-
-                tasks.push(self.drawer.update_glass(glass));
-            }
-            Message::FrostedSystemInterface(v) => {
-                theme_staged = self.theme_manager.set_frosted_system_interface(v).map(|_| {
-                    self.drawer.reset(&self.theme_manager);
-                    theme_manager::ThemeStaged::Current
-                });
-                tasks.push(self.drawer.update_frosted_system_interface(v));
-            }
-            Message::FrostedWindows(v) => {
-                theme_staged = self.theme_manager.set_frosted_windows(v).map(|_| {
-                    self.drawer.reset(&self.theme_manager);
-                    theme_manager::ThemeStaged::Current
-                });
-                tasks.push(self.drawer.update_frosted_windows(v));
-            }
-            Message::FrostedPanel(v) => {
-                theme_staged = self.theme_manager.set_frosted_panel(v).map(|_| {
-                    self.drawer.reset(&self.theme_manager);
-                    theme_manager::ThemeStaged::Current
-                });
-                tasks.push(self.drawer.update_frosted_panel(v));
-            }
-            Message::FrostedApplets(v) => {
-                theme_staged = self.theme_manager.set_frosted_applets(v).map(|_| {
-                    self.drawer.reset(&self.theme_manager);
-                    theme_manager::ThemeStaged::Current
-                });
-                tasks.push(self.drawer.update_frosted_applets(v));
-            }
         }
 
         let mut tasks = cosmic::Task::batch(tasks);
diff --git a/cosmic-settings/src/pages/desktop/appearance/style.rs b/cosmic-settings/src/pages/desktop/appearance/style.rs
index cfce2b1..160b794 100644
--- a/cosmic-settings/src/pages/desktop/appearance/style.rs
+++ b/cosmic-settings/src/pages/desktop/appearance/style.rs
@@ -5,8 +5,6 @@ use cosmic::widget::{button, container, settings, text};
 use cosmic::{Apply, Element};
 use cosmic_settings_page::Section;
 
-use crate::pages::desktop::appearance::ContextView;
-
 use super::{Message, Page, Roundness};
 
 #[allow(clippy::too_many_lines)]
@@ -15,7 +13,6 @@ pub fn section() -> Section<crate::pages::Message> {
         round = fl!("style", "round");
         slightly_round = fl!("style", "slightly-round");
         square = fl!("style", "square");
-        frosted_glass = fl!("style", "frosted-glass");
     });
 
     let dark_round_style = from_name("illustration-appearance-dark-style-round").handle();
@@ -140,10 +137,6 @@ pub fn section() -> Section<crate::pages::Message> {
                     )
                     .center_x(Length::Fill),
                 )
-                .add(crate::widget::go_next_item(
-                    &descriptions[frosted_glass],
-                    Message::DrawerOpen(ContextView::FrostedGlass),
-                ))
                 .apply(Element::from)
                 .map(crate::pages::Message::Appearance)
         })
diff --git a/cosmic-settings/src/pages/desktop/appearance/theme_manager.rs b/cosmic-settings/src/pages/desktop/appearance/theme_manager.rs
index ac26c63..12d8cc6 100644
--- a/cosmic-settings/src/pages/desktop/appearance/theme_manager.rs
+++ b/cosmic-settings/src/pages/desktop/appearance/theme_manager.rs
@@ -1,8 +1,8 @@
 use cosmic::cosmic_config::{Config, ConfigSet, CosmicConfigEntry};
 use cosmic::cosmic_theme::palette::{Srgb, Srgba};
 use cosmic::cosmic_theme::{
-    AlphaMap, BlurStrength, CornerRadii, DARK_THEME_BUILDER_ID, LIGHT_THEME_BUILDER_ID, Spacing,
-    Theme, ThemeBuilder, ThemeMode,
+    CornerRadii, DARK_THEME_BUILDER_ID, LIGHT_THEME_BUILDER_ID, Spacing, Theme, ThemeBuilder,
+    ThemeMode,
 };
 use cosmic::iced::core::Color;
 
@@ -74,7 +74,7 @@ impl From<(Option<Config>, Option<Config>, Option<Vec<Srgba>>)> for ThemeCustomi
             .success(theme.success.base.color)
             .warning(theme.warning.base.color)
             .neutral_tint(theme.palette.neutral_5.color)
-            .text_tint(theme.background(false).on.color);
+            .text_tint(theme.background.on.color);
 
         theme_builder.gaps = theme.gaps;
 
@@ -160,6 +160,20 @@ impl Default for Manager {
 
 impl Manager {
     pub fn build_theme(&mut self, stage: ThemeStaged) -> Task<app::Message> {
+        macro_rules! theme_transaction {
+            ($config:ident, $current_theme:ident, $new_theme:ident, { $($name:ident;)+ }) => {
+                let tx = $config.transaction();
+
+                $(
+                    if $current_theme.$name != $new_theme.$name {
+                        _ = tx.set(stringify!($name), $new_theme.$name.clone());
+                    }
+                )+
+
+                _ = tx.commit();
+            }
+        }
+
         let map_data_fn = |customizer: &ThemeCustomizer| {
             (customizer.builder.0.clone(), customizer.theme.1.clone())
         };
@@ -185,80 +199,32 @@ impl Manager {
         cosmic::task::future(async move {
             for (builder, config) in data.by_ref() {
                 if let Some(config) = config {
-                    let cur = match Theme::get_entry(&config) {
+                    let current_theme = match Theme::get_entry(&config) {
                         Ok(theme) => theme,
                         Err((_errs, theme)) => theme,
                     };
 
-                    let new = builder.build();
-
-                    // do this without the macro
-                    let tx = config.transaction();
-
-                    if cur.accent != new.accent {
-                        _ = tx.set("accent", new.accent.clone());
-                    }
-                    if cur.accent_button != new.accent_button {
-                        _ = tx.set("accent_button", new.accent_button.clone());
-                    }
-                    if cur.background(false) != new.background(false) {
-                        _ = tx.set("background", new.background(false).clone());
-                    }
-                    if cur.background(true) != new.background(true) {
-                        _ = tx.set("transparent_background", new.background(true).clone());
-                    }
-                    if cur.button != new.button {
-                        _ = tx.set("button", new.button.clone());
-                    }
-                    if cur.destructive != new.destructive {
-                        _ = tx.set("destructive", new.destructive.clone());
-                    }
-                    if cur.destructive_button != new.destructive_button {
-                        _ = tx.set("destructive_button", new.destructive_button.clone());
-                    }
-                    if cur.link_button != new.link_button {
-                        _ = tx.set("link_button", new.link_button.clone());
-                    }
-                    if cur.icon_button != new.icon_button {
-                        _ = tx.set("icon_button", new.icon_button.clone());
-                    }
-                    if cur.palette != new.palette {
-                        _ = tx.set("palette", new.palette.clone());
-                    }
-                    if cur.primary(false) != new.primary(false) {
-                        _ = tx.set("primary", new.primary(false).clone());
-                    }
-                    if cur.secondary(false) != new.secondary(false) {
-                        _ = tx.set("secondary", new.secondary(false).clone());
-                    }
-                    if cur.primary(true) != new.primary(true) {
-                        _ = tx.set("transparent_primary", new.primary(true).clone());
-                    }
-                    if cur.secondary(true) != new.secondary(true) {
-                        _ = tx.set("transparent_secondary", new.secondary(true).clone());
-                    }
-                    if cur.shade != new.shade {
-                        _ = tx.set("shade", new.shade.clone());
-                    }
-                    if cur.success != new.success {
-                        _ = tx.set("success", new.success.clone());
-                    }
-                    if cur.text_button != new.text_button {
-                        _ = tx.set("text_button", new.text_button.clone());
-                    }
-                    if cur.warning != new.warning {
-                        _ = tx.set("warning", new.warning.clone());
-                    }
-                    if cur.warning_button != new.warning_button {
-                        _ = tx.set("warning_button", new.warning_button.clone());
-                    }
-                    if cur.window_hint != new.window_hint {
-                        _ = tx.set("window_hint", new.window_hint.clone());
-                    }
-                    if cur.accent_text != new.accent_text {
-                        _ = tx.set("accent_text", new.accent_text.clone());
-                    }
-                    _ = tx.commit();
+                    let new_theme = builder.build();
+                    theme_transaction!(config, current_theme, new_theme, {
+                        accent;
+                        accent_button;
+                        background;
+                        button;
+                        destructive;
+                        destructive_button;
+                        link_button;
+                        icon_button;
+                        palette;
+                        primary;
+                        secondary;
+                        shade;
+                        success;
+                        text_button;
+                        warning;
+                        warning_button;
+                        window_hint;
+                        accent_text;
+                    });
                 }
             }
 
@@ -394,39 +360,6 @@ impl Manager {
         Some(ThemeStaged::Both)
     }
 
-    pub fn set_frosted(&mut self, frosted: BlurStrength) -> Option<ThemeStaged> {
-        self.dark.set_frosted(frosted)?;
-        self.light.set_frosted(frosted)?;
-        Some(ThemeStaged::Both)
-    }
-
-    pub fn set_glass(&mut self, alpha_map: AlphaMap) -> Option<ThemeStaged> {
-        self.dark.set_glass(alpha_map)?;
-        self.light.set_glass(alpha_map)?;
-        Some(ThemeStaged::Both)
-    }
-
-    pub fn set_frosted_panel(&mut self, enabled: bool) -> Option<ThemeStaged> {
-        self.dark.set_frosted_panel(enabled)?;
-        self.light.set_frosted_panel(enabled)?;
-        Some(ThemeStaged::Both)
-    }
-    pub fn set_frosted_applets(&mut self, enabled: bool) -> Option<ThemeStaged> {
-        self.dark.set_frosted_applets(enabled)?;
-        self.light.set_frosted_applets(enabled)?;
-        Some(ThemeStaged::Both)
-    }
-    pub fn set_frosted_system_interface(&mut self, enabled: bool) -> Option<ThemeStaged> {
-        self.dark.set_frosted_system_interface(enabled)?;
-        self.light.set_frosted_system_interface(enabled)?;
-        Some(ThemeStaged::Both)
-    }
-    pub fn set_frosted_windows(&mut self, enabled: bool) -> Option<ThemeStaged> {
-        self.dark.set_frosted_windows(enabled)?;
-        self.light.set_frosted_windows(enabled)?;
-        Some(ThemeStaged::Both)
-    }
-
     pub fn get_color(&self, context: &ContextView) -> Option<Color> {
         match *context {
             ContextView::CustomAccent => self.custom_accent().map(Color::from),
@@ -607,81 +540,6 @@ impl ThemeCustomizer {
         Some(ThemeStaged::Current)
     }
 
-    pub fn set_frosted(&mut self, frosted: BlurStrength) -> Option<ThemeStaged> {
-        let config = self.builder.1.as_ref()?;
-
-        self.builder.0.set_frosted(config, frosted).ok()?;
-        self.theme
-            .0
-            .set_frosted(self.theme.1.as_ref()?, frosted)
-            .ok()?;
-
-        Some(ThemeStaged::Current)
-    }
-
-    pub fn set_glass(&mut self, alpha_map: AlphaMap) -> Option<ThemeStaged> {
-        let config = self.builder.1.as_ref()?;
-
-        self.builder.0.set_alpha_map(config, alpha_map).ok()?;
-        self.theme
-            .0
-            .set_alpha_map(self.theme.1.as_ref()?, alpha_map)
-            .ok()?;
-
-        Some(ThemeStaged::Current)
-    }
-
-    pub fn set_frosted_windows(&mut self, enabled: bool) -> Option<ThemeStaged> {
-        let config = self.builder.1.as_ref()?;
-
-        self.builder.0.set_frosted_windows(config, enabled).ok()?;
-        self.theme
-            .0
-            .set_frosted_windows(self.theme.1.as_ref()?, enabled)
-            .ok()?;
-
-        Some(ThemeStaged::Current)
-    }
-
-    pub fn set_frosted_system_interface(&mut self, enabled: bool) -> Option<ThemeStaged> {
-        let config = self.builder.1.as_ref()?;
-
-        self.builder
-            .0
-            .set_frosted_system_interface(config, enabled)
-            .ok()?;
-        self.theme
-            .0
-            .set_frosted_system_interface(self.theme.1.as_ref()?, enabled)
-            .ok()?;
-
-        Some(ThemeStaged::Current)
-    }
-
-    pub fn set_frosted_applets(&mut self, enabled: bool) -> Option<ThemeStaged> {
-        let config = self.builder.1.as_ref()?;
-
-        self.builder.0.set_frosted_applets(config, enabled).ok()?;
-        self.theme
-            .0
-            .set_frosted_applets(self.theme.1.as_ref()?, enabled)
-            .ok()?;
-
-        Some(ThemeStaged::Current)
-    }
-
-    pub fn set_frosted_panel(&mut self, enabled: bool) -> Option<ThemeStaged> {
-        let config = self.builder.1.as_ref()?;
-
-        self.builder.0.set_frosted_panel(config, enabled).ok()?;
-        self.theme
-            .0
-            .set_frosted_panel(self.theme.1.as_ref()?, enabled)
-            .ok()?;
-
-        Some(ThemeStaged::Current)
-    }
-
     // set active hints is set on all themes to be consistent between dark & light themes.
     pub fn set_active_hint(&mut self, active_hint: u32) -> Option<ThemeStaged> {
         let config = self.builder.1.as_ref()?;
diff --git a/cosmic-settings/src/pages/system/info.rs b/cosmic-settings/src/pages/system/info.rs
index a227fb2..69b3540 100644
--- a/cosmic-settings/src/pages/system/info.rs
+++ b/cosmic-settings/src/pages/system/info.rs
@@ -36,7 +36,7 @@ impl Info {
 
         // Use wgpu to enumerate GPUs. Works cross-platform and doesn't require external tools
         let instance = wgpu::Instance::default();
-        let adapters = instance.enumerate_adapters(wgpu::Backends::all());
+        let adapters = instance.enumerate_adapters(wgpu::Backends::all()).await;
 
         // Track seen GPUs by (vendor, device) and by name to handle different scenarios:
         // - Same GPU via different backends (Vulkan/OpenGL) -> deduplicate by device ID or name
@@ -45,7 +45,7 @@ impl Info {
         let mut seen_devices = HashSet::new();
         let mut seen_names = HashSet::new();
 
-        for adapter in adapters.await {
+        for adapter in adapters {
             let adapter_info = adapter.get_info();
 
             if adapter_info.device_type == wgpu::DeviceType::Cpu {
diff --git a/i18n/en/cosmic_settings.ftl b/i18n/en/cosmic_settings.ftl
index b77f075..eb2babe 100644
--- a/i18n/en/cosmic_settings.ftl
+++ b/i18n/en/cosmic_settings.ftl
@@ -401,20 +401,7 @@ style = Style
     .round = Round
     .slightly-round = Slightly round
     .square = Square
-    .frosted-glass = Frosted glass
-    .frosted-system-interface = System interface
-    .frosted-system-interface-desc = Applies frosted glass to Launcher, application library, workspace overview, on-screen controls
-    .frosted-windows = Windows
-    .frosted-windows-desc = Applies frosted glass to windows and dialogs
-    .frosted-panels = Panels
-    .frosted-panels-desc = Applies frosted glass to panel and dock
-    .frosted-applets = Applets
-    .frosted-applets-desc = Applies frosted glass to applet menus on panel and dock
-    .frosted-thickness = Frost thickness
-    .less = less
-    .more = more
-    .glass-opacity = Glass opacity
-    
+
 interface-density = Interface density
     .comfortable = Comfortable
     .compact = Compact
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/accent b/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/accent
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/accent
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/active_hint b/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/active_hint
deleted file mode 100644
index e440e5c..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/active_hint
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/alpha_map b/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/alpha_map
deleted file mode 100644
index 06f3e6a..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/alpha_map
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-    extremely_low: 0.9,
-    extremely_low_2: 0.87692,
-    very_low: 0.85385,
-    very_low_2: 0.83076,
-    low: 0.80769,
-    low_2: 0.78461,
-    medium: 0.76154,
-    medium_2: 0.73846,
-    high: 0.71538,
-    high_2: 0.69231,
-    very_high: 0.66023,
-    very_high_2: 0.64615,
-    extremely_high: 0.62308,
-    extremely_high_2: 0.6,
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/bg_color b/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/bg_color
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/bg_color
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/corner_radii b/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/corner_radii
deleted file mode 100644
index 7d52139..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/corner_radii
+++ /dev/null
@@ -1,8 +0,0 @@
-(
-    radius_0: (0.0, 0.0, 0.0, 0.0),
-    radius_xs: (4.0, 4.0, 4.0, 4.0),
-    radius_s: (8.0, 8.0, 8.0, 8.0),
-    radius_m: (16.0, 16.0, 16.0, 16.0),
-    radius_l: (32.0, 32.0, 32.0, 32.0),
-    radius_xl: (160.0, 160.0, 160.0, 160.0),
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/destructive b/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/destructive
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/destructive
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/frosted b/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/frosted
deleted file mode 100644
index 55b60b7..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/frosted
+++ /dev/null
@@ -1 +0,0 @@
-Medium
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/frosted_applets b/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/frosted_applets
deleted file mode 100644
index 02e4a84..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/frosted_applets
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/frosted_panel b/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/frosted_panel
deleted file mode 100644
index 02e4a84..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/frosted_panel
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/frosted_system_interface b/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/frosted_system_interface
deleted file mode 100644
index 02e4a84..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/frosted_system_interface
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/frosted_windows b/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/frosted_windows
deleted file mode 100644
index 02e4a84..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/frosted_windows
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/gaps b/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/gaps
deleted file mode 100644
index 6fe974b..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/gaps
+++ /dev/null
@@ -1 +0,0 @@
-(0, 8)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/neutral_tint b/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/neutral_tint
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/neutral_tint
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/palette b/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/palette
deleted file mode 100644
index 16e8c50..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/palette
+++ /dev/null
@@ -1,35 +0,0 @@
-(
-    name: "cosmic-dark",
-    bright_red: "#FFA09AFF",
-    bright_green: "#5EDB8CFF",
-    bright_orange: "#FFA37DFF",
-    gray_1: "#1B1B1BFF",
-    gray_2: "#262626FF",
-    neutral_0: "#000000FF",
-    neutral_1: "#030303FF",
-    neutral_2: "#161616FF",
-    neutral_3: "#2E2E2EFF",
-    neutral_4: "#484848FF",
-    neutral_5: "#636363FF",
-    neutral_6: "#808080FF",
-    neutral_7: "#9E9E9EFF",
-    neutral_8: "#BEBEBEFF",
-    neutral_9: "#DEDEDEFF",
-    neutral_10: "#FFFFFFFF",
-    accent_blue: "#63D0DFFF",
-    accent_indigo: "#A1C0EBFF",
-    accent_purple: "#E79CFEFF",
-    accent_pink: "#FF9CB1FF",
-    accent_red: "#FDA1A0FF",
-    accent_orange: "#FFAD00FF",
-    accent_yellow: "#F7E062FF",
-    accent_green: "#92CF9CFF",
-    accent_warm_grey: "#CABAB4FF",
-    ext_warm_grey: "#9B8E8AFF",
-    ext_orange: "#FFAD00FF",
-    ext_yellow: "#FEDB40FF",
-    ext_blue: "#48B9C7FF",
-    ext_purple: "#CF7DFFFF",
-    ext_pink: "#F93A83FF",
-    ext_indigo: "#3E88FFFF",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/primary_container_bg b/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/primary_container_bg
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/primary_container_bg
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/secondary_container_bg b/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/secondary_container_bg
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/secondary_container_bg
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/spacing b/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/spacing
deleted file mode 100644
index 464b264..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/spacing
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-    space_none: 0,
-    space_xxxs: 4,
-    space_xxs: 8,
-    space_xs: 12,
-    space_s: 16,
-    space_m: 24,
-    space_l: 32,
-    space_xl: 48,
-    space_xxl: 64,
-    space_xxxl: 128,
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/success b/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/success
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/success
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/text_tint b/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/text_tint
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/text_tint
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/warning b/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/warning
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/warning
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/window_hint b/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/window_hint
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark.Builder/v2/window_hint
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/accent b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/accent
deleted file mode 100644
index 5519c3b..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/accent
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#63D0DFFF",
-    hover: "#63BAC6FF",
-    pressed: "#3C737AFF",
-    selected: "#63BAC6FF",
-    selected_text: "#63D0DFFF",
-    focus: "#63D0DFFF",
-    divider: "#000000FF",
-    on: "#000000FF",
-    disabled: "#63D0DFFF",
-    on_disabled: "#326870FF",
-    border: "#63D0DFFF",
-    disabled_border: "#63D0DF80",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/accent_button b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/accent_button
deleted file mode 100644
index 0e79e51..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/accent_button
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#63D0DFFF",
-    hover: "#63BAC6FF",
-    pressed: "#3C737AFF",
-    selected: "#63BAC6FF",
-    selected_text: "#63D0DFFF",
-    focus: "#63D0DFFF",
-    divider: "#030303FF",
-    on: "#000000FF",
-    disabled: "#63D0DFFF",
-    on_disabled: "#00000080",
-    border: "#63D0DFFF",
-    disabled_border: "#63D0DF80",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/accent_text b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/accent_text
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/accent_text
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/active_hint b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/active_hint
deleted file mode 100644
index e440e5c..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/active_hint
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/alpha_map b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/alpha_map
deleted file mode 100644
index 06f3e6a..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/alpha_map
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-    extremely_low: 0.9,
-    extremely_low_2: 0.87692,
-    very_low: 0.85385,
-    very_low_2: 0.83076,
-    low: 0.80769,
-    low_2: 0.78461,
-    medium: 0.76154,
-    medium_2: 0.73846,
-    high: 0.71538,
-    high_2: 0.69231,
-    very_high: 0.66023,
-    very_high_2: 0.64615,
-    extremely_high: 0.62308,
-    extremely_high_2: 0.6,
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/background b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/background
deleted file mode 100644
index 8568268..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/background
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-    base: "#1B1B1BFF",
-    component: (
-        base: "#2E2E2EFF",
-        hover: "#434343FF",
-        pressed: "#585858FF",
-        selected: "#434343FF",
-        selected_text: "#63D0DFFF",
-        focus: "#63D0DFFF",
-        divider: "#C0C0C033",
-        on: "#C0C0C0FF",
-        disabled: "#2E2E2E80",
-        on_disabled: "#C0C0C0A6",
-        border: "#BEBEBEFF",
-        disabled_border: "#BEBEBE80",
-    ),
-    divider: "#444444FF",
-    on: "#E7E7E7FF",
-    small_widget: "#27272740",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/button b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/button
deleted file mode 100644
index ea09e2d..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/button
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#9E9E9E40",
-    hover: "#63636366",
-    pressed: "#2B2B2B9F",
-    selected: "#63636366",
-    selected_text: "#63D0DFFF",
-    focus: "#63D0DFFF",
-    divider: "#C0C0C033",
-    on: "#C0C0C0FF",
-    disabled: "#9E9E9E20",
-    on_disabled: "#C0C0C0A6",
-    border: "#BEBEBEFF",
-    disabled_border: "#BEBEBE80",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/control_tint b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/control_tint
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/control_tint
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/corner_radii b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/corner_radii
deleted file mode 100644
index 7d52139..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/corner_radii
+++ /dev/null
@@ -1,8 +0,0 @@
-(
-    radius_0: (0.0, 0.0, 0.0, 0.0),
-    radius_xs: (4.0, 4.0, 4.0, 4.0),
-    radius_s: (8.0, 8.0, 8.0, 8.0),
-    radius_m: (16.0, 16.0, 16.0, 16.0),
-    radius_l: (32.0, 32.0, 32.0, 32.0),
-    radius_xl: (160.0, 160.0, 160.0, 160.0),
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/destructive b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/destructive
deleted file mode 100644
index 428c1d1..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/destructive
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#FFA09AFF",
-    hover: "#E0948FFF",
-    pressed: "#8A5B58FF",
-    selected: "#E0948FFF",
-    selected_text: "#63D0DFFF",
-    focus: "#63D0DFFF",
-    divider: "#000000FF",
-    on: "#000000FF",
-    disabled: "#FFA09AFF",
-    on_disabled: "#80504DFF",
-    border: "#FFA09AFF",
-    disabled_border: "#FFA09A80",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/destructive_button b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/destructive_button
deleted file mode 100644
index fc8066f..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/destructive_button
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#FFA09AFF",
-    hover: "#E0948FFF",
-    pressed: "#8A5B58FF",
-    selected: "#E0948FFF",
-    selected_text: "#63D0DFFF",
-    focus: "#63D0DFFF",
-    divider: "#030303FF",
-    on: "#000000FF",
-    disabled: "#FFA09AFF",
-    on_disabled: "#00000080",
-    border: "#FFA09AFF",
-    disabled_border: "#FFA09A80",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/frosted b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/frosted
deleted file mode 100644
index 55b60b7..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/frosted
+++ /dev/null
@@ -1 +0,0 @@
-Medium
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/frosted_applets b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/frosted_applets
deleted file mode 100644
index 02e4a84..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/frosted_applets
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/frosted_panel b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/frosted_panel
deleted file mode 100644
index 02e4a84..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/frosted_panel
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/frosted_system_interface b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/frosted_system_interface
deleted file mode 100644
index 02e4a84..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/frosted_system_interface
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/frosted_windows b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/frosted_windows
deleted file mode 100644
index 02e4a84..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/frosted_windows
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/gaps b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/gaps
deleted file mode 100644
index 6fe974b..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/gaps
+++ /dev/null
@@ -1 +0,0 @@
-(0, 8)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/icon_button b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/icon_button
deleted file mode 100644
index cb5fa87..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/icon_button
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#00000000",
-    hover: "#63636333",
-    pressed: "#16161680",
-    selected: "#63636333",
-    selected_text: "#63D0DFFF",
-    focus: "#63D0DFFF",
-    divider: "#BEBEBE33",
-    on: "#BEBEBEFF",
-    disabled: "#00000000",
-    on_disabled: "#BEBEBEA6",
-    border: "#BEBEBEFF",
-    disabled_border: "#BEBEBE80",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/is_dark b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/is_dark
deleted file mode 100644
index f32a580..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/is_dark
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/is_high_contrast b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/is_high_contrast
deleted file mode 100644
index 02e4a84..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/is_high_contrast
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/link_button b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/link_button
deleted file mode 100644
index eec0dff..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/link_button
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#00000000",
-    hover: "#00000000",
-    pressed: "#00000000",
-    selected: "#00000000",
-    selected_text: "#63D0DFFF",
-    focus: "#63D0DFFF",
-    divider: "#63D0DF33",
-    on: "#63D0DFFF",
-    disabled: "#00000000",
-    on_disabled: "#32687080",
-    border: "#BEBEBEFF",
-    disabled_border: "#BEBEBE80",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/name b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/name
deleted file mode 100644
index 7147ddb..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/name
+++ /dev/null
@@ -1 +0,0 @@
-"cosmic-dark"
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/palette b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/palette
deleted file mode 100644
index 16e8c50..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/palette
+++ /dev/null
@@ -1,35 +0,0 @@
-(
-    name: "cosmic-dark",
-    bright_red: "#FFA09AFF",
-    bright_green: "#5EDB8CFF",
-    bright_orange: "#FFA37DFF",
-    gray_1: "#1B1B1BFF",
-    gray_2: "#262626FF",
-    neutral_0: "#000000FF",
-    neutral_1: "#030303FF",
-    neutral_2: "#161616FF",
-    neutral_3: "#2E2E2EFF",
-    neutral_4: "#484848FF",
-    neutral_5: "#636363FF",
-    neutral_6: "#808080FF",
-    neutral_7: "#9E9E9EFF",
-    neutral_8: "#BEBEBEFF",
-    neutral_9: "#DEDEDEFF",
-    neutral_10: "#FFFFFFFF",
-    accent_blue: "#63D0DFFF",
-    accent_indigo: "#A1C0EBFF",
-    accent_purple: "#E79CFEFF",
-    accent_pink: "#FF9CB1FF",
-    accent_red: "#FDA1A0FF",
-    accent_orange: "#FFAD00FF",
-    accent_yellow: "#F7E062FF",
-    accent_green: "#92CF9CFF",
-    accent_warm_grey: "#CABAB4FF",
-    ext_warm_grey: "#9B8E8AFF",
-    ext_orange: "#FFAD00FF",
-    ext_yellow: "#FEDB40FF",
-    ext_blue: "#48B9C7FF",
-    ext_purple: "#CF7DFFFF",
-    ext_pink: "#F93A83FF",
-    ext_indigo: "#3E88FFFF",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/primary b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/primary
deleted file mode 100644
index c779f21..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/primary
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-    base: "#272727FF",
-    component: (
-        base: "#363636FF",
-        hover: "#4A4A4AFF",
-        pressed: "#5E5E5EFF",
-        selected: "#4A4A4AFF",
-        selected_text: "#63D0DFFF",
-        focus: "#63D0DFFF",
-        divider: "#CACACA33",
-        on: "#CACACAFF",
-        disabled: "#36363680",
-        on_disabled: "#CACACAA6",
-        border: "#BEBEBEFF",
-        disabled_border: "#BEBEBE80",
-    ),
-    divider: "#515151FF",
-    on: "#F8F8F8FF",
-    small_widget: "#34343440",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/secondary b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/secondary
deleted file mode 100644
index 069a373..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/secondary
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-    base: "#343434FF",
-    component: (
-        base: "#3B3B3BFF",
-        hover: "#4F4F4FFF",
-        pressed: "#626262FF",
-        selected: "#4F4F4FFF",
-        selected_text: "#63D0DFFF",
-        focus: "#63D0DFFF",
-        divider: "#D0D0D033",
-        on: "#D0D0D0FF",
-        disabled: "#3B3B3B80",
-        on_disabled: "#D0D0D0A6",
-        border: "#BEBEBEFF",
-        disabled_border: "#BEBEBE80",
-    ),
-    divider: "#515151FF",
-    on: "#C7C7C7FF",
-    small_widget: "#41414140",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/shade b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/shade
deleted file mode 100644
index 1afc7ab..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/shade
+++ /dev/null
@@ -1 +0,0 @@
-"#00000052"
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/spacing b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/spacing
deleted file mode 100644
index 464b264..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/spacing
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-    space_none: 0,
-    space_xxxs: 4,
-    space_xxs: 8,
-    space_xs: 12,
-    space_s: 16,
-    space_m: 24,
-    space_l: 32,
-    space_xl: 48,
-    space_xxl: 64,
-    space_xxxl: 128,
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/success b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/success
deleted file mode 100644
index 8bdbb8b..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/success
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#5EDB8CFF",
-    hover: "#5FC384FF",
-    pressed: "#3A7851FF",
-    selected: "#5FC384FF",
-    selected_text: "#63D0DFFF",
-    focus: "#63D0DFFF",
-    divider: "#000000FF",
-    on: "#000000FF",
-    disabled: "#5EDB8CFF",
-    on_disabled: "#2F6E46FF",
-    border: "#5EDB8CFF",
-    disabled_border: "#5EDB8C80",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/success_button b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/success_button
deleted file mode 100644
index 972c4f3..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/success_button
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#5EDB8CFF",
-    hover: "#5FC384FF",
-    pressed: "#3A7851FF",
-    selected: "#5FC384FF",
-    selected_text: "#63D0DFFF",
-    focus: "#63D0DFFF",
-    divider: "#030303FF",
-    on: "#000000FF",
-    disabled: "#5EDB8CFF",
-    on_disabled: "#00000080",
-    border: "#5EDB8CFF",
-    disabled_border: "#5EDB8C80",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/text_button b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/text_button
deleted file mode 100644
index cd17f71..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/text_button
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#00000000",
-    hover: "#63636333",
-    pressed: "#16161680",
-    selected: "#63636333",
-    selected_text: "#63D0DFFF",
-    focus: "#63D0DFFF",
-    divider: "#63D0DF33",
-    on: "#63D0DFFF",
-    disabled: "#00000000",
-    on_disabled: "#63D0DFA6",
-    border: "#BEBEBEFF",
-    disabled_border: "#BEBEBE80",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/text_tint b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/text_tint
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/text_tint
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/transparent_background b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/transparent_background
deleted file mode 100644
index 8981793..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/transparent_background
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-    base: "#1B1B1B99",
-    component: (
-        base: "#2E2E2E99",
-        hover: "#2E2E2E99",
-        pressed: "#2E2E2E99",
-        selected: "#2E2E2E99",
-        selected_text: "#63D0DFFF",
-        focus: "#63D0DFFF",
-        divider: "#C0C0C033",
-        on: "#C0C0C099",
-        disabled: "#2E2E2E4C",
-        on_disabled: "#C0C0C0A6",
-        border: "#BEBEBEFF",
-        disabled_border: "#BEBEBE80",
-    ),
-    divider: "#414141AD",
-    on: "#E7E7E799",
-    small_widget: "#27272740",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/transparent_primary b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/transparent_primary
deleted file mode 100644
index 3f25243..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/transparent_primary
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-    base: "#272727E6",
-    component: (
-        base: "#363636E6",
-        hover: "#363636E6",
-        pressed: "#363636E6",
-        selected: "#363636E6",
-        selected_text: "#63D0DFFF",
-        focus: "#63D0DFFF",
-        divider: "#CACACA33",
-        on: "#CACACAE6",
-        disabled: "#36363673",
-        on_disabled: "#CACACAA6",
-        border: "#BEBEBEFF",
-        disabled_border: "#BEBEBE80",
-    ),
-    divider: "#505050EB",
-    on: "#F8F8F8E6",
-    small_widget: "#34343440",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/transparent_secondary b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/transparent_secondary
deleted file mode 100644
index b2a0ac2..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/transparent_secondary
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-    base: "#343434FF",
-    component: (
-        base: "#3B3B3BFF",
-        hover: "#3B3B3BFF",
-        pressed: "#3B3B3BFF",
-        selected: "#3B3B3BFF",
-        selected_text: "#63D0DFFF",
-        focus: "#63D0DFFF",
-        divider: "#D0D0D033",
-        on: "#D0D0D0FF",
-        disabled: "#3B3B3B80",
-        on_disabled: "#D0D0D0A6",
-        border: "#BEBEBEFF",
-        disabled_border: "#BEBEBE80",
-    ),
-    divider: "#515151FF",
-    on: "#C7C7C7FF",
-    small_widget: "#41414140",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/warning b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/warning
deleted file mode 100644
index 944161b..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/warning
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#FFA37DFF",
-    hover: "#E09678FF",
-    pressed: "#8A5C49FF",
-    selected: "#E09678FF",
-    selected_text: "#63D0DFFF",
-    focus: "#63D0DFFF",
-    divider: "#000000FF",
-    on: "#000000FF",
-    disabled: "#FFA37DFF",
-    on_disabled: "#80523FFF",
-    border: "#FFA37DFF",
-    disabled_border: "#FFA37D80",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/warning_button b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/warning_button
deleted file mode 100644
index e184d57..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/warning_button
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#FFA37DFF",
-    hover: "#E09678FF",
-    pressed: "#8A5C49FF",
-    selected: "#E09678FF",
-    selected_text: "#63D0DFFF",
-    focus: "#63D0DFFF",
-    divider: "#FFFFFFFF",
-    on: "#000000FF",
-    disabled: "#FFA37DFF",
-    on_disabled: "#00000080",
-    border: "#FFA37DFF",
-    disabled_border: "#FFA37D80",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/window_hint b/resources/default_schema/com.system76.CosmicTheme.Dark/v2/window_hint
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Dark/v2/window_hint
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/accent b/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/accent
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/accent
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/active_hint b/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/active_hint
deleted file mode 100644
index e440e5c..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/active_hint
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/alpha_map b/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/alpha_map
deleted file mode 100644
index 06f3e6a..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/alpha_map
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-    extremely_low: 0.9,
-    extremely_low_2: 0.87692,
-    very_low: 0.85385,
-    very_low_2: 0.83076,
-    low: 0.80769,
-    low_2: 0.78461,
-    medium: 0.76154,
-    medium_2: 0.73846,
-    high: 0.71538,
-    high_2: 0.69231,
-    very_high: 0.66023,
-    very_high_2: 0.64615,
-    extremely_high: 0.62308,
-    extremely_high_2: 0.6,
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/bg_color b/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/bg_color
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/bg_color
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/corner_radii b/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/corner_radii
deleted file mode 100644
index 7d52139..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/corner_radii
+++ /dev/null
@@ -1,8 +0,0 @@
-(
-    radius_0: (0.0, 0.0, 0.0, 0.0),
-    radius_xs: (4.0, 4.0, 4.0, 4.0),
-    radius_s: (8.0, 8.0, 8.0, 8.0),
-    radius_m: (16.0, 16.0, 16.0, 16.0),
-    radius_l: (32.0, 32.0, 32.0, 32.0),
-    radius_xl: (160.0, 160.0, 160.0, 160.0),
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/destructive b/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/destructive
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/destructive
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/frosted b/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/frosted
deleted file mode 100644
index 55b60b7..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/frosted
+++ /dev/null
@@ -1 +0,0 @@
-Medium
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/frosted_applets b/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/frosted_applets
deleted file mode 100644
index 02e4a84..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/frosted_applets
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/frosted_panel b/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/frosted_panel
deleted file mode 100644
index 02e4a84..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/frosted_panel
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/frosted_system_interface b/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/frosted_system_interface
deleted file mode 100644
index 02e4a84..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/frosted_system_interface
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/frosted_windows b/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/frosted_windows
deleted file mode 100644
index 02e4a84..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/frosted_windows
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/gaps b/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/gaps
deleted file mode 100644
index 6fe974b..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/gaps
+++ /dev/null
@@ -1 +0,0 @@
-(0, 8)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/neutral_tint b/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/neutral_tint
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/neutral_tint
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/palette b/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/palette
deleted file mode 100644
index 71b3c7d..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/palette
+++ /dev/null
@@ -1,35 +0,0 @@
-Light((
-    name: "cosmic-light",
-    bright_red: "#890418FF",
-    bright_green: "#00572CFF",
-    bright_orange: "#792C00FF",
-    gray_1: "#D7D7D7FF",
-    gray_2: "#E4E4E4FF",
-    neutral_0: "#FFFFFFFF",
-    neutral_1: "#DEDEDEFF",
-    neutral_2: "#BEBEBEFF",
-    neutral_3: "#9E9E9EFF",
-    neutral_4: "#808080FF",
-    neutral_5: "#636363FF",
-    neutral_6: "#484848FF",
-    neutral_7: "#2E2E2EFF",
-    neutral_8: "#161616FF",
-    neutral_9: "#030303FF",
-    neutral_10: "#000000FF",
-    accent_blue: "#00525AFF",
-    accent_indigo: "#2E496DFF",
-    accent_purple: "#68217CFF",
-    accent_pink: "#86043AFF",
-    accent_red: "#78292EFF",
-    accent_orange: "#624000FF",
-    accent_yellow: "#534800FF",
-    accent_green: "#185529FF",
-    accent_warm_grey: "#554742FF",
-    ext_warm_grey: "#9B8E8AFF",
-    ext_orange: "#FBB86CFF",
-    ext_yellow: "#F7E062FF",
-    ext_blue: "#6ACAD8FF",
-    ext_purple: "#D58CFFFF",
-    ext_pink: "#FF9CDDFF",
-    ext_indigo: "#95C4FCFF",
-))
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/primary_container_bg b/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/primary_container_bg
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/primary_container_bg
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/secondary_container_bg b/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/secondary_container_bg
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/secondary_container_bg
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/spacing b/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/spacing
deleted file mode 100644
index 464b264..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/spacing
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-    space_none: 0,
-    space_xxxs: 4,
-    space_xxs: 8,
-    space_xs: 12,
-    space_s: 16,
-    space_m: 24,
-    space_l: 32,
-    space_xl: 48,
-    space_xxl: 64,
-    space_xxxl: 128,
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/success b/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/success
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/success
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/text_tint b/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/text_tint
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/text_tint
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/warning b/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/warning
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/warning
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/window_hint b/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/window_hint
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light.Builder/v2/window_hint
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/accent b/resources/default_schema/com.system76.CosmicTheme.Light/v2/accent
deleted file mode 100644
index adea896..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/accent
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#00525AFF",
-    hover: "#14555CFF",
-    pressed: "#5F888CFF",
-    selected: "#14555CFF",
-    selected_text: "#00525AFF",
-    focus: "#00525AFF",
-    divider: "#FFFFFFFF",
-    on: "#FFFFFFFF",
-    disabled: "#00525AFF",
-    on_disabled: "#7FA8ACFF",
-    border: "#00525AFF",
-    disabled_border: "#00525A80",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/accent_button b/resources/default_schema/com.system76.CosmicTheme.Light/v2/accent_button
deleted file mode 100644
index b9eb27a..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/accent_button
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#00525AFF",
-    hover: "#14555CFF",
-    pressed: "#5F888CFF",
-    selected: "#14555CFF",
-    selected_text: "#00525AFF",
-    focus: "#00525AFF",
-    divider: "#DEDEDEFF",
-    on: "#FFFFFFFF",
-    disabled: "#00525AFF",
-    on_disabled: "#FFFFFF80",
-    border: "#00525AFF",
-    disabled_border: "#00525A80",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/accent_text b/resources/default_schema/com.system76.CosmicTheme.Light/v2/accent_text
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/accent_text
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/active_hint b/resources/default_schema/com.system76.CosmicTheme.Light/v2/active_hint
deleted file mode 100644
index e440e5c..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/active_hint
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/alpha_map b/resources/default_schema/com.system76.CosmicTheme.Light/v2/alpha_map
deleted file mode 100644
index 06f3e6a..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/alpha_map
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-    extremely_low: 0.9,
-    extremely_low_2: 0.87692,
-    very_low: 0.85385,
-    very_low_2: 0.83076,
-    low: 0.80769,
-    low_2: 0.78461,
-    medium: 0.76154,
-    medium_2: 0.73846,
-    high: 0.71538,
-    high_2: 0.69231,
-    very_high: 0.66023,
-    very_high_2: 0.64615,
-    extremely_high: 0.62308,
-    extremely_high_2: 0.6,
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/background b/resources/default_schema/com.system76.CosmicTheme.Light/v2/background
deleted file mode 100644
index 70dc626..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/background
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-    base: "#D7D7D7FF",
-    component: (
-        base: "#F5F5F5FF",
-        hover: "#F6F6F6FF",
-        pressed: "#F7F7F7FF",
-        selected: "#F6F6F6FF",
-        selected_text: "#00525AFF",
-        focus: "#00525AFF",
-        divider: "#27272733",
-        on: "#272727FF",
-        disabled: "#F5F5F580",
-        on_disabled: "#272727A6",
-        border: "#161616FF",
-        disabled_border: "#16161680",
-    ),
-    divider: "#B0B0B0FF",
-    on: "#121212FF",
-    small_widget: "#CACACA40",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/button b/resources/default_schema/com.system76.CosmicTheme.Light/v2/button
deleted file mode 100644
index 5b5826a..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/button
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#2E2E2E40",
-    hover: "#2B2B2B66",
-    pressed: "#6868689F",
-    selected: "#2B2B2B66",
-    selected_text: "#00525AFF",
-    focus: "#00525AFF",
-    divider: "#27272733",
-    on: "#272727FF",
-    disabled: "#2E2E2E20",
-    on_disabled: "#272727A6",
-    border: "#161616FF",
-    disabled_border: "#16161680",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/control_tint b/resources/default_schema/com.system76.CosmicTheme.Light/v2/control_tint
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/control_tint
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/corner_radii b/resources/default_schema/com.system76.CosmicTheme.Light/v2/corner_radii
deleted file mode 100644
index 7d52139..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/corner_radii
+++ /dev/null
@@ -1,8 +0,0 @@
-(
-    radius_0: (0.0, 0.0, 0.0, 0.0),
-    radius_xs: (4.0, 4.0, 4.0, 4.0),
-    radius_s: (8.0, 8.0, 8.0, 8.0),
-    radius_m: (16.0, 16.0, 16.0, 16.0),
-    radius_l: (32.0, 32.0, 32.0, 32.0),
-    radius_xl: (160.0, 160.0, 160.0, 160.0),
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/destructive b/resources/default_schema/com.system76.CosmicTheme.Light/v2/destructive
deleted file mode 100644
index a13c718..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/destructive
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#890418FF",
-    hover: "#811727FF",
-    pressed: "#A3616BFF",
-    selected: "#811727FF",
-    selected_text: "#00525AFF",
-    focus: "#00525AFF",
-    divider: "#FFFFFFFF",
-    on: "#FFFFFFFF",
-    disabled: "#890418FF",
-    on_disabled: "#C4828CFF",
-    border: "#890418FF",
-    disabled_border: "#89041880",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/destructive_button b/resources/default_schema/com.system76.CosmicTheme.Light/v2/destructive_button
deleted file mode 100644
index bb2de29..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/destructive_button
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#890418FF",
-    hover: "#811727FF",
-    pressed: "#A3616BFF",
-    selected: "#811727FF",
-    selected_text: "#00525AFF",
-    focus: "#00525AFF",
-    divider: "#DEDEDEFF",
-    on: "#FFFFFFFF",
-    disabled: "#890418FF",
-    on_disabled: "#FFFFFF80",
-    border: "#890418FF",
-    disabled_border: "#89041880",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/frosted b/resources/default_schema/com.system76.CosmicTheme.Light/v2/frosted
deleted file mode 100644
index 55b60b7..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/frosted
+++ /dev/null
@@ -1 +0,0 @@
-Medium
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/frosted_applets b/resources/default_schema/com.system76.CosmicTheme.Light/v2/frosted_applets
deleted file mode 100644
index 02e4a84..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/frosted_applets
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/frosted_panel b/resources/default_schema/com.system76.CosmicTheme.Light/v2/frosted_panel
deleted file mode 100644
index 02e4a84..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/frosted_panel
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/frosted_system_interface b/resources/default_schema/com.system76.CosmicTheme.Light/v2/frosted_system_interface
deleted file mode 100644
index 02e4a84..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/frosted_system_interface
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/frosted_windows b/resources/default_schema/com.system76.CosmicTheme.Light/v2/frosted_windows
deleted file mode 100644
index 02e4a84..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/frosted_windows
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/gaps b/resources/default_schema/com.system76.CosmicTheme.Light/v2/gaps
deleted file mode 100644
index 6fe974b..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/gaps
+++ /dev/null
@@ -1 +0,0 @@
-(0, 8)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/icon_button b/resources/default_schema/com.system76.CosmicTheme.Light/v2/icon_button
deleted file mode 100644
index 52138d5..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/icon_button
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#00000000",
-    hover: "#63636333",
-    pressed: "#BEBEBE80",
-    selected: "#63636333",
-    selected_text: "#00525AFF",
-    focus: "#00525AFF",
-    divider: "#16161633",
-    on: "#161616FF",
-    disabled: "#00000000",
-    on_disabled: "#161616A6",
-    border: "#161616FF",
-    disabled_border: "#16161680",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/is_dark b/resources/default_schema/com.system76.CosmicTheme.Light/v2/is_dark
deleted file mode 100644
index 02e4a84..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/is_dark
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/is_high_contrast b/resources/default_schema/com.system76.CosmicTheme.Light/v2/is_high_contrast
deleted file mode 100644
index 02e4a84..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/is_high_contrast
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/link_button b/resources/default_schema/com.system76.CosmicTheme.Light/v2/link_button
deleted file mode 100644
index 826da6e..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/link_button
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#00000000",
-    hover: "#00000000",
-    pressed: "#00000000",
-    selected: "#00000000",
-    selected_text: "#00525AFF",
-    focus: "#00525AFF",
-    divider: "#00525A33",
-    on: "#00525AFF",
-    disabled: "#00000000",
-    on_disabled: "#00292D80",
-    border: "#161616FF",
-    disabled_border: "#16161680",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/name b/resources/default_schema/com.system76.CosmicTheme.Light/v2/name
deleted file mode 100644
index 9dce5c6..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/name
+++ /dev/null
@@ -1 +0,0 @@
-"cosmic-light"
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/palette b/resources/default_schema/com.system76.CosmicTheme.Light/v2/palette
deleted file mode 100644
index 3b9eda9..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/palette
+++ /dev/null
@@ -1,35 +0,0 @@
-(
-    name: "cosmic-light",
-    bright_red: "#890418FF",
-    bright_green: "#00572CFF",
-    bright_orange: "#792C00FF",
-    gray_1: "#D7D7D7FF",
-    gray_2: "#E4E4E4FF",
-    neutral_0: "#FFFFFFFF",
-    neutral_1: "#DEDEDEFF",
-    neutral_2: "#BEBEBEFF",
-    neutral_3: "#9E9E9EFF",
-    neutral_4: "#808080FF",
-    neutral_5: "#636363FF",
-    neutral_6: "#484848FF",
-    neutral_7: "#2E2E2EFF",
-    neutral_8: "#161616FF",
-    neutral_9: "#030303FF",
-    neutral_10: "#000000FF",
-    accent_blue: "#00525AFF",
-    accent_indigo: "#2E496DFF",
-    accent_purple: "#68217CFF",
-    accent_pink: "#86043AFF",
-    accent_red: "#78292EFF",
-    accent_orange: "#624000FF",
-    accent_yellow: "#534800FF",
-    accent_green: "#185529FF",
-    accent_warm_grey: "#554742FF",
-    ext_warm_grey: "#9B8E8AFF",
-    ext_orange: "#FBB86CFF",
-    ext_yellow: "#F7E062FF",
-    ext_blue: "#6ACAD8FF",
-    ext_purple: "#D58CFFFF",
-    ext_pink: "#FF9CDDFF",
-    ext_indigo: "#95C4FCFF",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/primary b/resources/default_schema/com.system76.CosmicTheme.Light/v2/primary
deleted file mode 100644
index 8610d9c..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/primary
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-    base: "#EBEBEBFF",
-    component: (
-        base: "#DADADAFF",
-        hover: "#DEDEDEFF",
-        pressed: "#E2E2E2FF",
-        selected: "#DEDEDEFF",
-        selected_text: "#00525AFF",
-        focus: "#00525AFF",
-        divider: "#14141433",
-        on: "#141414FF",
-        disabled: "#DADADA80",
-        on_disabled: "#141414A6",
-        border: "#161616FF",
-        disabled_border: "#16161680",
-    ),
-    divider: "#C2C2C2FF",
-    on: "#202020FF",
-    small_widget: "#DDDDDD40",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/secondary b/resources/default_schema/com.system76.CosmicTheme.Light/v2/secondary
deleted file mode 100644
index cb87ef0..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/secondary
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-    base: "#FCFCFCFF",
-    component: (
-        base: "#F5F5F5FF",
-        hover: "#F6F6F6FF",
-        pressed: "#F7F7F7FF",
-        selected: "#F6F6F6FF",
-        selected_text: "#00525AFF",
-        focus: "#00525AFF",
-        divider: "#27272733",
-        on: "#272727FF",
-        disabled: "#F5F5F580",
-        on_disabled: "#272727A6",
-        border: "#161616FF",
-        disabled_border: "#16161680",
-    ),
-    divider: "#D2D2D2FF",
-    on: "#2C2C2CFF",
-    small_widget: "#EEEEEE40",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/shade b/resources/default_schema/com.system76.CosmicTheme.Light/v2/shade
deleted file mode 100644
index 8714b7f..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/shade
+++ /dev/null
@@ -1 +0,0 @@
-"#00000014"
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/spacing b/resources/default_schema/com.system76.CosmicTheme.Light/v2/spacing
deleted file mode 100644
index 464b264..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/spacing
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-    space_none: 0,
-    space_xxxs: 4,
-    space_xxs: 8,
-    space_xs: 12,
-    space_s: 16,
-    space_m: 24,
-    space_l: 32,
-    space_xl: 48,
-    space_xxl: 64,
-    space_xxxl: 128,
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/success b/resources/default_schema/com.system76.CosmicTheme.Light/v2/success
deleted file mode 100644
index 0b24f8c..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/success
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#00572CFF",
-    hover: "#145937FF",
-    pressed: "#5F8A75FF",
-    selected: "#145937FF",
-    selected_text: "#00525AFF",
-    focus: "#00525AFF",
-    divider: "#FFFFFFFF",
-    on: "#FFFFFFFF",
-    disabled: "#00572CFF",
-    on_disabled: "#7FAB96FF",
-    border: "#00572CFF",
-    disabled_border: "#00572C80",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/success_button b/resources/default_schema/com.system76.CosmicTheme.Light/v2/success_button
deleted file mode 100644
index 8e69154..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/success_button
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#00572CFF",
-    hover: "#145937FF",
-    pressed: "#5F8A75FF",
-    selected: "#145937FF",
-    selected_text: "#00525AFF",
-    focus: "#00525AFF",
-    divider: "#DEDEDEFF",
-    on: "#FFFFFFFF",
-    disabled: "#00572CFF",
-    on_disabled: "#FFFFFF80",
-    border: "#00572CFF",
-    disabled_border: "#00572C80",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/text_button b/resources/default_schema/com.system76.CosmicTheme.Light/v2/text_button
deleted file mode 100644
index b95c9c0..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/text_button
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#00000000",
-    hover: "#63636333",
-    pressed: "#BEBEBE80",
-    selected: "#63636333",
-    selected_text: "#00525AFF",
-    focus: "#00525AFF",
-    divider: "#00525A33",
-    on: "#00525AFF",
-    disabled: "#00000000",
-    on_disabled: "#00525AA6",
-    border: "#161616FF",
-    disabled_border: "#16161680",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/text_tint b/resources/default_schema/com.system76.CosmicTheme.Light/v2/text_tint
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/text_tint
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/transparent_background b/resources/default_schema/com.system76.CosmicTheme.Light/v2/transparent_background
deleted file mode 100644
index 8f9a00d..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/transparent_background
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-    base: "#D7D7D799",
-    component: (
-        base: "#F5F5F599",
-        hover: "#F5F5F599",
-        pressed: "#F5F5F599",
-        selected: "#F5F5F599",
-        selected_text: "#00525AFF",
-        focus: "#00525AFF",
-        divider: "#27272733",
-        on: "#27272799",
-        disabled: "#F5F5F54C",
-        on_disabled: "#272727A6",
-        border: "#161616FF",
-        disabled_border: "#16161680",
-    ),
-    divider: "#9B9B9BAD",
-    on: "#12121299",
-    small_widget: "#CACACA40",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/transparent_primary b/resources/default_schema/com.system76.CosmicTheme.Light/v2/transparent_primary
deleted file mode 100644
index d1f0b03..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/transparent_primary
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-    base: "#EBEBEBD9",
-    component: (
-        base: "#DADADAD9",
-        hover: "#DADADAD9",
-        pressed: "#DADADAD9",
-        selected: "#DADADAD9",
-        selected_text: "#00525AFF",
-        focus: "#00525AFF",
-        divider: "#14141433",
-        on: "#141414D9",
-        disabled: "#DADADA6C",
-        on_disabled: "#141414A6",
-        border: "#161616FF",
-        disabled_border: "#16161680",
-    ),
-    divider: "#BCBCBCE0",
-    on: "#202020D9",
-    small_widget: "#DDDDDD40",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/transparent_secondary b/resources/default_schema/com.system76.CosmicTheme.Light/v2/transparent_secondary
deleted file mode 100644
index b8753f1..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/transparent_secondary
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-    base: "#FCFCFCFF",
-    component: (
-        base: "#F5F5F5FF",
-        hover: "#F5F5F5FF",
-        pressed: "#F5F5F5FF",
-        selected: "#F5F5F5FF",
-        selected_text: "#00525AFF",
-        focus: "#00525AFF",
-        divider: "#27272733",
-        on: "#272727FF",
-        disabled: "#F5F5F580",
-        on_disabled: "#272727A6",
-        border: "#161616FF",
-        disabled_border: "#16161680",
-    ),
-    divider: "#D2D2D2FF",
-    on: "#2C2C2CFF",
-    small_widget: "#EEEEEE40",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/warning b/resources/default_schema/com.system76.CosmicTheme.Light/v2/warning
deleted file mode 100644
index b84809e..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/warning
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#792C00FF",
-    hover: "#753714FF",
-    pressed: "#9B755FFF",
-    selected: "#753714FF",
-    selected_text: "#00525AFF",
-    focus: "#00525AFF",
-    divider: "#FFFFFFFF",
-    on: "#FFFFFFFF",
-    disabled: "#792C00FF",
-    on_disabled: "#BC967FFF",
-    border: "#792C00FF",
-    disabled_border: "#792C0080",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/warning_button b/resources/default_schema/com.system76.CosmicTheme.Light/v2/warning_button
deleted file mode 100644
index 695ca71..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/warning_button
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-    base: "#792C00FF",
-    hover: "#753714FF",
-    pressed: "#9B755FFF",
-    selected: "#753714FF",
-    selected_text: "#00525AFF",
-    focus: "#00525AFF",
-    divider: "#000000FF",
-    on: "#FFFFFFFF",
-    disabled: "#792C00FF",
-    on_disabled: "#FFFFFF80",
-    border: "#792C00FF",
-    disabled_border: "#792C0080",
-)
\ No newline at end of file
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v2/window_hint b/resources/default_schema/com.system76.CosmicTheme.Light/v2/window_hint
deleted file mode 100644
index 4af1832..0000000
--- a/resources/default_schema/com.system76.CosmicTheme.Light/v2/window_hint
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
diff --git a/subscriptions/upower/src/lib.rs b/subscriptions/upower/src/lib.rs
index 6e210f3..968bbe2 100644
--- a/subscriptions/upower/src/lib.rs
+++ b/subscriptions/upower/src/lib.rs
@@ -32,7 +32,7 @@ pub mod device {
         Ok((upower, device_path))
     }
 
-    async fn events() -> zbus::Result<Box<dyn Stream<Item = DeviceDbusEvent> + Unpin + Send>> {
+    async fn events() -> zbus::Result<impl Stream<Item = DeviceDbusEvent>> {
         let (upower, device) = display_device().await?;
         let devices = upower.enumerate_devices().await?;
         let mut has_battery = false;
@@ -51,11 +51,11 @@ pub mod device {
             }
         }
 
-        if !has_battery {
-            return Ok(Box::new(futures::stream::iter(Some(
-                DeviceDbusEvent::NoBattery,
-            ))));
-        };
+        let initial = futures::stream::iter(if has_battery {
+            None
+        } else {
+            Some(DeviceDbusEvent::NoBattery)
+        });
 
         let stream = futures::stream_select!(
             upower.receive_on_battery_changed().await.map(|_| ()),
@@ -63,7 +63,7 @@ pub mod device {
             device.receive_time_to_empty_changed().await.map(|_| ()),
         );
 
-        Ok(Box::new(stream.map(move |_| {
+        Ok(initial.chain(stream.map(move |_| {
             DeviceDbusEvent::Update {
                 on_battery: upower
                     .cached_on_battery()