diff --git a/Cargo.lock b/Cargo.lock
index b75e9113..1046e716 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
 
 [[package]]
 name = "ab_glyph"
-version = "0.2.21"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5110f1c78cf582855d895ecd0746b653db010cec6d9f5575293f27934d980a39"
+checksum = "b1061f3ff92c2f65800df1f12fc7b4ff44ee14783104187dd04dfee6f11b0fd2"
 dependencies = [
  "ab_glyph_rasterizer",
  "owned_ttf_parser",
@@ -26,9 +26,9 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
 
 [[package]]
 name = "addr2line"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
 dependencies = [
  "gimli",
 ]
@@ -63,9 +63,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.0.2"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
+checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab"
 dependencies = [
  "memchr",
 ]
@@ -76,6 +76,12 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
 
+[[package]]
+name = "allocator-api2"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+
 [[package]]
 name = "android-activity"
 version = "0.4.3"
@@ -111,9 +117,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.72"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 dependencies = [
  "backtrace",
 ]
@@ -175,11 +181,17 @@ dependencies = [
  "libloading 0.7.4",
 ]
 
+[[package]]
+name = "async-task"
+version = "4.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921"
+
 [[package]]
 name = "atomic_refcell"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79d6dc922a2792b006573f60b2648076355daeae5ce9cb59507e5908c9625d31"
+checksum = "112ef6b3f6cb3cb6fc5b6b494ef7a848492cff1ab0ef4de10b0f7d572861c905"
 
 [[package]]
 name = "atomicwrites"
@@ -187,7 +199,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1163d9d7c51de51a2b79d6df5e8888d11e9df17c752ce4a285fb6ca1580734e"
 dependencies = [
- "rustix 0.37.23",
+ "rustix 0.37.24",
  "tempfile",
  "windows-sys 0.48.0",
 ]
@@ -200,9 +212,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "backtrace"
-version = "0.3.68"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
 dependencies = [
  "addr2line",
  "cc",
@@ -221,9 +233,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.2"
+version = "0.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
+checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
 
 [[package]]
 name = "bincode"
@@ -263,9 +275,12 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
+checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "block"
@@ -303,28 +318,28 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
 
 [[package]]
 name = "bytemuck"
-version = "1.13.1"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
+checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
 dependencies = [
  "bytemuck_derive",
 ]
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192"
+checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -340,7 +355,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8"
 dependencies = [
  "bitflags 1.3.2",
- "futures-util",
  "log",
  "nix 0.25.1",
  "slotmap",
@@ -348,13 +362,29 @@ dependencies = [
  "vec_map",
 ]
 
+[[package]]
+name = "calloop"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aadd183e815348c0649051b1c43418643208f8ed13c8a84da7215b4e1cf42714"
+dependencies = [
+ "async-task",
+ "bitflags 2.4.0",
+ "log",
+ "polling",
+ "rustix 0.38.14",
+ "slab",
+ "thiserror",
+]
+
 [[package]]
 name = "cc"
-version = "1.0.79"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
 dependencies = [
  "jobserver",
+ "libc",
 ]
 
 [[package]]
@@ -397,15 +427,14 @@ dependencies = [
 
 [[package]]
 name = "cocoa-foundation"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6"
+checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7"
 dependencies = [
  "bitflags 1.3.2",
  "block",
  "core-foundation",
  "core-graphics-types",
- "foreign-types",
  "libc",
  "objc",
 ]
@@ -432,6 +461,15 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642"
 
+[[package]]
+name = "concurrent-queue"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.3"
@@ -478,11 +516,11 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "apply",
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
  "bytemuck",
- "calloop",
+ "calloop 0.12.2",
  "cosmic-comp-config",
- "cosmic-config",
+ "cosmic-config 0.1.0 (git+https://github.com/pop-os/libcosmic/?rev=94e147a)",
  "cosmic-protocols",
  "edid-rs",
  "egui",
@@ -491,7 +529,7 @@ dependencies = [
  "i18n-embed-fl",
  "iced_tiny_skia",
  "id_tree",
- "indexmap 1.9.3",
+ "indexmap 2.0.1",
  "keyframe",
  "lazy_static",
  "libcosmic",
@@ -516,11 +554,11 @@ dependencies = [
  "tracing",
  "tracing-journald",
  "tracing-subscriber",
- "wayland-backend",
- "wayland-scanner 0.30.1",
+ "wayland-backend 0.3.2",
+ "wayland-scanner 0.31.0",
  "xcursor",
  "xdg",
- "xkbcommon 0.4.1",
+ "xkbcommon",
 ]
 
 [[package]]
@@ -537,12 +575,26 @@ version = "0.1.0"
 source = "git+https://github.com/pop-os/libcosmic/?rev=4895b0c#4895b0c9bda9e46fc7db173e239d155dac957186"
 dependencies = [
  "atomicwrites",
- "calloop",
- "cosmic-config-derive",
+ "cosmic-config-derive 0.1.0 (git+https://github.com/pop-os/libcosmic/?rev=4895b0c)",
+ "dirs 5.0.1",
+ "iced_futures 0.6.0",
+ "notify",
+ "ron 0.8.1",
+ "serde",
+]
+
+[[package]]
+name = "cosmic-config"
+version = "0.1.0"
+source = "git+https://github.com/pop-os/libcosmic/?rev=94e147a#94e147a19483d5d48740a2174f4be257721a9119"
+dependencies = [
+ "atomicwrites",
+ "calloop 0.12.2",
+ "cosmic-config-derive 0.1.0 (git+https://github.com/pop-os/libcosmic/?rev=94e147a)",
  "dirs 5.0.1",
- "iced_futures",
+ "iced_futures 0.7.0",
  "notify",
- "ron 0.8.0",
+ "ron 0.8.1",
  "serde",
 ]
 
@@ -555,15 +607,24 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "cosmic-config-derive"
+version = "0.1.0"
+source = "git+https://github.com/pop-os/libcosmic/?rev=94e147a#94e147a19483d5d48740a2174f4be257721a9119"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "cosmic-protocols"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-protocols?branch=main#e39748e1312d74ab8b4c26f4813b858413500b59"
+source = "git+https://github.com/pop-os/cosmic-protocols?rev=bf7958d#bf7958d53de54bffb3c7f6715673364b7a726edb"
 dependencies = [
- "bitflags 1.3.2",
- "wayland-backend",
- "wayland-protocols 0.30.1",
- "wayland-scanner 0.30.1",
+ "bitflags 2.4.0",
+ "wayland-backend 0.3.2",
+ "wayland-protocols 0.31.0",
+ "wayland-scanner 0.31.0",
  "wayland-server",
 ]
 
@@ -592,12 +653,12 @@ version = "0.1.0"
 source = "git+https://github.com/pop-os/libcosmic/?rev=4895b0c#4895b0c9bda9e46fc7db173e239d155dac957186"
 dependencies = [
  "anyhow",
- "cosmic-config",
+ "cosmic-config 0.1.0 (git+https://github.com/pop-os/libcosmic/?rev=4895b0c)",
  "csscolorparser",
  "directories",
  "lazy_static",
  "palette",
- "ron 0.8.0",
+ "ron 0.8.1",
  "serde",
 ]
 
@@ -720,7 +781,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.28",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -731,17 +792,17 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.37",
 ]
 
 [[package]]
 name = "dashmap"
-version = "5.5.0"
+version = "5.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d"
+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
 dependencies = [
  "cfg-if",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.1",
  "lock_api",
  "once_cell",
  "parking_lot_core 0.9.8",
@@ -755,9 +816,9 @@ checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5"
 
 [[package]]
 name = "deranged"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8810e7e2cf385b1e9b50d68264908ec367ba642c96d02edfe61c39e88e2a3c01"
+checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
 
 [[package]]
 name = "derive_setters"
@@ -768,7 +829,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -846,7 +907,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -872,25 +933,25 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
 
 [[package]]
 name = "drm"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edf9159ef4bcecd0c5e4cbeb573b8d0037493403d542780dba5d840bbf9df56f"
+checksum = "97fb1b703ffbc7ebd216eba7900008049a56ace55580ecb2ee7fa801e8d8be87"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
  "bytemuck",
  "drm-ffi",
  "drm-fourcc",
- "nix 0.26.2",
+ "nix 0.27.1",
 ]
 
 [[package]]
 name = "drm-ffi"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1352481b7b90e27a8a1bf8ef6b33cf18b98dba7c410e75c24bb3eef2f0d8d525"
+checksum = "ba7d1c19c4b6270e89d59fb27dc6d02a317c658a8a54e54781e1db9b5947595d"
 dependencies = [
  "drm-sys",
- "nix 0.26.2",
+ "nix 0.27.1",
 ]
 
 [[package]]
@@ -901,12 +962,9 @@ checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
 
 [[package]]
 name = "drm-sys"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1369f1679d6b706d234c4c1e0613c415c2c74b598a09ad28080ba2474b72e42d"
-dependencies = [
- "libc",
-]
+checksum = "3a4f1c0468062a56cd5705f1e3b5409eb286d5596a2028ec8e947595d7e715ae"
 
 [[package]]
 name = "ecolor"
@@ -1065,9 +1123,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
+checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
 dependencies = [
  "errno-dragonfly",
  "libc",
@@ -1105,9 +1163,9 @@ dependencies = [
 
 [[package]]
 name = "exr"
-version = "1.7.0"
+version = "1.71.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18"
+checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8"
 dependencies = [
  "bit_field",
  "flume",
@@ -1136,9 +1194,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
 
 [[package]]
 name = "fdeflate"
@@ -1151,13 +1209,13 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.21"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
+checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.2.16",
+ "redox_syscall 0.3.5",
  "windows-sys 0.48.0",
 ]
 
@@ -1172,9 +1230,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.26"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
+checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1241,14 +1299,10 @@ dependencies = [
 
 [[package]]
 name = "flume"
-version = "0.10.14"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577"
+checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
 dependencies = [
- "futures-core",
- "futures-sink",
- "nanorand",
- "pin-project",
  "spin",
 ]
 
@@ -1260,9 +1314,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "fontconfig-parser"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ab2e12762761366dcb876ab8b6e0cfa4797ddcd890575919f008b5ba655672a"
+checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4"
 dependencies = [
  "roxmltree 0.18.0",
 ]
@@ -1307,9 +1361,9 @@ dependencies = [
 
 [[package]]
 name = "freedesktop-icons"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00e61ac115df4632b592d36b71fda3c259f4c8061c70b7fa429bac145890e880"
+checksum = "3f9d46a9ae065c46efb83854bb10315de6d333bb6f4526ebe320c004dab7857e"
 dependencies = [
  "dirs 4.0.0",
  "once_cell",
@@ -1384,7 +1438,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -1419,16 +1473,16 @@ dependencies = [
 
 [[package]]
 name = "gbm"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ec389cda876966cf824111bf6e533fb934c711d473498279964a990853b3c6"
+checksum = "57c97c1672f2d951da311cd20b148794c4157a8879c7650e65f76c7826e2b1c1"
 dependencies = [
  "bitflags 1.3.2",
  "drm",
  "drm-fourcc",
  "gbm-sys",
  "libc",
- "wayland-backend",
+ "wayland-backend 0.3.2",
  "wayland-server",
 ]
 
@@ -1461,6 +1515,16 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "gethostname"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.2.10"
@@ -1468,10 +1532,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
 dependencies = [
  "cfg-if",
- "js-sys",
  "libc",
  "wasi",
- "wasm-bindgen",
 ]
 
 [[package]]
@@ -1486,9 +1548,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.27.3"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
 
 [[package]]
 name = "gl_generator"
@@ -1503,9 +1565,9 @@ dependencies = [
 
 [[package]]
 name = "glam"
-version = "0.24.1"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42218cb640844e3872cc3c153dc975229e080a6c4733b34709ef445610550226"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
 
 [[package]]
 name = "glow"
@@ -1576,22 +1638,22 @@ dependencies = [
 
 [[package]]
 name = "gpu-descriptor"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a"
+checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
  "gpu-descriptor-types",
- "hashbrown 0.12.3",
+ "hashbrown 0.14.1",
 ]
 
 [[package]]
 name = "gpu-descriptor-types"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126"
+checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
 ]
 
 [[package]]
@@ -1633,9 +1695,13 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
+dependencies = [
+ "ahash 0.8.3",
+ "allocator-api2",
+]
 
 [[package]]
 name = "hassle-rs"
@@ -1654,9 +1720,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
+checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
 
 [[package]]
 name = "hexf-parse"
@@ -1675,15 +1741,15 @@ dependencies = [
 
 [[package]]
 name = "i18n-config"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b987084cadad6e2f2b1e6ea62c44123591a3c044793a1beabf71a8356ea768d5"
+checksum = "0c9ce3c48cbc21fd5b22b9331f32b5b51f6ad85d969b99e793427332e76e7640"
 dependencies = [
  "log",
  "serde",
  "serde_derive",
  "thiserror",
- "toml 0.7.6",
+ "toml 0.8.1",
  "unic-langid",
 ]
 
@@ -1726,21 +1792,21 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.28",
+ "syn 2.0.37",
  "unic-langid",
 ]
 
 [[package]]
 name = "i18n-embed-impl"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9a95d065e6be4499e50159172395559a388d20cf13c84c77e4a1e341786f219"
+checksum = "a2a4d5bff745c9a6e1459c490059281b353a4ab0a4e1e58b3eeeaef71f97d07b"
 dependencies = [
  "find-crate",
  "i18n-config",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -1748,8 +1814,8 @@ name = "iced"
 version = "0.9.0"
 source = "git+https://github.com/pop-os/libcosmic/?rev=4895b0c#4895b0c9bda9e46fc7db173e239d155dac957186"
 dependencies = [
- "iced_core",
- "iced_futures",
+ "iced_core 0.9.0",
+ "iced_futures 0.6.0",
  "iced_renderer",
  "iced_widget",
  "image",
@@ -1769,13 +1835,37 @@ dependencies = [
  "twox-hash",
 ]
 
+[[package]]
+name = "iced_core"
+version = "0.10.0"
+source = "git+https://github.com/pop-os/libcosmic/?rev=94e147a#94e147a19483d5d48740a2174f4be257721a9119"
+dependencies = [
+ "bitflags 1.3.2",
+ "instant",
+ "log",
+ "thiserror",
+ "twox-hash",
+]
+
 [[package]]
 name = "iced_futures"
 version = "0.6.0"
 source = "git+https://github.com/pop-os/libcosmic/?rev=4895b0c#4895b0c9bda9e46fc7db173e239d155dac957186"
 dependencies = [
  "futures",
- "iced_core",
+ "iced_core 0.9.0",
+ "log",
+ "wasm-bindgen-futures",
+ "wasm-timer",
+]
+
+[[package]]
+name = "iced_futures"
+version = "0.7.0"
+source = "git+https://github.com/pop-os/libcosmic/?rev=94e147a#94e147a19483d5d48740a2174f4be257721a9119"
+dependencies = [
+ "futures",
+ "iced_core 0.10.0",
  "log",
  "wasm-bindgen-futures",
  "wasm-timer",
@@ -1789,7 +1879,7 @@ dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
  "glam",
- "iced_core",
+ "iced_core 0.9.0",
  "image",
  "kamadak-exif",
  "log",
@@ -1815,8 +1905,8 @@ name = "iced_runtime"
 version = "0.1.0"
 source = "git+https://github.com/pop-os/libcosmic/?rev=4895b0c#4895b0c9bda9e46fc7db173e239d155dac957186"
 dependencies = [
- "iced_core",
- "iced_futures",
+ "iced_core 0.9.0",
+ "iced_futures 0.6.0",
  "thiserror",
 ]
 
@@ -1825,7 +1915,7 @@ name = "iced_style"
 version = "0.8.0"
 source = "git+https://github.com/pop-os/libcosmic/?rev=4895b0c#4895b0c9bda9e46fc7db173e239d155dac957186"
 dependencies = [
- "iced_core",
+ "iced_core 0.9.0",
  "once_cell",
  "palette",
 ]
@@ -1899,9 +1989,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "image"
-version = "0.24.6"
+version = "0.24.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"
+checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711"
 dependencies = [
  "bytemuck",
  "byteorder",
@@ -1941,12 +2031,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+checksum = "ad227c3af19d4914570ad36d30409928b75967c298feb9ea1969db3a610bb14e"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.1",
 ]
 
 [[package]]
@@ -1977,10 +2067,10 @@ checksum = "e6e74cd82cedcd66db78742a8337bdc48f188c4d2c12742cbc5cd85113f0b059"
 dependencies = [
  "bitflags 1.3.2",
  "input-sys",
- "io-lifetimes",
+ "io-lifetimes 1.0.11",
  "libc",
  "log",
- "udev",
+ "udev 0.7.0",
 ]
 
 [[package]]
@@ -2034,6 +2124,12 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "io-lifetimes"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bffb4def18c48926ccac55c1223e02865ce1a821751a95920448662696e7472c"
+
 [[package]]
 name = "itoa"
 version = "1.0.9"
@@ -2111,9 +2207,9 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 
 [[package]]
 name = "kqueue"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98"
+checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
 dependencies = [
  "kqueue-sys",
  "libc",
@@ -2121,9 +2217,9 @@ dependencies = [
 
 [[package]]
 name = "kqueue-sys"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587"
+checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
 dependencies = [
  "bitflags 1.3.2",
  "libc",
@@ -2161,9 +2257,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
 
 [[package]]
 name = "libc"
-version = "0.2.147"
+version = "0.2.148"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
 
 [[package]]
 name = "libcosmic"
@@ -2171,14 +2267,14 @@ version = "0.1.0"
 source = "git+https://github.com/pop-os/libcosmic/?rev=4895b0c#4895b0c9bda9e46fc7db173e239d155dac957186"
 dependencies = [
  "apply",
- "cosmic-config",
+ "cosmic-config 0.1.0 (git+https://github.com/pop-os/libcosmic/?rev=4895b0c)",
  "cosmic-theme",
  "derive_setters",
  "fraction",
  "freedesktop-icons",
  "iced",
- "iced_core",
- "iced_futures",
+ "iced_core 0.9.0",
+ "iced_futures 0.6.0",
  "iced_renderer",
  "iced_runtime",
  "iced_style",
@@ -2273,9 +2369,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.3"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
+checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128"
 
 [[package]]
 name = "locale_config"
@@ -2302,9 +2398,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.19"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "log-panics"
@@ -2351,9 +2447,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
 
 [[package]]
 name = "memmap2"
@@ -2474,15 +2570,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "nanorand"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
-dependencies = [
- "getrandom",
-]
-
 [[package]]
 name = "natord"
 version = "1.0.9"
@@ -2558,16 +2645,27 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.26.2"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
 dependencies = [
  "bitflags 1.3.2",
  "cfg-if",
  "libc",
  "memoffset 0.7.1",
  "pin-utils",
- "static_assertions",
+]
+
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.4.0",
+ "cfg-if",
+ "libc",
+ "memoffset 0.9.0",
 ]
 
 [[package]]
@@ -2588,20 +2686,21 @@ dependencies = [
 
 [[package]]
 name = "notify"
-version = "6.0.1"
+version = "6.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5738a2795d57ea20abec2d6d76c6081186709c0024187cd5977265eda6598b51"
+checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
  "crossbeam-channel",
  "filetime",
  "fsevent-sys",
  "inotify",
  "kqueue",
  "libc",
+ "log",
  "mio",
  "walkdir",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -2630,9 +2729,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
+checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -2641,9 +2740,9 @@ dependencies = [
 
 [[package]]
 name = "num-complex"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d"
+checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
 dependencies = [
  "num-traits",
 ]
@@ -2740,7 +2839,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -2810,9 +2909,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.31.1"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
 dependencies = [
  "memchr",
 ]
@@ -2831,18 +2930,18 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
 [[package]]
 name = "orbclient"
-version = "0.3.45"
+version = "0.3.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "221d488cd70617f1bd599ed8ceb659df2147d9393717954d82a0f5e8032a6ab1"
+checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f"
 dependencies = [
  "redox_syscall 0.3.5",
 ]
 
 [[package]]
 name = "ordered-float"
-version = "3.7.0"
+version = "3.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213"
+checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06"
 dependencies = [
  "num-traits",
 ]
@@ -2916,14 +3015,14 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4"
 dependencies = [
- "ttf-parser 0.19.1",
+ "ttf-parser 0.19.2",
 ]
 
 [[package]]
 name = "palette"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1641aee47803391405d0a1250e837d2336fdddd18b27f3ddb8c1d80ce8d7f43"
+checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc"
 dependencies = [
  "approx 0.5.1",
  "fast-srgb8",
@@ -2934,13 +3033,13 @@ dependencies = [
 
 [[package]]
 name = "palette_derive"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c02bfa6b3ba8af5434fa0531bf5701f750d983d4260acd6867faca51cdc4484"
+checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -2988,7 +3087,7 @@ dependencies = [
  "libc",
  "redox_syscall 0.3.5",
  "smallvec",
- "windows-targets 0.48.1",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -3027,7 +3126,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -3045,31 +3144,11 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 
-[[package]]
-name = "pin-project"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.28",
-]
-
 [[package]]
 name = "pin-project-lite"
-version = "0.2.10"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
 
 [[package]]
 name = "pin-utils"
@@ -3085,9 +3164,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
 [[package]]
 name = "png"
-version = "0.17.9"
+version = "0.17.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11"
+checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64"
 dependencies = [
  "bitflags 1.3.2",
  "crc32fast",
@@ -3096,6 +3175,20 @@ dependencies = [
  "miniz_oxide",
 ]
 
+[[package]]
+name = "polling"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7571075a670bb8e02350c4d1c27d934aabdce416aa91a95d58dc9e21267dad3c"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "pin-project-lite",
+ "rustix 0.38.14",
+ "tracing",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
@@ -3109,7 +3202,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
  "once_cell",
- "toml_edit",
+ "toml_edit 0.19.15",
 ]
 
 [[package]]
@@ -3138,30 +3231,30 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.66"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "profiling"
-version = "1.0.8"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2"
+checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b"
 dependencies = [
  "profiling-procmacros",
 ]
 
 [[package]]
 name = "profiling-procmacros"
-version = "1.0.8"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a10adb8d151bb1280afb8bed41ae5db26be1b056964947133c7525b0bf39c0b0"
+checksum = "eb156a45b6b9fe8027497422179fb65afc84d36707a7ca98297bf06bccb8d43f"
 dependencies = [
  "quote",
- "syn 1.0.109",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -3226,11 +3319,20 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "quick-xml"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "quote"
-version = "1.0.32"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
 dependencies = [
  "proc-macro2",
 ]
@@ -3273,9 +3375,9 @@ checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
 
 [[package]]
 name = "rangemap"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9283c6b06096b47afc7109834fdedab891175bb5241ee5d4f7d2546549f263"
+checksum = "977b1e897f9d764566891689e642653e5ed90c6895106acd005eb4c1d0203991"
 
 [[package]]
 name = "raw-window-handle"
@@ -3285,9 +3387,9 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
 
 [[package]]
 name = "rayon"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
+checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
 dependencies = [
  "either",
  "rayon-core",
@@ -3295,14 +3397,12 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
+checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
 dependencies = [
- "crossbeam-channel",
  "crossbeam-deque",
  "crossbeam-utils",
- "num_cpus",
 ]
 
 [[package]]
@@ -3342,14 +3442,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.9.1"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
+checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.3.4",
- "regex-syntax 0.7.4",
+ "regex-automata 0.3.8",
+ "regex-syntax 0.7.5",
 ]
 
 [[package]]
@@ -3363,13 +3463,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.3.4"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7b6d6190b7594385f61bd3911cd1be99dfddcfc365a4160cc2ab5bff4aed294"
+checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.7.4",
+ "regex-syntax 0.7.5",
 ]
 
 [[package]]
@@ -3380,9 +3480,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
+checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
 
 [[package]]
 name = "renderdoc"
@@ -3465,13 +3565,14 @@ dependencies = [
 
 [[package]]
 name = "ron"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff"
+checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
 dependencies = [
- "base64 0.13.1",
- "bitflags 1.3.2",
+ "base64 0.21.4",
+ "bitflags 2.4.0",
  "serde",
+ "serde_derive",
 ]
 
 [[package]]
@@ -3525,7 +3626,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rust-embed-utils",
- "syn 2.0.28",
+ "syn 2.0.37",
  "walkdir",
 ]
 
@@ -3563,13 +3664,13 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustix"
-version = "0.37.23"
+version = "0.37.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
+checksum = "4279d76516df406a8bd37e7dff53fd37d1a093f997a3c34a5c21658c126db06d"
 dependencies = [
  "bitflags 1.3.2",
  "errno",
- "io-lifetimes",
+ "io-lifetimes 1.0.11",
  "libc",
  "linux-raw-sys 0.3.8",
  "windows-sys 0.48.0",
@@ -3577,14 +3678,14 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.4"
+version = "0.38.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5"
+checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f"
 dependencies = [
- "bitflags 2.3.3",
+ "bitflags 2.4.0",
  "errno",
  "libc",
- "linux-raw-sys 0.4.3",
+ "linux-raw-sys 0.4.7",
  "windows-sys 0.48.0",
 ]
 
@@ -3655,29 +3756,29 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.179"
+version = "1.0.188"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a5bf42b8d227d4abf38a1ddb08602e229108a517cd4e5bb28f9c7eaafdce5c0"
+checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.179"
+version = "1.0.188"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "741e124f5485c7e60c03b043f79f320bff3527f4bbf12cf3831750dc46a0ec2c"
+checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.37",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.104"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
+checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
 dependencies = [
  "itoa",
  "ryu",
@@ -3695,9 +3796,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.7"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -3706,9 +3807,9 @@ dependencies = [
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "c1b21f559e07218024e7e9f90f96f601825397de0e25420135f7f952453fed0b"
 dependencies = [
  "lazy_static",
 ]
@@ -3730,15 +3831,15 @@ dependencies = [
 
 [[package]]
 name = "siphasher"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
 
 [[package]]
 name = "slab"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
 dependencies = [
  "autocfg",
 ]
@@ -3754,19 +3855,19 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
 
 [[package]]
 name = "smithay"
 version = "0.3.0"
-source = "git+https://github.com/smithay//smithay?rev=d3e1ef9#d3e1ef9584cb3eadec80e8961552447cb919d6aa"
+source = "git+https://github.com/smithay//smithay?rev=74ef59a3f#74ef59a3f8b6a1f86a74388590f2f852040354e4"
 dependencies = [
  "appendlist",
  "ash",
- "bitflags 2.3.3",
- "calloop",
+ "bitflags 2.4.0",
+ "calloop 0.12.2",
  "cc",
  "cgmath",
  "downcast-rs",
@@ -3777,13 +3878,13 @@ dependencies = [
  "gbm",
  "gl_generator",
  "glow 0.12.3",
- "indexmap 1.9.3",
+ "indexmap 2.0.1",
  "input",
  "lazy_static",
  "libc",
  "libloading 0.8.0",
  "libseat",
- "nix 0.26.2",
+ "nix 0.27.1",
  "once_cell",
  "pkg-config",
  "profiling",
@@ -3794,27 +3895,27 @@ dependencies = [
  "tempfile",
  "thiserror",
  "tracing",
- "udev",
- "wayland-backend",
+ "udev 0.8.0",
+ "wayland-backend 0.3.2",
  "wayland-egl",
- "wayland-protocols 0.30.1",
+ "wayland-protocols 0.31.0",
  "wayland-protocols-misc",
  "wayland-protocols-wlr",
  "wayland-server",
- "wayland-sys 0.30.1",
+ "wayland-sys 0.31.1",
  "winit",
- "x11rb",
- "xkbcommon 0.5.1",
+ "x11rb 0.12.0",
+ "xkbcommon",
 ]
 
 [[package]]
 name = "smithay-client-toolkit"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454"
+checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9"
 dependencies = [
  "bitflags 1.3.2",
- "calloop",
+ "calloop 0.10.6",
  "dlib",
  "lazy_static",
  "log",
@@ -3829,7 +3930,7 @@ dependencies = [
 [[package]]
 name = "smithay-egui"
 version = "0.1.0"
-source = "git+https://github.com/Smithay/smithay-egui.git?rev=dab5c1b#dab5c1b4323e35389500996a8119906b54f63fda"
+source = "git+https://github.com/Smithay/smithay-egui.git?rev=114d8db6#114d8db655094f89a3e9821dcc74bd8eb2e26406"
 dependencies = [
  "cgmath",
  "egui",
@@ -3839,7 +3940,7 @@ dependencies = [
  "log",
  "memoffset 0.9.0",
  "smithay",
- "xkbcommon 0.5.1",
+ "xkbcommon",
 ]
 
 [[package]]
@@ -3860,19 +3961,19 @@ dependencies = [
  "fastrand 1.9.0",
  "foreign-types",
  "log",
- "nix 0.26.2",
+ "nix 0.26.4",
  "objc",
  "raw-window-handle",
  "redox_syscall 0.3.5",
  "thiserror",
  "wasm-bindgen",
- "wayland-backend",
+ "wayland-backend 0.1.2",
  "wayland-client 0.30.2",
  "wayland-sys 0.30.1",
  "web-sys",
  "windows-sys 0.42.0",
  "x11-dl",
- "x11rb",
+ "x11rb 0.11.1",
 ]
 
 [[package]]
@@ -3985,9 +4086,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.28"
+version = "2.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
+checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3996,54 +4097,53 @@ dependencies = [
 
 [[package]]
 name = "sys-locale"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea0b9eefabb91675082b41eb94c3ecd91af7656caee3fb4961a07c0ec8c7ca6f"
+checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0"
 dependencies = [
  "libc",
- "windows-sys 0.45.0",
 ]
 
 [[package]]
 name = "tempfile"
-version = "3.7.0"
+version = "3.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998"
+checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
 dependencies = [
  "cfg-if",
- "fastrand 2.0.0",
+ "fastrand 2.0.1",
  "redox_syscall 0.3.5",
- "rustix 0.38.4",
+ "rustix 0.38.14",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "termcolor"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.44"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
+checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.44"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
+checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -4058,9 +4158,9 @@ dependencies = [
 
 [[package]]
 name = "tiff"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471"
+checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211"
 dependencies = [
  "flate2",
  "jpeg-decoder",
@@ -4069,9 +4169,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.24"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b79eabcd964882a646b3584543ccabeae7869e9ac32a46f6f22b7a5bd405308b"
+checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe"
 dependencies = [
  "deranged",
  "itoa",
@@ -4082,15 +4182,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.11"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd"
+checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
 dependencies = [
  "time-core",
 ]
@@ -4148,9 +4248,9 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.7.1"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ac3f5b6856e931e15e07b478e98c8045239829a65f9156d4fa7e7788197a5ef"
+checksum = "b07bb54ef1f8ff27564b08b861144d3b8d40263efe07684f64987f4c0d044e3e"
 dependencies = [
  "displaydoc",
 ]
@@ -4166,14 +4266,14 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.7.6"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
+checksum = "1bc1433177506450fe920e46a4f9812d0c211f5dd556da10e731a0a3dfa151f0"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit",
+ "toml_edit 0.20.1",
 ]
 
 [[package]]
@@ -4187,11 +4287,22 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.19.14"
+version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.0.0",
+ "indexmap 2.0.1",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca676d9ba1a322c1b64eb8045a5ec5c0cfb0c9d08e15e9ff622589ad5221c8fe"
+dependencies = [
+ "indexmap 2.0.1",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -4218,7 +4329,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -4279,9 +4390,9 @@ checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633"
 
 [[package]]
 name = "ttf-parser"
-version = "0.19.1"
+version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a464a4b34948a5f67fddd2b823c62d9d92e44be75058b99939eae6c5b6960b33"
+checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1"
 
 [[package]]
 name = "twox-hash"
@@ -4305,9 +4416,9 @@ dependencies = [
 
 [[package]]
 name = "typenum"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "udev"
@@ -4320,6 +4431,18 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "udev"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50051c6e22be28ee6f217d50014f3bc29e81c20dc66ff7ca0d5c5226e1dcc5a1"
+dependencies = [
+ "io-lifetimes 1.0.11",
+ "libc",
+ "libudev-sys",
+ "pkg-config",
+]
+
 [[package]]
 name = "unic-langid"
 version = "0.9.1"
@@ -4365,9 +4488,9 @@ checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-linebreak"
@@ -4395,9 +4518,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
 
 [[package]]
 name = "unicode-xid"
@@ -4431,7 +4554,7 @@ version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b44e14b7678bcc5947b397991432d0c4e02a103958a0ed5e1b9b961ddd08b21"
 dependencies = [
- "base64 0.21.2",
+ "base64 0.21.4",
  "log",
  "pico-args",
  "usvg-parser",
@@ -4520,9 +4643,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "walkdir"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
 dependencies = [
  "same-file",
  "winapi-util",
@@ -4555,7 +4678,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.37",
  "wasm-bindgen-shared",
 ]
 
@@ -4589,7 +4712,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.37",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -4623,13 +4746,27 @@ checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8"
 dependencies = [
  "cc",
  "downcast-rs",
- "io-lifetimes",
- "nix 0.26.2",
+ "io-lifetimes 1.0.11",
+ "nix 0.26.4",
  "scoped-tls",
  "smallvec",
  "wayland-sys 0.30.1",
 ]
 
+[[package]]
+name = "wayland-backend"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4"
+dependencies = [
+ "cc",
+ "downcast-rs",
+ "nix 0.26.4",
+ "scoped-tls",
+ "smallvec",
+ "wayland-sys 0.31.1",
+]
+
 [[package]]
 name = "wayland-client"
 version = "0.29.5"
@@ -4653,8 +4790,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8"
 dependencies = [
  "bitflags 1.3.2",
- "nix 0.26.2",
- "wayland-backend",
+ "nix 0.26.4",
+ "wayland-backend 0.1.2",
  "wayland-scanner 0.30.1",
 ]
 
@@ -4683,12 +4820,12 @@ dependencies = [
 
 [[package]]
 name = "wayland-egl"
-version = "0.30.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1187695fe81c3153c3163f9d2953149f638c5d7dbc6fe988914ca3f4961e28ed"
+checksum = "355f652e5a24ae02d2ad536c8fc2d3dcc6c2bd635027cd6103a193e7d75eeda2"
 dependencies = [
- "wayland-backend",
- "wayland-sys 0.30.1",
+ "wayland-backend 0.3.2",
+ "wayland-sys 0.31.1",
 ]
 
 [[package]]
@@ -4705,39 +4842,39 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols"
-version = "0.30.1"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b28101e5ca94f70461a6c2d610f76d85ad223d042dd76585ab23d3422dd9b4d"
+checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c"
 dependencies = [
- "bitflags 1.3.2",
- "wayland-backend",
- "wayland-scanner 0.30.1",
+ "bitflags 2.4.0",
+ "wayland-backend 0.3.2",
+ "wayland-scanner 0.31.0",
  "wayland-server",
 ]
 
 [[package]]
 name = "wayland-protocols-misc"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897d4e99645e1ed9245e9e6b5efa78828d2b23b661016d63d55251243d812f8b"
+checksum = "bfa5933740b200188c9b4c38601b8212e8c154d7de0d2cb171944e137a77de1e"
 dependencies = [
- "bitflags 1.3.2",
- "wayland-backend",
- "wayland-protocols 0.30.1",
- "wayland-scanner 0.30.1",
+ "bitflags 2.4.0",
+ "wayland-backend 0.3.2",
+ "wayland-protocols 0.31.0",
+ "wayland-scanner 0.31.0",
  "wayland-server",
 ]
 
 [[package]]
 name = "wayland-protocols-wlr"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fce991093320e4a6a525876e6b629ab24da25f9baef0c2e0080ad173ec89588a"
+checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6"
 dependencies = [
- "bitflags 1.3.2",
- "wayland-backend",
- "wayland-protocols 0.30.1",
- "wayland-scanner 0.30.1",
+ "bitflags 2.4.0",
+ "wayland-backend 0.3.2",
+ "wayland-protocols 0.31.0",
+ "wayland-scanner 0.31.0",
  "wayland-server",
 ]
 
@@ -4759,22 +4896,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9b873b257fbc32ec909c0eb80dea312076a67014e65e245f5eb69a6b8ab330e"
 dependencies = [
  "proc-macro2",
- "quick-xml",
+ "quick-xml 0.28.2",
+ "quote",
+]
+
+[[package]]
+name = "wayland-scanner"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c"
+dependencies = [
+ "proc-macro2",
+ "quick-xml 0.30.0",
  "quote",
 ]
 
 [[package]]
 name = "wayland-server"
-version = "0.30.1"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c43c28096fe1d49fff7d1079404fdd0f669cd1a5b00c615bdfe71bb1884d23a"
+checksum = "3f3f0c52a445936ca1184c98f1a69cf4ad9c9130788884531ef04428468cb1ce"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
  "downcast-rs",
- "io-lifetimes",
- "nix 0.26.2",
- "wayland-backend",
- "wayland-scanner 0.30.1",
+ "io-lifetimes 2.0.2",
+ "nix 0.26.4",
+ "wayland-backend 0.3.2",
+ "wayland-scanner 0.31.0",
 ]
 
 [[package]]
@@ -4796,9 +4944,20 @@ checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06"
 dependencies = [
  "dlib",
  "lazy_static",
+ "log",
+ "pkg-config",
+]
+
+[[package]]
+name = "wayland-sys"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af"
+dependencies = [
+ "dlib",
  "libc",
  "log",
- "memoffset 0.7.1",
+ "memoffset 0.9.0",
  "pkg-config",
 ]
 
@@ -4850,7 +5009,7 @@ checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2"
 dependencies = [
  "arrayvec",
  "bit-vec",
- "bitflags 2.3.3",
+ "bitflags 2.4.0",
  "codespan-reporting",
  "log",
  "naga",
@@ -4875,7 +5034,7 @@ dependencies = [
  "arrayvec",
  "ash",
  "bit-set",
- "bitflags 2.3.3",
+ "bitflags 2.4.0",
  "block",
  "core-graphics-types",
  "d3d12",
@@ -4913,7 +5072,7 @@ version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a"
 dependencies = [
- "bitflags 2.3.3",
+ "bitflags 2.4.0",
  "js-sys",
  "web-sys",
 ]
@@ -4942,9 +5101,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
 dependencies = [
  "winapi",
 ]
@@ -5003,7 +5162,7 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets 0.48.1",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -5023,17 +5182,17 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.48.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
- "windows_aarch64_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
 ]
 
 [[package]]
@@ -5044,9 +5203,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -5056,9 +5215,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -5068,9 +5227,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -5080,9 +5239,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -5092,9 +5251,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -5104,9 +5263,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -5116,15 +5275,15 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "winit"
-version = "0.28.6"
+version = "0.28.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "866db3f712fffba75d31bf0cdecf357c8aeafd158c5b7ab51dba2a2b2d47f196"
+checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94"
 dependencies = [
  "android-activity",
  "bitflags 1.3.2",
@@ -5156,9 +5315,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.5.2"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bd122eb777186e60c3fdf765a58ac76e41c582f1f535fbf3314434c6b58f3f7"
+checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
 dependencies = [
  "memchr",
 ]
@@ -5189,14 +5348,27 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdf3c79412dd91bae7a7366b8ad1565a85e35dd049affc3a6a2c549e97419617"
 dependencies = [
- "gethostname",
+ "gethostname 0.2.3",
  "libc",
  "libloading 0.7.4",
  "nix 0.25.1",
  "once_cell",
  "winapi",
  "winapi-wsapoll",
- "x11rb-protocol",
+ "x11rb-protocol 0.11.1",
+]
+
+[[package]]
+name = "x11rb"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a"
+dependencies = [
+ "gethostname 0.3.0",
+ "nix 0.26.4",
+ "winapi",
+ "winapi-wsapoll",
+ "x11rb-protocol 0.12.0",
 ]
 
 [[package]]
@@ -5208,6 +5380,15 @@ dependencies = [
  "nix 0.25.1",
 ]
 
+[[package]]
+name = "x11rb-protocol"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc"
+dependencies = [
+ "nix 0.26.4",
+]
+
 [[package]]
 name = "xcursor"
 version = "0.3.4"
@@ -5225,28 +5406,26 @@ checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546"
 
 [[package]]
 name = "xkbcommon"
-version = "0.4.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "032ed00cc755c31221bbd6aaf9fa4196a01bf33bca185f9316e14f26d28c28cf"
+checksum = "c286371c44b3572d19b09196c129a8fff47d7704d6494daefb44fec10f0278ab"
 dependencies = [
  "libc",
+ "memmap2 0.7.1",
+ "xkeysym",
 ]
 
 [[package]]
-name = "xkbcommon"
-version = "0.5.1"
+name = "xkeysym"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52db25b599e92bf6e3904134618728eeb7b49a5a4f38f107f92399bb9c496b88"
-dependencies = [
- "libc",
- "memmap2 0.7.1",
-]
+checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621"
 
 [[package]]
 name = "xml-rs"
-version = "0.8.16"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1"
+checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a"
 
 [[package]]
 name = "xmlparser"
@@ -5268,9 +5447,9 @@ checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1"
 
 [[package]]
 name = "zeno"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c110ba09c9b3a43edd4803d570df0da2414fed6e822e22b976a4e3ef50860701"
+checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697"
 
 [[package]]
 name = "zune-inflate"
diff --git a/Cargo.toml b/Cargo.toml
index 63b38964..5e47d056 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,9 +13,9 @@ members = [
 [dependencies]
 apply = "0.3.0"
 anyhow = { version = "1.0.51", features = ["backtrace"] }
-bitflags = "1.3.2"
+bitflags = "2.4"
 bytemuck = "1.12"
-calloop = { version = "0.10.1", features = ["executor"] }
+calloop = { version = "0.12.2", features = ["executor"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 sendfd = "0.4.1"
@@ -28,16 +28,16 @@ log-panics = { version = "2", features = ["with-backtrace"] }
 thiserror = "1.0.26"
 regex = "1"
 xcursor = "0.3.3"
-xkbcommon = "0.4"
-indexmap = "1.8.0"
+xkbcommon = "0.6"
+indexmap = "2.0"
 xdg = "^2.1"
 ron = "0.7"
 libsystemd = { version = "0.5", optional = true }
-wayland-backend = "0.1.0"
-wayland-scanner = "0.30.0"
+wayland-backend = "0.3.0"
+wayland-scanner = "0.31.0"
 cosmic-comp-config = { path = "cosmic-comp-config" }
-cosmic-config = { git = "https://github.com/pop-os/libcosmic/", rev = "4895b0c", features = ["calloop"] }
-cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", branch = "main", default-features = false, features = ["server"] }
+cosmic-config = { git = "https://github.com/pop-os/libcosmic/", rev = "94e147a", features = ["calloop"] }
+cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", rev = "bf7958d", default-features = false, features = ["server"] }
 libcosmic = { git = "https://github.com/pop-os/libcosmic/", rev = "4895b0c", default-features = false }
 iced_tiny_skia = { git = "https://github.com/pop-os/libcosmic/", rev = "4895b0c" }
 tiny-skia = "0.9"
@@ -61,13 +61,13 @@ branch = "feature/copy_clone"
 [dependencies.smithay]
 version = "0.3"
 git = "https://github.com/smithay/smithay.git"
-rev = "58d5bdc"
+rev = "74ef59a3f"
 default-features = false
 features = ["backend_drm", "backend_gbm", "backend_egl", "backend_libinput", "backend_session_libseat", "backend_udev", "backend_winit", "backend_vulkan", "backend_x11", "desktop", "use_system_lib", "renderer_glow", "renderer_multi", "wayland_frontend", "xwayland"]
 
 [dependencies.smithay-egui]
 git = "https://github.com/Smithay/smithay-egui.git"
-rev = "dab5c1b"
+rev = "114d8db6"
 features = ["svg"]
 optional = true
 
@@ -87,4 +87,4 @@ debug = true
 lto = "fat"
 
 [patch."https://github.com/Smithay/smithay.git"]
-smithay = { git = "https://github.com/smithay//smithay", rev = "d3e1ef9" }
+smithay = { git = "https://github.com/smithay//smithay", rev = "74ef59a3f" }
diff --git a/src/backend/kms/mod.rs b/src/backend/kms/mod.rs
index 3ee0a850..3e1c90fe 100644
--- a/src/backend/kms/mod.rs
+++ b/src/backend/kms/mod.rs
@@ -6,7 +6,7 @@ use crate::{
     backend::render::{workspace_elements, CLEAR_COLOR},
     config::OutputConfig,
     shell::Shell,
-    state::{BackendData, ClientState, Common, Data, Fps, SurfaceDmabufFeedback},
+    state::{BackendData, ClientState, Common, Fps, SurfaceDmabufFeedback},
     utils::prelude::*,
     wayland::{
         handlers::screencopy::{render_session, UserdataExt},
@@ -157,7 +157,7 @@ pub type GbmDrmCompositor = DrmCompositor<
 
 pub fn init_backend(
     dh: &DisplayHandle,
-    event_loop: &mut EventLoop<'static, Data>,
+    event_loop: &mut EventLoop<'static, State>,
     state: &mut State,
 ) -> Result<()> {
     let (session, notifier) = LibSeatSession::new().context("Failed to acquire session")?;
@@ -172,21 +172,21 @@ pub fn init_backend(
 
     let libinput_event_source = event_loop
         .handle()
-        .insert_source(libinput_backend, move |mut event, _, data| {
+        .insert_source(libinput_backend, move |mut event, _, state| {
             if let InputEvent::DeviceAdded { ref mut device } = &mut event {
-                data.state.common.config.read_device(device);
-                data.state
+                state.common.config.read_device(device);
+                state
                     .backend
                     .kms()
                     .input_devices
                     .insert(device.name().into(), device.clone());
             } else if let InputEvent::DeviceRemoved { device } = &event {
-                data.state.backend.kms().input_devices.remove(device.name());
+                state.backend.kms().input_devices.remove(device.name());
             }
-            data.state.process_input_event(event, true);
-            for output in data.state.common.shell.outputs() {
-                if let Err(err) = data.state.backend.kms().schedule_render(
-                    &data.state.common.event_loop_handle,
+            state.process_input_event(event, true);
+            for output in state.common.shell.outputs() {
+                if let Err(err) = state.backend.kms().schedule_render(
+                    &state.common.event_loop_handle,
                     output,
                     None,
                     None,
@@ -236,19 +236,17 @@ pub fn init_backend(
     };
     info!("Using {} as primary gpu for rendering.", primary);
 
-    let udev_dispatcher = Dispatcher::new(udev_backend, move |event, _, data: &mut Data| {
+    let udev_dispatcher = Dispatcher::new(udev_backend, move |event, _, state: &mut State| {
+        let dh = state.common.display_handle.clone();
         match match event {
-            UdevEvent::Added { device_id, path } => data
-                .state
-                .device_added(device_id, path, &data.display.handle(), true)
+            UdevEvent::Added { device_id, path } => state
+                .device_added(device_id, path, &dh, true)
                 .with_context(|| format!("Failed to add drm device: {}", device_id)),
-            UdevEvent::Changed { device_id } => data
-                .state
+            UdevEvent::Changed { device_id } => state
                 .device_changed(device_id)
                 .with_context(|| format!("Failed to update drm device: {}", device_id)),
-            UdevEvent::Removed { device_id } => data
-                .state
-                .device_removed(device_id, &data.display.handle())
+            UdevEvent::Removed { device_id } => state
+                .device_removed(device_id, &dh)
                 .with_context(|| format!("Failed to remove drm device: {}", device_id)),
         } {
             Ok(()) => {
@@ -269,16 +267,16 @@ pub fn init_backend(
     let dispatcher = udev_dispatcher.clone();
     let session_event_source = event_loop
         .handle()
-        .insert_source(notifier, move |event, &mut (), data| match event {
+        .insert_source(notifier, move |event, &mut (), state| match event {
             SessionEvent::ActivateSession => {
                 if let Err(err) = libinput_context.resume() {
                     error!(?err, "Failed to resume libinput context.");
                 }
-                for device in data.state.backend.kms().devices.values() {
+                for device in state.backend.kms().devices.values() {
                     device.drm.activate();
                 }
                 let dispatcher = dispatcher.clone();
-                handle.insert_idle(move |data| {
+                handle.insert_idle(move |state| {
                     for (dev, path) in dispatcher.as_source_ref().device_list() {
                         let drm_node = match DrmNode::from_dev_id(dev) {
                             Ok(node) => node,
@@ -287,32 +285,27 @@ pub fn init_backend(
                                 continue;
                             }
                         };
-                        if data.state.backend.kms().devices.contains_key(&drm_node) {
-                            if let Err(err) = data.state.device_changed(dev) {
+                        if state.backend.kms().devices.contains_key(&drm_node) {
+                            if let Err(err) = state.device_changed(dev) {
                                 error!(?err, "Failed to update drm device {}.", path.display(),);
                             }
                         } else {
-                            if let Err(err) = data.state.device_added(
-                                dev,
-                                path.into(),
-                                &data.display.handle(),
-                                true,
-                            ) {
+                            let dh = state.common.display_handle.clone();
+                            if let Err(err) = state.device_added(dev, path.into(), &dh, true) {
                                 error!(?err, "Failed to add drm device {}.", path.display(),);
                             }
                         }
                     }
 
-                    let seats = data.state.common.seats().cloned().collect::<Vec<_>>();
-                    data.state.common.config.read_outputs(
-                        &mut data.state.common.output_configuration_state,
-                        &mut data.state.backend,
-                        &mut data.state.common.shell,
+                    let seats = state.common.seats().cloned().collect::<Vec<_>>();
+                    state.common.config.read_outputs(
+                        &mut state.common.output_configuration_state,
+                        &mut state.backend,
+                        &mut state.common.shell,
                         seats.into_iter(),
-                        &data.state.common.event_loop_handle,
+                        &state.common.event_loop_handle,
                     );
-                    for surface in data
-                        .state
+                    for surface in state
                         .backend
                         .kms()
                         .devices
@@ -322,10 +315,10 @@ pub fn init_backend(
                         surface.scheduled = false;
                         surface.pending = false;
                     }
-                    for output in data.state.common.shell.outputs() {
+                    for output in state.common.shell.outputs() {
                         let sessions = output.pending_buffers().collect::<Vec<_>>();
-                        if let Err(err) = data.state.backend.kms().schedule_render(
-                            &data.state.common.event_loop_handle,
+                        if let Err(err) = state.backend.kms().schedule_render(
+                            &state.common.event_loop_handle,
                             output,
                             None,
                             if !sessions.is_empty() {
@@ -346,12 +339,12 @@ pub fn init_backend(
             }
             SessionEvent::PauseSession => {
                 libinput_context.suspend();
-                for device in data.state.backend.kms().devices.values_mut() {
+                for device in state.backend.kms().devices.values_mut() {
                     device.drm.pause();
                     for surface in device.surfaces.values_mut() {
                         surface.surface = None;
                         if let Some(token) = surface.render_timer_token.take() {
-                            data.state.common.event_loop_handle.remove(token);
+                            state.common.event_loop_handle.remove(token);
                         }
                         surface.scheduled = false;
                     }
@@ -466,10 +459,10 @@ impl State {
             .event_loop_handle
             .insert_source(
                 notifier,
-                move |event, metadata, data: &mut Data| match event {
+                move |event, metadata, state: &mut State| match event {
                     DrmEvent::VBlank(crtc) => {
                         let rescheduled = if let Some(device) =
-                            data.state.backend.kms().devices.get_mut(&drm_node)
+                            state.backend.kms().devices.get_mut(&drm_node)
                         {
                             if let Some(surface) = device.surfaces.get_mut(&crtc) {
                                 #[cfg(feature = "debug")]
@@ -497,7 +490,7 @@ impl State {
                                             )
                                             } else {
                                                 (
-                                                    data.state.common.clock.now(),
+                                                    state.common.clock.now(),
                                                     wp_presentation_feedback::Kind::Vsync,
                                                 )
                                             };
@@ -520,7 +513,7 @@ impl State {
 
                                         surface.pending = false;
                                         let animations_going =
-                                            data.state.common.shell.animations_going();
+                                            state.common.shell.animations_going();
                                         let animation_diff = std::mem::replace(
                                             &mut surface.last_animation_state,
                                             animations_going,
@@ -549,7 +542,7 @@ impl State {
 
                         if let Some((output, avg_rendertime)) = rescheduled {
                             let mut scheduled_sessions =
-                                data.state.workspace_session_for_output(&output);
+                                state.workspace_session_for_output(&output);
                             let mut output_sessions = output.pending_buffers().peekable();
                             if output_sessions.peek().is_some() {
                                 scheduled_sessions
@@ -559,8 +552,8 @@ impl State {
 
                             let estimated_rendertime =
                                 std::cmp::max(avg_rendertime, MIN_RENDER_TIME);
-                            if let Err(err) = data.state.backend.kms().schedule_render(
-                                &data.state.common.event_loop_handle,
+                            if let Err(err) = state.backend.kms().schedule_render(
+                                &state.common.event_loop_handle,
                                 &output,
                                 Some(estimated_rendertime),
                                 scheduled_sessions,
@@ -1255,7 +1248,7 @@ impl KmsState {
         seats: impl Iterator<Item = Seat<State>>,
         shell: &mut Shell,
         test_only: bool,
-        loop_handle: &LoopHandle<'_, Data>,
+        loop_handle: &LoopHandle<'_, State>,
     ) -> Result<(), anyhow::Error> {
         let recreated = if let Some(device) = self
             .devices
@@ -1464,7 +1457,7 @@ impl KmsState {
 
     pub fn schedule_render(
         &mut self,
-        loop_handle: &LoopHandle<'_, Data>,
+        loop_handle: &LoopHandle<'_, State>,
         output: &Output,
         estimated_rendertime: Option<Duration>,
         mut screencopy_sessions: Option<Vec<(ScreencopySession, BufferParams)>>,
@@ -1477,9 +1470,9 @@ impl KmsState {
         {
             if surface.surface.is_none() {
                 if let Some(sessions) = screencopy_sessions {
-                    loop_handle.insert_idle(move |data| {
+                    loop_handle.insert_idle(move |state| {
                         for (session, params) in sessions.into_iter() {
-                            data.state.common.still_pending(session, params);
+                            state.common.still_pending(session, params);
                         }
                     });
                 }
@@ -1500,8 +1493,8 @@ impl KmsState {
                                 .saturating_sub(estimated_rendertime.unwrap()),
                         )
                     },
-                    move |_time, _, data| {
-                        let backend = data.state.backend.kms();
+                    move |_time, _, state| {
+                        let backend = state.backend.kms();
                         let (mut device, mut other) = backend
                             .devices
                             .iter_mut()
@@ -1511,12 +1504,12 @@ impl KmsState {
                         if let Some(surface) = target_device.surfaces.get_mut(&crtc) {
                             let target_node = target_device.render_node;
                             let render_node = render_node_for_output(
-                                &data.display.handle(),
+                                &state.common.display_handle,
                                 &surface.output,
                                 target_node,
-                                &data.state.common.shell,
+                                &state.common.shell,
                             );
-                            let state = &mut data.state.common;
+                            let common = &mut state.common;
 
                             let result = if render_node != target_node {
                                 let render_device = &mut other
@@ -1531,7 +1524,7 @@ impl KmsState {
                                         render_device.allocator.as_mut(),
                                     )),
                                     &target_node,
-                                    state,
+                                    common,
                                     screencopy_sessions.as_deref(),
                                 )
                             } else {
@@ -1539,7 +1532,7 @@ impl KmsState {
                                     &mut backend.api,
                                     None,
                                     &target_node,
-                                    state,
+                                    common,
                                     screencopy_sessions.as_deref(),
                                 )
                             };
@@ -1564,7 +1557,7 @@ impl KmsState {
 
                         if let Some(sessions) = screencopy_sessions.as_mut() {
                             for (session, params) in sessions.drain(..) {
-                                data.state.common.still_pending(session, params);
+                                state.common.still_pending(session, params);
                             }
                         }
                         TimeoutAction::Drop
@@ -1573,9 +1566,9 @@ impl KmsState {
                 surface.scheduled = true;
             } else {
                 if let Some(sessions) = screencopy_sessions {
-                    loop_handle.insert_idle(|data| {
+                    loop_handle.insert_idle(|state| {
                         for (session, params) in sessions.into_iter() {
-                            data.state.common.still_pending(session, params);
+                            state.common.still_pending(session, params);
                         }
                     });
                 }
diff --git a/src/backend/kms/socket.rs b/src/backend/kms/socket.rs
index f8f4fde9..414c2dae 100644
--- a/src/backend/kms/socket.rs
+++ b/src/backend/kms/socket.rs
@@ -19,10 +19,7 @@ use smithay::{
 use std::sync::Arc;
 use tracing::{info, warn};
 
-use crate::{
-    state::{ClientState, Data},
-    utils::prelude::*,
-};
+use crate::state::{ClientState, State};
 
 #[derive(Debug)]
 pub struct Socket {
@@ -96,10 +93,10 @@ impl State {
         let token = self
             .common
             .event_loop_handle
-            .insert_source(listener, move |client_stream, _, data: &mut Data| {
-                if let Err(err) = data.display.handle().insert_client(
+            .insert_source(listener, move |client_stream, _, state: &mut State| {
+                if let Err(err) = state.common.display_handle.insert_client(
                     client_stream,
-                    Arc::new(data.state.new_client_state_with_node(render_node)),
+                    Arc::new(state.new_client_state_with_node(render_node)),
                 ) {
                     warn!(
                         socket_name = socket_name_clone,
diff --git a/src/backend/mod.rs b/src/backend/mod.rs
index 940b6c42..59df16cb 100644
--- a/src/backend/mod.rs
+++ b/src/backend/mod.rs
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-use crate::state::{Data, State};
+use crate::state::State;
 use anyhow::{Context, Result};
 use smithay::reexports::{calloop::EventLoop, wayland_server::DisplayHandle};
 use tracing::{info, warn};
@@ -15,7 +15,7 @@ pub mod x11;
 
 pub fn init_backend_auto(
     dh: &DisplayHandle,
-    event_loop: &mut EventLoop<'static, Data>,
+    event_loop: &mut EventLoop<'static, State>,
     state: &mut State,
 ) -> Result<()> {
     let res = match std::env::var("COSMIC_BACKEND") {
diff --git a/src/backend/winit.rs b/src/backend/winit.rs
index 9d7f3435..da2cb26d 100644
--- a/src/backend/winit.rs
+++ b/src/backend/winit.rs
@@ -4,7 +4,7 @@ use crate::{
     backend::render,
     config::OutputConfig,
     input::Devices,
-    state::{BackendData, Common, Data},
+    state::{BackendData, Common},
     utils::prelude::*,
     wayland::protocols::screencopy::{BufferParams, Session as ScreencopySession},
 };
@@ -147,7 +147,7 @@ impl WinitState {
 
 pub fn init_backend(
     dh: &DisplayHandle,
-    event_loop: &mut EventLoop<Data>,
+    event_loop: &mut EventLoop<State>,
     state: &mut State,
 ) -> Result<()> {
     let (mut backend, mut input) =
@@ -197,13 +197,8 @@ pub fn init_backend(
     let mut token = Some(
         event_loop
             .handle()
-            .insert_source(render_source, move |_, _, data| {
-                if let Err(err) = data
-                    .state
-                    .backend
-                    .winit()
-                    .render_output(&mut data.state.common)
-                {
+            .insert_source(render_source, move |_, _, state| {
+                if let Err(err) = state.backend.winit().render_output(&mut state.common) {
                     error!(?err, "Failed to render frame.");
                     render_ping.ping();
                 }
@@ -213,21 +208,18 @@ pub fn init_backend(
     let event_loop_handle = event_loop.handle();
     event_loop
         .handle()
-        .insert_source(event_source, move |_, _, data| {
-            match input.dispatch_new_events(|event| {
-                data.state.process_winit_event(event, &render_ping_handle)
-            }) {
+        .insert_source(event_source, move |_, _, state| {
+            match input
+                .dispatch_new_events(|event| state.process_winit_event(event, &render_ping_handle))
+            {
                 Ok(_) => {
                     event_ping_handle.ping();
                     render_ping_handle.ping();
                 }
                 Err(winit::WinitError::WindowClosed) => {
-                    let output = data.state.backend.winit().output.clone();
-                    let seats = data.state.common.seats().cloned().collect::<Vec<_>>();
-                    data.state
-                        .common
-                        .shell
-                        .remove_output(&output, seats.into_iter());
+                    let output = state.backend.winit().output.clone();
+                    let seats = state.common.seats().cloned().collect::<Vec<_>>();
+                    state.common.shell.remove_output(&output, seats.into_iter());
                     if let Some(token) = token.take() {
                         event_loop_handle.remove(token);
                     }
diff --git a/src/backend/x11.rs b/src/backend/x11.rs
index 65a825bd..7952eaa7 100644
--- a/src/backend/x11.rs
+++ b/src/backend/x11.rs
@@ -4,7 +4,7 @@ use crate::{
     backend::render,
     config::OutputConfig,
     input::Devices,
-    state::{BackendData, Common, Data},
+    state::{BackendData, Common},
     utils::prelude::*,
     wayland::protocols::screencopy::{BufferParams, Session as ScreencopySession},
 };
@@ -63,7 +63,7 @@ pub struct X11State {
 }
 
 impl X11State {
-    pub fn add_window(&mut self, handle: LoopHandle<'_, Data>) -> Result<Output> {
+    pub fn add_window(&mut self, handle: LoopHandle<'_, State>) -> Result<Output> {
         let window = WindowBuilder::new()
             .title("COSMIC")
             .build(&self.handle)
@@ -124,15 +124,15 @@ impl X11State {
         let (ping, source) =
             ping::make_ping().with_context(|| "Failed to create output event loop source")?;
         let _token = handle
-            .insert_source(source, move |_, _, data| {
-                let x11_state = data.state.backend.x11();
+            .insert_source(source, move |_, _, state| {
+                let x11_state = state.backend.x11();
                 if let Some(surface) = x11_state
                     .surfaces
                     .iter_mut()
                     .find(|s| s.output == output_ref)
                 {
                     if let Err(err) =
-                        surface.render_output(&mut x11_state.renderer, &mut data.state.common)
+                        surface.render_output(&mut x11_state.renderer, &mut state.common)
                     {
                         error!(?err, "Error rendering.");
                     }
@@ -333,7 +333,7 @@ fn try_gbm_allocator(fd: OwnedFd) -> Option<Allocator> {
 
 pub fn init_backend(
     dh: &DisplayHandle,
-    event_loop: &mut EventLoop<Data>,
+    event_loop: &mut EventLoop<State>,
     state: &mut State,
 ) -> Result<()> {
     let backend = X11Backend::new().with_context(|| "Failed to initilize X11 backend")?;
@@ -391,12 +391,11 @@ pub fn init_backend(
 
     event_loop
         .handle()
-        .insert_source(backend, move |event, _, data| match event {
+        .insert_source(backend, move |event, _, state| match event {
             X11Event::CloseRequested { window_id } => {
                 // TODO: drain_filter
                 let mut outputs_removed = Vec::new();
-                for surface in data
-                    .state
+                for surface in state
                     .backend
                     .x11()
                     .surfaces
@@ -406,13 +405,13 @@ pub fn init_backend(
                     surface.window.unmap();
                     outputs_removed.push(surface.output.clone());
                 }
-                data.state
+                state
                     .backend
                     .x11()
                     .surfaces
                     .retain(|s| s.window.id() != window_id);
                 for output in outputs_removed.into_iter() {
-                    data.state
+                    state
                         .common
                         .shell
                         .remove_output(&output, seats.iter().cloned());
@@ -427,8 +426,7 @@ pub fn init_backend(
                     size,
                     refresh: 60_000,
                 };
-                if let Some(surface) = data
-                    .state
+                if let Some(surface) = state
                     .backend
                     .x11()
                     .surfaces
@@ -449,8 +447,8 @@ pub fn init_backend(
                     output.change_current_state(Some(mode), None, None, None);
                     output.set_preferred(mode);
                     layer_map_for_output(output).arrange();
-                    data.state.common.output_configuration_state.update();
-                    data.state.common.shell.refresh_outputs();
+                    state.common.output_configuration_state.update();
+                    state.common.shell.refresh_outputs();
                     surface.dirty = true;
                     if !surface.pending {
                         surface.render.ping();
@@ -458,8 +456,7 @@ pub fn init_backend(
                 }
             }
             X11Event::Refresh { window_id } | X11Event::PresentCompleted { window_id } => {
-                if let Some(surface) = data
-                    .state
+                if let Some(surface) = state
                     .backend
                     .x11()
                     .surfaces
@@ -473,7 +470,7 @@ pub fn init_backend(
                     }
                 }
             }
-            X11Event::Input(event) => data.state.process_x11_event(event),
+            X11Event::Input(event) => state.process_x11_event(event),
         })
         .map_err(|_| anyhow::anyhow!("Failed to insert X11 Backend into event loop"))?;
 
diff --git a/src/config/key_bindings.rs b/src/config/key_bindings.rs
index 4ad89f6a..0d79f178 100644
--- a/src/config/key_bindings.rs
+++ b/src/config/key_bindings.rs
@@ -4,7 +4,7 @@ use crate::shell::{focus::FocusDirection, grabs::ResizeEdge, Direction, ResizeDi
 use serde::Deserialize;
 use smithay::{
     backend::input::KeyState,
-    input::keyboard::{keysyms as KeySyms, xkb::keysym_get_name, ModifiersState},
+    input::keyboard::{xkb::keysym_get_name, ModifiersState},
 };
 use std::collections::HashMap;
 
@@ -90,11 +90,11 @@ pub struct KeyPattern {
     pub modifiers: KeyModifiers,
     /// The actual key, that was pressed
     #[serde(deserialize_with = "deserialize_Keysym")]
-    pub key: u32,
+    pub key: Keysym,
 }
 
 impl KeyPattern {
-    pub fn new(modifiers: impl Into<KeyModifiers>, key: u32) -> KeyPattern {
+    pub fn new(modifiers: impl Into<KeyModifiers>, key: Keysym) -> KeyPattern {
         KeyPattern {
             modifiers: modifiers.into(),
             key,
@@ -169,7 +169,7 @@ pub enum Action {
 fn insert_binding(
     key_bindings: &mut HashMap<KeyPattern, Action>,
     modifiers: KeyModifiers,
-    keys: impl Iterator<Item = u32>,
+    keys: impl Iterator<Item = Keysym>,
     action: Action,
 ) {
     if !key_bindings.values().any(|a| a == &action) {
@@ -192,16 +192,16 @@ pub fn add_default_bindings(
     let (workspace_previous, workspace_next, output_previous, output_next) = match workspace_layout
     {
         WorkspaceLayout::Horizontal => (
-            [KeySyms::KEY_Left, KeySyms::KEY_h],
-            [KeySyms::KEY_Right, KeySyms::KEY_l],
-            [KeySyms::KEY_Up, KeySyms::KEY_k],
-            [KeySyms::KEY_Down, KeySyms::KEY_j],
+            [Keysym::Left, Keysym::h],
+            [Keysym::Right, Keysym::l],
+            [Keysym::Up, Keysym::k],
+            [Keysym::Down, Keysym::j],
         ),
         WorkspaceLayout::Vertical => (
-            [KeySyms::KEY_Up, KeySyms::KEY_k],
-            [KeySyms::KEY_Down, KeySyms::KEY_j],
-            [KeySyms::KEY_Left, KeySyms::KEY_h],
-            [KeySyms::KEY_Right, KeySyms::KEY_l],
+            [Keysym::Up, Keysym::k],
+            [Keysym::Down, Keysym::j],
+            [Keysym::Left, Keysym::h],
+            [Keysym::Right, Keysym::l],
         ),
     };
 
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 98b56c9d..c783a080 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -2,7 +2,7 @@
 
 use crate::{
     shell::{Shell, WorkspaceAmount},
-    state::{BackendData, Data, State},
+    state::{BackendData, State},
     wayland::protocols::output_configuration::OutputConfigurationState,
 };
 use cosmic_config::ConfigGet;
@@ -158,12 +158,12 @@ impl OutputConfig {
 }
 
 impl Config {
-    pub fn load(loop_handle: &LoopHandle<'_, Data>) -> Config {
+    pub fn load(loop_handle: &LoopHandle<'_, State>) -> Config {
         let config = cosmic_config::Config::new("com.system76.CosmicComp", 1).unwrap();
         let source = cosmic_config::calloop::ConfigWatchSource::new(&config).unwrap();
         loop_handle
-            .insert_source(source, |(config, keys), (), shared_data| {
-                config_changed(config, keys, &mut shared_data.state);
+            .insert_source(source, |(config, keys), (), state| {
+                config_changed(config, keys, state);
             })
             .expect("Failed to add cosmic-config to the event loop");
         let xdg = xdg::BaseDirectories::new().ok();
@@ -260,7 +260,7 @@ impl Config {
         backend: &mut BackendData,
         shell: &mut Shell,
         seats: impl Iterator<Item = Seat<State>>,
-        loop_handle: &LoopHandle<'_, Data>,
+        loop_handle: &LoopHandle<'_, State>,
     ) {
         let seats = seats.collect::<Vec<_>>();
         let outputs = output_state.outputs().collect::<Vec<_>>();
diff --git a/src/config/types.rs b/src/config/types.rs
index 349dc216..9cd7bbb2 100644
--- a/src/config/types.rs
+++ b/src/config/types.rs
@@ -3,6 +3,7 @@
 
 use super::{KeyModifier, KeyModifiers};
 use serde::{Deserialize, Serialize};
+use smithay::reexports::x11rb::NO_SYMBOL;
 pub use smithay::{
     backend::input::KeyState,
     input::keyboard::{keysyms as KeySyms, Keysym, XkbConfig as WlXkbConfig},
@@ -65,20 +66,22 @@ where
     let name = String::deserialize(deserializer)?;
     //let name = format!("KEY_{}", code);
     match xkb::keysym_from_name(&name, xkb::KEYSYM_NO_FLAGS) {
-        KeySyms::KEY_NoSymbol => match xkb::keysym_from_name(&name, xkb::KEYSYM_CASE_INSENSITIVE) {
-            KeySyms::KEY_NoSymbol => Err(<D::Error as Error>::invalid_value(
-                Unexpected::Str(&name),
-                &"One of the keysym names of xkbcommon.h without the 'KEY_' prefix",
-            )),
-            x => {
-                warn!(
-                    "Key-Binding '{}' only matched case insensitive for {:?}",
-                    name,
-                    xkb::keysym_get_name(x)
-                );
-                Ok(x)
+        x if x.raw() == NO_SYMBOL => {
+            match xkb::keysym_from_name(&name, xkb::KEYSYM_CASE_INSENSITIVE) {
+                x if x.raw() == NO_SYMBOL => Err(<D::Error as Error>::invalid_value(
+                    Unexpected::Str(&name),
+                    &"One of the keysym names of xkbcommon.h without the 'KEY_' prefix",
+                )),
+                x => {
+                    warn!(
+                        "Key-Binding '{}' only matched case insensitive for {:?}",
+                        name,
+                        xkb::keysym_get_name(x)
+                    );
+                    Ok(x)
+                }
             }
-        },
+        }
         x => Ok(x),
     }
 }
diff --git a/src/input/mod.rs b/src/input/mod.rs
index fd4db964..6d42ac8a 100644
--- a/src/input/mod.rs
+++ b/src/input/mod.rs
@@ -25,7 +25,7 @@ use smithay::{
     },
     desktop::{layer_map_for_output, space::SpaceElement, WindowSurfaceType},
     input::{
-        keyboard::{keysyms, FilterResult, KeysymHandle, XkbConfig},
+        keyboard::{FilterResult, KeysymHandle, XkbConfig},
         pointer::{
             AxisFrame, ButtonEvent, CursorImageStatus, GestureHoldBeginEvent, GestureHoldEndEvent,
             GesturePinchBeginEvent, GesturePinchEndEvent, GesturePinchUpdateEvent,
@@ -51,6 +51,7 @@ use smithay::{
 #[cfg(not(feature = "debug"))]
 use tracing::info;
 use tracing::{error, trace, warn};
+use xkbcommon::xkb::{Keycode, Keysym};
 
 use std::{
     any::Any,
@@ -58,7 +59,6 @@ use std::{
     collections::HashMap,
     time::{Duration, Instant},
 };
-use xkbcommon::xkb::KEY_XF86Switch_VT_12;
 
 crate::utils::id_gen!(next_seat_id, SEAT_ID, SEAT_IDS);
 
@@ -66,7 +66,7 @@ crate::utils::id_gen!(next_seat_id, SEAT_ID, SEAT_IDS);
 pub struct SeatId(pub usize);
 pub struct ActiveOutput(pub RefCell<Output>);
 #[derive(Default)]
-pub struct SupressedKeys(RefCell<Vec<(u32, Option<RegistrationToken>)>>);
+pub struct SupressedKeys(RefCell<Vec<(Keycode, Option<RegistrationToken>)>>);
 #[derive(Default)]
 pub struct Devices(RefCell<HashMap<String, Vec<DeviceCapability>>>);
 
@@ -296,8 +296,8 @@ impl State {
                                                             if let Some(new_workspace) = other_w.iter_mut().find(|w| w.handle == new_descriptor.handle) {
                                                                 if let Some(focus) = TilingLayout::swap_trees(&mut old_workspace.tiling_layer, Some(&mut new_workspace.tiling_layer), &old_descriptor, &new_descriptor, &mut data.common.shell.toplevel_info_state) {
                                                                     let seat = seat.clone();
-                                                                    data.common.event_loop_handle.insert_idle(move |data| {
-                                                                        Common::set_focus(&mut data.state, Some(&focus), &seat, None);
+                                                                    data.common.event_loop_handle.insert_idle(move |state| {
+                                                                        Common::set_focus(state, Some(&focus), &seat, None);
                                                                     });
                                                                 }
                                                                 old_workspace.refresh_focus_stack();
@@ -309,8 +309,8 @@ impl State {
                                                             if let Some(focus) = TilingLayout::swap_trees(&mut workspace.tiling_layer, None, &old_descriptor, &new_descriptor, &mut data.common.shell.toplevel_info_state) {
                                                                 std::mem::drop(spaces);
                                                                 let seat = seat.clone();
-                                                                data.common.event_loop_handle.insert_idle(move |data| {
-                                                                    Common::set_focus(&mut data.state, Some(&focus), &seat, None);
+                                                                data.common.event_loop_handle.insert_idle(move |state| {
+                                                                    Common::set_focus(state, Some(&focus), &seat, None);
                                                                 });
                                                             }
                                                             workspace.refresh_focus_stack();
@@ -327,8 +327,8 @@ impl State {
                                                             if new_workspace.tiling_layer.windows().next().is_none() {
                                                                 if let Some(focus) = TilingLayout::move_tree(&mut old_workspace.tiling_layer, &mut new_workspace.tiling_layer, &current_output, &new_workspace.handle, &seat, new_workspace.focus_stack.get(&seat).iter(), old_descriptor, &mut data.common.shell.toplevel_info_state) {
                                                                     let seat = seat.clone();
-                                                                    data.common.event_loop_handle.insert_idle(move |data| {
-                                                                        Common::set_focus(&mut data.state, Some(&focus), &seat, None);
+                                                                    data.common.event_loop_handle.insert_idle(move |state| {
+                                                                        Common::set_focus(state, Some(&focus), &seat, None);
                                                                     });
                                                                 }
                                                                 old_workspace.refresh_focus_stack();
@@ -376,10 +376,10 @@ impl State {
                                         data.common.shell.resize_mode()
                                     {
                                         let resize_edge = match handle.modified_sym() {
-                                            keysyms::KEY_Left | keysyms::KEY_h | keysyms::KEY_H => Some(ResizeEdge::LEFT),
-                                            keysyms::KEY_Down | keysyms::KEY_j | keysyms::KEY_J => Some(ResizeEdge::BOTTOM),
-                                            keysyms::KEY_Up | keysyms::KEY_k | keysyms::KEY_K => Some(ResizeEdge::TOP),
-                                            keysyms::KEY_Right | keysyms::KEY_l | keysyms::KEY_L => Some(ResizeEdge::RIGHT),
+                                            Keysym::Left | Keysym::h | Keysym::H => Some(ResizeEdge::LEFT),
+                                            Keysym::Down | Keysym::j | Keysym::J => Some(ResizeEdge::BOTTOM),
+                                            Keysym::Up | Keysym::k | Keysym::K => Some(ResizeEdge::TOP),
+                                            Keysym::Right | Keysym::l | Keysym::L => Some(ResizeEdge::RIGHT),
                                             _ => None,
                                         };
 
@@ -390,7 +390,7 @@ impl State {
                                             let action = Action::_ResizingInternal(direction, edge, state);
                                             let key_pattern = KeyPattern {
                                                 modifiers: modifiers.clone().into(),
-                                                key: handle.raw_code(),
+                                                key: Keysym::new(handle.raw_code().raw()),
                                             };
 
                                             if state == KeyState::Released {
@@ -405,9 +405,9 @@ impl State {
                                                     let action_clone = action.clone();
                                                     let key_pattern_clone = key_pattern.clone();
                                                     let start = Instant::now();
-                                                    loop_handle.insert_source(Timer::from_duration(Duration::from_millis(200)), move |current, _, data| {
+                                                    loop_handle.insert_source(Timer::from_duration(Duration::from_millis(200)), move |current, _, state| {
                                                         let duration = current.duration_since(start).as_millis();
-                                                        data.state.handle_action(action_clone.clone(), &seat_clone, serial, time.overflowing_add(duration as u32).0, key_pattern_clone.clone(), None);
+                                                        state.handle_action(action_clone.clone(), &seat_clone, serial, time.overflowing_add(duration as u32).0, key_pattern_clone.clone(), None);
                                                         calloop::timer::TimeoutAction::ToDuration(Duration::from_millis(25))
                                                     }).ok()
                                                 } else { None };
@@ -457,11 +457,11 @@ impl State {
 
                                     // Handle VT switches
                                     if state == KeyState::Pressed
-                                        && (keysyms::KEY_XF86Switch_VT_1..=KEY_XF86Switch_VT_12)
-                                            .contains(&handle.modified_sym())
+                                        && (Keysym::XF86_Switch_VT_1.raw() ..= Keysym::XF86_Switch_VT_12.raw())
+                                            .contains(&handle.modified_sym().raw())
                                     {
                                         if let Err(err) = data.backend.kms().switch_vt(
-                                            (handle.modified_sym() - keysyms::KEY_XF86Switch_VT_1
+                                            (handle.modified_sym().raw() - Keysym::XF86_Switch_VT_1.raw()
                                                 + 1)
                                                 as i32,
                                         ) {
diff --git a/src/main.rs b/src/main.rs
index c53275d9..e87ab39d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,13 +3,13 @@
 use smithay::{
     reexports::{
         calloop::{generic::Generic, EventLoop, Interest, Mode, PostAction},
-        wayland_server::Display,
+        wayland_server::{Display, DisplayHandle},
     },
     wayland::socket::ListeningSocketSource,
 };
 
 use anyhow::{Context, Result};
-use std::{ffi::OsString, os::unix::prelude::AsRawFd, sync::Arc};
+use std::{ffi::OsString, sync::Arc};
 use tracing::{error, info, warn};
 
 use crate::wayland::handlers::compositor::client_compositor_state;
@@ -35,19 +35,18 @@ fn main() -> Result<()> {
     info!("Cosmic starting up!");
 
     // init event loop
-    let mut event_loop =
-        EventLoop::try_new_high_precision().with_context(|| "Failed to initialize event loop")?;
+    let mut event_loop = EventLoop::try_new().with_context(|| "Failed to initialize event loop")?;
     // init wayland
     let (display, socket) = init_wayland_display(&mut event_loop)?;
     // init state
     let mut state = state::State::new(
-        &display.handle(),
+        &display,
         socket,
         event_loop.handle(),
         event_loop.get_signal(),
     );
     // init backend
-    backend::init_backend_auto(&display.handle(), &mut event_loop, &mut state)?;
+    backend::init_backend_auto(&display, &mut event_loop, &mut state)?;
     // potentially tell systemd we are setup now
     #[cfg(feature = "systemd")]
     if let state::BackendData::Kms(_) = &state.backend {
@@ -56,43 +55,43 @@ fn main() -> Result<()> {
     // potentially tell the session we are setup now
     session::setup_socket(event_loop.handle(), &state)?;
 
-    let mut data = state::Data { display, state };
     // run the event loop
-    event_loop.run(None, &mut data, |data| {
+    event_loop.run(None, &mut state, |state| {
         // shall we shut down?
-        if data.state.common.shell.outputs().next().is_none() || data.state.common.should_stop {
+        if state.common.shell.outputs().next().is_none() || state.common.should_stop {
             info!("Shutting down");
-            data.state.common.event_loop_signal.stop();
-            data.state.common.event_loop_signal.wakeup();
+            state.common.event_loop_signal.stop();
+            state.common.event_loop_signal.wakeup();
             return;
         }
 
         // trigger routines
-        let clients = data.state.common.shell.update_animations();
+        let clients = state.common.shell.update_animations();
         {
-            let dh = data.display.handle();
+            let dh = state.common.display_handle.clone();
             for client in clients.values() {
-                client_compositor_state(&client).blocker_cleared(&mut data.state, &dh);
+                client_compositor_state(&client).blocker_cleared(state, &dh);
             }
         }
-        data.state.common.shell.refresh();
-        state::Common::refresh_focus(&mut data.state);
+        state.common.shell.refresh();
+        state::Common::refresh_focus(state);
 
         // send out events
-        let _ = data.display.flush_clients();
+        let _ = state.common.display_handle.flush_clients();
     })?;
 
     // drop eventloop & state before logger
     std::mem::drop(event_loop);
-    std::mem::drop(data);
+    std::mem::drop(state);
 
     Ok(())
 }
 
 fn init_wayland_display(
-    event_loop: &mut EventLoop<state::Data>,
-) -> Result<(Display<state::State>, OsString)> {
-    let mut display = Display::new().unwrap();
+    event_loop: &mut EventLoop<state::State>,
+) -> Result<(DisplayHandle, OsString)> {
+    let display = Display::new().unwrap();
+    let handle = display.handle();
 
     let source = ListeningSocketSource::new_auto().unwrap();
     let socket_name = source.socket_name().to_os_string();
@@ -100,13 +99,13 @@ fn init_wayland_display(
 
     event_loop
         .handle()
-        .insert_source(source, |client_stream, _, data| {
-            if let Err(err) = data.display.handle().insert_client(
+        .insert_source(source, |client_stream, _, state| {
+            if let Err(err) = state.common.display_handle.insert_client(
                 client_stream,
                 Arc::new(if cfg!(debug_assertions) {
-                    data.state.new_privileged_client_state()
+                    state.new_privileged_client_state()
                 } else {
-                    data.state.new_client_state()
+                    state.new_client_state()
                 }),
             ) {
                 warn!(?err, "Error adding wayland client");
@@ -116,22 +115,20 @@ fn init_wayland_display(
     event_loop
         .handle()
         .insert_source(
-            Generic::new(
-                display.backend().poll_fd().as_raw_fd(),
-                Interest::READ,
-                Mode::Level,
-            ),
-            move |_, _, data: &mut state::Data| match data.display.dispatch_clients(&mut data.state)
-            {
-                Ok(_) => Ok(PostAction::Continue),
-                Err(err) => {
-                    error!(?err, "I/O error on the Wayland display");
-                    data.state.common.should_stop = true;
-                    Err(err)
+            Generic::new(display, Interest::READ, Mode::Level),
+            move |_, display, state| {
+                // SAFETY: We don't drop the display
+                match unsafe { display.get_mut().dispatch_clients(state) } {
+                    Ok(_) => Ok(PostAction::Continue),
+                    Err(err) => {
+                        error!(?err, "I/O error on the Wayland display");
+                        state.common.should_stop = true;
+                        Err(err)
+                    }
                 }
             },
         )
         .with_context(|| "Failed to init the wayland event source.")?;
 
-    Ok((display, socket_name))
+    Ok((handle, socket_name))
 }
diff --git a/src/session.rs b/src/session.rs
index 3dba3ccf..4c2fd2e9 100644
--- a/src/session.rs
+++ b/src/session.rs
@@ -12,14 +12,14 @@ use std::{
     collections::HashMap,
     io::{Read, Write},
     os::unix::{
-        io::{AsRawFd, FromRawFd, RawFd},
+        io::{AsFd, BorrowedFd, FromRawFd, RawFd},
         net::UnixStream,
     },
     sync::Arc,
 };
 use tracing::{error, warn};
 
-use crate::state::{Data, State};
+use crate::state::State;
 
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case", tag = "message")]
@@ -34,9 +34,9 @@ struct StreamWrapper {
     size: u16,
     read_bytes: usize,
 }
-impl AsRawFd for StreamWrapper {
-    fn as_raw_fd(&self) -> RawFd {
-        self.stream.as_raw_fd()
+impl AsFd for StreamWrapper {
+    fn as_fd(&self) -> BorrowedFd<'_> {
+        self.stream.as_fd()
     }
 }
 impl From<UnixStream> for StreamWrapper {
@@ -50,7 +50,7 @@ impl From<UnixStream> for StreamWrapper {
     }
 }
 
-pub fn setup_socket(handle: LoopHandle<Data>, state: &State) -> Result<()> {
+pub fn setup_socket(handle: LoopHandle<State>, state: &State) -> Result<()> {
     if let Ok(fd_num) = std::env::var("COSMIC_SESSION_SOCK") {
         if let Ok(fd) = fd_num.parse::<RawFd>() {
             // set CLOEXEC
@@ -94,7 +94,10 @@ pub fn setup_socket(handle: LoopHandle<Data>, state: &State) -> Result<()> {
 
             handle.insert_source(
                 Generic::new(StreamWrapper::from(session_socket), Interest::READ, Mode::Level),
-                move |_, stream, data: &mut crate::state::Data| {
+                move |_, stream, state| {
+                    // SAFETY: We don't drop the stream!
+                    let stream = unsafe { stream.get_mut() };
+
                     if stream.size == 0 {
                         let mut len = [0u8; 2];
                         match stream.stream.read_exact(&mut len) {
@@ -131,7 +134,7 @@ pub fn setup_socket(handle: LoopHandle<Data>, state: &State) -> Result<()> {
                                                 assert_eq!(received_count, count);
                                                 for fd in fds.into_iter().take(received_count) {
                                                     let stream = unsafe { UnixStream::from_raw_fd(fd) };
-                                                    if let Err(err) = data.display.handle().insert_client(stream, Arc::new(data.state.new_privileged_client_state())) {
+                                                    if let Err(err) = state.common.display_handle.insert_client(stream, Arc::new(state.new_privileged_client_state())) {
                                                         warn!(?err, "Failed to add privileged client to display");
                                                     }
                                                 }
diff --git a/src/shell/element/mod.rs b/src/shell/element/mod.rs
index 848723c0..95eea64d 100644
--- a/src/shell/element/mod.rs
+++ b/src/shell/element/mod.rs
@@ -539,7 +539,7 @@ impl CosmicMapped {
         self.element = CosmicMappedInternal::Window(window);
     }
 
-    pub(super) fn loop_handle(&self) -> LoopHandle<'static, crate::state::Data> {
+    pub(super) fn loop_handle(&self) -> LoopHandle<'static, crate::state::State> {
         match &self.element {
             CosmicMappedInternal::Stack(stack) => stack.loop_handle(),
             CosmicMappedInternal::Window(window) => window.loop_handle(),
diff --git a/src/shell/element/resize_indicator.rs b/src/shell/element/resize_indicator.rs
index 17e74ac9..a180120f 100644
--- a/src/shell/element/resize_indicator.rs
+++ b/src/shell/element/resize_indicator.rs
@@ -22,7 +22,7 @@ pub type ResizeIndicator = IcedElement<ResizeIndicatorInternal>;
 pub fn resize_indicator(
     direction: ResizeDirection,
     config: &Config,
-    evlh: LoopHandle<'static, crate::state::Data>,
+    evlh: LoopHandle<'static, crate::state::State>,
 ) -> ResizeIndicator {
     ResizeIndicator::new(
         ResizeIndicatorInternal {
diff --git a/src/shell/element/stack.rs b/src/shell/element/stack.rs
index 9449f99f..29279f9e 100644
--- a/src/shell/element/stack.rs
+++ b/src/shell/element/stack.rs
@@ -122,14 +122,14 @@ pub enum Focus {
 
 pub enum MoveResult {
     Handled,
-    MoveOut(CosmicSurface, LoopHandle<'static, crate::state::Data>),
+    MoveOut(CosmicSurface, LoopHandle<'static, crate::state::State>),
     Default,
 }
 
 impl CosmicStack {
     pub fn new<I: Into<CosmicSurface>>(
         windows: impl Iterator<Item = I>,
-        handle: LoopHandle<'static, crate::state::Data>,
+        handle: LoopHandle<'static, crate::state::State>,
     ) -> CosmicStack {
         let windows = windows.map(Into::into).collect::<Vec<_>>();
         assert!(!windows.is_empty());
@@ -498,7 +498,7 @@ impl CosmicStack {
             .with_program(|p| p.group_focused.store(true, Ordering::SeqCst));
     }
 
-    pub(in super::super) fn loop_handle(&self) -> LoopHandle<'static, crate::state::Data> {
+    pub(in super::super) fn loop_handle(&self) -> LoopHandle<'static, crate::state::State> {
         self.0.loop_handle()
     }
 
@@ -603,7 +603,7 @@ impl Program for CosmicStackInternal {
     fn update(
         &mut self,
         message: Self::Message,
-        loop_handle: &LoopHandle<'static, crate::state::Data>,
+        loop_handle: &LoopHandle<'static, crate::state::State>,
     ) -> Command<Self::Message> {
         match message {
             Message::DragStart => {
@@ -612,8 +612,8 @@ impl Program for CosmicStackInternal {
                         [self.active.load(Ordering::SeqCst)]
                     .wl_surface()
                     {
-                        loop_handle.insert_idle(move |data| {
-                            Shell::move_request(&mut data.state, &surface, &seat, serial);
+                        loop_handle.insert_idle(move |state| {
+                            Shell::move_request(state, &surface, &seat, serial);
                         });
                     }
                 }
@@ -1080,9 +1080,9 @@ impl PointerTarget<State> for CosmicStack {
                                     }
 
                                     let seat = seat.clone();
-                                    data.common.event_loop_handle.insert_idle(move |data| {
+                                    data.common.event_loop_handle.insert_idle(move |state| {
                                         seat.get_pointer().unwrap().set_grab(
-                                            &mut data.state,
+                                            state,
                                             grab,
                                             event.serial,
                                             smithay::input::pointer::Focus::Clear,
diff --git a/src/shell/element/stack_hover.rs b/src/shell/element/stack_hover.rs
index 6f4621de..da077cff 100644
--- a/src/shell/element/stack_hover.rs
+++ b/src/shell/element/stack_hover.rs
@@ -16,7 +16,7 @@ use smithay::utils::{Logical, Size};
 pub type StackHover = IcedElement<StackHoverInternal>;
 
 pub fn stack_hover(
-    evlh: LoopHandle<'static, crate::state::Data>,
+    evlh: LoopHandle<'static, crate::state::State>,
     size: Size<i32, Logical>,
 ) -> StackHover {
     StackHover::new(StackHoverInternal, size, evlh)
diff --git a/src/shell/element/swap_indicator.rs b/src/shell/element/swap_indicator.rs
index 1817297b..bb3eac15 100644
--- a/src/shell/element/swap_indicator.rs
+++ b/src/shell/element/swap_indicator.rs
@@ -15,7 +15,7 @@ use smithay::utils::Size;
 
 pub type SwapIndicator = IcedElement<SwapIndicatorInternal>;
 
-pub fn swap_indicator(evlh: LoopHandle<'static, crate::state::Data>) -> SwapIndicator {
+pub fn swap_indicator(evlh: LoopHandle<'static, crate::state::State>) -> SwapIndicator {
     SwapIndicator::new(SwapIndicatorInternal, Size::from((1, 1)), evlh)
 }
 
diff --git a/src/shell/element/window.rs b/src/shell/element/window.rs
index 8c7e7329..67856dd1 100644
--- a/src/shell/element/window.rs
+++ b/src/shell/element/window.rs
@@ -113,7 +113,7 @@ impl CosmicWindowInternal {
 impl CosmicWindow {
     pub fn new(
         window: impl Into<CosmicSurface>,
-        handle: LoopHandle<'static, crate::state::Data>,
+        handle: LoopHandle<'static, crate::state::State>,
     ) -> CosmicWindow {
         let window = window.into();
         let width = window.geometry().size.w;
@@ -166,7 +166,7 @@ impl CosmicWindow {
         }
     }
 
-    pub(super) fn loop_handle(&self) -> LoopHandle<'static, crate::state::Data> {
+    pub(super) fn loop_handle(&self) -> LoopHandle<'static, crate::state::State> {
         self.0.loop_handle()
     }
 
@@ -228,14 +228,14 @@ impl Program for CosmicWindowInternal {
     fn update(
         &mut self,
         message: Self::Message,
-        loop_handle: &LoopHandle<'static, crate::state::Data>,
+        loop_handle: &LoopHandle<'static, crate::state::State>,
     ) -> Command<Self::Message> {
         match message {
             Message::DragStart => {
                 if let Some((seat, serial)) = self.last_seat.lock().unwrap().clone() {
                     if let Some(surface) = self.window.wl_surface() {
-                        loop_handle.insert_idle(move |data| {
-                            Shell::move_request(&mut data.state, &surface, &seat, serial);
+                        loop_handle.insert_idle(move |state| {
+                            Shell::move_request(state, &surface, &seat, serial);
                         });
                     }
                 }
@@ -243,17 +243,11 @@ impl Program for CosmicWindowInternal {
             Message::Maximize => {
                 if let Some((seat, _serial)) = self.last_seat.lock().unwrap().clone() {
                     if let Some(surface) = self.window.wl_surface() {
-                        loop_handle.insert_idle(move |data| {
-                            if let Some(mapped) = data
-                                .state
-                                .common
-                                .shell
-                                .element_for_wl_surface(&surface)
-                                .cloned()
+                        loop_handle.insert_idle(move |state| {
+                            if let Some(mapped) =
+                                state.common.shell.element_for_wl_surface(&surface).cloned()
                             {
-                                if let Some(workspace) =
-                                    data.state.common.shell.space_for_mut(&mapped)
-                                {
+                                if let Some(workspace) = state.common.shell.space_for_mut(&mapped) {
                                     let output = seat.active_output();
                                     let (window, _) = mapped
                                         .windows()
@@ -262,7 +256,7 @@ impl Program for CosmicWindowInternal {
                                     workspace.maximize_toggle(
                                         &window,
                                         &output,
-                                        data.state.common.event_loop_handle.clone(),
+                                        state.common.event_loop_handle.clone(),
                                     )
                                 }
                             }
diff --git a/src/shell/grabs/mod.rs b/src/shell/grabs/mod.rs
index 87a4a361..92776337 100644
--- a/src/shell/grabs/mod.rs
+++ b/src/shell/grabs/mod.rs
@@ -21,17 +21,18 @@ mod moving;
 pub use self::moving::*;
 
 bitflags::bitflags! {
+    #[derive(Debug, Clone, Copy, PartialEq, Eq)]
     pub struct ResizeEdge: u32 {
         const TOP          = 0b0001;
         const BOTTOM       = 0b0010;
         const LEFT         = 0b0100;
         const RIGHT        = 0b1000;
 
-        const TOP_LEFT     = Self::TOP.bits | Self::LEFT.bits;
-        const BOTTOM_LEFT  = Self::BOTTOM.bits | Self::LEFT.bits;
+        const TOP_LEFT     = Self::TOP.bits() | Self::LEFT.bits();
+        const BOTTOM_LEFT  = Self::BOTTOM.bits() | Self::LEFT.bits();
 
-        const TOP_RIGHT    = Self::TOP.bits | Self::RIGHT.bits;
-        const BOTTOM_RIGHT = Self::BOTTOM.bits | Self::RIGHT.bits;
+        const TOP_RIGHT    = Self::TOP.bits() | Self::RIGHT.bits();
+        const BOTTOM_RIGHT = Self::BOTTOM.bits() | Self::RIGHT.bits();
     }
 }
 
diff --git a/src/shell/layout/floating/mod.rs b/src/shell/layout/floating/mod.rs
index 24094dca..28f9a40b 100644
--- a/src/shell/layout/floating/mod.rs
+++ b/src/shell/layout/floating/mod.rs
@@ -366,6 +366,7 @@ impl FloatingLayout {
             KeyboardFocusTarget::Popup(popup) => {
                 let Some(toplevel_surface) = (match popup {
                     PopupKind::Xdg(xdg) => get_popup_toplevel(&xdg),
+                    PopupKind::InputMethod(_) => unreachable!(),
                 }) else {
                     return FocusResult::None
                 };
@@ -436,6 +437,7 @@ impl FloatingLayout {
             KeyboardFocusTarget::Popup(popup) => {
                 let Some(toplevel_surface) = (match popup {
                     PopupKind::Xdg(xdg) => get_popup_toplevel(&xdg),
+                    PopupKind::InputMethod(_) => unreachable!(),
                 }) else {
                     return MoveResult::None
                 };
diff --git a/src/shell/layout/tiling/grabs/resize.rs b/src/shell/layout/tiling/grabs/resize.rs
index d90b211b..b78a9837 100644
--- a/src/shell/layout/tiling/grabs/resize.rs
+++ b/src/shell/layout/tiling/grabs/resize.rs
@@ -69,11 +69,11 @@ impl PointerTarget<State> for ResizeForkTarget {
             let orientation = self.orientation;
             let serial = event.serial;
             let button = event.button;
-            data.common.event_loop_handle.insert_idle(move |data| {
+            data.common.event_loop_handle.insert_idle(move |state| {
                 let pointer = seat.get_pointer().unwrap();
                 let location = pointer.current_location();
                 pointer.set_grab(
-                    &mut data.state,
+                    state,
                     ResizeForkGrab {
                         start_data: PointerGrabStartData {
                             focus: None,
diff --git a/src/shell/layout/tiling/grabs/swap.rs b/src/shell/layout/tiling/grabs/swap.rs
index 4272d86d..a26e78dc 100644
--- a/src/shell/layout/tiling/grabs/swap.rs
+++ b/src/shell/layout/tiling/grabs/swap.rs
@@ -9,6 +9,7 @@ use smithay::{
     },
     utils::Serial,
 };
+use xkbcommon::xkb::Keysym;
 
 use crate::{
     config::{Action, KeyPattern},
@@ -71,7 +72,7 @@ impl KeyboardGrab<State> for SwapWindowGrab {
             time,
             KeyPattern {
                 modifiers: modifiers.map(Into::into).unwrap_or_default(),
-                key: keycode,
+                key: Keysym::new(keycode),
             },
             None,
         );
diff --git a/src/shell/layout/tiling/mod.rs b/src/shell/layout/tiling/mod.rs
index cfa48157..7e4c4d78 100644
--- a/src/shell/layout/tiling/mod.rs
+++ b/src/shell/layout/tiling/mod.rs
@@ -2660,6 +2660,7 @@ impl TilingLayout {
         if let KeyboardFocusTarget::Popup(popup) = target {
             let toplevel_surface = match popup {
                 PopupKind::Xdg(xdg) => get_popup_toplevel(&xdg),
+                PopupKind::InputMethod(_) => unreachable!(),
             }?;
             let root_id = tree.root_node_id()?;
             let node =
diff --git a/src/shell/mod.rs b/src/shell/mod.rs
index 4154db4e..3640353f 100644
--- a/src/shell/mod.rs
+++ b/src/shell/mod.rs
@@ -1219,7 +1219,7 @@ impl Shell {
     pub fn set_overview_mode(
         &mut self,
         enabled: Option<Trigger>,
-        evlh: LoopHandle<'static, crate::state::Data>,
+        evlh: LoopHandle<'static, crate::state::State>,
     ) {
         if let Some(trigger) = enabled {
             if !matches!(self.overview_mode, OverviewMode::Started(_, _)) {
@@ -1261,7 +1261,7 @@ impl Shell {
         &mut self,
         enabled: Option<(KeyPattern, ResizeDirection)>,
         config: &Config,
-        evlh: LoopHandle<'static, crate::state::Data>,
+        evlh: LoopHandle<'static, crate::state::State>,
     ) {
         if let Some((pattern, direction)) = enabled {
             if let ResizeMode::Started(old_pattern, _, old_direction) = &mut self.resize_mode {
diff --git a/src/shell/workspace.rs b/src/shell/workspace.rs
index 2e781ad0..39486bae 100644
--- a/src/shell/workspace.rs
+++ b/src/shell/workspace.rs
@@ -430,7 +430,7 @@ impl Workspace {
         &mut self,
         window: &CosmicSurface,
         output: &Output,
-        evlh: LoopHandle<'static, crate::state::Data>,
+        evlh: LoopHandle<'static, crate::state::State>,
     ) {
         if self.fullscreen.contains_key(output) {
             return;
@@ -459,7 +459,7 @@ impl Workspace {
         &mut self,
         window: &CosmicSurface,
         output: &Output,
-        evlh: LoopHandle<'static, crate::state::Data>,
+        evlh: LoopHandle<'static, crate::state::State>,
     ) {
         if self
             .fullscreen
@@ -484,7 +484,7 @@ impl Workspace {
         window: &'a CosmicSurface,
         output: &Output,
         exclusive: bool,
-        evlh: LoopHandle<'static, crate::state::Data>,
+        evlh: LoopHandle<'static, crate::state::State>,
     ) {
         if let Some(mapped) = self
             .mapped()
@@ -635,7 +635,7 @@ impl Workspace {
         &mut self,
         window: &CosmicSurface,
         output: &Output,
-        evlh: LoopHandle<'static, crate::state::Data>,
+        evlh: LoopHandle<'static, crate::state::State>,
     ) {
         if self.fullscreen.contains_key(output) {
             self.unmaximize_request(window);
diff --git a/src/state.rs b/src/state.rs
index a92b6148..e4052048 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -54,7 +54,7 @@ use smithay::{
         wayland_server::{
             backend::{ClientData, ClientId, DisconnectReason},
             protocol::wl_shm,
-            Client, Display, DisplayHandle,
+            Client, DisplayHandle,
         },
     },
     utils::{Clock, IsAlive, Monotonic},
@@ -114,11 +114,6 @@ impl ClientData for ClientState {
     }
 }
 
-pub struct Data {
-    pub display: Display<State>,
-    pub state: State,
-}
-
 #[derive(Debug)]
 pub struct State {
     pub backend: BackendData,
@@ -131,7 +126,7 @@ pub struct Common {
 
     pub socket: OsString,
     pub display_handle: DisplayHandle,
-    pub event_loop_handle: LoopHandle<'static, Data>,
+    pub event_loop_handle: LoopHandle<'static, State>,
     pub event_loop_signal: LoopSignal,
 
     //pub output_conf: ConfigurationManager,
@@ -212,7 +207,7 @@ impl BackendData {
         test_only: bool,
         shell: &mut Shell,
         seats: impl Iterator<Item = Seat<State>>,
-        loop_handle: &LoopHandle<'_, Data>,
+        loop_handle: &LoopHandle<'_, State>,
     ) -> Result<(), anyhow::Error> {
         let result = match self {
             BackendData::Kms(ref mut state) => {
@@ -252,7 +247,7 @@ impl BackendData {
 
     pub fn schedule_render(
         &mut self,
-        loop_handle: &LoopHandle<'_, Data>,
+        loop_handle: &LoopHandle<'_, State>,
         output: &Output,
         screencopy: Option<Vec<(ScreencopySession, BufferParams)>>,
     ) {
@@ -281,7 +276,7 @@ impl State {
     pub fn new(
         dh: &DisplayHandle,
         socket: OsString,
-        handle: LoopHandle<'static, Data>,
+        handle: LoopHandle<'static, State>,
         signal: LoopSignal,
     ) -> State {
         let requested_languages = DesktopLanguageRequester::requested_languages();
diff --git a/src/utils/iced.rs b/src/utils/iced.rs
index bd2a5a4c..470bdbcc 100644
--- a/src/utils/iced.rs
+++ b/src/utils/iced.rs
@@ -98,7 +98,7 @@ pub trait Program {
     fn update(
         &mut self,
         message: Self::Message,
-        loop_handle: &LoopHandle<'static, crate::state::Data>,
+        loop_handle: &LoopHandle<'static, crate::state::State>,
     ) -> Command<Self::Message> {
         let _ = (message, loop_handle);
         Command::none()
@@ -119,7 +119,7 @@ pub trait Program {
     }
 }
 
-struct ProgramWrapper<P: Program>(P, LoopHandle<'static, crate::state::Data>);
+struct ProgramWrapper<P: Program>(P, LoopHandle<'static, crate::state::State>);
 impl<P: Program> IcedProgram for ProgramWrapper<P> {
     type Message = <P as Program>::Message;
     type Renderer = IcedRenderer;
@@ -150,7 +150,7 @@ struct IcedElementInternal<P: Program + Send + 'static> {
     debug: Debug,
 
     // futures
-    handle: LoopHandle<'static, crate::state::Data>,
+    handle: LoopHandle<'static, crate::state::State>,
     scheduler: Scheduler<<P as Program>::Message>,
     executor_token: Option<RegistrationToken>,
     rx: Receiver<<P as Program>::Message>,
@@ -228,7 +228,7 @@ impl<P: Program + Send + 'static> IcedElement<P> {
     pub fn new(
         program: P,
         size: impl Into<Size<i32, Logical>>,
-        handle: LoopHandle<'static, crate::state::Data>,
+        handle: LoopHandle<'static, crate::state::State>,
     ) -> IcedElement<P> {
         let size = size.into();
         let mut renderer =
@@ -276,7 +276,7 @@ impl<P: Program + Send + 'static> IcedElement<P> {
         func(&internal.state.program().0)
     }
 
-    pub fn loop_handle(&self) -> LoopHandle<'static, crate::state::Data> {
+    pub fn loop_handle(&self) -> LoopHandle<'static, crate::state::State> {
         self.0.lock().unwrap().handle.clone()
     }
 
diff --git a/src/wayland/handlers/compositor.rs b/src/wayland/handlers/compositor.rs
index 3a8d9268..3746d57e 100644
--- a/src/wayland/handlers/compositor.rs
+++ b/src/wayland/handlers/compositor.rs
@@ -2,7 +2,7 @@
 
 use crate::{
     shell::CosmicSurface,
-    state::{BackendData, ClientState, Data},
+    state::{BackendData, ClientState},
     utils::prelude::*,
     wayland::protocols::screencopy::SessionType,
 };
@@ -73,20 +73,21 @@ impl State {
     }
 
     fn xdg_popup_ensure_initial_configure(&mut self, popup: &PopupKind) {
-        let PopupKind::Xdg(ref popup) = popup;
-        let initial_configure_sent = with_states(popup.wl_surface(), |states| {
-            states
-                .data_map
-                .get::<Mutex<XdgPopupSurfaceRoleAttributes>>()
-                .unwrap()
-                .lock()
-                .unwrap()
-                .initial_configure_sent
-        });
-        if !initial_configure_sent {
-            // NOTE: This should never fail as the initial configure is always
-            // allowed.
-            popup.send_configure().expect("initial configure failed");
+        if let PopupKind::Xdg(ref popup) = popup {
+            let initial_configure_sent = with_states(popup.wl_surface(), |states| {
+                states
+                    .data_map
+                    .get::<Mutex<XdgPopupSurfaceRoleAttributes>>()
+                    .unwrap()
+                    .lock()
+                    .unwrap()
+                    .initial_configure_sent
+            });
+            if !initial_configure_sent {
+                // NOTE: This should never fail as the initial configure is always
+                // allowed.
+                popup.send_configure().expect("initial configure failed");
+            }
         }
     }
 
@@ -149,10 +150,11 @@ impl CompositorHandler for State {
                         state
                             .common
                             .event_loop_handle
-                            .insert_source(source, move |_, _, data| {
-                                data.state
+                            .insert_source(source, move |_, _, state| {
+                                let dh = state.common.display_handle.clone();
+                                state
                                     .client_compositor_state(&client)
-                                    .blocker_cleared(&mut data.state, &data.display.handle());
+                                    .blocker_cleared(state, &dh);
                                 Ok(())
                             });
                     if res.is_ok() {
@@ -164,7 +166,7 @@ impl CompositorHandler for State {
     }
 
     fn commit(&mut self, surface: &WlSurface) {
-        X11Wm::commit_hook::<Data>(surface);
+        X11Wm::commit_hook::<State>(surface);
         // first load the buffer for various smithay helper functions
         on_commit_buffer_handler::<Self>(surface);
 
diff --git a/src/wayland/handlers/output_configuration.rs b/src/wayland/handlers/output_configuration.rs
index 73b407db..ab32c5af 100644
--- a/src/wayland/handlers/output_configuration.rs
+++ b/src/wayland/handlers/output_configuration.rs
@@ -137,8 +137,8 @@ impl State {
         self.common
             .config
             .write_outputs(self.common.output_configuration_state.outputs());
-        self.common.event_loop_handle.insert_idle(move |data| {
-            data.state.common.output_configuration_state.update();
+        self.common.event_loop_handle.insert_idle(move |state| {
+            state.common.output_configuration_state.update();
         });
 
         true
diff --git a/src/wayland/handlers/screencopy.rs b/src/wayland/handlers/screencopy.rs
index bc8a04fc..dd775448 100644
--- a/src/wayland/handlers/screencopy.rs
+++ b/src/wayland/handlers/screencopy.rs
@@ -46,7 +46,7 @@ use crate::{
         render_output, render_workspace, CursorMode, CLEAR_COLOR,
     },
     shell::{CosmicMappedRenderElement, CosmicSurface, WorkspaceRenderElement},
-    state::{BackendData, ClientState, Common, Data, State},
+    state::{BackendData, ClientState, Common, State},
     utils::prelude::OutputExt,
     wayland::protocols::{
         screencopy::{
@@ -1173,19 +1173,14 @@ impl State {
             if active.wl_surface().as_ref() == Some(surface) {
                 for (session, params) in active.pending_buffers() {
                     let window = active.clone();
-                    self.common.event_loop_handle.insert_idle(move |data| {
+                    self.common.event_loop_handle.insert_idle(move |state| {
                         if !session.alive() {
                             return;
                         }
 
-                        match render_window_to_buffer(
-                            &mut data.state,
-                            &session,
-                            params.clone(),
-                            &window,
-                        ) {
+                        match render_window_to_buffer(state, &session, params.clone(), &window) {
                             // rendering yielded no damage, buffer is still pending
-                            Ok(false) => data.state.common.still_pending(session, params),
+                            Ok(false) => state.common.still_pending(session, params),
                             Ok(true) => {} // success
                             Err((reason, err)) => {
                                 warn!(?err, "Screencopy session failed");
@@ -1291,21 +1286,21 @@ impl State {
 }
 
 pub fn schedule_offscreen_workspace_session(
-    event_loop_handle: &LoopHandle<'static, Data>,
+    event_loop_handle: &LoopHandle<'static, State>,
     session: Session,
     params: BufferParams,
     output: Output,
     handle: WorkspaceHandle,
 ) {
-    event_loop_handle.insert_idle(move |data| {
+    event_loop_handle.insert_idle(move |state| {
         if !session.alive() {
             return;
         }
-        if !data.state.common.shell.outputs.contains(&output) {
+        if !state.common.shell.outputs.contains(&output) {
             return;
         }
         match render_workspace_to_buffer(
-            &mut data.state,
+            state,
             &session,
             params.clone(),
             &output,
@@ -1313,7 +1308,7 @@ pub fn schedule_offscreen_workspace_session(
         ) {
             Ok(false) => {
                 // rendering yielded no new damage, buffer still pending
-                data.state.common.still_pending(session, params);
+                state.common.still_pending(session, params);
             }
             Ok(true) => {}
             Err((reason, err)) => {
diff --git a/src/wayland/handlers/security_context.rs b/src/wayland/handlers/security_context.rs
index 0695f70e..50abd04d 100644
--- a/src/wayland/handlers/security_context.rs
+++ b/src/wayland/handlers/security_context.rs
@@ -16,12 +16,12 @@ impl SecurityContextHandler for State {
     ) {
         self.common
             .event_loop_handle
-            .insert_source(source, move |client_stream, _, data| {
-                if let Err(err) = data.display.handle().insert_client(
+            .insert_source(source, move |client_stream, _, state| {
+                if let Err(err) = state.common.display_handle.insert_client(
                     client_stream,
                     Arc::new(ClientState {
                         security_context: Some(security_context.clone()),
-                        ..data.state.new_client_state()
+                        ..state.new_client_state()
                     }),
                 ) {
                     warn!(?err, "Error adding wayland client");
diff --git a/src/wayland/handlers/xdg_shell/popup.rs b/src/wayland/handlers/xdg_shell/popup.rs
index e91f7e0a..99842a3a 100644
--- a/src/wayland/handlers/xdg_shell/popup.rs
+++ b/src/wayland/handlers/xdg_shell/popup.rs
@@ -95,6 +95,7 @@ pub fn update_reactive_popups<'a>(
                     }
                 }
             }
+            PopupKind::InputMethod(_) => {}
         }
     }
 }
diff --git a/src/wayland/protocols/output_configuration.rs b/src/wayland/protocols/output_configuration.rs
index 8be6c734..c1282523 100644
--- a/src/wayland/protocols/output_configuration.rs
+++ b/src/wayland/protocols/output_configuration.rs
@@ -11,7 +11,7 @@ use smithay::{
             zwlr_output_mode_v1::{self, ZwlrOutputModeV1},
         },
         wayland_server::{
-            backend::{ClientId, GlobalId, ObjectId},
+            backend::{ClientId, GlobalId},
             protocol::wl_output::WlOutput,
             Client, DataInit, Dispatch, DisplayHandle, GlobalDispatch, New, Resource,
         },
@@ -247,9 +247,9 @@ where
         }
     }
 
-    fn destroyed(state: &mut D, _client: ClientId, resource: ObjectId, _data: &Output) {
+    fn destroyed(state: &mut D, _client: ClientId, resource: &ZwlrOutputHeadV1, _data: &Output) {
         for instance in &mut state.output_configuration_state().instances {
-            instance.heads.retain(|h| h.head.id() != resource);
+            instance.heads.retain(|h| &h.head != resource);
         }
     }
 }
diff --git a/src/wayland/protocols/screencopy.rs b/src/wayland/protocols/screencopy.rs
index f8662315..5167110a 100644
--- a/src/wayland/protocols/screencopy.rs
+++ b/src/wayland/protocols/screencopy.rs
@@ -883,18 +883,18 @@ where
     fn destroyed(
         state: &mut D,
         _client: wayland_backend::server::ClientId,
-        resource: wayland_backend::server::ObjectId,
+        resource: &ZcosmicScreencopySessionV1,
         data: &SessionData,
     ) {
         if data.inner.lock().unwrap().is_cursor() {
             let session = CursorSession {
-                obj: SessionResource::Destroyed(resource),
+                obj: SessionResource::Destroyed(resource.id()),
                 data: data.clone(),
             };
             state.cursor_session_destroyed(session)
         } else {
             let session = Session {
-                obj: SessionResource::Destroyed(resource),
+                obj: SessionResource::Destroyed(resource.id()),
                 data: data.clone(),
             };
             state.session_destroyed(session)
diff --git a/src/wayland/protocols/toplevel_info.rs b/src/wayland/protocols/toplevel_info.rs
index 734e3cbc..8a5810da 100644
--- a/src/wayland/protocols/toplevel_info.rs
+++ b/src/wayland/protocols/toplevel_info.rs
@@ -5,7 +5,7 @@ use std::{collections::HashMap, sync::Mutex};
 use smithay::{
     output::Output,
     reexports::wayland_server::{
-        backend::{ClientId, GlobalId, ObjectId},
+        backend::{ClientId, GlobalId},
         protocol::wl_surface::WlSurface,
         Client, DataInit, Dispatch, DisplayHandle, GlobalDispatch, New, Resource,
     },
@@ -139,11 +139,11 @@ where
         }
     }
 
-    fn destroyed(state: &mut D, _client: ClientId, resource: ObjectId, _data: &()) {
+    fn destroyed(state: &mut D, _client: ClientId, resource: &ZcosmicToplevelInfoV1, _data: &()) {
         state
             .toplevel_info_state_mut()
             .instances
-            .retain(|i| i.id() != resource);
+            .retain(|i| i != resource);
     }
 }
 
@@ -174,16 +174,12 @@ where
     fn destroyed(
         state: &mut D,
         _client: ClientId,
-        resource: ObjectId,
+        resource: &ZcosmicToplevelHandleV1,
         _data: &ToplevelHandleState<W>,
     ) {
         for toplevel in &state.toplevel_info_state_mut().toplevels {
             if let Some(state) = toplevel.user_data().get::<ToplevelState>() {
-                state
-                    .lock()
-                    .unwrap()
-                    .instances
-                    .retain(|i| i.id() != resource);
+                state.lock().unwrap().instances.retain(|i| i != resource);
             }
         }
     }
diff --git a/src/wayland/protocols/toplevel_management.rs b/src/wayland/protocols/toplevel_management.rs
index 3ac3dd77..1b46e6b2 100644
--- a/src/wayland/protocols/toplevel_management.rs
+++ b/src/wayland/protocols/toplevel_management.rs
@@ -4,7 +4,7 @@ use smithay::{
     input::{Seat, SeatHandler},
     output::Output,
     reexports::wayland_server::{
-        backend::{ClientId, GlobalId, ObjectId},
+        backend::{ClientId, GlobalId},
         protocol::wl_surface::WlSurface,
         Client, DataInit, Dispatch, DisplayHandle, GlobalDispatch, New, Resource,
     },
@@ -225,9 +225,9 @@ where
         }
     }
 
-    fn destroyed(state: &mut D, client: ClientId, resource: ObjectId, _data: &()) {
+    fn destroyed(state: &mut D, client: ClientId, resource: &ZcosmicToplevelManagerV1, _data: &()) {
         let mng_state = state.toplevel_management_state();
-        mng_state.instances.retain(|i| i.id() != resource);
+        mng_state.instances.retain(|i| i != resource);
         if !mng_state
             .instances
             .iter()
diff --git a/src/wayland/protocols/workspace.rs b/src/wayland/protocols/workspace.rs
index ee358773..fe5f638a 100644
--- a/src/wayland/protocols/workspace.rs
+++ b/src/wayland/protocols/workspace.rs
@@ -211,11 +211,16 @@ where
         }
     }
 
-    fn destroyed(state: &mut D, _client: ClientId, resource: ObjectId, _data: &()) {
+    fn destroyed(
+        state: &mut D,
+        _client: ClientId,
+        resource: &ZcosmicWorkspaceManagerV1,
+        _data: &(),
+    ) {
         state
             .workspace_state_mut()
             .instances
-            .retain(|i| i.id() != resource);
+            .retain(|i| i != resource);
     }
 }
 
@@ -268,9 +273,14 @@ where
         }
     }
 
-    fn destroyed(state: &mut D, _client: ClientId, resource: ObjectId, _data: &WorkspaceGroupData) {
+    fn destroyed(
+        state: &mut D,
+        _client: ClientId,
+        resource: &ZcosmicWorkspaceGroupHandleV1,
+        _data: &WorkspaceGroupData,
+    ) {
         for group in &mut state.workspace_state_mut().groups {
-            group.instances.retain(|i| i.id() != resource)
+            group.instances.retain(|i| i != resource)
         }
     }
 }
@@ -361,10 +371,15 @@ where
         }
     }
 
-    fn destroyed(state: &mut D, _client: ClientId, resource: ObjectId, _data: &WorkspaceData) {
+    fn destroyed(
+        state: &mut D,
+        _client: ClientId,
+        resource: &ZcosmicWorkspaceHandleV1,
+        _data: &WorkspaceData,
+    ) {
         for group in &mut state.workspace_state_mut().groups {
             for workspace in &mut group.workspaces {
-                workspace.instances.retain(|i| i.id() != resource)
+                workspace.instances.retain(|i| i != resource)
             }
         }
     }
diff --git a/src/xwayland.rs b/src/xwayland.rs
index 6fe62b27..cc3b6d52 100644
--- a/src/xwayland.rs
+++ b/src/xwayland.rs
@@ -3,7 +3,7 @@ use std::{ffi::OsString, os::unix::io::OwnedFd};
 use crate::{
     backend::render::cursor::{load_cursor_theme, Cursor, CursorShape},
     shell::{focus::target::KeyboardFocusTarget, CosmicSurface, Shell},
-    state::{Data, State},
+    state::State,
     utils::prelude::*,
     wayland::{handlers::screencopy::PendingScreencopyBuffers, protocols::screencopy::SessionType},
 };
@@ -56,8 +56,8 @@ impl State {
                         display: _,
                     } => {
                         let mut wm = match X11Wm::start_wm(
-                            data.state.common.event_loop_handle.clone(),
-                            data.state.common.display_handle.clone(),
+                            data.common.event_loop_handle.clone(),
+                            data.common.display_handle.clone(),
                             connection,
                             client,
                         ) {
@@ -83,11 +83,11 @@ impl State {
                             );
                         }
 
-                        let xwayland_state = data.state.common.xwayland_state.as_mut().unwrap();
+                        let xwayland_state = data.common.xwayland_state.as_mut().unwrap();
                         xwayland_state.xwm = Some(wm);
                     }
                     XWaylandEvent::Exited => {
-                        if let Some(mut xwayland_state) = data.state.common.xwayland_state.take() {
+                        if let Some(mut xwayland_state) = data.common.xwayland_state.take() {
                             xwayland_state.xwm = None;
                         }
                     }
@@ -126,10 +126,9 @@ impl State {
     }
 }
 
-impl XwmHandler for Data {
+impl XwmHandler for State {
     fn xwm_state(&mut self, _xwm: XwmId) -> &mut X11Wm {
-        self.state
-            .common
+        self.common
             .xwayland_state
             .as_mut()
             .and_then(|state| state.xwm.as_mut())
@@ -146,27 +145,16 @@ impl XwmHandler for Data {
         }
 
         let surface = CosmicSurface::X11(window.clone());
-        if self
-            .state
-            .common
-            .shell
-            .element_for_surface(&surface)
-            .is_some()
-        {
+        if self.common.shell.element_for_surface(&surface).is_some() {
             return;
         }
 
-        let seat = self.state.common.last_active_seat().clone();
-        self.state
-            .common
-            .shell
-            .pending_windows
-            .push((surface, seat));
+        let seat = self.common.last_active_seat().clone();
+        self.common.shell.pending_windows.push((surface, seat));
     }
 
     fn map_window_notify(&mut self, _xwm: XwmId, surface: X11Surface) {
         if let Some((window, seat)) = self
-            .state
             .common
             .shell
             .pending_windows
@@ -181,13 +169,12 @@ impl XwmHandler for Data {
             .cloned()
         {
             let output = seat.active_output();
-            Shell::map_window(&mut self.state, &window, &output);
+            Shell::map_window(self, &window, &output);
         }
     }
 
     fn mapped_override_redirect_window(&mut self, _xwm: XwmId, window: X11Surface) {
         if self
-            .state
             .common
             .shell
             .override_redirect_windows
@@ -196,26 +183,23 @@ impl XwmHandler for Data {
         {
             return;
         }
-        Shell::map_override_redirect(&mut self.state, window)
+        Shell::map_override_redirect(self, window)
     }
 
     fn unmapped_window(&mut self, _xwm: XwmId, window: X11Surface) {
         let surface = CosmicSurface::X11(window.clone());
         if window.is_override_redirect() {
-            self.state
-                .common
+            self.common
                 .shell
                 .override_redirect_windows
                 .retain(|or| or != &window);
         } else if let Some((element, space)) = self
-            .state
             .common
             .shell
             .element_for_surface(&surface)
             .cloned()
             .and_then(|element| {
-                self.state
-                    .common
+                self.common
                     .shell
                     .space_for_mut(&element)
                     .map(|space| (element, space))
@@ -229,27 +213,21 @@ impl XwmHandler for Data {
         }
 
         let outputs = if let Some(wl_surface) = window.wl_surface() {
-            self.state
-                .common
+            self.common
                 .shell
                 .visible_outputs_for_surface(&wl_surface)
                 .collect::<Vec<_>>()
         } else {
-            self.state
-                .common
-                .shell
-                .outputs()
-                .cloned()
-                .collect::<Vec<_>>()
+            self.common.shell.outputs().cloned().collect::<Vec<_>>()
         };
         for output in outputs.iter() {
-            self.state.common.shell.active_space_mut(output).refresh();
+            self.common.shell.active_space_mut(output).refresh();
         }
 
         // screencopy
         let mut scheduled_sessions = window
             .wl_surface()
-            .map(|wl_surface| self.state.schedule_workspace_sessions(&wl_surface))
+            .map(|wl_surface| self.schedule_workspace_sessions(&wl_surface))
             .unwrap_or_default();
 
         for output in outputs.into_iter() {
@@ -258,8 +236,8 @@ impl XwmHandler for Data {
                     .get_or_insert_with(Vec::new)
                     .extend(sessions.borrow_mut().drain(..));
             }
-            self.state.backend.schedule_render(
-                &self.state.common.event_loop_handle,
+            self.backend.schedule_render(
+                &self.common.event_loop_handle,
                 &output,
                 scheduled_sessions.as_ref().map(|sessions| {
                     sessions
@@ -292,12 +270,11 @@ impl XwmHandler for Data {
         // We only allow floating X11 windows to resize themselves. Nothing else
         let mut current_geo = window.geometry();
         if let Some(mapped) = self
-            .state
             .common
             .shell
             .element_for_surface(&CosmicSurface::X11(window.clone()))
         {
-            let space = self.state.common.shell.space_for(mapped).unwrap();
+            let space = self.common.shell.space_for(mapped).unwrap();
             if space.is_floating(mapped) {
                 mapped.set_geometry(Rectangle::from_loc_and_size(
                     current_geo.loc,
@@ -334,7 +311,7 @@ impl XwmHandler for Data {
     ) {
         if window.is_override_redirect() {
             if let Some(id) = above {
-                let or_windows = &mut self.state.common.shell.override_redirect_windows;
+                let or_windows = &mut self.common.shell.override_redirect_windows;
                 if let Some(own_pos) = or_windows.iter().position(|or| or == &window) {
                     let compare_pos = or_windows
                         .iter()
@@ -348,7 +325,7 @@ impl XwmHandler for Data {
             }
 
             let geo = window.geometry();
-            for (output, overlap) in self.state.common.shell.outputs().cloned().map(|o| {
+            for (output, overlap) in self.common.shell.outputs().cloned().map(|o| {
                 let intersection = o.geometry().intersection(geo);
                 (o, intersection)
             }) {
@@ -369,57 +346,35 @@ impl XwmHandler for Data {
         resize_edge: smithay::xwayland::xwm::ResizeEdge,
     ) {
         if let Some(wl_surface) = window.wl_surface() {
-            let seat = self.state.common.last_active_seat().clone();
-            Shell::resize_request(
-                &mut self.state,
-                &wl_surface,
-                &seat,
-                None,
-                resize_edge.into(),
-            )
+            let seat = self.common.last_active_seat().clone();
+            Shell::resize_request(self, &wl_surface, &seat, None, resize_edge.into())
         }
     }
 
     fn move_request(&mut self, _xwm: XwmId, window: X11Surface, _button: u32) {
         if let Some(wl_surface) = window.wl_surface() {
-            let seat = self.state.common.last_active_seat().clone();
-            Shell::move_request(&mut self.state, &wl_surface, &seat, None)
+            let seat = self.common.last_active_seat().clone();
+            Shell::move_request(self, &wl_surface, &seat, None)
         }
     }
 
     fn maximize_request(&mut self, _xwm: XwmId, window: X11Surface) {
-        let seat = self.state.common.last_active_seat();
+        let seat = self.common.last_active_seat();
         let output = seat.active_output();
         let surface = CosmicSurface::X11(window);
 
-        if let Some(mapped) = self
-            .state
-            .common
-            .shell
-            .element_for_surface(&surface)
-            .cloned()
-        {
-            if let Some(workspace) = self.state.common.shell.space_for_mut(&mapped) {
+        if let Some(mapped) = self.common.shell.element_for_surface(&surface).cloned() {
+            if let Some(workspace) = self.common.shell.space_for_mut(&mapped) {
                 let (window, _) = mapped.windows().find(|(w, _)| w == &surface).unwrap();
-                workspace.maximize_request(
-                    &window,
-                    &output,
-                    self.state.common.event_loop_handle.clone(),
-                )
+                workspace.maximize_request(&window, &output, self.common.event_loop_handle.clone())
             }
         }
     }
 
     fn unmaximize_request(&mut self, _xwm: XwmId, window: X11Surface) {
         let surface = CosmicSurface::X11(window);
-        if let Some(mapped) = self
-            .state
-            .common
-            .shell
-            .element_for_surface(&surface)
-            .cloned()
-        {
-            if let Some(workspace) = self.state.common.shell.space_for_mut(&mapped) {
+        if let Some(mapped) = self.common.shell.element_for_surface(&surface).cloned() {
+            if let Some(workspace) = self.common.shell.space_for_mut(&mapped) {
                 let (window, _) = mapped.windows().find(|(w, _)| w == &surface).unwrap();
                 workspace.unmaximize_request(&window);
             }
@@ -427,23 +382,17 @@ impl XwmHandler for Data {
     }
 
     fn fullscreen_request(&mut self, _xwm: XwmId, window: X11Surface) {
-        let seat = self.state.common.last_active_seat();
+        let seat = self.common.last_active_seat();
         let output = seat.active_output();
         let surface = CosmicSurface::X11(window);
 
-        if let Some(mapped) = self
-            .state
-            .common
-            .shell
-            .element_for_surface(&surface)
-            .cloned()
-        {
-            if let Some(workspace) = self.state.common.shell.space_for_mut(&mapped) {
+        if let Some(mapped) = self.common.shell.element_for_surface(&surface).cloned() {
+            if let Some(workspace) = self.common.shell.space_for_mut(&mapped) {
                 let (window, _) = mapped.windows().find(|(w, _)| w == &surface).unwrap();
                 workspace.fullscreen_request(
                     &window,
                     &output,
-                    self.state.common.event_loop_handle.clone(),
+                    self.common.event_loop_handle.clone(),
                 )
             }
         }
@@ -451,14 +400,8 @@ impl XwmHandler for Data {
 
     fn unfullscreen_request(&mut self, _xwm: XwmId, window: X11Surface) {
         let surface = CosmicSurface::X11(window);
-        if let Some(mapped) = self
-            .state
-            .common
-            .shell
-            .element_for_surface(&surface)
-            .cloned()
-        {
-            if let Some(workspace) = self.state.common.shell.space_for_mut(&mapped) {
+        if let Some(mapped) = self.common.shell.element_for_surface(&surface).cloned() {
+            if let Some(workspace) = self.common.shell.space_for_mut(&mapped) {
                 let (window, _) = mapped.windows().find(|(w, _)| w == &surface).unwrap();
                 workspace.unfullscreen_request(&window);
             }
@@ -472,7 +415,7 @@ impl XwmHandler for Data {
         mime_type: String,
         fd: OwnedFd,
     ) {
-        let seat = self.state.common.last_active_seat();
+        let seat = self.common.last_active_seat();
         match selection {
             SelectionType::Clipboard => {
                 if let Err(err) = request_data_device_client_selection(seat, mime_type, fd) {
@@ -494,39 +437,36 @@ impl XwmHandler for Data {
     }
 
     fn allow_selection_access(&mut self, xwm: XwmId, _selection: SelectionType) -> bool {
-        self.state.common.is_x_focused(xwm)
+        self.common.is_x_focused(xwm)
     }
 
     fn new_selection(&mut self, xwm: XwmId, selection: SelectionType, mime_types: Vec<String>) {
         trace!(?selection, ?mime_types, "Got Selection from Xwayland",);
 
-        if self.state.common.is_x_focused(xwm) {
-            let seat = self.state.common.last_active_seat();
+        if self.common.is_x_focused(xwm) {
+            let seat = self.common.last_active_seat();
             match selection {
-                SelectionType::Clipboard => set_data_device_selection(
-                    &self.state.common.display_handle,
-                    &seat,
-                    mime_types,
-                    xwm,
-                ),
+                SelectionType::Clipboard => {
+                    set_data_device_selection(&self.common.display_handle, &seat, mime_types, xwm)
+                }
                 SelectionType::Primary => {
-                    set_primary_selection(&self.state.common.display_handle, &seat, mime_types, xwm)
+                    set_primary_selection(&self.common.display_handle, &seat, mime_types, xwm)
                 }
             }
         }
     }
 
     fn cleared_selection(&mut self, xwm: XwmId, selection: SelectionType) {
-        for seat in self.state.common.seats() {
+        for seat in self.common.seats() {
             match selection {
                 SelectionType::Clipboard => {
                     if current_data_device_selection_userdata(seat).as_deref() == Some(&xwm) {
-                        clear_data_device_selection(&self.state.common.display_handle, seat)
+                        clear_data_device_selection(&self.common.display_handle, seat)
                     }
                 }
                 SelectionType::Primary => {
                     if current_primary_selection_userdata(seat).as_deref() == Some(&xwm) {
-                        clear_primary_selection(&self.state.common.display_handle, seat)
+                        clear_primary_selection(&self.common.display_handle, seat)
                     }
                 }
             }