diff --git a/Cargo.lock b/Cargo.lock
index 1f4bc60d..8f2882ec 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -163,7 +163,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046"
 dependencies = [
  "android-properties",
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "cc",
  "cesu8",
  "jni",
@@ -395,7 +395,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -430,7 +430,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -439,6 +439,12 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
+[[package]]
+name = "atomic_float"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "628d228f918ac3b82fe590352cc719d30664a0c13ca3a60266fe02c7132d480a"
+
 [[package]]
 name = "atomicwrites"
 version = "0.4.2"
@@ -488,14 +494,14 @@ dependencies = [
 
 [[package]]
 name = "auto_enums"
-version = "0.8.8"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65398a2893f41bce5c9259f6e1a4f03fbae40637c1bdc755b4f387f48c613b03"
+checksum = "2e4487600931c9a89f8db7ffbdf3fbdd45bb7bd85e26861f659a463cd0dff966"
 dependencies = [
  "derive_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -563,9 +569,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.13.1"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da"
+checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
 dependencies = [
  "serde_core",
 ]
@@ -645,13 +651,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "build_helpers"
-version = "0.14.0"
-dependencies = [
- "cfg_aliases",
-]
-
 [[package]]
 name = "bumpalo"
 version = "3.20.2"
@@ -681,7 +680,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -703,7 +702,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dbf9978365bac10f54d1d4b04f7ce4427e51f71d61f2fe15e3fed5166474df7"
 dependencies = [
  "async-task",
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "futures-core",
  "polling",
  "rustix 1.1.4",
@@ -867,7 +866,7 @@ checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81"
 dependencies = [
  "serde",
  "termcolor",
- "unicode-width 0.1.14",
+ "unicode-width 0.2.2",
 ]
 
 [[package]]
@@ -957,7 +956,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "core-foundation 0.10.1",
  "libc",
 ]
@@ -975,7 +974,7 @@ dependencies = [
 name = "cosmic-client-toolkit"
 version = "0.2.0"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "cosmic-protocols",
  "libc",
  "smithay-client-toolkit",
@@ -988,7 +987,7 @@ name = "cosmic-comp"
 version = "1.0.0"
 dependencies = [
  "anyhow",
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "calloop",
  "clap_lex",
  "cosmic-comp-config",
@@ -1031,7 +1030,7 @@ dependencies = [
  "smithay",
  "smithay-egui",
  "thiserror 2.0.18",
- "tiny-skia 0.11.4",
+ "tiny-skia",
  "tokio",
  "tracing",
  "tracing-journald",
@@ -1085,7 +1084,7 @@ name = "cosmic-config-derive"
 version = "1.0.0"
 dependencies = [
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -1105,7 +1104,7 @@ dependencies = [
 name = "cosmic-protocols"
 version = "0.2.0"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -1155,7 +1154,7 @@ dependencies = [
 name = "cosmic-text"
 version = "0.19.0"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "fontdb",
  "harfrust",
  "linebender_resource_handle",
@@ -1302,7 +1301,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -1313,7 +1312,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -1341,7 +1340,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -1352,7 +1351,7 @@ checksum = "ccfae181bab5ab6c5478b2ccb69e4c68a02f8c3ec72f6616bfec9dbc599d2ee0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -1393,7 +1392,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "block2 0.6.2",
  "libc",
  "objc2 0.6.4",
@@ -1407,7 +1406,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -1423,7 +1422,7 @@ dependencies = [
 name = "dnd"
 version = "0.1.0"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "mime 0.1.0",
  "raw-window-handle",
  "smithay-client-toolkit",
@@ -1461,7 +1460,7 @@ version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "80bc8c5c6c2941f70a55c15f8d9f00f9710ebda3ffda98075f996a0e6c92756f"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "bytemuck",
  "drm-ffi",
  "drm-fourcc",
@@ -1471,12 +1470,12 @@ dependencies = [
 
 [[package]]
 name = "drm-ffi"
-version = "0.9.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51a91c9b32ac4e8105dec255e849e0d66e27d7c34d184364fb93e469db08f690"
+checksum = "d8e41459d99a9b529845f6d2c909eb9adf3b6d2f82635ae40be8de0601726e8b"
 dependencies = [
  "drm-sys",
- "rustix 1.1.4",
+ "rustix 0.38.44",
 ]
 
 [[package]]
@@ -1487,12 +1486,12 @@ checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
 
 [[package]]
 name = "drm-sys"
-version = "0.8.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc8e1361066d91f5ffccff060a3c3be9c3ecde15be2959c1937595f7a82a9f8"
+checksum = "bafb66c8dbc944d69e15cfcc661df7e703beffbaec8bd63151368b06c5f9858c"
 dependencies = [
  "libc",
- "linux-raw-sys 0.9.4",
+ "linux-raw-sys 0.6.5",
 ]
 
 [[package]]
@@ -1518,7 +1517,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25dd34cec49ab55d85ebf70139cb1ccd29c977ef6b6ba4fe85489d6877ee9ef3"
 dependencies = [
  "ahash",
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "emath",
  "epaint",
  "nohash-hasher",
@@ -1610,7 +1609,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -1631,7 +1630,7 @@ checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -1908,7 +1907,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -2004,7 +2003,7 @@ checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -2042,7 +2041,7 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce852e998d3ca5e4a97014fb31c940dc5ef344ec7d364984525fd11e8a547e6a"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "drm",
  "drm-fourcc",
  "gbm-sys",
@@ -2210,7 +2209,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "gpu-descriptor-types",
  "hashbrown 0.15.5",
 ]
@@ -2221,7 +2220,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
 ]
 
 [[package]]
@@ -2258,7 +2257,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4f9f40651a03bc0f7316bd75267ff5767e93017ef3cfffe76c6aa7252cc5a31c"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "bytemuck",
  "core_maths",
  "read-fonts 0.37.0",
@@ -2406,7 +2405,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.117",
+ "syn",
  "unic-langid",
 ]
 
@@ -2420,7 +2419,7 @@ dependencies = [
  "i18n-config",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -2451,7 +2450,6 @@ dependencies = [
 name = "iced"
 version = "0.14.0"
 dependencies = [
- "build_helpers",
  "dnd",
  "iced_accessibility",
  "iced_core",
@@ -2480,8 +2478,7 @@ dependencies = [
 name = "iced_core"
 version = "0.14.0"
 dependencies = [
- "bitflags 2.13.1",
- "build_helpers",
+ "bitflags 2.11.0",
  "bytes",
  "cosmic-client-toolkit",
  "dnd",
@@ -2527,7 +2524,7 @@ dependencies = [
 name = "iced_graphics"
 version = "0.14.0"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "bytemuck",
  "cosmic-text",
  "half",
@@ -2566,7 +2563,6 @@ dependencies = [
 name = "iced_runtime"
 version = "0.14.0"
 dependencies = [
- "build_helpers",
  "bytes",
  "cosmic-client-toolkit",
  "dnd",
@@ -2590,15 +2586,14 @@ dependencies = [
  "resvg 0.45.1",
  "rustc-hash 2.1.1",
  "softbuffer",
- "tiny-skia 0.11.4",
+ "tiny-skia",
 ]
 
 [[package]]
 name = "iced_wgpu"
 version = "0.14.0"
 dependencies = [
- "bitflags 2.13.1",
- "build_helpers",
+ "bitflags 2.11.0",
  "bytemuck",
  "cosmic-client-toolkit",
  "cryoglyph",
@@ -2625,7 +2620,6 @@ dependencies = [
 name = "iced_widget"
 version = "0.14.2"
 dependencies = [
- "build_helpers",
  "cosmic-client-toolkit",
  "dnd",
  "iced_renderer",
@@ -2643,7 +2637,6 @@ dependencies = [
 name = "iced_winit"
 version = "0.14.0"
 dependencies = [
- "build_helpers",
  "cosmic-client-toolkit",
  "cursor-icon",
  "dnd",
@@ -2859,7 +2852,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "inotify-sys",
  "libc",
 ]
@@ -2879,7 +2872,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9793345a65d71317763a33066b5d8351f8760dde8d4930fe9e39b5f14a7959d"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "input-sys",
  "libc",
  "log",
@@ -2951,7 +2944,7 @@ checksum = "470252db18ecc35fd766c0891b1e3ec6cbbcd62507e85276c01bf75d8e94d4a1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -3037,7 +3030,7 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fbe853b403ae61a04233030ae8a79d94975281ed9770a1f9e246732b534b28d"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "serde",
 ]
 
@@ -3141,9 +3134,9 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
 
 [[package]]
 name = "libc"
-version = "0.2.189"
+version = "0.2.186"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
 
 [[package]]
 name = "libcosmic-yoda"
@@ -3152,7 +3145,6 @@ dependencies = [
  "apply",
  "ashpd 0.12.3",
  "auto_enums",
- "build_helpers",
  "cosmic-client-toolkit",
  "cosmic-config",
  "cosmic-freedesktop-icons",
@@ -3198,7 +3190,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59fd96dbb2381ff31f314f07accbdf8550febdcc5cd8761ecaf7c1763361c359"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "libc",
  "libdisplay-info-derive",
  "libdisplay-info-sys",
@@ -3213,7 +3205,7 @@ checksum = "8dc2c710cf5819e91220a446d9e64acc6814386cc22c509c3f0df83c0b874a98"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -3244,14 +3236,14 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
 
 [[package]]
 name = "libredox"
-version = "0.1.20"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d0a00925a9f930d679b6789b721e3a7f9ed110f41b86d2497caa780c3a070a"
+checksum = "c943259e342f1e06ff2da7a83eabdfe7f92ce10262688dbf1895ff0b3e6e4652"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "libc",
  "plain",
- "redox_syscall 0.9.2",
+ "redox_syscall 0.9.0",
 ]
 
 [[package]]
@@ -3325,9 +3317,9 @@ checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.9.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7"
 
 [[package]]
 name = "linux-raw-sys"
@@ -3510,7 +3502,7 @@ version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7047791b5bc903b8cd963014b355f71dc9864a9a0b727057676c1dcae5cbc15"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "block",
  "core-graphics-types 0.2.0",
  "foreign-types",
@@ -3572,9 +3564,9 @@ checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
 
 [[package]]
 name = "mio"
-version = "1.2.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d65c71f1ce40ab09135ce117d742b9f8a19ff91a41a8b57ed50bc2de59c427"
+checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda"
 dependencies = [
  "libc",
  "log",
@@ -3606,7 +3598,7 @@ checksum = "618f667225063219ddfc61251087db8a9aec3c3f0950c916b614e403486f1135"
 dependencies = [
  "arrayvec",
  "bit-set",
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "cfg-if",
  "cfg_aliases",
  "codespan-reporting",
@@ -3630,7 +3622,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "jni-sys",
  "log",
  "ndk-sys",
@@ -3660,7 +3652,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -3688,7 +3680,7 @@ version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "fsevent-sys",
  "inotify",
  "kqueue",
@@ -3706,7 +3698,7 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
 ]
 
 [[package]]
@@ -3817,7 +3809,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -3871,7 +3863,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "block2 0.5.1",
  "libc",
  "objc2 0.5.2",
@@ -3887,7 +3879,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "block2 0.6.2",
  "objc2 0.6.4",
  "objc2-core-foundation",
@@ -3900,7 +3892,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -3912,7 +3904,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "block2 0.6.2",
  "dispatch2",
  "objc2 0.6.4",
@@ -3924,7 +3916,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "libc",
  "objc2-core-foundation",
 ]
@@ -3947,7 +3939,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "objc2-core-foundation",
  "objc2-core-graphics",
 ]
@@ -3964,7 +3956,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "block2 0.5.1",
  "libc",
  "objc2 0.5.2",
@@ -3976,7 +3968,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "block2 0.6.2",
  "objc2 0.6.4",
  "objc2-core-foundation",
@@ -3988,7 +3980,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -4000,7 +3992,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -4013,7 +4005,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
@@ -4099,7 +4091,7 @@ dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -4133,7 +4125,7 @@ dependencies = [
  "by_address",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -4228,7 +4220,7 @@ dependencies = [
  "phf_shared 0.11.3",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
  "unicase",
 ]
 
@@ -4242,7 +4234,7 @@ dependencies = [
  "phf_shared 0.13.1",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
  "uncased",
 ]
 
@@ -4289,7 +4281,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -4364,7 +4356,7 @@ version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "crc32fast",
  "fdeflate",
  "flate2",
@@ -4443,7 +4435,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
 dependencies = [
  "proc-macro2",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -4474,7 +4466,7 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -4494,7 +4486,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
  "version_check",
  "yansi",
 ]
@@ -4516,7 +4508,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52717f9a02b6965224f95ca2a81e2e0c5c43baacd28ca057577988930b6c3d5b"
 dependencies = [
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -4686,7 +4678,7 @@ version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c5018d583d6d2f5499352aea8d177e9067d1eb03ab17c78169d5ba7a30001b15"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "libredox",
 ]
 
@@ -4696,16 +4688,16 @@ version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.9.2"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1c93da5bb2c5d4e6c0ef7abeead62c89169a0a4882bfb83ac892f2423aea2fe"
+checksum = "c5102a6aaa05aa011a238e178e6bca86d2cb56fc9f586d37cb80f5bca6e07759"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
 ]
 
 [[package]]
@@ -4736,7 +4728,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -4770,9 +4762,9 @@ checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
 
 [[package]]
 name = "reis"
-version = "0.7.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b967ec6489a42067a20724f11987bb96178ea796873cbe1afd25fb93ee6f85f"
+checksum = "81f3fedd2777cde52c1be5e572efbec485eac7b801c47820eda388d4f13b9c4b"
 dependencies = [
  "calloop",
  "enumflags2",
@@ -4796,7 +4788,7 @@ dependencies = [
  "pico-args",
  "rgb",
  "svgtypes 0.13.0",
- "tiny-skia 0.11.4",
+ "tiny-skia",
  "usvg 0.37.0",
 ]
 
@@ -4812,7 +4804,7 @@ dependencies = [
  "pico-args",
  "rgb",
  "svgtypes 0.15.3",
- "tiny-skia 0.11.4",
+ "tiny-skia",
  "usvg 0.45.1",
  "zune-jpeg 0.4.21",
 ]
@@ -4857,7 +4849,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "db09040cc89e461f1a265139777a2bde7f8d8c67c4936f700c63ce3e2904d468"
 dependencies = [
  "base64 0.22.1",
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "serde",
  "serde_derive",
  "unicode-ident",
@@ -4869,7 +4861,7 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd490c5b18261893f14449cbd28cb9c0b637aebf161cd77900bfdedaff21ec32"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "once_cell",
  "serde",
  "serde_derive",
@@ -4909,7 +4901,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rust-embed-utils",
- "syn 2.0.117",
+ "syn",
  "walkdir",
 ]
 
@@ -4947,7 +4939,7 @@ version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
@@ -4960,7 +4952,7 @@ version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "errno",
  "libc",
  "linux-raw-sys 0.12.1",
@@ -4979,7 +4971,7 @@ version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd3c7c96f8a08ee34eff8857b11b49b07d71d1c3f4e88f8a88d4c9e9f90b1702"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "bytemuck",
  "core_maths",
  "log",
@@ -5047,15 +5039,15 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "sctk-adwaita"
-version = "0.11.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2a4360b9abcdcee43809e6fc11d6d61ca5d25734026a8fc46c2883eea3f13f"
+checksum = "1dd3accc0f3f4bbaf2c9e1957a030dc582028130c67660d44c0a0345a22ca69b"
 dependencies = [
  "ab_glyph",
  "log",
  "memmap2 0.9.10",
  "smithay-client-toolkit",
- "tiny-skia 0.12.0",
+ "tiny-skia",
 ]
 
 [[package]]
@@ -5097,7 +5089,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -5122,7 +5114,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -5162,7 +5154,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -5272,12 +5264,13 @@ checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
 [[package]]
 name = "smithay"
 version = "0.7.0"
-source = "git+https://github.com/smithay/smithay.git?rev=5fb12b8#5fb12b87407b3680135c45d94214c5f1b1d0fbea"
+source = "git+https://github.com/smithay/smithay.git?rev=1ed69cb#1ed69cb55e9d0e9f38887c3b7d53d24365c4b14f"
 dependencies = [
  "aliasable",
  "appendlist",
  "ash",
- "bitflags 2.13.1",
+ "atomic_float",
+ "bitflags 2.11.0",
  "calloop",
  "cc",
  "cursor-icon",
@@ -5285,7 +5278,6 @@ dependencies = [
  "drm",
  "drm-ffi",
  "drm-fourcc",
- "drm-sys",
  "encoding_rs",
  "errno",
  "gbm",
@@ -5299,7 +5291,6 @@ dependencies = [
  "libseat",
  "pixman",
  "pkg-config",
- "portable-atomic",
  "profiling",
  "rand 0.9.2",
  "reis",
@@ -5330,7 +5321,7 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0512da38f5e2b31201a93524adb8d3136276fa4fe4aafab4e1f727a82b534cc0"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "bytemuck",
  "calloop",
  "calloop-wayland-source",
@@ -5399,9 +5390,9 @@ checksum = "27207bb65232eda1f588cf46db2fee75c0808d557f6b3cf19a75f5d6d7c94df1"
 
 [[package]]
 name = "socket2"
-version = "0.6.5"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
+checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51"
 dependencies = [
  "libc",
  "windows-sys 0.61.2",
@@ -5419,11 +5410,11 @@ dependencies = [
  "fastrand",
  "foreign-types",
  "js-sys",
- "libredox",
  "log",
  "memmap2 0.9.10",
  "objc",
  "raw-window-handle",
+ "redox_syscall 0.5.18",
  "rustix 0.38.44",
  "tiny-xlib",
  "wasm-bindgen",
@@ -5441,7 +5432,7 @@ version = "0.3.0+sdk-1.3.268.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
 ]
 
 [[package]]
@@ -5525,17 +5516,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "syn"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
 [[package]]
 name = "synstructure"
 version = "0.13.2"
@@ -5544,7 +5524,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -5635,7 +5615,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -5646,7 +5626,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -5701,21 +5681,7 @@ dependencies = [
  "cfg-if",
  "log",
  "png 0.17.16",
- "tiny-skia-path 0.11.4",
-]
-
-[[package]]
-name = "tiny-skia"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47ffee5eaaf5527f630fb0e356b90ebdec84d5d18d937c5e440350f88c5a91ea"
-dependencies = [
- "arrayref",
- "arrayvec",
- "bytemuck",
- "cfg-if",
- "log",
- "tiny-skia-path 0.12.0",
+ "tiny-skia-path",
 ]
 
 [[package]]
@@ -5729,17 +5695,6 @@ dependencies = [
  "strict-num",
 ]
 
-[[package]]
-name = "tiny-skia-path"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edca365c3faccca67d06593c5980fa6c57687de727a03131735bb85f01fdeeb9"
-dependencies = [
- "arrayref",
- "bytemuck",
- "strict-num",
-]
-
 [[package]]
 name = "tiny-xlib"
 version = "0.2.4"
@@ -5781,9 +5736,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.53.1"
+version = "1.52.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "202caea871b69668250d242070849eb495be178ed697a3e98aebce5bc81a0bed"
+checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe"
 dependencies = [
  "bytes",
  "libc",
@@ -5798,20 +5753,20 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.7.2"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e"
+checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.3",
+ "syn",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.19"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3d06f0b082ba57c26b79407372e57cf2a1e28124f78e9479fe80322cf53420b"
+checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -5898,7 +5853,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -6184,7 +6139,7 @@ dependencies = [
  "siphasher 1.0.2",
  "strict-num",
  "svgtypes 0.15.3",
- "tiny-skia-path 0.11.4",
+ "tiny-skia-path",
  "unicode-bidi",
  "unicode-script",
  "unicode-vo",
@@ -6218,7 +6173,7 @@ dependencies = [
  "rctree",
  "strict-num",
  "svgtypes 0.13.0",
- "tiny-skia-path 0.11.4",
+ "tiny-skia-path",
 ]
 
 [[package]]
@@ -6336,7 +6291,7 @@ dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
  "wasm-bindgen-shared",
 ]
 
@@ -6377,7 +6332,7 @@ version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "hashbrown 0.15.5",
  "indexmap 2.13.0",
  "semver",
@@ -6417,7 +6372,7 @@ version = "0.31.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "rustix 1.1.4",
  "wayland-backend",
  "wayland-scanner",
@@ -6429,7 +6384,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "cursor-icon",
  "wayland-backend",
 ]
@@ -6457,11 +6412,11 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols"
-version = "0.32.13"
+version = "0.32.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d0c813de3daa2ed6520af85a3bd49b0e722a3078506899aa9686fea58dc4b6"
+checksum = "563a85523cade2429938e790815fd7319062103b9f4a2dc806e9b53b95982d8f"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "wayland-backend",
  "wayland-client",
  "wayland-scanner",
@@ -6474,7 +6429,7 @@ version = "20250721.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40a1f863128dcaaec790d7b4b396cc9b9a7a079e878e18c47e6c2d2c5a8dcbb1"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -6487,7 +6442,7 @@ version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e9567599ef23e09b8dad6e429e5738d4509dfc46b3b21f32841a304d16b29c8"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -6501,7 +6456,7 @@ version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa98634619300a535a9a97f338aed9a5ff1e01a461943e8346ff4ae26007306b"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -6514,7 +6469,7 @@ version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -6539,7 +6494,7 @@ version = "0.31.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc1846eb04c49182e04f4a099e2a830a2b745610bbc1d61246e206f29c7000a0"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "downcast-rs",
  "rustix 1.1.4",
  "wayland-backend",
@@ -6591,7 +6546,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9cb534d5ffd109c7d1135f34cdae29e60eab94855a625dcfe1705f8bc7ad79f"
 dependencies = [
  "arrayvec",
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "bytemuck",
  "cfg-if",
  "cfg_aliases",
@@ -6623,7 +6578,7 @@ dependencies = [
  "arrayvec",
  "bit-set",
  "bit-vec",
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "bytemuck",
  "cfg_aliases",
  "document-features",
@@ -6683,7 +6638,7 @@ dependencies = [
  "arrayvec",
  "ash",
  "bit-set",
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "block",
  "bytemuck",
  "cfg-if",
@@ -6727,7 +6682,7 @@ version = "28.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e18308757e594ed2cd27dddbb16a139c42a683819d32a2e0b1b0167552f5840c"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "bytemuck",
  "js-sys",
  "log",
@@ -6877,7 +6832,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -6888,7 +6843,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -7278,7 +7233,7 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 name = "winit"
 version = "0.31.0-beta.2"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "cfg_aliases",
  "cursor-icon",
  "dpi 0.1.2",
@@ -7304,7 +7259,7 @@ version = "0.31.0-beta.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2879d2854d1a43e48f67322d4bd097afcb6eb8f8f775c8de0260a71aea1df1aa"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "cfg_aliases",
  "cursor-icon",
  "dpi 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -7330,7 +7285,7 @@ name = "winit-android"
 version = "0.31.0-beta.2"
 dependencies = [
  "android-activity",
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "dpi 0.1.2",
  "ndk",
  "raw-window-handle",
@@ -7346,7 +7301,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51d9c0d2cd93efec3a9f9ad819cfaf0834782403af7c0d248c784ec0c61761df"
 dependencies = [
  "android-activity",
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "dpi 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "ndk",
  "raw-window-handle",
@@ -7359,7 +7314,7 @@ dependencies = [
 name = "winit-appkit"
 version = "0.31.0-beta.2"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "block2 0.6.2",
  "dispatch2",
  "dpi 0.1.2",
@@ -7382,7 +7337,7 @@ version = "0.31.0-beta.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21310ca07851a49c348e0c2cc768e36b52ca65afda2c2354d78ed4b90074d8aa"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "block2 0.6.2",
  "dispatch2",
  "dpi 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -7432,7 +7387,7 @@ dependencies = [
 name = "winit-core"
 version = "0.31.0-beta.2"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "cursor-icon",
  "dpi 0.1.2",
  "keyboard-types",
@@ -7447,7 +7402,7 @@ version = "0.31.0-beta.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4f0ccd7abb43740e2c6124ac7cae7d865ecec74eec63783e8922577ac232583"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "cursor-icon",
  "dpi 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "keyboard-types",
@@ -7460,7 +7415,7 @@ dependencies = [
 name = "winit-orbital"
 version = "0.31.0-beta.2"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "dpi 0.1.2",
  "libredox",
  "orbclient",
@@ -7477,7 +7432,7 @@ version = "0.31.0-beta.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51ea1fb262e7209f265f12bd0cc792c399b14355675e65531e9c8a87db287d46"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "dpi 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "orbclient",
  "raw-window-handle",
@@ -7491,7 +7446,7 @@ dependencies = [
 name = "winit-uikit"
 version = "0.31.0-beta.2"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "block2 0.6.2",
  "dispatch2",
  "dpi 0.1.2",
@@ -7512,7 +7467,7 @@ version = "0.31.0-beta.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "680a356e798837d8eb274d4556e83bceaf81698194e31aafc5cfb8a9f2fab643"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "block2 0.6.2",
  "dispatch2",
  "dpi 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -7532,7 +7487,7 @@ name = "winit-wayland"
 version = "0.31.0-beta.2"
 dependencies = [
  "ahash",
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "calloop",
  "cursor-icon",
  "dpi 0.1.2",
@@ -7559,7 +7514,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ce5afb2ba07da603f84b722c95f9f9396d2cedae3944fb6c0cda4a6f88de545"
 dependencies = [
  "ahash",
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "calloop",
  "cursor-icon",
  "dpi 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -7583,7 +7538,7 @@ name = "winit-web"
 version = "0.31.0-beta.2"
 dependencies = [
  "atomic-waker",
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "concurrent-queue",
  "cursor-icon",
  "dpi 0.1.2",
@@ -7606,7 +7561,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c2490a953fb776fbbd5e295d54f1c3847f4f15b6c3929ec53c09acda6487a92"
 dependencies = [
  "atomic-waker",
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "concurrent-queue",
  "cursor-icon",
  "dpi 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -7626,7 +7581,7 @@ dependencies = [
 name = "winit-win32"
 version = "0.31.0-beta.2"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "cursor-icon",
  "dpi 0.1.2",
  "raw-window-handle",
@@ -7643,7 +7598,7 @@ version = "0.31.0-beta.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "644ea78af0e858aa3b092e5d1c67c41995a98220c81813f1353b28bc8bb91eaa"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "cursor-icon",
  "dpi 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "raw-window-handle",
@@ -7660,7 +7615,7 @@ version = "0.31.0-beta.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa5b600756534c7041aa93cd0d244d44b09fca1b89e202bd1cd80dd9f3636c46"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "bytemuck",
  "calloop",
  "cursor-icon",
@@ -7735,7 +7690,7 @@ dependencies = [
  "heck 0.5.0",
  "indexmap 2.13.0",
  "prettyplease",
- "syn 2.0.117",
+ "syn",
  "wasm-metadata",
  "wit-bindgen-core",
  "wit-component",
@@ -7751,7 +7706,7 @@ dependencies = [
  "prettyplease",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
  "wit-bindgen-core",
  "wit-bindgen-rust",
 ]
@@ -7763,7 +7718,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
 dependencies = [
  "anyhow",
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "indexmap 2.13.0",
  "log",
  "serde",
@@ -7893,7 +7848,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.11.0",
  "dlib",
  "log",
  "once_cell",
@@ -7952,7 +7907,7 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
  "synstructure",
 ]
 
@@ -8010,7 +7965,7 @@ checksum = "10da05367f3a7b7553c8cdf8fa91aee6b64afebe32b51c95177957efc47ca3a0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
  "zbus-lockstep",
  "zbus_xml",
  "zvariant",
@@ -8025,7 +7980,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
  "zbus_names",
  "zvariant",
  "zvariant_utils",
@@ -8077,7 +8032,7 @@ checksum = "4122cd3169e94605190e77839c9a40d40ed048d305bfdc146e7df40ab0f3e517"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -8097,7 +8052,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
  "synstructure",
 ]
 
@@ -8132,7 +8087,7 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -8195,7 +8150,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
  "zvariant_utils",
 ]
 
@@ -8208,7 +8163,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 2.0.117",
+ "syn",
  "winnow 1.0.3",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index d754b61e..fddb41b9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -102,7 +102,6 @@ features = [
     "backend_drm",
     "backend_gbm",
     "backend_egl",
-    "backend_libei",
     "backend_libinput",
     "backend_session_libseat",
     "backend_udev",
@@ -178,4 +177,4 @@ dnd = { path = "../window_clipboard/dnd" }
 mime = { path = "../window_clipboard/mime" }
 
 [patch.crates-io]
-smithay = { git = "https://github.com/smithay/smithay.git", rev = "5fb12b8" }
+smithay = { git = "https://github.com/smithay/smithay.git", rev = "1ed69cb" }
diff --git a/resources/i18n/da/cosmic_comp.ftl b/resources/i18n/da/cosmic_comp.ftl
index ad4befea..e69de29b 100644
--- a/resources/i18n/da/cosmic_comp.ftl
+++ b/resources/i18n/da/cosmic_comp.ftl
@@ -1,28 +0,0 @@
-a11y-zoom-move-continuously = Visningen bevæger sig kontinuerligt med markøren
-a11y-zoom-move-onedge = Vis bevægelser når markør rammer kant
-a11y-zoom-move-centered = Vis bevægelser, for at holde markør centreret
-a11y-zoom-settings = Forstørrelsesglas-indstillinger...
-grow-window = Gro
-shrink-window = Skrump
-swap-windows = Byt Vinduer
-stack-windows = Stabel Vinduer
-window-menu-tiled = Gør vindue flydende
-window-menu-screenshot = Tag skærmbillede
-window-menu-move = Flyt
-window-menu-resize = Skift størrelse
-window-menu-move-prev-workspace = Flyt til forrige arbejdsområde
-window-menu-move-next-workspace = Flyt til næste arbejdsområde
-window-menu-stack = Opret vinduestak
-window-menu-unstack-all = Udtag vinduer af stak
-window-menu-unstack = Udtag vindue af stak
-window-menu-sticky = Fastgjort vindue
-window-menu-close = Luk
-window-menu-close-all = Luk alle vinduer
-window-menu-resize-edge-top = Top
-window-menu-resize-edge-left = Venstre
-window-menu-resize-edge-right = Højre
-window-menu-resize-edge-bottom = Bund
-window-menu-minimize = Minimér
-window-menu-maximize = Maksimér
-window-menu-fullscreen = Fuld skærm
-unknown-keybinding = <uangiven>
diff --git a/resources/i18n/en-GB/cosmic_comp.ftl b/resources/i18n/en-GB/cosmic_comp.ftl
index 853cc97d..e69de29b 100644
--- a/resources/i18n/en-GB/cosmic_comp.ftl
+++ b/resources/i18n/en-GB/cosmic_comp.ftl
@@ -1,28 +0,0 @@
-a11y-zoom-move-continuously = View moves continuously with pointer
-a11y-zoom-move-onedge = View moves when pointer reaches edge
-a11y-zoom-move-centered = View moves to keep pointer centred
-a11y-zoom-settings = Magnifier settings...
-grow-window = Grow
-shrink-window = Shrink
-swap-windows = Swap Windows
-stack-windows = Stack Windows
-unknown-keybinding = <unset>
-window-menu-minimize = Minimise
-window-menu-maximize = Maximise
-window-menu-fullscreen = Fullscreen
-window-menu-tiled = Float window
-window-menu-screenshot = Take screenshot
-window-menu-move = Move
-window-menu-resize = Resize
-window-menu-move-prev-workspace = Move to previous workspace
-window-menu-move-next-workspace = Move to next workspace
-window-menu-stack = Create window stack
-window-menu-unstack-all = Unstack windows
-window-menu-unstack = Unstack window
-window-menu-sticky = Sticky window
-window-menu-close = Close
-window-menu-close-all = Close all windows
-window-menu-resize-edge-top = Top
-window-menu-resize-edge-left = Left
-window-menu-resize-edge-right = Right
-window-menu-resize-edge-bottom = Bottom
diff --git a/resources/i18n/gl/cosmic_comp.ftl b/resources/i18n/gl/cosmic_comp.ftl
deleted file mode 100644
index 1176cad6..00000000
--- a/resources/i18n/gl/cosmic_comp.ftl
+++ /dev/null
@@ -1,28 +0,0 @@
-a11y-zoom-move-continuously = A vista móvese continuamente co punteiro
-a11y-zoom-move-onedge = A vista móvese cando o punteiro chega ao bordo
-a11y-zoom-move-centered = Mover a vista para manter o cursor centrado
-a11y-zoom-settings = Configuración da lupa...
-grow-window = Aumentar
-shrink-window = Encoller
-swap-windows = Cambiar xanelas
-stack-windows = Apilar xanelas
-unknown-keybinding = <unset>
-window-menu-minimize = Minimizar
-window-menu-maximize = Maximizar
-window-menu-fullscreen = Pantalla Completa
-window-menu-tiled = Xanela flotante
-window-menu-screenshot = Capturar pantalla
-window-menu-move = Mover
-window-menu-resize = Redimensionar
-window-menu-move-prev-workspace = Mover ao espazo de traballo anterior
-window-menu-move-next-workspace = Mover ao seguinte espazo de traballo
-window-menu-stack = Crear pila de xanelas
-window-menu-unstack-all = Desapilar xanelas
-window-menu-unstack = Desapilar xanela
-window-menu-sticky = Xanela persistente
-window-menu-close = Pechar
-window-menu-close-all = Pechar todas as xanelas
-window-menu-resize-edge-top = Arriba
-window-menu-resize-edge-left = Esquerda
-window-menu-resize-edge-right = Dereita
-window-menu-resize-edge-bottom = Fondo
diff --git a/resources/i18n/it/cosmic_comp.ftl b/resources/i18n/it/cosmic_comp.ftl
index b1eb56c3..ba92609f 100644
--- a/resources/i18n/it/cosmic_comp.ftl
+++ b/resources/i18n/it/cosmic_comp.ftl
@@ -1,4 +1,4 @@
-grow-window = Crescere
+grow-window = Ingrandisci
 shrink-window = Riduci
 swap-windows = Scambia le finestre
 stack-windows = Sovrapponi le finestre
@@ -6,7 +6,7 @@ unknown-keybinding = <unset>
 window-menu-minimize = Minimizza
 window-menu-maximize = Massimizza
 window-menu-tiled = Finestra flottante
-window-menu-screenshot = Scatta uno screenshot
+window-menu-screenshot = Cattura una schermata
 window-menu-move = Sposta
 window-menu-resize = Ridimensiona
 window-menu-move-prev-workspace = Sposta all'area di lavoro precedente
@@ -22,7 +22,7 @@ window-menu-resize-edge-left = Sinistra
 window-menu-resize-edge-right = Destra
 window-menu-resize-edge-bottom = In basso
 window-menu-fullscreen = Schermo intero
-a11y-zoom-settings = Impostazioni lente d'ingrandimento...
+a11y-zoom-settings = Opzioni lente d'ingrandimento...
 a11y-zoom-move-continuously = Segue sempre il cursorse
 a11y-zoom-move-centered = Mantiene il cursore centrato
 a11y-zoom-move-onedge = Segue il cursore ai bordi
diff --git a/resources/i18n/sat/cosmic_comp.ftl b/resources/i18n/sat/cosmic_comp.ftl
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/backend/kms/device.rs b/src/backend/kms/device.rs
index 7df3c8f9..bb32f5a3 100644
--- a/src/backend/kms/device.rs
+++ b/src/backend/kms/device.rs
@@ -59,7 +59,7 @@ use std::{
     time::Duration,
 };
 
-use super::{drm_helpers, surface::Surface};
+use super::{drm_helpers, socket::Socket, surface::Surface};
 
 #[derive(Debug)]
 pub struct EGLInternals {
@@ -98,12 +98,14 @@ pub struct Device {
 
     pub texture_formats: FormatSet,
     event_token: Option<RegistrationToken>,
+    pub socket: Option<Socket>,
 }
 
 #[derive(Debug)]
 struct ReusableDevice {
     leasing_global: Option<DrmLeaseState>,
     active_clients: HashSet<ClientId>,
+    socket: Option<Socket>,
 }
 
 #[derive(Debug)]
@@ -591,7 +593,7 @@ impl State {
         }
     }
 
-    pub fn device_removed(&mut self, dev: dev_t, _dh: &DisplayHandle) -> Result<()> {
+    pub fn device_removed(&mut self, dev: dev_t, dh: &DisplayHandle) -> Result<()> {
         let backend = self.backend.kms();
         // we can't use DrmNode::from_node_id, because that assumes the node is still on sysfs
         let drm_node = backend
@@ -614,6 +616,13 @@ impl State {
             if let Some(token) = device.event_token.take() {
                 self.common.event_loop_handle.remove(token);
             }
+            if let Some(socket) = device.socket.take() {
+                self.common.event_loop_handle.remove(socket.token);
+                self.common
+                    .dmabuf_state
+                    .destroy_global::<State>(dh, socket.dmabuf_global);
+                dh.remove_global::<State>(socket.drm_global);
+            }
             backend.api.as_mut().remove_node(&device.inner.render_node);
             backend
                 .primary_node
@@ -746,7 +755,23 @@ impl Device {
         let ReusableDevice {
             leasing_global,
             active_clients,
+            socket,
         } = reuse.unwrap_or_else(|| {
+            let socket = match (!is_software)
+                .then(|| common.create_socket(dh, render_node, texture_formats.clone()))
+                .transpose()
+            {
+                Ok(socket) => socket,
+                Err(err) => {
+                    warn!(
+                        ?err,
+                        "Failed to initialize hardware-acceleration for clients on {}.",
+                        render_node,
+                    );
+                    None
+                }
+            };
+
             let leasing_global = match (!is_software)
                 .then(|| DrmLeaseState::new::<State>(dh, &dev_node))
                 .transpose()
@@ -765,6 +790,7 @@ impl Device {
             ReusableDevice {
                 leasing_global,
                 active_clients: HashSet::new(),
+                socket,
             }
         });
 
@@ -805,6 +831,7 @@ impl Device {
 
             texture_formats,
             event_token: Some(token),
+            socket,
         })
     }
 
@@ -865,6 +892,7 @@ impl Device {
         let device = ReusableDevice {
             leasing_global: self.inner.leasing_global,
             active_clients: self.inner.active_clients,
+            socket: self.socket,
         };
 
         let state = OldDeviceState {
diff --git a/src/backend/kms/drm_helpers.rs b/src/backend/kms/drm_helpers.rs
index 46659613..8629c9d7 100644
--- a/src/backend/kms/drm_helpers.rs
+++ b/src/backend/kms/drm_helpers.rs
@@ -75,7 +75,6 @@ pub fn display_configuration(
     // And then cleanup
     if device.is_atomic() {
         let mut req = AtomicModeReq::new();
-        let mut has_changes = false;
         let plane_handles = device.plane_handles()?;
 
         // We cannot just shortcut and use the legacy api for all cleanups because of this.
@@ -96,15 +95,10 @@ pub fn display_configuration(
                     let fb_id = get_prop(device, plane, "FB_ID")?;
                     req.add_property(plane, crtc_id, property::Value::CRTC(None));
                     req.add_property(plane, fb_id, property::Value::Framebuffer(None));
-                    has_changes = true;
                 }
             }
         }
-        // Skip an empty commit: a no-op modeset that also fails with EPERM
-        // without DRM master (e.g. a render-only secondary GPU).
-        if has_changes {
-            device.atomic_commit(AtomicCommitFlags::ALLOW_MODESET, req)?;
-        }
+        device.atomic_commit(AtomicCommitFlags::ALLOW_MODESET, req)?;
     } else {
         for crtc in res_handles.crtcs() {
             #[allow(deprecated)]
diff --git a/src/backend/kms/mod.rs b/src/backend/kms/mod.rs
index 6da04aac..16559e4e 100644
--- a/src/backend/kms/mod.rs
+++ b/src/backend/kms/mod.rs
@@ -4,15 +4,12 @@ use crate::{
     config::{CompOutputConfig, ScreenFilter},
     shell::Shell,
     state::BackendData,
-    utils::{env::dev_var, global::remove_global_with_timer, prelude::*},
-    wayland::protocols::{drm::WlDrmState, output_power::OutputPowerState},
+    utils::{env::dev_var, prelude::*},
+    wayland::protocols::output_power::OutputPowerState,
 };
 
-use anyhow::{self, Context, Result};
-use calloop::{
-    LoopSignal,
-    timer::{TimeoutAction, Timer},
-};
+use anyhow::{Context, Result};
+use calloop::LoopSignal;
 use cosmic_comp_config::output::comp::{AdaptiveSync, OutputState};
 use indexmap::IndexMap;
 use render::gles::GbmGlowBackend;
@@ -35,12 +32,11 @@ use smithay::{
             control::{Device as _, connector::Interface, crtc},
         },
         input::{self, Libinput},
-        wayland_protocols::wp::linux_dmabuf::zv1::server::zwp_linux_dmabuf_feedback_v1::TrancheFlags,
         wayland_server::{Client, DisplayHandle},
     },
     utils::{Clock, DevPath, Monotonic, Size},
     wayland::{
-        dmabuf::{DmabufFeedbackBuilder, DmabufGlobal},
+        dmabuf::DmabufGlobal,
         drm_syncobj::{DrmSyncobjState, supports_syncobj_eventfd},
         relative_pointer::RelativePointerManagerState,
     },
@@ -52,12 +48,12 @@ use std::{
     collections::{HashMap, HashSet},
     path::Path,
     sync::{Arc, RwLock, atomic::AtomicBool},
-    time::Duration,
 };
 
 mod device;
 mod drm_helpers;
 pub mod render;
+mod socket;
 mod surface;
 use device::*;
 pub(crate) use surface::Surface;
@@ -78,7 +74,6 @@ pub struct KmsState {
     libinput: Libinput,
 
     pub syncobj_state: Option<DrmSyncobjState>,
-    pub dmabuf_global: Option<DmabufGlobal>,
 }
 
 pub struct KmsGuard<'a> {
@@ -136,7 +131,6 @@ pub fn init_backend(
         libinput: libinput_context,
 
         syncobj_state: None,
-        dmabuf_global: None,
     });
 
     // manually add already present gpus
@@ -148,10 +142,9 @@ pub fn init_backend(
         }
     }
 
-    if let Err(err) = state.select_primary_gpu(dh) {
+    if let Err(err) = state.backend.kms().select_primary_gpu(dh) {
         warn!("Failed to determine primary gpu: {}", err);
     }
-    state.update_default_feedback();
 
     if let Err(err) = state.refresh_output_config() {
         info!(
@@ -211,7 +204,7 @@ fn init_libinput(
             state.backend.kms().input_devices.remove(&*device.name());
         }
 
-        state.process_input_event(event, crate::input::InputBackendId::Normal);
+        state.process_input_event(event);
 
         for output in state.common.shell.read().outputs() {
             state.backend.kms().schedule_render(output);
@@ -324,13 +317,11 @@ fn init_udev(
 
                 {
                     let backend = state.backend.kms();
-                    if matches!(event, UdevEvent::Added { .. } | UdevEvent::Removed { .. }) {
-                        if backend.primary_node.read().unwrap().is_none()
-                            && let Err(err) = state.select_primary_gpu(&dh)
-                        {
-                            warn!("Failed to determine a new primary gpu: {}", err);
-                        }
-                        state.update_default_feedback();
+                    if matches!(event, UdevEvent::Added { .. } | UdevEvent::Removed { .. })
+                        && backend.primary_node.read().unwrap().is_none()
+                        && let Err(err) = state.backend.kms().select_primary_gpu(&dh)
+                    {
+                        warn!("Failed to determine a new primary gpu: {}", err);
                     }
                 }
 
@@ -474,118 +465,50 @@ impl State {
             device.drm.pause();
         }
     }
+}
 
+impl KmsState {
     fn select_primary_gpu(&mut self, dh: &DisplayHandle) -> Result<()> {
         // We don't have to check the allow/blocklist here,
         // as any disallowed devices won't be in `self.drm_devices`.
 
-        let kms = self.backend.kms();
-        let mut primary_node = kms.primary_node.write().unwrap();
+        let mut primary_node = self.primary_node.write().unwrap();
         let _ = primary_node.take(); // if we error don't leave an old node in place
-        *primary_node = determine_primary_gpu(&kms.drm_devices, kms.session.seat())?;
+        *primary_node = determine_primary_gpu(&self.drm_devices, self.session.seat())?;
 
         if let Some(node) = *primary_node {
             info!("Using {} as primary gpu for rendering.", node);
-            kms.software_renderer.take();
-
-            // setup minimal feedback. We will update it in `update_default_feedback`
-            let primary_formats = kms
-                .drm_devices
-                .values()
-                .find(|dev| dev.inner.render_node == node)
-                .unwrap()
-                .texture_formats
-                .clone();
-            let feedback = DmabufFeedbackBuilder::new(node.dev_id(), primary_formats.clone())
-                .build()
-                .unwrap();
-
-            if let Some(global) = kms.dmabuf_global.as_ref() {
-                self.common
-                    .dmabuf_state
-                    .set_default_feedback(global, &feedback);
-            } else {
-                let dmabuf_global = self
-                    .common
-                    .dmabuf_state
-                    .create_global_with_default_feedback::<State>(dh, &feedback);
-                kms.dmabuf_global = Some(dmabuf_global);
-            };
-
-            let device_path = node
-                .dev_path_with_type(NodeType::Render)
-                .or_else(|| node.dev_path())
-                .ok_or(anyhow::anyhow!(
-                    "Could not determine path for gpu node: {}",
-                    node
-                ))?;
-
-            if let Some(drm) = self.common.wl_drm_state.as_mut() {
-                drm.update_device(device_path, primary_formats);
-            } else {
-                self.common.wl_drm_state = Some(WlDrmState::new::<State>(
-                    dh,
-                    device_path,
-                    primary_formats,
-                    kms.dmabuf_global.as_ref().unwrap(),
-                ));
-            }
-        } else if kms.software_renderer.is_none() {
+            self.software_renderer.take();
+        } else if self.software_renderer.is_none() {
             info!("Failed to find a suitable gpu, using software renderingr");
-            kms.software_renderer = match software_renderer() {
+            self.software_renderer = match software_renderer() {
                 Ok(renderer) => Some(renderer),
                 Err(err) => {
                     error!(?err, "Failed to initialize software EGL renderer.");
                     None
                 }
             };
-
-            if let Some(drm) = self.common.wl_drm_state.take() {
-                remove_global_with_timer(dh, &self.common.event_loop_handle, drm.global().clone());
-            }
-            if let Some(global) = kms.dmabuf_global.take() {
-                self.common
-                    .dmabuf_state
-                    .disable_global::<State>(dh, &global);
-                let source = Timer::from_duration(Duration::from_secs(5));
-                let res =
-                    self.common
-                        .event_loop_handle
-                        .insert_source(source, move |_, _, state| {
-                            state
-                                .common
-                                .dmabuf_state
-                                .destroy_global::<State>(&state.common.display_handle, global);
-                            TimeoutAction::Drop
-                        });
-                if let Err(err) = res {
-                    tracing::error!(
-                        "failed to insert timer source to destroy output global: {}",
-                        err
-                    );
-                }
-            }
         }
 
         if !crate::utils::env::bool_var("COSMIC_DISABLE_SYNCOBJ").unwrap_or(false) {
             if let Some(primary_node) = primary_node
                 .as_ref()
                 .and_then(|node| node.node_with_type(NodeType::Primary).and_then(|x| x.ok()))
-                && let Some(device) = kms.drm_devices.get(&primary_node)
+                && let Some(device) = self.drm_devices.get(&primary_node)
             {
                 let import_device = device.drm.device().device_fd().clone();
                 if supports_syncobj_eventfd(&import_device) {
-                    if let Some(state) = kms.syncobj_state.as_mut() {
+                    if let Some(state) = self.syncobj_state.as_mut() {
                         state.update_device(import_device);
                     } else {
                         let syncobj_state = DrmSyncobjState::new::<State>(dh, import_device);
-                        kms.syncobj_state = Some(syncobj_state);
+                        self.syncobj_state = Some(syncobj_state);
                     }
                     return Ok(());
                 }
             }
 
-            if let Some(old_state) = kms.syncobj_state.take() {
+            if let Some(old_state) = self.syncobj_state.take() {
                 dh.remove_global::<State>(old_state.into_global());
             }
         }
@@ -593,45 +516,6 @@ impl State {
         Ok(())
     }
 
-    fn update_default_feedback(&mut self) {
-        let kms = self.backend.kms();
-        let primary_node = kms.primary_node.read().unwrap();
-        if let Some(primary_node) = *primary_node {
-            let primary_formats = kms
-                .drm_devices
-                .values()
-                .find(|dev| dev.inner.render_node == primary_node)
-                .unwrap()
-                .texture_formats
-                .clone();
-
-            let mut feedback =
-                DmabufFeedbackBuilder::new(primary_node.dev_id(), primary_formats.clone());
-            for dev in kms
-                .drm_devices
-                .values()
-                .filter(|dev| dev.inner.render_node != primary_node)
-            {
-                feedback = feedback.add_preference_tranche(
-                    dev.inner.render_node.dev_id(),
-                    TrancheFlags::Sampling,
-                    dev.texture_formats.iter().cloned(),
-                    6..=6,
-                );
-            }
-
-            let default_feedback = feedback.build().unwrap();
-            self.common.dmabuf_state.set_default_feedback(
-                kms.dmabuf_global
-                    .as_ref()
-                    .expect("Primary node but no dmabuf global?"),
-                &default_feedback,
-            );
-        }
-    }
-}
-
-impl KmsState {
     pub fn switch_vt(&mut self, num: i32) -> Result<(), anyhow::Error> {
         self.session.change_vt(num).map_err(Into::into)
     }
@@ -639,25 +523,29 @@ impl KmsState {
     pub fn dmabuf_imported(
         &mut self,
         client: Option<Client>,
-        _global: &DmabufGlobal,
+        global: &DmabufGlobal,
         dmabuf: Dmabuf,
     ) -> Result<DrmNode> {
-        let device_node = dmabuf
-            .node()
-            .unwrap_or_else(|| self.primary_node.read().unwrap().unwrap());
         let mut device = self
             .drm_devices
             .values_mut()
-            .find(|dev| dev.inner.render_node == device_node)
-            .ok_or(anyhow::anyhow!(
-                "Unable to find device for node: {}",
-                device_node
-            ))?;
+            .find(|device| {
+                device
+                    .socket
+                    .as_ref()
+                    .map(|s| &s.dmabuf_global == global)
+                    .unwrap_or(false)
+            })
+            .context("Couldn't find gpu for dmabuf global")?;
 
         // If device advertised to client doesn't support format/modifier, select
         // first device that does. This is needed for image-copy from
         // output/toplevel on a different node.
-        if dmabuf.node().is_none() && !device.texture_formats.contains(&dmabuf.format()) {
+        //
+        // TODO: After
+        // https://gitlab.freedesktop.org/wayland/wayland-protocols/-/merge_requests/268,
+        // only try the device specified explicitly by the client, if set.
+        if !device.texture_formats.contains(&dmabuf.format()) {
             device = self
                 .drm_devices
                 .values_mut()
diff --git a/src/backend/kms/surface/mod.rs b/src/backend/kms/surface/mod.rs
index cbc89381..bb28bc3c 100644
--- a/src/backend/kms/surface/mod.rs
+++ b/src/backend/kms/surface/mod.rs
@@ -1006,16 +1006,12 @@ impl SurfaceThreadState {
             &self.shell.read(),
         );
 
-        // Acquiring a renderer can fail transiently when the underlying DRM
-        // device is lost (e.g. after a GPU reset).
         let mut renderer = if render_node != self.target_node {
             self.api
                 .renderer(&render_node, &self.target_node, compositor.format())
-                .map_err(|err| anyhow::format_err!("Failed to create renderer: {:?}", err))?
+                .unwrap()
         } else {
-            self.api
-                .single_renderer(&self.target_node)
-                .map_err(|err| anyhow::format_err!("Failed to create renderer: {:?}", err))?
+            self.api.single_renderer(&self.target_node).unwrap()
         };
 
         self.timings.start_render(&self.clock);
@@ -1271,10 +1267,7 @@ impl SurfaceThreadState {
                 })
                 .context("Failed to draw to offscreen render target")?;
 
-            renderer = self
-                .api
-                .single_renderer(&self.target_node)
-                .map_err(|err| anyhow::format_err!("Failed to create renderer: {:?}", err))?;
+            renderer = self.api.single_renderer(&self.target_node).unwrap();
 
             elements = postprocess_elements(
                 &mut renderer,
@@ -1529,7 +1522,7 @@ fn get_surface_dmabuf_feedback(
     render_node: DrmNode,
     target_node: DrmNode,
     render_formats: FormatSet,
-    target_formats: FormatSet,
+    _target_formats: FormatSet,
     primary_plane_formats: FormatSet,
     overlay_plane_formats: Option<FormatSet>,
 ) -> SurfaceDmabufFeedback {
@@ -1547,40 +1540,60 @@ fn get_surface_dmabuf_feedback(
             .cloned()
             .collect::<FormatSet>()
     });
+    let builder = DmabufFeedbackBuilder::new(render_node.dev_id(), render_formats);
 
-    let mut builder = DmabufFeedbackBuilder::new(render_node.dev_id(), render_formats.clone());
+    /*
+    // Sadly no implementation would pick this up as a preferred render tranche,
+    // where the combined formats would increase our chances of doing a dmabuf copy.
+    // .. So we should probably not advertise this on the off-chance it actually triggers bugs.
+    //
 
-    if target_node != render_node {
+    let combined_formats = render_formats.intersection(&target_formats).cloned().collect::<FormatSet>();
+    if target_node != render_node.dev_id() && !combined_formats.is_empty() {
         builder = builder.add_preference_tranche(
-            target_node.dev_id(),
-            zwp_linux_dmabuf_feedback_v1::TrancheFlags::Sampling,
-            target_formats,
-            6..=6,
+            render_node.dev_id(),
+            None,
+            combined_formats,
         );
     };
-    let render_feedback = builder.clone().build().unwrap();
 
-    let primary_scanout_feedback = builder
-        .clone()
-        .add_preference_tranche(
+    // We also can't advertise scan out tranches for the actual display device,
+    // as e.g. the nvidia driver might then send us dmabufs, that makes e.g. the iris hangs on import...
+    if target_node != render_node.dev_id() && !combined_formats.is_empty() {
+        builder = builder.add_preference_tranche(
             target_node.dev_id(),
-            zwp_linux_dmabuf_feedback_v1::TrancheFlags::Scanout,
-            primary_plane_formats,
-            4..=6,
-        )
-        .build()
-        .unwrap();
-    let overlay_scanout_feedback = overlay_plane_formats.map(|formats| {
+            Some(zwp_linux_dmabuf_feedback_v1::TrancheFlags::Scanout),
+            combined_formats,
+        );
+    };
+
+    // So no fun combinations, we gotta wait for dmabuf-v6
+    */
+
+    let render_feedback = builder.clone().build().unwrap();
+    let primary_scanout_feedback = (target_node == render_node).then(|| {
         builder
+            .clone()
             .add_preference_tranche(
-                target_node.dev_id(),
-                zwp_linux_dmabuf_feedback_v1::TrancheFlags::Scanout,
-                formats,
-                4..=6,
+                render_node.dev_id(),
+                Some(zwp_linux_dmabuf_feedback_v1::TrancheFlags::Scanout),
+                primary_plane_formats,
             )
             .build()
             .unwrap()
     });
+    let overlay_scanout_feedback = overlay_plane_formats
+        .filter(|_| target_node == render_node)
+        .map(|formats| {
+            builder
+                .add_preference_tranche(
+                    render_node.dev_id(),
+                    Some(zwp_linux_dmabuf_feedback_v1::TrancheFlags::Scanout),
+                    formats,
+                )
+                .build()
+                .unwrap()
+        });
 
     SurfaceDmabufFeedback {
         render_feedback,
diff --git a/src/backend/winit.rs b/src/backend/winit.rs
index 8f3d14c5..0ff249a7 100644
--- a/src/backend/winit.rs
+++ b/src/backend/winit.rs
@@ -6,7 +6,6 @@ use crate::{
     shell::{Devices, SeatExt},
     state::{BackendData, Common},
     utils::prelude::*,
-    wayland::protocols::drm::WlDrmState,
 };
 use anyhow::{Context, Result, anyhow};
 use cosmic_comp_config::output::comp::{OutputConfig, TransformDef};
@@ -274,7 +273,7 @@ fn init_egl_client_side(
                 .create_global_with_default_feedback::<State>(dh, &feedback);
 
             let render_node = render_node.unwrap().unwrap();
-            state.common.wl_drm_state = Some(WlDrmState::new::<State>(
+            let _drm_global_id = state.common.wl_drm_state.create_global::<State>(
                 dh,
                 render_node
                     .dev_path_with_type(NodeType::Render)
@@ -285,7 +284,7 @@ fn init_egl_client_side(
                     ))?,
                 dmabuf_formats,
                 &dmabuf_global,
-            ));
+            );
 
             info!("EGL hardware-acceleration enabled.");
         }
@@ -310,9 +309,7 @@ impl State {
             WinitEvent::Focus(true) => {
                 for seat in self.common.shell.read().seats.iter() {
                     let devices = seat.user_data().get::<Devices>().unwrap();
-                    if devices
-                        .has_device(&WinitVirtualDevice, &crate::input::InputBackendId::Normal)
-                    {
+                    if devices.has_device(&WinitVirtualDevice) {
                         seat.set_active_output(&self.backend.winit().output);
                         break;
                     }
@@ -342,9 +339,7 @@ impl State {
                 render_ping.ping();
             }
             WinitEvent::Redraw => render_ping.ping(),
-            WinitEvent::Input(event) => {
-                self.process_input_event(event, crate::input::InputBackendId::Normal)
-            }
+            WinitEvent::Input(event) => self.process_input_event(event),
             WinitEvent::CloseRequested => {
                 self.common.should_stop = true;
             }
diff --git a/src/backend/x11.rs b/src/backend/x11.rs
index ed92e844..bd0e1b34 100644
--- a/src/backend/x11.rs
+++ b/src/backend/x11.rs
@@ -6,7 +6,6 @@ use crate::{
     shell::{Devices, SeatExt},
     state::{BackendData, Common},
     utils::prelude::*,
-    wayland::protocols::drm::WlDrmState,
 };
 use anyhow::{Context, Result, anyhow};
 use cosmic_comp_config::output::comp::OutputConfig;
@@ -498,7 +497,7 @@ where
         .common
         .dmabuf_state
         .create_global_with_default_feedback::<State>(dh, &default_feedback);
-    state.common.wl_drm_state = Some(WlDrmState::new::<State>(
+    let _drm_global_id = state.common.wl_drm_state.create_global::<State>(
         dh,
         render_node
             .dev_path_with_type(NodeType::Render)
@@ -509,7 +508,7 @@ where
             ))?,
         renderer.dmabuf_formats(),
         &dmabuf_global,
-    ));
+    );
 
     info!("EGL hardware-acceleration enabled.");
 
@@ -534,14 +533,14 @@ impl State {
             let device = event.device();
             for seat in self.common.shell.read().seats.iter() {
                 let devices = seat.user_data().get::<Devices>().unwrap();
-                if devices.has_device(&device, &crate::input::InputBackendId::Normal) {
+                if devices.has_device(&device) {
                     seat.set_active_output(&output);
                     break;
                 }
             }
         };
 
-        self.process_input_event(event, crate::input::InputBackendId::Normal);
+        self.process_input_event(event);
         // TODO actually figure out the output
         for output in self.common.shell.read().outputs() {
             self.backend.x11().schedule_render(output);
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 4a2500fd..1d9b9c92 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 use crate::{
-    input::InputBackendId,
     shell::Shell,
     state::{BackendData, State},
     utils::prelude::OutputExt,
@@ -821,27 +820,6 @@ fn config_changed(config: cosmic_config::Config, keys: Vec<String>, state: &mut
                         }
                     }
                 }
-                let ei_connections = state
-                    .common
-                    .ei_keyboard_source
-                    .keys()
-                    .cloned()
-                    .collect::<Vec<_>>();
-                for conn in &ei_connections {
-                    state.release_ei_keyboard(conn);
-                    state.clear_input_source_state(&InputBackendId::Ei(conn.clone()));
-                }
-                for ei_seat in state.common.ei_seats.values() {
-                    if let Err(err) =
-                        ei_seat.add_keyboard("virtual keyboard", xkb_config_to_wl(&value))
-                    {
-                        warn!(?err, "Failed to update libei keyboard keymap");
-                    }
-                }
-                if !state.common.ei_seats.is_empty() {
-                    let seat = state.common.shell.read().seats.last_active().clone();
-                    state.broadcast_ei_keyboard_modifiers(&seat);
-                }
                 state.common.config.cosmic_conf.xkb_config = value;
             }
             "keyboard_config" => {
diff --git a/src/dbus/a11y_keyboard_monitor.rs b/src/dbus/a11y_keyboard_monitor.rs
index c97aa590..cf66a54b 100644
--- a/src/dbus/a11y_keyboard_monitor.rs
+++ b/src/dbus/a11y_keyboard_monitor.rs
@@ -150,10 +150,9 @@ impl A11yKeyboardMonitorState {
     }
 
     pub fn key_event(&self, modifiers: &ModifiersState, keysym: &KeysymHandle, state: KeyState) {
-        let has_key_grab = self.has_key_grab(modifiers, keysym.modified_sym());
         let clients = self.clients.lock().unwrap();
         for (unique_name, client) in clients.0.iter() {
-            if !client.watched && !has_key_grab {
+            if !client.watched && !self.has_key_grab(modifiers, keysym.modified_sym()) {
                 continue;
             }
 
diff --git a/src/dbus/ei.rs b/src/dbus/ei.rs
deleted file mode 100644
index 263bced4..00000000
--- a/src/dbus/ei.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-use std::{
-    os::unix::net::UnixStream,
-    sync::{Arc, Mutex},
-};
-
-use smithay::reexports::calloop;
-use zbus::names::{UniqueName, WellKnownName};
-
-use super::name_owners::NameOwners;
-
-static ALLOWED_NAMES: &[WellKnownName] = &[
-    WellKnownName::from_static_str_unchecked("org.freedesktop.impl.portal.desktop.cosmic"),
-    WellKnownName::from_static_str_unchecked("com.system76.CosmicOSK"),
-];
-
-/// Channel for handing the EI socketpair (and requested device types)
-/// It's `None` until the EI sender side has been set up
-type EiSender = Arc<Mutex<Option<calloop::channel::Sender<crate::libei::EiRequest>>>>;
-
-struct Ei {
-    ei_sender: EiSender,
-    name_owners: NameOwners,
-}
-
-impl Ei {
-    async fn check_sender_allowed(&self, sender: &UniqueName<'_>) -> zbus::fdo::Result<()> {
-        if self.name_owners.check_owner(sender, ALLOWED_NAMES).await {
-            Ok(())
-        } else {
-            Err(zbus::fdo::Error::AccessDenied("Access denied".to_string()))
-        }
-    }
-}
-
-#[zbus::interface(name = "com.system76.CosmicComp.Ei")]
-impl Ei {
-    /// Create a new EI sender context
-    async fn get_sender_socket(
-        &self,
-        device_types: u32,
-        #[zbus(header)] header: zbus::message::Header<'_>,
-    ) -> zbus::fdo::Result<zbus::zvariant::OwnedFd> {
-        if let Some(sender) = header.sender() {
-            self.check_sender_allowed(sender).await?;
-        }
-
-        let (comp_stream, client_stream) = UnixStream::pair().map_err(|err| {
-            zbus::fdo::Error::Failed(format!("Failed to create socket pair: {err}"))
-        })?;
-
-        {
-            let guard = self.ei_sender.lock().unwrap();
-            let sender = guard
-                .as_ref()
-                .ok_or_else(|| zbus::fdo::Error::Failed("EI sender not available".to_string()))?;
-            sender.send((comp_stream, device_types)).map_err(|err| {
-                zbus::fdo::Error::Failed(format!("Failed to hand off EI socket: {err}"))
-            })?;
-        }
-
-        Ok(std::os::fd::OwnedFd::from(client_stream).into())
-    }
-}
-
-/// Register the `com.system76.CosmicComp.Ei` interface on the shared session connection.
-pub async fn init(
-    conn: &zbus::Connection,
-    name_owners: &NameOwners,
-    ei_sender: EiSender,
-) -> zbus::Result<()> {
-    let ei = Ei {
-        ei_sender,
-        name_owners: name_owners.clone(),
-    };
-    conn.object_server()
-        .at("/com/system76/CosmicComp/Ei", ei)
-        .await?;
-    conn.request_name("com.system76.CosmicComp").await?;
-    Ok(())
-}
diff --git a/src/dbus/mod.rs b/src/dbus/mod.rs
index 9138caee..5b9754c3 100644
--- a/src/dbus/mod.rs
+++ b/src/dbus/mod.rs
@@ -9,13 +9,11 @@ use std::{
     cell::{RefCell, RefMut},
     collections::HashMap,
     rc::Rc,
-    sync::{Arc, Mutex},
 };
 use tracing::{error, warn};
 
 pub mod a11y_keyboard_monitor;
 use a11y_keyboard_monitor::A11yKeyboardMonitorState;
-pub mod ei;
 #[cfg(feature = "logind")]
 pub mod logind;
 mod name_owners;
@@ -31,7 +29,6 @@ struct DBusStateInner {
     session_conn: zbus::Result<zbus::Connection>,
     system_conn: zbus::Result<zbus::Connection>,
     a11y_keyboard_monitor: RefCell<Option<a11y_keyboard_monitor::A11yKeyboardMonitorState>>,
-    ei_sender: Arc<Mutex<Option<calloop::channel::Sender<crate::libei::EiRequest>>>>,
 }
 
 impl DBusState {
@@ -45,7 +42,6 @@ impl DBusState {
             session_conn,
             system_conn,
             a11y_keyboard_monitor: RefCell::new(None),
-            ei_sender: Arc::new(Mutex::new(None)),
         }));
         evlh.insert_source(source, |_, _, _| {}).unwrap();
         let state_clone = state.clone();
@@ -69,10 +65,6 @@ impl DBusState {
         RefMut::filter_map(self.0.a11y_keyboard_monitor.borrow_mut(), |x| x.as_mut()).ok()
     }
 
-    pub fn set_ei_sender(&self, sender: calloop::channel::Sender<crate::libei::EiRequest>) {
-        *self.0.ei_sender.lock().unwrap() = Some(sender);
-    }
-
     // TODO Lazy async init when we don't have anything blocking main thread
     async fn session_conn(&self) -> zbus::Result<&zbus::Connection> {
         self.0.session_conn.as_ref().map_err(|err| err.clone())
@@ -93,7 +85,6 @@ async fn init_session(state: &DBusState) -> zbus::Result<()> {
     let a11y_keyboard_monitor_state =
         A11yKeyboardMonitorState::new(conn, &name_owners, &state.0.executor).await?;
     *state.0.a11y_keyboard_monitor.borrow_mut() = Some(a11y_keyboard_monitor_state);
-    ei::init(conn, &name_owners, state.0.ei_sender.clone()).await?;
     Ok(())
 }
 
diff --git a/src/input/actions.rs b/src/input/actions.rs
index a4932597..3d017697 100644
--- a/src/input/actions.rs
+++ b/src/input/actions.rs
@@ -2,7 +2,6 @@
 
 use crate::{
     config::{Action, PrivateAction},
-    input::InputBackendId,
     shell::{
         FocusResult, InvalidWorkspaceIndex, MoveResult, SeatExt, Trigger, WorkspaceDelta,
         focus::{FocusTarget, target::KeyboardFocusTarget},
@@ -40,7 +39,6 @@ impl State {
     pub fn handle_action(
         &mut self,
         action: Action,
-        backend_id: &InputBackendId,
         seat: &Seat<State>,
         serial: Serial,
         time: u32,
@@ -71,7 +69,7 @@ impl State {
             Action::Shortcut(action) => {
                 let propagate = propagate_by_default(&action);
                 self.handle_shortcut_action(
-                    action, backend_id, seat, serial, time, pattern, direction, propagate,
+                    action, seat, serial, time, pattern, direction, propagate,
                 )
             }
             Action::Private(PrivateAction::Escape) => {
@@ -145,7 +143,6 @@ impl State {
     pub fn handle_shortcut_action(
         &mut self,
         action: shortcuts::Action,
-        backend_id: &InputBackendId,
         seat: &Seat<State>,
         serial: Serial,
         time: u32,
@@ -235,7 +232,6 @@ impl State {
                 {
                     self.handle_shortcut_action(
                         Action::SwitchOutput(inferred),
-                        backend_id,
                         seat,
                         serial,
                         time,
@@ -275,7 +271,6 @@ impl State {
                 {
                     self.handle_shortcut_action(
                         Action::SwitchOutput(inferred),
-                        backend_id,
                         seat,
                         serial,
                         time,
@@ -397,7 +392,6 @@ impl State {
                                 } else {
                                     Action::SendToOutput(inferred)
                                 },
-                                backend_id,
                                 seat,
                                 serial,
                                 time,
@@ -423,7 +417,6 @@ impl State {
                                 } else {
                                     Action::SendToWorkspace(1)
                                 },
-                                backend_id,
                                 seat,
                                 serial,
                                 time,
@@ -490,7 +483,6 @@ impl State {
                                 } else {
                                     Action::SendToOutput(inferred)
                                 },
-                                backend_id,
                                 seat,
                                 serial,
                                 time,
@@ -516,7 +508,6 @@ impl State {
                                 } else {
                                     Action::SendToLastWorkspace
                                 },
-                                backend_id,
                                 seat,
                                 serial,
                                 time,
@@ -541,9 +532,7 @@ impl State {
                         if propagate
                             && let Some((serial, prev_output, prev_idx)) =
                                 shell.previous_workspace_idx.take()
-                            && seat
-                                .last_modifier_change_for(backend_id)
-                                .is_some_and(|s| s == serial)
+                            && seat.last_modifier_change().is_some_and(|s| s == serial)
                             && prev_output == current_output
                         {
                             let _ = shell.activate(
@@ -716,7 +705,6 @@ impl State {
                         if res.is_ok() {
                             self.handle_shortcut_action(
                                 Action::SwitchOutput(direction),
-                                backend_id,
                                 seat,
                                 serial,
                                 time,
@@ -753,8 +741,7 @@ impl State {
                         };
 
                         if let Some(direction) = dir {
-                            if let Some(last_mod_serial) = seat.last_modifier_change_for(backend_id)
-                            {
+                            if let Some(last_mod_serial) = seat.last_modifier_change() {
                                 let mut shell = self.common.shell.write();
                                 if !shell
                                     .previous_workspace_idx
@@ -789,7 +776,6 @@ impl State {
 
                             self.handle_shortcut_action(
                                 action,
-                                backend_id,
                                 seat,
                                 serial,
                                 time,
@@ -814,7 +800,7 @@ impl State {
                     .move_current_element(direction, seat);
                 match res {
                     MoveResult::MoveFurther(_move_further) => {
-                        if let Some(last_mod_serial) = seat.last_modifier_change_for(backend_id) {
+                        if let Some(last_mod_serial) = seat.last_modifier_change() {
                             let mut shell = self.common.shell.write();
                             if !shell
                                 .previous_workspace_idx
@@ -848,7 +834,6 @@ impl State {
 
                         self.handle_shortcut_action(
                             action,
-                            backend_id,
                             seat,
                             serial,
                             time,
diff --git a/src/input/mod.rs b/src/input/mod.rs
index 67780d53..0cb26a9d 100644
--- a/src/input/mod.rs
+++ b/src/input/mod.rs
@@ -11,7 +11,7 @@ use crate::{
     },
     input::gestures::{GestureState, SwipeAction},
     shell::{
-        SeatExt, Trigger,
+        LastModifierChange, SeatExt, Trigger,
         focus::{
             Stage, render_input_order,
             target::{KeyboardFocusTarget, PointerFocusTarget},
@@ -42,21 +42,20 @@ use smithay::{
     backend::input::{
         AbsolutePositionEvent, Axis, AxisRelativeDirection, AxisSource, Device, DeviceCapability,
         GestureBeginEvent, GestureEndEvent, GesturePinchUpdateEvent as _,
-        GestureSwipeUpdateEvent as _, InputBackend, InputEvent, KeyState, PointerAxisEvent,
-        ProximityState, TabletToolButtonEvent, TabletToolEvent, TabletToolProximityEvent,
-        TabletToolTipEvent, TabletToolTipState, TouchEvent,
+        GestureSwipeUpdateEvent as _, InputBackend, InputEvent, KeyState, KeyboardKeyEvent,
+        PointerAxisEvent, ProximityState, TabletToolButtonEvent, TabletToolEvent,
+        TabletToolProximityEvent, TabletToolTipEvent, TabletToolTipState, TouchEvent,
     },
     desktop::{PopupKeyboardGrab, WindowSurfaceType, utils::under_from_surface_tree},
     input::{
         Seat,
-        keyboard::{FilterResult, KeyboardSource, KeysymHandle, ModifiersState},
+        keyboard::{FilterResult, KeysymHandle, ModifiersState},
         pointer::{
             AxisFrame, ButtonEvent, GestureHoldBeginEvent, GestureHoldEndEvent,
             GesturePinchBeginEvent, GesturePinchEndEvent, GesturePinchUpdateEvent,
             GestureSwipeBeginEvent, GestureSwipeEndEvent, GestureSwipeUpdateEvent, MotionEvent,
             PointerGrab, PointerHandle, RelativeMotionEvent,
         },
-        tablet::{TabletDescriptor, TabletSeatTrait, tool},
         touch::{DownEvent, MotionEvent as TouchMotionEvent, UpEvent},
     },
     output::Output,
@@ -64,13 +63,14 @@ use smithay::{
         input::Device as InputDevice,
         wayland_server::{Resource as _, protocol::wl_surface::WlSurface},
     },
-    utils::{Clock, Logical, Monotonic, Point, Rectangle, SERIAL_COUNTER, Serial, Size},
+    utils::{Clock, Logical, Monotonic, Point, Rectangle, SERIAL_COUNTER, Serial},
     wayland::{
         compositor::CompositorHandler,
         image_copy_capture::CursorSessionRef,
         keyboard_shortcuts_inhibit::KeyboardShortcutsInhibitorSeat,
         pointer_constraints::{PointerConstraint, with_pointer_constraint},
         seat::WaylandFocus,
+        tablet_manager::{TabletDescriptor, TabletSeatTrait},
     },
 };
 use tracing::{error, trace};
@@ -80,7 +80,7 @@ use std::{
     any::Any,
     borrow::Cow,
     cell::RefCell,
-    collections::{HashMap, HashSet},
+    collections::HashSet,
     ops::ControlFlow,
     time::{Duration, Instant},
 };
@@ -88,19 +88,6 @@ use std::{
 pub mod actions;
 pub mod gestures;
 
-/// Identifies the input backend instance an event came from, used to disambiguate device ids
-/// (which are only unique within a single backend instance, see
-/// [`smithay::backend::input::Device::id`]).
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
-pub enum InputBackendId {
-    /// The session input backend (libinput / winit / x11) these are mutually exclusive
-    Normal,
-    /// A specific Ei client connection
-    Ei(smithay::reexports::reis::eis::Connection),
-    /// The `zwp_virtual_keyboard_v1` protocol (all virtual keyboards share this source)
-    VirtualKeyboard,
-}
-
 /// Used for debouncing focus updates due to pointer motion, if after the focus change is
 /// triggered the event will cancel if the pointer moves to the original target
 #[derive(Debug)]
@@ -113,35 +100,19 @@ pub struct PointerFocusState {
 }
 
 #[derive(Default)]
-pub struct SupressedKeys(
-    RefCell<HashMap<InputBackendId, Vec<(Keycode, Option<RegistrationToken>)>>>,
-);
+pub struct SupressedKeys(RefCell<Vec<(Keycode, Option<RegistrationToken>)>>);
 #[derive(Default)]
-pub struct SupressedButtons(RefCell<HashMap<InputBackendId, HashSet<u32>>>);
+pub struct SupressedButtons(RefCell<HashSet<u32>>);
 #[derive(Default, Debug)]
-pub struct ModifiersShortcutQueue(RefCell<HashMap<InputBackendId, shortcuts::Binding>>);
+pub struct ModifiersShortcutQueue(RefCell<Option<shortcuts::Binding>>);
 
 impl SupressedKeys {
-    fn add(
-        &self,
-        backend_id: &InputBackendId,
-        keysym: &KeysymHandle,
-        token: impl Into<Option<RegistrationToken>>,
-    ) {
-        self.0
-            .borrow_mut()
-            .entry(backend_id.clone())
-            .or_default()
-            .push((keysym.raw_code(), token.into()));
+    fn add(&self, keysym: &KeysymHandle, token: impl Into<Option<RegistrationToken>>) {
+        self.0.borrow_mut().push((keysym.raw_code(), token.into()));
     }
 
-    fn filter(
-        &self,
-        backend_id: &InputBackendId,
-        keysym: &KeysymHandle,
-    ) -> Option<Vec<RegistrationToken>> {
-        let mut by_source = self.0.borrow_mut();
-        let keys = by_source.get_mut(backend_id)?;
+    fn filter(&self, keysym: &KeysymHandle) -> Option<Vec<RegistrationToken>> {
+        let mut keys = self.0.borrow_mut();
         let (removed, remaining) = keys
             .drain(..)
             .partition(|(key, _)| *key == keysym.raw_code());
@@ -158,60 +129,44 @@ impl SupressedKeys {
                 .collect::<Vec<_>>(),
         )
     }
-
-    fn clear_source(&self, backend_id: &InputBackendId) {
-        self.0.borrow_mut().remove(backend_id);
-    }
 }
 
 impl SupressedButtons {
-    fn add(&self, backend_id: &InputBackendId, button: u32) {
-        self.0
-            .borrow_mut()
-            .entry(backend_id.clone())
-            .or_default()
-            .insert(button);
+    fn add(&self, button: u32) {
+        self.0.borrow_mut().insert(button);
     }
 
-    fn remove(&self, backend_id: &InputBackendId, button: u32) -> bool {
-        self.0
-            .borrow_mut()
-            .get_mut(backend_id)
-            .is_some_and(|buttons| buttons.remove(&button))
-    }
-
-    fn clear_source(&self, backend_id: &InputBackendId) {
-        self.0.borrow_mut().remove(backend_id);
+    fn remove(&self, button: u32) -> bool {
+        self.0.borrow_mut().remove(&button)
     }
 }
 
 impl ModifiersShortcutQueue {
-    pub fn set(&self, backend_id: &InputBackendId, binding: shortcuts::Binding) {
-        self.0.borrow_mut().insert(backend_id.clone(), binding);
+    pub fn set(&self, binding: shortcuts::Binding) {
+        let mut set = self.0.borrow_mut();
+        *set = Some(binding);
     }
 
-    pub fn take(&self, backend_id: &InputBackendId, binding: &shortcuts::Binding) -> bool {
+    pub fn take(&self, binding: &shortcuts::Binding) -> bool {
         let mut set = self.0.borrow_mut();
-        if set.get(backend_id).is_some_and(|queued| queued == binding) {
-            set.remove(backend_id);
+        if set.is_some() && set.as_ref().unwrap() == binding {
+            *set = None;
             true
         } else {
             false
         }
     }
 
-    pub fn clear(&self, backend_id: &InputBackendId) {
-        self.0.borrow_mut().remove(backend_id);
+    pub fn clear(&self) {
+        let mut set = self.0.borrow_mut();
+        *set = None;
     }
 }
 
 impl State {
     #[profiling::function]
-    pub fn process_input_event<B: InputBackend>(
-        &mut self,
-        event: InputEvent<B>,
-        backend_id: InputBackendId,
-    ) where
+    pub fn process_input_event<B: InputBackend>(&mut self, event: InputEvent<B>)
+    where
         <B as InputBackend>::Device: 'static,
     {
         crate::wayland::handlers::output_power::set_all_surfaces_dpms_on(self);
@@ -222,25 +177,19 @@ impl State {
                 let shell = self.common.shell.read();
                 let seat = shell.seats.last_active();
                 let led_state = seat.get_keyboard().unwrap().led_state();
-                seat.devices().add_device(&device, led_state, &backend_id);
+                seat.devices().add_device(&device, led_state);
                 if device.has_capability(DeviceCapability::TabletTool) {
-                    seat.tablet_seat().add_wp_tablet(
+                    seat.tablet_seat().add_tablet::<Self>(
                         &self.common.display_handle,
                         &TabletDescriptor::from(&device),
                     );
                 }
-                let has_keyboard = device.has_capability(DeviceCapability::Keyboard);
-                std::mem::drop(shell);
-                // send the seat's current modifier state to the new ei keyboard
-                if has_keyboard && let InputBackendId::Ei(conn) = &backend_id {
-                    self.send_ei_keyboard_modifiers(conn);
-                }
             }
             InputEvent::DeviceRemoved { device } => {
                 for seat in &mut self.common.shell.read().seats.iter() {
                     let devices = seat.devices();
-                    if devices.has_device(&device, &backend_id) {
-                        devices.remove_device(&device, &backend_id);
+                    if devices.has_device(&device) {
+                        devices.remove_device(&device);
                         if device.has_capability(DeviceCapability::TabletTool) {
                             seat.tablet_seat()
                                 .remove_tablet(&TabletDescriptor::from(&device));
@@ -261,7 +210,7 @@ impl State {
                     .shell
                     .read()
                     .seats
-                    .for_device(&event.device(), &backend_id)
+                    .for_device(&event.device())
                     .cloned();
                 if let Some(seat) = maybe_seat {
                     self.common.idle_notifier_state.notify_activity(&seat);
@@ -282,17 +231,51 @@ impl State {
                             serial,
                             time,
                             |data, modifiers, handle| {
-                                data.process_keyboard_filter(
-                                    &backend_id,
-                                    &seat,
-                                    modifiers,
-                                    handle,
-                                    serial,
-                                    time,
-                                    keycode,
-                                    state,
-                                    previous_modifiers,
-                                )
+                                if previous_modifiers != *modifiers {
+                                    *seat
+                                        .user_data()
+                                        .get::<LastModifierChange>()
+                                        .unwrap()
+                                        .0
+                                        .lock()
+                                        .unwrap() = Some(serial);
+                                }
+
+                                let current_focus = seat.get_keyboard().unwrap().current_focus();
+                                let shortcuts_inhibited = current_focus.as_ref().is_some_and(|f| {
+                                    f.wl_surface()
+                                        .map(|surface| {
+                                            seat.keyboard_shortcuts_inhibitor_for_surface(&surface)
+                                                .map(|inhibitor| inhibitor.is_active())
+                                                .unwrap_or(false)
+                                                || seat.has_active_xwayland_grab(&surface)
+                                        })
+                                        .unwrap_or(false)
+                                });
+                                let sym = handle.modified_sym();
+
+                                let result = Self::filter_keyboard_input(
+                                    data, &event, &seat, modifiers, handle, serial,
+                                );
+
+                                if (matches!(result, FilterResult::Forward)
+                                    && !seat.get_keyboard().unwrap().is_grabbed()
+                                    && !shortcuts_inhibited
+                                    && !matches!(
+                                        current_focus,
+                                        Some(KeyboardFocusTarget::LockSurface(_))
+                                    ))
+                                // we don't want to accidentally leave any keys pressed
+                                // and do more filtering in `xwayland_notify_key_event`
+                                // for released keys
+                                    || state == KeyState::Released
+                                {
+                                    data.common.xwayland_notify_key_event(
+                                        sym, keycode, state, serial, time,
+                                    );
+                                }
+
+                                result
                             },
                         )
                         .flatten()
@@ -303,7 +286,7 @@ impl State {
                                 FilterResult::<()>::Forward
                             });
                         }
-                        self.handle_action(action, &backend_id, &seat, serial, time, pattern, None)
+                        self.handle_action(action, &seat, serial, time, pattern, None)
                     }
 
                     // If we want to track numlock state so it can be reused on the next boot...
@@ -328,11 +311,7 @@ impl State {
                 use smithay::backend::input::PointerMotionEvent;
 
                 let shell = self.common.shell.write();
-                if let Some(seat) = shell
-                    .seats
-                    .for_device(&event.device(), &backend_id)
-                    .cloned()
-                {
+                if let Some(seat) = shell.seats.for_device(&event.device()).cloned() {
                     self.common.idle_notifier_state.notify_activity(&seat);
                     notify_cursor_activity(self, &seat);
                     let current_output = seat.active_output();
@@ -414,12 +393,10 @@ impl State {
                     // - output_geometry.size so that we don't send leave events to a fullscreen app
                     // - logical size so that the position doesn't end up outside the actual size of the output
                     // See https://github.com/pop-os/cosmic-comp/pull/2568
-                    let max_x = (output_geometry_loc.x
-                        + logical.w.min(output_geometry.size.w as f64))
-                    .next_down();
-                    let max_y = (output_geometry_loc.y
-                        + logical.h.min(output_geometry.size.h as f64))
-                    .next_down();
+                    let max_x = output_geometry_loc.x
+                        + logical.w.min(output_geometry.size.w as f64).next_down();
+                    let max_y = output_geometry_loc.y
+                        + logical.h.min(output_geometry.size.h as f64).next_down();
                     position.x = position.x.clamp(output_geometry_loc.x, max_x);
                     position.y = position.y.clamp(output_geometry_loc.y, max_y);
 
@@ -686,47 +663,19 @@ impl State {
                     .shell
                     .read()
                     .seats
-                    .for_device(&event.device(), &backend_id)
+                    .for_device(&event.device())
                     .cloned();
                 if let Some(seat) = maybe_seat {
                     self.common.idle_notifier_state.notify_activity(&seat);
                     notify_cursor_activity(self, &seat);
-                    let (output, position) = if matches!(&backend_id, InputBackendId::Ei(_)) {
-                        // EI absolute coordinates are in the compositor's *global*
-                        // logical space: each advertised region carries its output's
-                        // global offset, so the client sends a global position. Use
-                        // the coordinate directly and find the output it lands in,
-                        // rather than mapping relative to the focused output (which
-                        // cannot address other monitors). This is the KWin/mutter
-                        // model.
-                        let position =
-                            smithay::backend::input::AbsolutePositionEvent::position_transformed(
-                                &event,
-                                // smithay's EI impl ignores the size and returns the
-                                // raw coordinate.
-                                Size::from((0, 0)),
-                            )
-                            .as_global();
-                        let output = self
-                            .common
-                            .shell
-                            .read()
-                            .outputs()
-                            .find(|o| o.geometry().to_f64().contains(position))
-                            .cloned()
-                            .unwrap_or_else(|| seat.active_output());
-                        (output, position)
-                    } else {
-                        let output = seat.active_output();
-                        let output_geometry = output.geometry();
-                        let position = output_geometry.loc.to_f64()
-                            + smithay::backend::input::AbsolutePositionEvent::position_transformed(
-                                &event,
-                                output_geometry.size.as_logical(),
-                            )
-                            .as_global();
-                        (output, position)
-                    };
+                    let output = seat.active_output();
+                    let output_geometry = output.geometry();
+                    let position = output_geometry.loc.to_f64()
+                        + smithay::backend::input::AbsolutePositionEvent::position_transformed(
+                            &event,
+                            output_geometry.size.as_logical(),
+                        )
+                        .as_global();
                     let serial = SERIAL_COUNTER.next_serial();
                     let under = State::surface_under(position, &output, &self.common.shell.write())
                         .map(|(target, pos)| (target, pos.as_logical()));
@@ -743,14 +692,6 @@ impl State {
                     );
                     ptr.frame(self);
 
-                    // Keep the seat's active output following the pointer. Click-to-
-                    // focus (PointerButton) resolves its target via
-                    // `seat.active_output()`
-                    let previous_output = seat.active_output();
-                    if previous_output != output {
-                        seat.set_active_output(&output);
-                    }
-
                     let shell = self.common.shell.read();
                     update_output_image_copy_cursor_position(
                         &shell,
@@ -770,7 +711,7 @@ impl State {
                     .shell
                     .read()
                     .seats
-                    .for_device(&event.device(), &backend_id)
+                    .for_device(&event.device())
                     .cloned()
                 else {
                     return;
@@ -793,26 +734,7 @@ impl State {
                 let serial = SERIAL_COUNTER.next_serial();
                 let button = event.button_code();
 
-                // Track buttons held by a libei source so they can be released if the connection
-                // drops mid-press
-                if let InputBackendId::Ei(conn) = &backend_id {
-                    match event.state() {
-                        ButtonState::Pressed => {
-                            self.common
-                                .ei_pointer_buttons
-                                .entry(conn.clone())
-                                .or_default()
-                                .insert(button);
-                        }
-                        ButtonState::Released => {
-                            if let Some(held) = self.common.ei_pointer_buttons.get_mut(conn) {
-                                held.remove(&button);
-                            }
-                        }
-                    }
-                }
-
-                let mut pass_event = !seat.supressed_buttons().remove(&backend_id, button);
+                let mut pass_event = !seat.supressed_buttons().remove(button);
                 if event.state() == ButtonState::Pressed {
                     // change the keyboard focus unless the pointer is grabbed
                     // We test for any matching surface type here but always use the root
@@ -834,7 +756,7 @@ impl State {
                         );
                         if let Some(target) = under.filter(|_| !on_resize_fork) {
                             if let Some(surface) = target.toplevel().map(Cow::into_owned)
-                                && self.source_modifiers(&backend_id, &seat).logo
+                                && seat.get_keyboard().unwrap().modifier_state().logo
                                 && !shortcuts_inhibited
                             {
                                 let seat_clone = seat.clone();
@@ -845,18 +767,17 @@ impl State {
                                     // aimed at the compositor and shouldn't be passed
                                     // to the application.
                                     pass_event = false;
-                                    seat.supressed_buttons().add(&backend_id, button);
+                                    seat.supressed_buttons().add(button);
                                 };
 
                                 fn dispatch_grab<G: PointerGrab<State> + 'static>(
                                     grab: Option<(G, smithay::input::pointer::Focus)>,
                                     seat: Seat<State>,
-                                    backend_id: &InputBackendId,
                                     serial: Serial,
                                     state: &mut State,
                                 ) {
                                     if let Some((target, focus)) = grab {
-                                        seat.modifiers_shortcut_queue().clear(backend_id);
+                                        seat.modifiers_shortcut_queue().clear();
 
                                         seat.get_pointer()
                                             .unwrap()
@@ -868,7 +789,6 @@ impl State {
                                     match mouse_button {
                                         smithay::backend::input::MouseButton::Left => {
                                             supress_button();
-                                            let backend_id = backend_id.clone();
                                             self.common.event_loop_handle.insert_idle(
                                                 move |state| {
                                                     let mut shell = state.common.shell.write();
@@ -883,19 +803,12 @@ impl State {
                                                         false,
                                                     );
                                                     drop(shell);
-                                                    dispatch_grab(
-                                                        res,
-                                                        seat_clone,
-                                                        &backend_id,
-                                                        serial,
-                                                        state,
-                                                    );
+                                                    dispatch_grab(res, seat_clone, serial, state);
                                                 },
                                             );
                                         }
                                         smithay::backend::input::MouseButton::Right => {
                                             supress_button();
-                                            let backend_id = backend_id.clone();
                                             self.common.event_loop_handle.insert_idle(
                                                 move |state| {
                                                     let mut shell = state.common.shell.write();
@@ -953,13 +866,7 @@ impl State {
                                                         false,
                                                     );
                                                     drop(shell);
-                                                    dispatch_grab(
-                                                        res,
-                                                        seat_clone,
-                                                        &backend_id,
-                                                        serial,
-                                                        state,
-                                                    );
+                                                    dispatch_grab(res, seat_clone, serial, state);
                                                 },
                                             );
                                         }
@@ -1023,13 +930,13 @@ impl State {
                     .shell
                     .read()
                     .seats
-                    .for_device(&event.device(), &backend_id)
+                    .for_device(&event.device())
                     .cloned();
                 if let Some(seat) = maybe_seat {
                     self.common.idle_notifier_state.notify_activity(&seat);
                     notify_cursor_activity(self, &seat);
 
-                    if self.source_modifiers(&backend_id, &seat).logo
+                    if seat.get_keyboard().unwrap().modifier_state().logo
                         && self
                             .common
                             .config
@@ -1037,7 +944,7 @@ impl State {
                             .accessibility_zoom
                             .enable_mouse_zoom_shortcuts
                     {
-                        seat.modifiers_shortcut_queue().clear(&backend_id);
+                        seat.modifiers_shortcut_queue().clear();
                         if let Some(mut percentage) = event
                             .amount_v120(Axis::Vertical)
                             .map(|val| val / 120.)
@@ -1059,10 +966,7 @@ impl State {
                         }
                     } else {
                         let mut frame = AxisFrame::new(event.time_msec()).source(event.source());
-                        let horizontal_amount = event
-                            .amount(Axis::Horizontal)
-                            .or_else(|| Some(event.amount_v120(Axis::Horizontal)? * 15.0 / 120.));
-                        if let Some(horizontal_amount) = horizontal_amount {
+                        if let Some(horizontal_amount) = event.amount(Axis::Horizontal) {
                             if horizontal_amount != 0.0 {
                                 frame = frame
                                     .relative_direction(
@@ -1080,10 +984,7 @@ impl State {
                                 frame = frame.stop(Axis::Horizontal);
                             }
                         }
-                        let vertical_amount = event
-                            .amount(Axis::Vertical)
-                            .or_else(|| Some(event.amount_v120(Axis::Vertical)? * 15.0 / 120.));
-                        if let Some(vertical_amount) = vertical_amount {
+                        if let Some(vertical_amount) = event.amount(Axis::Vertical) {
                             if vertical_amount != 0.0 {
                                 frame = frame
                                     .relative_direction(
@@ -1114,7 +1015,7 @@ impl State {
                     .shell
                     .read()
                     .seats
-                    .for_device(&event.device(), &backend_id)
+                    .for_device(&event.device())
                     .cloned();
                 if let Some(seat) = maybe_seat {
                     self.common.idle_notifier_state.notify_activity(&seat);
@@ -1140,7 +1041,7 @@ impl State {
                     .shell
                     .read()
                     .seats
-                    .for_device(&event.device(), &backend_id)
+                    .for_device(&event.device())
                     .cloned();
                 if let Some(seat) = maybe_seat {
                     self.common.idle_notifier_state.notify_activity(&seat);
@@ -1241,7 +1142,7 @@ impl State {
                     .shell
                     .read()
                     .seats
-                    .for_device(&event.device(), &backend_id)
+                    .for_device(&event.device())
                     .cloned();
                 if let Some(seat) = maybe_seat {
                     self.common.idle_notifier_state.notify_activity(&seat);
@@ -1286,7 +1187,7 @@ impl State {
                     .shell
                     .read()
                     .seats
-                    .for_device(&event.device(), &backend_id)
+                    .for_device(&event.device())
                     .cloned();
                 if let Some(seat) = maybe_seat {
                     self.common.idle_notifier_state.notify_activity(&seat);
@@ -1308,7 +1209,7 @@ impl State {
                     .shell
                     .read()
                     .seats
-                    .for_device(&event.device(), &backend_id)
+                    .for_device(&event.device())
                     .cloned();
                 if let Some(seat) = maybe_seat {
                     self.common.idle_notifier_state.notify_activity(&seat);
@@ -1330,7 +1231,7 @@ impl State {
                     .shell
                     .read()
                     .seats
-                    .for_device(&event.device(), &backend_id)
+                    .for_device(&event.device())
                     .cloned();
                 if let Some(seat) = maybe_seat {
                     self.common.idle_notifier_state.notify_activity(&seat);
@@ -1352,7 +1253,7 @@ impl State {
                     .shell
                     .read()
                     .seats
-                    .for_device(&event.device(), &backend_id)
+                    .for_device(&event.device())
                     .cloned();
                 if let Some(seat) = maybe_seat {
                     self.common.idle_notifier_state.notify_activity(&seat);
@@ -1374,7 +1275,7 @@ impl State {
                     .shell
                     .read()
                     .seats
-                    .for_device(&event.device(), &backend_id)
+                    .for_device(&event.device())
                     .cloned();
                 if let Some(seat) = maybe_seat {
                     self.common.idle_notifier_state.notify_activity(&seat);
@@ -1393,40 +1294,17 @@ impl State {
 
             InputEvent::TouchDown { event, .. } => {
                 let shell = self.common.shell.write();
-                if let Some(seat) = shell
-                    .seats
-                    .for_device(&event.device(), &backend_id)
-                    .cloned()
-                {
+                if let Some(seat) = shell.seats.for_device(&event.device()).cloned() {
                     self.common.idle_notifier_state.notify_activity(&seat);
-                    // Check if the touch is from an ei device or a mapped device
-                    // EI absolute coordinates are already in the compositor's global logical
-                    // space (each advertised region carries its output's global offset), so use
-                    // them directly and find the output they land in.
-                    let (output, position) = if matches!(&backend_id, InputBackendId::Ei(_)) {
-                        let position =
-                            smithay::backend::input::AbsolutePositionEvent::position_transformed(
-                                &event,
-                                Size::from((0, 0)),
-                            )
-                            .as_global();
-                        let output = shell
-                            .outputs()
-                            .find(|o| o.geometry().to_f64().contains(position))
+                    let Some(output) =
+                        mapped_output_for_device(&self.common.config, &shell, &event.device())
                             .cloned()
-                            .unwrap_or_else(|| seat.active_output());
-                        (output, position)
-                    } else {
-                        let Some(output) =
-                            mapped_output_for_device(&self.common.config, &shell, &event.device())
-                                .cloned()
-                        else {
-                            return;
-                        };
-                        let position =
-                            transform_output_mapped_position(&output, &event, shell.zoom_state());
-                        (output, position)
+                    else {
+                        return;
                     };
+
+                    let position =
+                        transform_output_mapped_position(&output, &event, shell.zoom_state());
                     let under = State::surface_under(position, &output, &shell)
                         .map(|(target, pos)| (target, pos.as_logical()));
 
@@ -1448,36 +1326,17 @@ impl State {
             }
             InputEvent::TouchMotion { event, .. } => {
                 let shell = self.common.shell.write();
-                if let Some(seat) = shell
-                    .seats
-                    .for_device(&event.device(), &backend_id)
-                    .cloned()
-                {
+                if let Some(seat) = shell.seats.for_device(&event.device()).cloned() {
                     self.common.idle_notifier_state.notify_activity(&seat);
-                    let (output, position) = if matches!(&backend_id, InputBackendId::Ei(_)) {
-                        let position =
-                            smithay::backend::input::AbsolutePositionEvent::position_transformed(
-                                &event,
-                                Size::from((0, 0)),
-                            )
-                            .as_global();
-                        let output = shell
-                            .outputs()
-                            .find(|o| o.geometry().to_f64().contains(position))
+                    let Some(output) =
+                        mapped_output_for_device(&self.common.config, &shell, &event.device())
                             .cloned()
-                            .unwrap_or_else(|| seat.active_output());
-                        (output, position)
-                    } else {
-                        let Some(output) =
-                            mapped_output_for_device(&self.common.config, &shell, &event.device())
-                                .cloned()
-                        else {
-                            return;
-                        };
-                        let position =
-                            transform_output_mapped_position(&output, &event, shell.zoom_state());
-                        (output, position)
+                    else {
+                        return;
                     };
+
+                    let position =
+                        transform_output_mapped_position(&output, &event, shell.zoom_state());
                     let under = State::surface_under(position, &output, &shell)
                         .map(|(target, pos)| (target, pos.as_logical()));
 
@@ -1503,10 +1362,7 @@ impl State {
                     shell.set_overview_mode(None, self.common.event_loop_handle.clone());
                 }
 
-                let maybe_seat = shell
-                    .seats
-                    .for_device(&event.device(), &backend_id)
-                    .cloned();
+                let maybe_seat = shell.seats.for_device(&event.device()).cloned();
                 if let Some(seat) = maybe_seat {
                     self.common.idle_notifier_state.notify_activity(&seat);
                     std::mem::drop(shell);
@@ -1528,7 +1384,7 @@ impl State {
                     .shell
                     .read()
                     .seats
-                    .for_device(&event.device(), &backend_id)
+                    .for_device(&event.device())
                     .cloned();
                 if let Some(seat) = maybe_seat {
                     self.common.idle_notifier_state.notify_activity(&seat);
@@ -1542,7 +1398,7 @@ impl State {
                     .shell
                     .read()
                     .seats
-                    .for_device(&event.device(), &backend_id)
+                    .for_device(&event.device())
                     .cloned();
                 if let Some(seat) = maybe_seat {
                     self.common.idle_notifier_state.notify_activity(&seat);
@@ -1553,11 +1409,7 @@ impl State {
 
             InputEvent::TabletToolAxis { event, .. } => {
                 let shell = self.common.shell.write();
-                if let Some(seat) = shell
-                    .seats
-                    .for_device(&event.device(), &backend_id)
-                    .cloned()
-                {
+                if let Some(seat) = shell.seats.for_device(&event.device()).cloned() {
                     self.common.idle_notifier_state.notify_activity(&seat);
                     notify_cursor_activity(self, &seat);
                     let Some(output) =
@@ -1587,46 +1439,43 @@ impl State {
 
                     let tablet_seat = seat.tablet_seat();
 
+                    let tablet = tablet_seat.get_tablet(&TabletDescriptor::from(&event.device()));
                     let tool = tablet_seat.get_tool(&event.tool());
 
-                    if let Some(tool) = tool {
-                        let frame = tool::AxisFrame {
-                            pressure: event.pressure_has_changed().then(|| event.pressure()),
-                            distance: event.distance_has_changed().then(|| event.distance()),
-
-                            tilt: event.tilt_has_changed().then(|| event.tilt()),
-                            rotation: event.rotation_has_changed().then(|| event.rotation()),
-
-                            slider: event.slider_has_changed().then(|| event.slider_position()),
-                            wheel: event
-                                .wheel_has_changed()
-                                .then(|| (event.wheel_delta(), event.wheel_delta_discrete())),
-                        };
-
-                        tool.axis(self, frame);
+                    if let (Some(tablet), Some(tool)) = (tablet, tool) {
+                        if event.pressure_has_changed() {
+                            tool.pressure(event.pressure());
+                        }
+                        if event.distance_has_changed() {
+                            tool.distance(event.distance());
+                        }
+                        if event.tilt_has_changed() {
+                            tool.tilt(event.tilt());
+                        }
+                        if event.slider_has_changed() {
+                            tool.slider_position(event.slider_position());
+                        }
+                        if event.rotation_has_changed() {
+                            tool.rotation(event.rotation());
+                        }
+                        if event.wheel_has_changed() {
+                            tool.wheel(event.wheel_delta(), event.wheel_delta_discrete());
+                        }
 
                         tool.motion(
-                            self,
+                            position.as_logical(),
                             under
                                 .and_then(|(f, loc)| f.wl_surface().map(|s| (s.into_owned(), loc))),
-                            &tool::MotionEvent {
-                                location: position.as_logical(),
-                                serial: SERIAL_COUNTER.next_serial(),
-                                time: event.time_msec(),
-                            },
+                            &tablet,
+                            SERIAL_COUNTER.next_serial(),
+                            event.time_msec(),
                         );
-
-                        tool.frame(self, event.time_msec());
                     }
                 }
             }
             InputEvent::TabletToolProximity { event, .. } => {
                 let shell = self.common.shell.write();
-                if let Some(seat) = shell
-                    .seats
-                    .for_device(&event.device(), &backend_id)
-                    .cloned()
-                {
+                if let Some(seat) = shell.seats.for_device(&event.device()).cloned() {
                     self.common.idle_notifier_state.notify_activity(&seat);
                     notify_cursor_activity(self, &seat);
                     let Some(output) =
@@ -1658,53 +1507,25 @@ impl State {
 
                     let tablet = tablet_seat.get_tablet(&TabletDescriptor::from(&event.device()));
                     let dh = self.common.display_handle.clone();
-                    let tool = tablet_seat
-                        .get_tool(&event.tool())
-                        .unwrap_or_else(|| tablet_seat.add_wp_tool(self, &dh, &event.tool()));
+                    let tool = tablet_seat.add_tool::<Self>(self, &dh, &event.tool());
 
                     if let Some(tablet) = tablet {
-                        let serial = SERIAL_COUNTER.next_serial();
-
-                        let frame = tool::AxisFrame {
-                            pressure: event.pressure_has_changed().then(|| event.pressure()),
-                            distance: event.distance_has_changed().then(|| event.distance()),
-
-                            tilt: event.tilt_has_changed().then(|| event.tilt()),
-                            rotation: event.rotation_has_changed().then(|| event.rotation()),
-
-                            slider: event.slider_has_changed().then(|| event.slider_position()),
-                            wheel: event
-                                .wheel_has_changed()
-                                .then(|| (event.wheel_delta(), event.wheel_delta_discrete())),
-                        };
-
                         match event.state() {
                             ProximityState::In => {
-                                let under = under.and_then(|(f, loc)| {
+                                if let Some(under) = under.and_then(|(f, loc)| {
                                     f.wl_surface().map(|s| (s.into_owned(), loc))
-                                });
-                                tool.proximity_in(
-                                    self,
-                                    under,
-                                    tablet,
-                                    &tool::ProximityInEvent {
-                                        location: position.as_logical(),
-                                        axis: Some(frame),
-                                        serial: SERIAL_COUNTER.next_serial(),
-                                        time: event.time_msec(),
-                                    },
-                                )
+                                }) {
+                                    tool.proximity_in(
+                                        position.as_logical(),
+                                        under,
+                                        &tablet,
+                                        SERIAL_COUNTER.next_serial(),
+                                        event.time_msec(),
+                                    )
+                                }
                             }
-                            ProximityState::Out => tool.proximity_out(
-                                self,
-                                &tool::ProximityOutEvent {
-                                    serial,
-                                    time: event.time_msec(),
-                                },
-                            ),
+                            ProximityState::Out => tool.proximity_out(event.time_msec()),
                         }
-
-                        tool.frame(self, event.time_msec());
                     }
                 }
             }
@@ -1714,35 +1535,20 @@ impl State {
                     .shell
                     .read()
                     .seats
-                    .for_device(&event.device(), &backend_id)
+                    .for_device(&event.device())
                     .cloned();
                 if let Some(seat) = maybe_seat {
                     self.common.idle_notifier_state.notify_activity(&seat);
                     notify_cursor_activity(self, &seat);
                     if let Some(tool) = seat.tablet_seat().get_tool(&event.tool()) {
-                        let serial = SERIAL_COUNTER.next_serial();
                         match event.tip_state() {
                             TabletToolTipState::Down => {
-                                tool.down(
-                                    self,
-                                    &tool::DownEvent {
-                                        serial,
-                                        time: event.time_msec(),
-                                    },
-                                );
+                                tool.tip_down(SERIAL_COUNTER.next_serial(), event.time_msec());
                             }
                             TabletToolTipState::Up => {
-                                tool.up(
-                                    self,
-                                    &tool::UpEvent {
-                                        serial,
-                                        time: event.time_msec(),
-                                    },
-                                );
+                                tool.tip_up(event.time_msec());
                             }
                         }
-
-                        tool.frame(self, event.time_msec());
                     }
                 }
             }
@@ -1752,23 +1558,18 @@ impl State {
                     .shell
                     .read()
                     .seats
-                    .for_device(&event.device(), &backend_id)
+                    .for_device(&event.device())
                     .cloned();
                 if let Some(seat) = maybe_seat {
                     self.common.idle_notifier_state.notify_activity(&seat);
                     notify_cursor_activity(self, &seat);
                     if let Some(tool) = seat.tablet_seat().get_tool(&event.tool()) {
                         tool.button(
-                            self,
-                            &tool::ButtonEvent {
-                                button: event.button(),
-                                state: event.button_state(),
-                                serial: SERIAL_COUNTER.next_serial(),
-                                time: event.time_msec(),
-                            },
+                            event.button(),
+                            event.button_state(),
+                            SERIAL_COUNTER.next_serial(),
+                            event.time_msec(),
                         );
-
-                        tool.frame(self, event.time_msec());
                     }
                 }
             }
@@ -1814,335 +1615,15 @@ impl State {
         }
     }
 
-    /// The modifier state held by the source that produced an event.
-    pub(crate) fn source_modifiers(
-        &self,
-        _backend_id: &InputBackendId,
-        seat: &Seat<State>,
-    ) -> ModifiersState {
-        seat.get_keyboard()
-            .map(|k| k.modifier_state())
-            .unwrap_or_default()
-    }
-
-    pub(crate) fn clear_input_source_state(&mut self, backend_id: &InputBackendId) {
-        let seats = self
-            .common
-            .shell
-            .read()
-            .seats
-            .iter()
-            .cloned()
-            .collect::<Vec<_>>();
-        for seat in seats {
-            seat.supressed_keys().clear_source(backend_id);
-            seat.supressed_buttons().clear_source(backend_id);
-            seat.modifiers_shortcut_queue().clear(backend_id);
-            seat.clear_last_modifier_change(backend_id);
-        }
-    }
-
-    /// Release the keys this libei connection still holds on the shared seat, so they don't stay
-    /// stuck in the focused client. Keeps the connection's source valid (only clears held keys),
-    /// so it's safe to call both on disconnect and on a keymap change. Does not remove the source
-    /// from [`Common::ei_keyboard_source`], the disconnect path does that.
-    pub(crate) fn release_ei_keyboard(&mut self, conn: &smithay::reexports::reis::eis::Connection) {
-        let seat = self.common.shell.read().seats.last_active().clone();
-        let Some(keyboard) = seat.get_keyboard() else {
-            return;
-        };
-        if let Some(source) = self.common.ei_keyboard_source.get(conn).copied() {
-            keyboard.release_source(self, source);
-        }
-    }
-
-    /// Release any pointer buttons this libei connection still holds
-    pub(crate) fn release_ei_pointer(&mut self, conn: &smithay::reexports::reis::eis::Connection) {
-        let buttons: Vec<u32> = self
-            .common
-            .ei_pointer_buttons
-            .get(conn)
-            .map(|held| held.iter().copied().collect())
-            .unwrap_or_default();
-        if buttons.is_empty() {
-            return;
-        }
-        let seat = self.common.shell.read().seats.last_active().clone();
-        let Some(pointer) = seat.get_pointer() else {
-            return;
-        };
-        let time = self.common.clock.now().as_millis();
-        for button in buttons {
-            let serial = SERIAL_COUNTER.next_serial();
-            pointer.button(
-                self,
-                &smithay::input::pointer::ButtonEvent {
-                    button,
-                    state: smithay::backend::input::ButtonState::Released,
-                    serial,
-                    time,
-                },
-            );
-        }
-        pointer.frame(self);
-    }
-
-    /// Mirror the seat's current modifier state to every libei sender with a keyboard via
-    /// `ei_keyboard.modifiers`
-    pub(crate) fn broadcast_ei_keyboard_modifiers(&self, seat: &Seat<State>) {
-        if self.common.ei_seats.is_empty() {
-            return;
-        }
-        let Some(keyboard) = seat.get_keyboard() else {
-            return;
-        };
-        let s = keyboard.modifier_state().serialized;
-        for ei_seat in self.common.ei_seats.values() {
-            ei_seat.keyboard_modifiers(s.depressed, s.locked, s.latched, s.layout_effective);
-        }
-    }
-
-    /// Send the seat's current modifier state to a single libei connection, used when that
-    /// connection's `ei_keyboard` device is created. The EI spec expects the current (nonzero)
-    /// modifier state to be announced once the device is live, so the client doesn't have to
-    /// wait for the next change to learn e.g. that Caps Lock is on.
-    pub(crate) fn send_ei_keyboard_modifiers(
-        &self,
-        conn: &smithay::reexports::reis::eis::Connection,
-    ) {
-        let Some(ei_seat) = self.common.ei_seats.get(conn) else {
-            return;
-        };
-        let mods = {
-            let shell = self.common.shell.read();
-            shell
-                .seats
-                .last_active()
-                .get_keyboard()
-                .map(|keyboard| keyboard.modifier_state().serialized)
-        };
-        if let Some(s) = mods {
-            ei_seat.keyboard_modifiers(s.depressed, s.locked, s.latched, s.layout_effective);
-        }
-    }
-
-    pub(crate) fn process_keyboard_filter(
-        &mut self,
-        backend_id: &InputBackendId,
-        seat: &Seat<State>,
-        modifiers: &ModifiersState,
-        handle: KeysymHandle<'_>,
-        serial: Serial,
-        time: u32,
-        keycode: Keycode,
-        key_state: KeyState,
-        previous_modifiers: ModifiersState,
-    ) -> FilterResult<Option<(Action, shortcuts::Binding)>> {
-        if previous_modifiers != *modifiers {
-            seat.set_last_modifier_change(backend_id, serial);
-            self.broadcast_ei_keyboard_modifiers(seat);
-        }
-
-        let current_focus = seat.get_keyboard().unwrap().current_focus();
-        let shortcuts_inhibited = current_focus.as_ref().is_some_and(|f| {
-            f.wl_surface()
-                .map(|surface| {
-                    seat.keyboard_shortcuts_inhibitor_for_surface(&surface)
-                        .map(|inhibitor| inhibitor.is_active())
-                        .unwrap_or(false)
-                        || seat.has_active_xwayland_grab(&surface)
-                })
-                .unwrap_or(false)
-        });
-        let sym = handle.modified_sym();
-
-        let result = self.filter_keyboard_input(
-            backend_id, seat, modifiers, handle, serial, keycode, key_state, time,
-        );
-
-        if (matches!(result, FilterResult::Forward)
-            && !seat.get_keyboard().unwrap().is_grabbed()
-            && !shortcuts_inhibited
-            && !matches!(current_focus, Some(KeyboardFocusTarget::LockSurface(_))))
-        // we don't want to accidentally leave any keys pressed
-            || key_state == KeyState::Released
-        {
-            self.common
-                .xwayland_notify_key_event(sym, keycode, key_state, *modifiers, serial, time);
-        }
-
-        result
-    }
-
-    /// Inject a key from an auxiliary source (a virtual keyboard, or libei) into the shared
-    /// seat keyboard, tagged with `source` so its held keys are tracked independently of the
-    /// physical keyboard
-    ///
-    /// `handle_shortcuts` is `false` when synthesizing releases so still-held keys are just
-    /// forwarded without re-triggering bindings.
-    pub(crate) fn inject_source_key(
-        &mut self,
-        source: KeyboardSource,
-        backend_id: &InputBackendId,
-        seat: &Seat<State>,
-        keycode: Keycode,
-        key_state: KeyState,
-        handle_shortcuts: bool,
-    ) {
-        let Some(keyboard) = seat.get_keyboard() else {
-            return;
-        };
-        let serial = SERIAL_COUNTER.next_serial();
-        let time = self.common.clock.now().as_millis();
-        let previous_modifiers = keyboard.modifier_state();
-        let result = keyboard
-            .input_from_source(
-                source,
-                self,
-                keycode,
-                key_state,
-                serial,
-                time,
-                |data, modifiers, handle| {
-                    if handle_shortcuts {
-                        data.process_keyboard_filter(
-                            backend_id,
-                            seat,
-                            modifiers,
-                            handle,
-                            serial,
-                            time,
-                            keycode,
-                            key_state,
-                            previous_modifiers,
-                        )
-                    } else {
-                        FilterResult::Forward
-                    }
-                },
-            )
-            .flatten();
-
-        if let Some((action, pattern)) = result {
-            self.handle_action(action, backend_id, seat, serial, time, pattern, None);
-        }
-    }
-
-    /// Inject a real key from a libei connection's `ei_keyboard` into the shared seat keyboard,
-    /// tagged with the connection's source so it behaves like any other keyboard (its keycodes
-    /// are interpreted with the seat keymap, which the compositor already forced onto the
-    /// `ei_keyboard` device).
-    pub(crate) fn inject_ei_key(
-        &mut self,
-        conn: &smithay::reexports::reis::eis::Connection,
-        keycode: Keycode,
-        key_state: KeyState,
-    ) {
-        let seat = self.common.shell.read().seats.last_active().clone();
-        let backend_id = InputBackendId::Ei(conn.clone());
-        let Some(source) = self.common.ei_keyboard_source.get(conn).copied() else {
-            return;
-        };
-        self.inject_source_key(source, &backend_id, &seat, keycode, key_state, true);
-    }
-
-    /// Inject a keysym from a libei `ei_text` device.
-    pub(crate) fn inject_ei_text_keysym(
-        &mut self,
-        conn: &smithay::reexports::reis::eis::Connection,
-        keysym: u32,
-        key_state: KeyState,
-    ) {
-        use smithay::wayland::input_method::InputMethodSeat;
-        use smithay::wayland::text_input::TextInputSeat;
-
-        let keysym = Keysym::new(keysym);
-
-        // `ei_text` is a tap: act on the press, ignore the release.
-        if key_state != KeyState::Pressed {
-            return;
-        }
-        let seat = self.common.shell.read().seats.last_active().clone();
-        let Some(keyboard) = seat.get_keyboard() else {
-            return;
-        };
-
-        let mods = keyboard.modifier_state();
-        let no_mods = !(mods.ctrl || mods.alt || mods.shift || mods.logo);
-
-        // Is this keysym plain text, or not (Escape, F-keys, arrows, ...)?
-        let is_text = keysym.key_char().is_some_and(|c| !c.is_control());
-
-        // Resolve to a real keycode and feed it through the shared seat when this is *not* plain
-        // text, or when a modifier is held.
-        if !is_text || !no_mods {
-            if let Some(keycode) = keyboard.keycode_for_keysym(keysym)
-                && let Some(source) = self.common.ei_keyboard_source.get(conn).copied()
-            {
-                let backend_id = InputBackendId::Ei(conn.clone());
-                self.inject_source_key(
-                    source,
-                    &backend_id,
-                    &seat,
-                    keycode,
-                    KeyState::Pressed,
-                    true,
-                );
-                self.inject_source_key(
-                    source,
-                    &backend_id,
-                    &seat,
-                    keycode,
-                    KeyState::Released,
-                    true,
-                );
-                return;
-            }
-            // No keycode for this keysym in the seat keymap (out-of-layout / Unicode), so fall
-            // through to the text paths below. Any held modifier is lost — best effort.
-            tracing::warn!(
-                "[ei-text]   -> keysym not in seat keymap; falling back (modifier not applied)"
-            );
-        }
-
-        // No modifier held: a printable, non-control character committed directly through the
-        // text-input protocol when a text-input client is focused (and no real IME). This also
-        // covers out-of-layout / Unicode that has no keycode.
-        if no_mods
-            && is_text
-            && let Some(c) = keysym.key_char()
-            && !seat.input_method().has_instance()
-        {
-            let text_input = seat.text_input();
-            let mut handled = false;
-            text_input.with_active_text_input(|ti, _surface| {
-                ti.commit_string(Some(c.to_string()));
-                handled = true;
-            });
-            if handled {
-                text_input.done(false);
-                return;
-            }
-        }
-
-        // Otherwise inject the keysym as a keycode tap via a temporary keymap delivered to just
-        // the focused client (reaches non-text-input apps: terminals, games, ...). This never
-        // touches the seat's own keyboard state.
-        keyboard.inject_text_keysyms(self, &[keysym]);
-    }
-
     /// Determine is key event should be intercepted as a key binding, or forwarded to surface
     #[profiling::function]
-    pub fn filter_keyboard_input(
+    pub fn filter_keyboard_input<B: InputBackend, E: KeyboardKeyEvent<B>>(
         &mut self,
-        backend_id: &InputBackendId,
+        event: &E,
         seat: &Seat<Self>,
         modifiers: &ModifiersState,
         handle: KeysymHandle<'_>,
         serial: Serial,
-        keycode: Keycode,
-        key_state: KeyState,
-        time: u32,
     ) -> FilterResult<Option<(Action, shortcuts::Binding)>> {
         // Pre-compute for layout-agnostic shortcut matching
         let raw_syms = handle.raw_syms();
@@ -2160,12 +1641,7 @@ impl State {
         let keyboard_grabbed = keyboard.with_grab(|_serial, grab| {
             grab.is::<SwapWindowGrab>() || grab.is::<PopupKeyboardGrab<State>>()
         }) == Some(true);
-        // A virtual-keyboard key can arrive while the seat's pointer is grabbed by that
-        // same on-screen keyboard's own button press (the implicit grab from clicking an OSK
-        // key). That pointer grab must not capture the injected key, otherwise e.g.
-        // pressing esc on a virtual keyboard gets swallowed here
-        let from_vk = matches!(backend_id, InputBackendId::VirtualKeyboard);
-        let is_grabbed = keyboard_grabbed || (pointer.is_grabbed() && !from_vk);
+        let is_grabbed = keyboard_grabbed || pointer.is_grabbed();
 
         let current_focus = keyboard.current_focus();
         //this should fall back to active output since there may not be a focused output
@@ -2183,7 +1659,7 @@ impl State {
         });
 
         if let Some(a11y_keyboard_monitor) = self.common.dbus_state.a11y_keyboard_monitor() {
-            a11y_keyboard_monitor.key_event(modifiers, &handle, key_state);
+            a11y_keyboard_monitor.key_event(modifiers, &handle, event.state());
         }
 
         // Leave move overview mode, if any modifier was released
@@ -2205,7 +1681,7 @@ impl State {
                 || (action_pattern.modifiers.shift && !modifiers.shift)
                 || (action_pattern.key.is_some()
                     && key_matches(action_pattern.key.unwrap())
-                    && key_state == KeyState::Released))
+                    && event.state() == KeyState::Released))
         {
             shell.set_overview_mode(None, self.common.event_loop_handle.clone());
 
@@ -2221,7 +1697,7 @@ impl State {
         // Leave or update resize mode, if modifiers changed or initial key was released
         if let Some(action_pattern) = shell.resize_mode().0.active_binding() {
             if action_pattern.key.is_some()
-                && key_state == KeyState::Released
+                && event.state() == KeyState::Released
                 && key_matches(action_pattern.key.unwrap())
             {
                 shell.set_resize_mode(
@@ -2274,7 +1750,7 @@ impl State {
                 let action = Action::Private(PrivateAction::Resizing(
                     direction,
                     edge.into(),
-                    cosmic_keystate_from_smithay(key_state),
+                    cosmic_keystate_from_smithay(event.state()),
                 ));
                 let key_pattern = shortcuts::Binding {
                     modifiers: cosmic_modifiers_from_smithay(*modifiers),
@@ -2283,8 +1759,8 @@ impl State {
                     description: None,
                 };
 
-                if key_state == KeyState::Released {
-                    if let Some(tokens) = seat.supressed_keys().filter(backend_id, &handle) {
+                if event.state() == KeyState::Released {
+                    if let Some(tokens) = seat.supressed_keys().filter(&handle) {
                         for token in tokens {
                             self.common.event_loop_handle.remove(token);
                         }
@@ -2293,8 +1769,8 @@ impl State {
                     let seat_clone = seat.clone();
                     let action_clone = action.clone();
                     let key_pattern_clone = key_pattern.clone();
-                    let backend_id_clone = backend_id.clone();
                     let start = Instant::now();
+                    let time = event.time_msec();
                     let token = self
                         .common
                         .event_loop_handle
@@ -2304,7 +1780,6 @@ impl State {
                                 let duration = current.duration_since(start).as_millis();
                                 state.handle_action(
                                     action_clone.clone(),
-                                    &backend_id_clone,
                                     &seat_clone,
                                     serial,
                                     time.overflowing_add(duration as u32).0,
@@ -2316,7 +1791,7 @@ impl State {
                         )
                         .ok();
 
-                    seat.supressed_keys().add(backend_id, &handle, token);
+                    seat.supressed_keys().add(&handle, token);
                 }
                 return FilterResult::Intercept(Some((action, key_pattern)));
             }
@@ -2327,13 +1802,13 @@ impl State {
         // cancel grabs
         if is_grabbed
             && handle.modified_sym() == Keysym::Escape
-            && key_state == KeyState::Pressed
+            && event.state() == KeyState::Pressed
             && !modifiers.alt
             && !modifiers.ctrl
             && !modifiers.logo
             && !modifiers.shift
         {
-            seat.supressed_keys().add(backend_id, &handle, None);
+            seat.supressed_keys().add(&handle, None);
             return FilterResult::Intercept(Some((
                 Action::Private(PrivateAction::Escape),
                 shortcuts::Binding {
@@ -2346,7 +1821,7 @@ impl State {
         }
 
         if let Some(mut a11y_keyboard_monitor) = self.common.dbus_state.a11y_keyboard_monitor() {
-            if key_state == KeyState::Released {
+            if event.state() == KeyState::Released {
                 let removed =
                     a11y_keyboard_monitor.remove_active_virtual_mod(handle.modified_sym());
                 // If `Caps_Lock` is a virtual modifier, and is in locked state, clear it
@@ -2355,7 +1830,7 @@ impl State {
                     && (modifiers.serialized.locked & 2) != 0
                 {
                     let seat = seat.clone();
-                    let key_code = keycode;
+                    let key_code = event.key_code();
                     self.common.event_loop_handle.insert_idle(move |state| {
                         if let Some(keyboard) = seat.get_keyboard() {
                             let serial = SERIAL_COUNTER.next_serial();
@@ -2380,7 +1855,7 @@ impl State {
                         }
                     });
                 }
-            } else if key_state == KeyState::Pressed
+            } else if event.state() == KeyState::Pressed
                 && a11y_keyboard_monitor.has_virtual_mod(handle.modified_sym())
             {
                 a11y_keyboard_monitor.add_active_virtual_mod(handle.modified_sym());
@@ -2389,15 +1864,15 @@ impl State {
                     "active virtual mods: {:?}",
                     a11y_keyboard_monitor.active_virtual_mods()
                 );
-                seat.supressed_keys().add(backend_id, &handle, None);
+                seat.supressed_keys().add(&handle, None);
 
                 return FilterResult::Intercept(None);
             }
         }
 
         // Skip released events for initially surpressed keys
-        if key_state == KeyState::Released
-            && let Some(tokens) = seat.supressed_keys().filter(backend_id, &handle)
+        if event.state() == KeyState::Released
+            && let Some(tokens) = seat.supressed_keys().filter(&handle)
         {
             for token in tokens {
                 self.common.event_loop_handle.remove(token);
@@ -2406,7 +1881,7 @@ impl State {
         }
 
         // Handle VT switches
-        if key_state == KeyState::Pressed
+        if event.state() == KeyState::Pressed
             && (Keysym::XF86_Switch_VT_1.raw()..=Keysym::XF86_Switch_VT_12.raw())
                 .contains(&handle.modified_sym().raw())
         {
@@ -2415,18 +1890,18 @@ impl State {
             ) {
                 error!(?err, "Failed switching virtual terminal.");
             }
-            seat.supressed_keys().add(backend_id, &handle, None);
+            seat.supressed_keys().add(&handle, None);
             return FilterResult::Intercept(None);
         }
 
         if let Some(a11y_keyboard_monitor) = self.common.dbus_state.a11y_keyboard_monitor()
-            && key_state == KeyState::Pressed
+            && event.state() == KeyState::Pressed
             && (a11y_keyboard_monitor.has_keyboard_grab()
                 || a11y_keyboard_monitor.has_key_grab(modifiers, handle.modified_sym()))
         {
             let modifiers_queue = seat.modifiers_shortcut_queue();
-            modifiers_queue.clear(backend_id);
-            seat.supressed_keys().add(backend_id, &handle, None);
+            modifiers_queue.clear();
+            seat.supressed_keys().add(&handle, None);
             return FilterResult::Intercept(None);
         }
 
@@ -2442,11 +1917,11 @@ impl State {
 
                 // is this a released (triggered) modifier-only binding?
                 if binding.key.is_none()
-                    && key_state == KeyState::Released
+                    && event.state() == KeyState::Released
                     && !cosmic_modifiers_eq_smithay(&binding.modifiers, modifiers)
-                    && modifiers_queue.take(backend_id, binding)
+                    && modifiers_queue.take(binding)
                 {
-                    modifiers_queue.clear(backend_id);
+                    modifiers_queue.clear();
                     return FilterResult::Intercept(Some((
                         Action::Shortcut(action.clone()),
                         binding.clone(),
@@ -2455,21 +1930,21 @@ impl State {
 
                 // could this potentially become a modifier-only binding?
                 if binding.key.is_none()
-                    && key_state == KeyState::Pressed
+                    && event.state() == KeyState::Pressed
                     && cosmic_modifiers_eq_smithay(&binding.modifiers, modifiers)
                 {
-                    modifiers_queue.set(backend_id, binding.clone());
+                    modifiers_queue.set(binding.clone());
                     clear_queue = false;
                 }
 
                 // is this a normal binding?
                 if binding.key.is_some()
-                    && key_state == KeyState::Pressed
+                    && event.state() == KeyState::Pressed
                     && key_matches(binding.key.unwrap())
                     && cosmic_modifiers_eq_smithay(&binding.modifiers, modifiers)
                 {
-                    modifiers_queue.clear(backend_id);
-                    seat.supressed_keys().add(backend_id, &handle, None);
+                    modifiers_queue.clear();
+                    seat.supressed_keys().add(&handle, None);
                     return FilterResult::Intercept(Some((
                         Action::Shortcut(action.clone()),
                         binding.clone(),
@@ -2480,7 +1955,7 @@ impl State {
 
         // no binding
         if clear_queue {
-            seat.modifiers_shortcut_queue().clear(backend_id);
+            seat.modifiers_shortcut_queue().clear();
         }
         // keys are passed through to apps
         FilterResult::Forward
@@ -3054,7 +2529,7 @@ pub fn update_output_image_copy_cursor_position(
     position: Point<f64, Global>,
 ) {
     let output_geometry = output.geometry();
-    for session in cursor_sessions_for_output(shell, output) {
+    for session in cursor_sessions_for_output(&shell, &output) {
         if let Some(cursor_geometry) = seat.cursor_geometry(
             (position - output_geometry.loc.to_f64())
                 .as_logical()
diff --git a/src/lib.rs b/src/lib.rs
index aa31a464..542162eb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -16,7 +16,7 @@ use smithay::{
 };
 
 use anyhow::{Context, Result};
-use state::{BackendData, LastRefresh, State};
+use state::{LastRefresh, State};
 use std::{
     env,
     ffi::OsString,
@@ -43,7 +43,6 @@ pub mod dbus;
 pub mod debug;
 pub mod hooks;
 pub mod input;
-pub mod libei;
 mod logger;
 pub mod session;
 pub mod shell;
@@ -177,10 +176,6 @@ pub fn run(hooks: crate::hooks::Hooks) -> Result<(), Box<dyn Error>> {
         with_xwayland,
         kiosk_command,
     );
-    // Set up the libei sender side before the backend spawns Xwayland.
-    let ei_sender = libei::setup_ei(&event_loop.handle());
-    state.common.dbus_state.set_ei_sender(ei_sender);
-
     // init backend
     backend::init_backend_auto(&display, &mut event_loop, &mut state)?;
 
@@ -227,17 +222,19 @@ pub fn run(hooks: crate::hooks::Hooks) -> Result<(), Box<dyn Error>> {
                 // Kiosk child exited with status
                 Ok(Some(exit_status)) => {
                     info!("Command exited with status {:?}", exit_status);
-                    // Stop cleanly so surface threads are joined before exit() (signal -> 1).
-                    state.common.kiosk_exit_code = Some(exit_status.code().unwrap_or(1));
-                    state.common.should_stop = true;
+                    match exit_status.code() {
+                        // Exiting with the same status as the kiosk child
+                        Some(code) => process::exit(code),
+                        // The kiosk child exited with signal, exiting with error
+                        None => process::exit(1),
+                    }
                 }
                 // Command still running
                 Ok(None) => {}
                 // Kiosk child disappeared, exiting with error
                 Err(err) => {
                     warn!(?err, "Failed to wait for command");
-                    state.common.kiosk_exit_code = Some(1);
-                    state.common.should_stop = true;
+                    process::exit(1);
                 }
             }
         }
@@ -248,32 +245,10 @@ pub fn run(hooks: crate::hooks::Hooks) -> Result<(), Box<dyn Error>> {
         let _ = child.kill();
     }
 
-    let kiosk_exit_code = state.common.kiosk_exit_code;
-
-    // Join surface threads before exit() so no thread is mid-eglCreateSync when
-    // Mesa's atexit handlers run and corrupt the heap (issue #2375). Safe here
-    // because the event loop has stopped; an unconditional join in Surface::Drop
-    // would instead deadlock against apply_config_for_outputs.
-    if let BackendData::Kms(kms) = &mut state.backend {
-        // Release master first so the surface drop path skips its blocking commit.
-        for device in kms.drm_devices.values_mut() {
-            device.drm.pause();
-        }
-        for device in kms.drm_devices.values_mut() {
-            for (_, surface) in device.inner.surfaces.drain() {
-                surface.drop_and_join();
-            }
-        }
-    }
-
     // drop eventloop & state before logger
     std::mem::drop(event_loop);
     std::mem::drop(state);
 
-    if let Some(code) = kiosk_exit_code {
-        process::exit(code);
-    }
-
     Ok(())
 }
 
diff --git a/src/libei.rs b/src/libei.rs
deleted file mode 100644
index ad3a674d..00000000
--- a/src/libei.rs
+++ /dev/null
@@ -1,228 +0,0 @@
-use std::os::unix::net::UnixStream;
-
-use reis::eis;
-use smithay::reexports::reis;
-
-use smithay::backend::libei::{EiInput, EiInputEvent, EiRegion};
-use smithay::input::keyboard::Keysym;
-use smithay::reexports::calloop;
-use smithay::wayland::input_method::InputMethodSeat;
-use smithay::wayland::text_input::TextInputSeat;
-
-use crate::config::xkb_config_to_wl;
-use crate::input::InputBackendId;
-use crate::state::{BackendData, State};
-use crate::utils::{geometry::RectGlobalExt, prelude::OutputExt};
-
-// Requested device types for an EI connection, mirroring the XDG RemoteDesktop portal `DeviceType` bitmask
-const DEVICE_TYPE_KEYBOARD: u32 = 1;
-const DEVICE_TYPE_POINTER: u32 = 2;
-const DEVICE_TYPE_TOUCHSCREEN: u32 = 4;
-
-// Name of the EI absolute-pointer device. Shared so the connect path and the
-// re-advertise-on-output-change path recreate the same device.
-const ABSOLUTE_POINTER_NAME: &str = "virtual absolute pointer";
-
-pub type EiRequest = (UnixStream, u32);
-
-/// Build the regions advertised on the EI absolute devices (absolute pointer and touch) for the
-/// output layout: one region per output, each at its **global logical** offset with
-/// its logical size and scale.
-pub fn absolute_regions(state: &State) -> Vec<EiRegion> {
-    let shell = state.common.shell.read();
-    shell
-        .outputs()
-        .map(|output| {
-            let scale = output.current_scale().fractional_scale();
-            EiRegion {
-                // Keep the signed logical rect
-                // the u32 clamp happens at the `ei_device.region` in smithay.
-                rect: output.geometry().as_logical(),
-                scale: scale as f32,
-                // Tie the region to its output so a client can correlate it with the
-                // matching screencast stream (the portal advertises the same name).
-                mapping_id: Some(output.name()),
-            }
-        })
-        .collect()
-}
-
-/// Re-advertise the coordinate regions on every active EI seat's absolute devices.
-pub fn refresh_absolute_pointer_regions(state: &State) {
-    if state.common.ei_seats.is_empty() {
-        return;
-    }
-    let regions = absolute_regions(state);
-    for seat in state.common.ei_seats.values() {
-        seat.update_regions(&regions);
-    }
-}
-
-pub fn setup_ei(
-    handle: &calloop::LoopHandle<'static, State>,
-) -> calloop::channel::Sender<EiRequest> {
-    let (sender, channel) = calloop::channel::channel::<EiRequest>();
-    let handle_clone = handle.clone();
-    handle
-        .insert_source(channel, move |event, _, _| {
-            let calloop::channel::Event::Msg((stream, device_types)) = event else {
-                return;
-            };
-            let context = match eis::Context::new(stream) {
-                Ok(context) => context,
-                Err(err) => {
-                    tracing::error!("Failed to create EI context: {}", err);
-                    return;
-                }
-            };
-            let source = EiInput::new(context);
-            if let Err(err) =
-                handle_clone.insert_source(source, move |event, connection, data| match event {
-                    EiInputEvent::Connected => {
-                        let conn = connection.eis_connection().clone();
-                        let seat = connection.add_seat("default");
-                        let wants_keyboard = device_types & DEVICE_TYPE_KEYBOARD != 0;
-                        if wants_keyboard {
-                            let conf = data.common.config.xkb_config();
-                            // The ei_keyboard device is given the compositor keymap; its key
-                            // events feed the shared seat like any other keyboard.
-                            let _ = seat.add_keyboard("virtual keyboard", xkb_config_to_wl(&conf));
-                            // The text device lets clients inject keysyms/utf8 directly, delivered
-                            seat.add_text("virtual text");
-                        }
-                        if device_types & DEVICE_TYPE_POINTER != 0 {
-                            seat.add_pointer("virtual pointer");
-                            let regions = absolute_regions(data);
-                            seat.add_pointer_absolute(ABSOLUTE_POINTER_NAME, &regions);
-                        }
-                        if device_types & DEVICE_TYPE_TOUCHSCREEN != 0 {
-                            let regions = absolute_regions(data);
-                            seat.add_touch("virtual touch", &regions);
-                        }
-                        // Kb-capable connections get a shared-seat source so their `ei_keyboard`
-                        // key events feed the seat keyboard tracking.
-                        if wants_keyboard {
-                            data.common.ei_keyboard_source.insert(
-                                conn.clone(),
-                                smithay::input::keyboard::KeyboardSource::new_auxiliary(),
-                            );
-                        }
-                        // Track the seat for every connection
-                        data.common.ei_seats.insert(conn, seat);
-                        data.update_ei_input_method();
-                    }
-                    EiInputEvent::Disconnected => {
-                        let conn = connection.eis_connection().clone();
-                        let backend_id = InputBackendId::Ei(conn.clone());
-                        // Release any keys/modifiers and pointer buttons this remote still holds
-                        data.release_ei_keyboard(&conn);
-                        data.release_ei_pointer(&conn);
-                        data.clear_input_source_state(&backend_id);
-                        data.common.ei_seats.remove(&conn);
-                        data.common.ei_keyboard_source.remove(&conn);
-                        data.common.ei_pointer_buttons.remove(&conn);
-                        data.update_ei_input_method();
-                        // Notify the remaining libei clients of the now-cleared modifier state
-                        let seat = data.common.shell.read().seats.last_active().clone();
-                        data.broadcast_ei_keyboard_modifiers(&seat);
-                    }
-                    EiInputEvent::Event(event) => {
-                        use smithay::backend::input::{InputEvent, KeyboardKeyEvent};
-                        match event {
-                            InputEvent::Keyboard { event } => {
-                                data.inject_ei_key(
-                                    connection.eis_connection(),
-                                    event.key_code(),
-                                    event.state(),
-                                );
-                            }
-                            other => {
-                                let backend_id =
-                                    InputBackendId::Ei(connection.eis_connection().clone());
-                                data.process_input_event(other, backend_id);
-                                if matches!(data.backend, BackendData::Kms(_)) {
-                                    for output in data.common.shell.read().outputs() {
-                                        data.backend.kms().schedule_render(output);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    EiInputEvent::TextKeysym { keysym, state } => {
-                        data.inject_ei_text_keysym(connection.eis_connection(), keysym, state);
-                    }
-                    EiInputEvent::TextUtf8 { text } => {
-                        data.inject_ei_text(&text);
-                    }
-                })
-            {
-                tracing::error!("Failed to insert EI input source: {}", err);
-            }
-        })
-        .expect("Failed to insert EI channel source into the event loop");
-
-    sender
-}
-
-impl State {
-    /// Act as the input method for text injection while any text-capable EI connection is
-    /// active, so `ei_text` UTF-8 can be committed into the focused app even without a real
-    /// IME, but only when none is bound (a real IME always wins)
-    pub(crate) fn update_ei_input_method(&mut self) {
-        let active = !self.common.ei_keyboard_source.is_empty();
-        let seats = self
-            .common
-            .shell
-            .read()
-            .seats
-            .iter()
-            .cloned()
-            .collect::<Vec<_>>();
-        for seat in seats {
-            let has_ime = seat.input_method().has_instance();
-            let text_input = seat.text_input();
-            if active {
-                if !has_ime {
-                    text_input.set_compositor_input_method(true);
-                }
-            } else {
-                text_input.set_compositor_input_method(false);
-            }
-        }
-    }
-
-    /// Inject UTF-8 text (from an EI `ei_text` device) into the focused client.
-    pub fn inject_ei_text(&mut self, text: &str) {
-        let seat = self.common.shell.read().seats.last_active().clone();
-        // Only commit through text-input when we're the active input method (no real IME)
-        if !seat.input_method().has_instance() {
-            let text_input = seat.text_input();
-            let mut injected = false;
-            text_input.with_active_text_input(|ti, _surface| {
-                ti.commit_string(Some(text.to_owned()));
-                injected = true;
-            });
-            if injected {
-                text_input.done(false);
-                return;
-            }
-        }
-
-        // Bind the whole chunk to spare keycodes in one temporary keymap per batch (delivered
-        // to just the focused client), so we change the keymap ~once per chunk instead of once
-        // per character. Leaves the seat's own keyboard state untouched.
-        let keysyms: Vec<Keysym> = text
-            .chars()
-            .map(Keysym::from_char)
-            .filter(|keysym| keysym.raw() != 0)
-            .collect();
-        let Some(keyboard) = seat.get_keyboard() else {
-            return;
-        };
-        // At most ~247 keysyms fit one spare keymap (keycodes 9..=255); leave margin.
-        const BATCH: usize = 240;
-        for batch in keysyms.chunks(BATCH) {
-            keyboard.inject_text_keysyms(self, batch);
-        }
-    }
-}
diff --git a/src/shell/element/surface.rs b/src/shell/element/surface.rs
index 99bb2f78..e146efeb 100644
--- a/src/shell/element/surface.rs
+++ b/src/shell/element/surface.rs
@@ -838,7 +838,10 @@ impl CosmicSurface {
         self.0
             .send_dmabuf_feedback(output, primary_scan_out_output, |_, data| {
                 if is_fullscreen {
-                    &feedback.primary_scanout_feedback
+                    feedback
+                        .primary_scanout_feedback
+                        .as_ref()
+                        .unwrap_or(&feedback.render_feedback)
                 } else if frame_time_filter_fn(data) == Kind::ScanoutCandidate {
                     feedback
                         .overlay_scanout_feedback
diff --git a/src/shell/focus/mod.rs b/src/shell/focus/mod.rs
index cab37a85..4e88c499 100644
--- a/src/shell/focus/mod.rs
+++ b/src/shell/focus/mod.rs
@@ -212,29 +212,6 @@ impl Shell {
         state.common.shell.write().update_active();
     }
 
-    // We suppress Element(X) to Fullscreen(X) transition to avoid
-    // loss of focus by the X window when having a transition to fullscreen
-    // but in the case of X11 unmap/map the leave/enter needs to happen for the X11
-    // internal state to be focused on the window
-    pub fn set_focus_on_x11_map(
-        state: &mut State,
-        target: &KeyboardFocusTarget,
-        seat: &Seat<State>,
-        update_cursor: bool,
-    ) {
-        let need_reset = seat
-            .get_keyboard()
-            .and_then(|keyboard| keyboard.current_focus())
-            .and_then(|current| current.x11_surface())
-            .is_some_and(|current| Some(current) == target.x11_surface());
-
-        if need_reset {
-            update_focus_state(seat, None, state, None, false);
-        }
-
-        Shell::set_focus(state, Some(target), seat, None, update_cursor);
-    }
-
     pub fn append_focus_stack(&mut self, target: impl Into<FocusTarget>, seat: &Seat<State>) {
         let target = target.into();
         if target.is_minimized() {
diff --git a/src/shell/focus/target.rs b/src/shell/focus/target.rs
index 80b1a34f..929cd92e 100644
--- a/src/shell/focus/target.rs
+++ b/src/shell/focus/target.rs
@@ -326,7 +326,7 @@ impl KeyboardFocusTarget {
         }
     }
 
-    pub fn x11_surface(&self) -> Option<X11Surface> {
+    fn x11_surface(&self) -> Option<X11Surface> {
         match self {
             KeyboardFocusTarget::Element(mapped) => mapped.active_window().x11_surface().cloned(),
             KeyboardFocusTarget::Fullscreen(surface) => surface.x11_surface().cloned(),
diff --git a/src/shell/layout/tiling/grabs/swap.rs b/src/shell/layout/tiling/grabs/swap.rs
index afe93cf0..4c22209f 100644
--- a/src/shell/layout/tiling/grabs/swap.rs
+++ b/src/shell/layout/tiling/grabs/swap.rs
@@ -13,7 +13,6 @@ use smithay::{
 
 use crate::{
     config::key_bindings::cosmic_modifiers_from_smithay,
-    input::InputBackendId,
     shell::{Trigger, layout::tiling::NodeDesc},
     state::State,
 };
@@ -74,7 +73,6 @@ impl KeyboardGrab<State> for SwapWindowGrab {
 
         data.handle_shortcut_action(
             shortcuts::Action::Focus(direction),
-            &InputBackendId::Normal,
             &self.seat,
             serial,
             time,
diff --git a/src/shell/mod.rs b/src/shell/mod.rs
index d9f95976..39d692e2 100644
--- a/src/shell/mod.rs
+++ b/src/shell/mod.rs
@@ -5024,20 +5024,6 @@ impl Shell {
         let mut output_presentation_feedback = OutputPresentationFeedback::new(output);
 
         if let Some(active) = self.active_space(output) {
-            for fs in active.get_fullscreen_surfaces() {
-                fs.surface.take_presentation_feedback(
-                    &mut output_presentation_feedback,
-                    surface_primary_scanout_output,
-                    |surface, _| {
-                        surface_presentation_feedback_flags_from_states(
-                            surface,
-                            None,
-                            render_element_states,
-                        )
-                    },
-                );
-            }
-
             active.mapped().for_each(|mapped| {
                 mapped.active_window().take_presentation_feedback(
                     &mut output_presentation_feedback,
diff --git a/src/shell/seats.rs b/src/shell/seats.rs
index 27b608cf..11211e90 100644
--- a/src/shell/seats.rs
+++ b/src/shell/seats.rs
@@ -5,7 +5,7 @@ use std::{any::Any, cell::RefCell, collections::HashMap, sync::Mutex};
 use crate::{
     backend::render::cursor::CursorState,
     config::{Config, xkb_config_to_wl},
-    input::{InputBackendId, ModifiersShortcutQueue, SupressedButtons, SupressedKeys},
+    input::{ModifiersShortcutQueue, SupressedButtons, SupressedKeys},
     state::State,
 };
 use smithay::{
@@ -82,25 +82,12 @@ impl Seats {
         self.last_active = Some(seat.clone());
     }
 
-    pub fn for_device<D: Device>(
-        &self,
-        device: &D,
-        backend_id: &InputBackendId,
-    ) -> Option<&Seat<State>> {
-        self.iter()
-            .find(|seat| {
-                let userdata = seat.user_data();
-                let devices = userdata.get::<Devices>().unwrap();
-                devices.has_device(device, backend_id)
-            })
-            .or_else(|| {
-                // EI devices can be transiently unregistered while the compositor recreates
-                // the absolute-pointer device (e.g. on a scale/geometry change), which would
-                // otherwise drop all pointer/touch input until the client re-binds it. EI is
-                // single-seat, so fall back to the active seat here, matching the EI keyboard
-                // path, which always targets the active seat.
-                matches!(backend_id, InputBackendId::Ei(_)).then(|| self.last_active())
-            })
+    pub fn for_device<D: Device>(&self, device: &D) -> Option<&Seat<State>> {
+        self.iter().find(|seat| {
+            let userdata = seat.user_data();
+            let devices = userdata.get::<Devices>().unwrap();
+            devices.has_device(device)
+        })
     }
 }
 
@@ -109,7 +96,6 @@ impl Devices {
         &self,
         device: &D,
         led_state: LedState,
-        backend_id: &InputBackendId,
     ) -> Vec<DeviceCapability> {
         let id = device.id();
         let mut map = self.capabilities.borrow_mut();
@@ -127,7 +113,7 @@ impl Devices {
             .cloned()
             .filter(|c| map.values().flatten().all(|has| *c != *has))
             .collect::<Vec<_>>();
-        map.insert((backend_id.clone(), id), caps);
+        map.insert(id, caps);
 
         if device.has_capability(DeviceCapability::Keyboard)
             && let Some(device) = <dyn Any>::downcast_ref::<InputDevice>(device)
@@ -140,18 +126,11 @@ impl Devices {
         new_caps
     }
 
-    /// Whether the given backend's device with this id is registered on the seat.
-    pub fn has_device<D: Device>(&self, device: &D, backend_id: &InputBackendId) -> bool {
-        self.capabilities
-            .borrow()
-            .contains_key(&(backend_id.clone(), device.id()))
+    pub fn has_device<D: Device>(&self, device: &D) -> bool {
+        self.capabilities.borrow().contains_key(&device.id())
     }
 
-    pub fn remove_device<D: Device>(
-        &self,
-        device: &D,
-        backend_id: &InputBackendId,
-    ) -> Vec<DeviceCapability> {
+    pub fn remove_device<D: Device>(&self, device: &D) -> Vec<DeviceCapability> {
         let id = device.id();
 
         let mut keyboards = self.keyboards.borrow_mut();
@@ -160,7 +139,7 @@ impl Devices {
         }
 
         let mut map = self.capabilities.borrow_mut();
-        map.remove(&(backend_id.clone(), id))
+        map.remove(&id)
             .unwrap_or_default()
             .into_iter()
             .filter(|c| map.values().flatten().all(|has| *c != *has))
@@ -176,8 +155,7 @@ impl Devices {
 
 #[derive(Default)]
 pub struct Devices {
-    // Keyed by `(backend, device_id)`
-    capabilities: RefCell<HashMap<(InputBackendId, String), Vec<DeviceCapability>>>,
+    capabilities: RefCell<HashMap<String, Vec<DeviceCapability>>>,
     // Used for updating keyboard leds on kms backend
     keyboards: RefCell<Vec<InputDevice>>,
 }
@@ -207,7 +185,7 @@ struct FocusedOutput(pub Mutex<Option<Output>>);
 pub struct PointerConstraintHint(pub Mutex<Option<(WlSurface, Point<f64, Logical>)>>);
 
 #[derive(Default)]
-pub struct LastModifierChange(pub Mutex<(HashMap<InputBackendId, Serial>, Option<Serial>)>);
+pub struct LastModifierChange(pub Mutex<Option<Serial>>);
 
 pub fn create_seat(
     dh: &DisplayHandle,
@@ -287,9 +265,6 @@ pub trait SeatExt {
     fn supressed_buttons(&self) -> &SupressedButtons;
     fn modifiers_shortcut_queue(&self) -> &ModifiersShortcutQueue;
     fn last_modifier_change(&self) -> Option<Serial>;
-    fn last_modifier_change_for(&self, backend_id: &InputBackendId) -> Option<Serial>;
-    fn set_last_modifier_change(&self, backend_id: &InputBackendId, serial: Serial);
-    fn clear_last_modifier_change(&self, backend_id: &InputBackendId);
     fn pointer_constraint_hint(&self) -> Option<(WlSurface, Point<f64, Logical>)>;
     fn set_pointer_constraint_hint(&self, hint: Option<(WlSurface, Point<f64, Logical>)>);
 
@@ -368,48 +343,13 @@ impl SeatExt for Seat<State> {
     }
 
     fn last_modifier_change(&self) -> Option<Serial> {
-        self.user_data()
-            .get::<LastModifierChange>()
-            .unwrap()
-            .0
-            .lock()
-            .unwrap()
-            .1
-    }
-
-    fn last_modifier_change_for(&self, backend_id: &InputBackendId) -> Option<Serial> {
-        self.user_data()
-            .get::<LastModifierChange>()
-            .unwrap()
-            .0
-            .lock()
-            .unwrap()
-            .0
-            .get(backend_id)
-            .copied()
-    }
-
-    fn set_last_modifier_change(&self, backend_id: &InputBackendId, serial: Serial) {
-        let mut guard = self
+        *self
             .user_data()
             .get::<LastModifierChange>()
             .unwrap()
             .0
             .lock()
-            .unwrap();
-        guard.0.insert(backend_id.clone(), serial);
-        guard.1 = Some(serial);
-    }
-
-    fn clear_last_modifier_change(&self, backend_id: &InputBackendId) {
-        self.user_data()
-            .get::<LastModifierChange>()
             .unwrap()
-            .0
-            .lock()
-            .unwrap()
-            .0
-            .remove(backend_id);
     }
 
     fn pointer_constraint_hint(&self) -> Option<(WlSurface, Point<f64, Logical>)> {
diff --git a/src/state.rs b/src/state.rs
index 5ccc7a7b..21cbb400 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -244,32 +244,9 @@ pub struct Common {
     pub clock: Clock<Monotonic>,
     pub startup_done: Arc<AtomicBool>,
     pub should_stop: bool,
-    pub kiosk_exit_code: Option<i32>,
 
     pub gesture_state: Option<GestureState>,
 
-    /// Active libei sender seats, keyed by their `eis` connection. Tracked so their virtual
-    /// keyboards can be re-created when the keyboard configuration changes at runtime.
-    pub ei_seats: std::collections::HashMap<
-        smithay::reexports::reis::eis::Connection,
-        smithay::backend::libei::EiInputSeat,
-    >,
-
-    /// The shared-seat [`KeyboardSource`] assigned to each libei connection, so its
-    /// `ei_keyboard` key events feed the seat keyboard with independent per-source hold
-    /// tracking (and can be released together on disconnect). Keyed by connection.
-    pub ei_keyboard_source: std::collections::HashMap<
-        smithay::reexports::reis::eis::Connection,
-        smithay::input::keyboard::KeyboardSource,
-    >,
-
-    /// Pointer buttons currently held by each libei connection, so they can be released when the
-    /// connection drops
-    pub ei_pointer_buttons: std::collections::HashMap<
-        smithay::reexports::reis::eis::Connection,
-        std::collections::HashSet<u32>,
-    >,
-
     pub kiosk_child: Option<Child>,
     pub theme: cosmic::Theme,
 
@@ -298,7 +275,7 @@ pub struct Common {
     pub idle_inhibiting_surfaces: HashSet<WlSurface>,
     pub shm_state: ShmState,
     pub cursor_shape_manager_state: CursorShapeManagerState,
-    pub wl_drm_state: Option<WlDrmState<Option<DrmNode>>>,
+    pub wl_drm_state: WlDrmState<Option<DrmNode>>,
     pub viewporter_state: ViewporterState,
     pub kde_decoration_state: KdeDecorationState,
     pub xdg_decoration_state: XdgDecorationState,
@@ -348,7 +325,7 @@ pub enum LockedBackend<'a> {
 pub struct SurfaceDmabufFeedback {
     pub render_feedback: DmabufFeedback,
     pub overlay_scanout_feedback: Option<DmabufFeedback>,
-    pub primary_scanout_feedback: DmabufFeedback,
+    pub primary_scanout_feedback: Option<DmabufFeedback>,
 }
 
 #[derive(Debug)]
@@ -693,7 +670,7 @@ impl State {
         let cursor_shape_manager_state = CursorShapeManagerState::new::<State>(dh);
         let seat_state = SeatState::<Self>::new();
         let viewporter_state = ViewporterState::new::<Self>(dh);
-        let wl_drm_state = None;
+        let wl_drm_state = WlDrmState::<Option<DrmNode>>::default();
         let kde_decoration_state = KdeDecorationState::new::<Self>(dh, Mode::Client);
         let xdg_decoration_state = XdgDecorationState::new::<Self>(dh);
         let session_lock_manager_state =
@@ -777,11 +754,7 @@ impl State {
                 clock,
                 startup_done: Arc::new(AtomicBool::new(false)),
                 should_stop: false,
-                kiosk_exit_code: None,
                 gesture_state: None,
-                ei_seats: std::collections::HashMap::new(),
-                ei_keyboard_source: std::collections::HashMap::new(),
-                ei_pointer_buttons: std::collections::HashMap::new(),
 
                 kiosk_child: None,
                 theme: cosmic::theme::system_preference(),
@@ -981,11 +954,8 @@ impl Common {
                 );
                 if let Some(output) = primary_scanout_output {
                     with_fractional_scale(states, |fraction_scale| {
-                        // The 1.0 clamp is a workaround for Chromium
-                        // TODO: remove if Chromium ever gets fixed
-                        fraction_scale.set_preferred_scale(
-                            output.current_scale().fractional_scale().max(1.0),
-                        );
+                        fraction_scale
+                            .set_preferred_scale(output.current_scale().fractional_scale());
                     });
                 }
             }
@@ -1091,7 +1061,10 @@ impl Common {
                         surface,
                         render_element_states,
                         &feedback.render_feedback,
-                        &feedback.primary_scanout_feedback,
+                        feedback
+                            .primary_scanout_feedback
+                            .as_ref()
+                            .unwrap_or(&feedback.render_feedback),
                     )
                 },
             )
diff --git a/src/utils/global.rs b/src/utils/global.rs
deleted file mode 100644
index e309f68a..00000000
--- a/src/utils/global.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use std::time::Duration;
-
-use calloop::{
-    LoopHandle,
-    timer::{TimeoutAction, Timer},
-};
-use smithay::reexports::wayland_server::DisplayHandle;
-use wayland_backend::server::GlobalId;
-
-pub fn remove_global_with_timer<D: 'static>(
-    dh: &DisplayHandle,
-    event_loop_handle: &LoopHandle<D>,
-    id: GlobalId,
-) {
-    dh.disable_global::<D>(id.clone());
-    let source = Timer::from_duration(Duration::from_secs(5));
-    let dh = dh.clone();
-    let res = event_loop_handle.insert_source(source, move |_, _, _state| {
-        dh.remove_global::<D>(id.clone());
-        TimeoutAction::Drop
-    });
-    if let Err(err) = res {
-        tracing::error!(
-            "failed to insert timer source to destroy output global: {}",
-            err
-        );
-    }
-}
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
index 401597cc..ac1df019 100644
--- a/src/utils/mod.rs
+++ b/src/utils/mod.rs
@@ -4,7 +4,6 @@ pub mod env;
 mod ids;
 pub(crate) use self::ids::id_gen;
 pub mod geometry;
-pub mod global;
 pub mod iced;
 pub mod prelude;
 pub mod quirks;
diff --git a/src/wayland/handlers/dmabuf.rs b/src/wayland/handlers/dmabuf.rs
index 572fe01b..4d9732bb 100644
--- a/src/wayland/handlers/dmabuf.rs
+++ b/src/wayland/handlers/dmabuf.rs
@@ -40,7 +40,7 @@ impl DmabufHandler for State {
     fn new_surface_feedback(
         &mut self,
         surface: &WlSurface,
-        _global: &DmabufGlobal,
+        global: &DmabufGlobal,
     ) -> Option<DmabufFeedback> {
         let BackendData::Kms(kms) = &self.backend else {
             return None;
@@ -57,7 +57,18 @@ impl DmabufHandler for State {
                 f.ended_at.is_none() && f.surface.has_surface(surface, WindowSurfaceType::all())
             });
 
-        let node = kms.primary_node.read().unwrap().unwrap();
+        let node = kms
+            .drm_devices
+            .values()
+            .find(|device| {
+                device
+                    .socket
+                    .as_ref()
+                    .map(|s| &s.dmabuf_global == global)
+                    .unwrap_or(false)
+            })?
+            .inner
+            .render_node;
         let kms_surface = kms
             .drm_devices
             .values()
@@ -66,7 +77,9 @@ impl DmabufHandler for State {
 
         Some(with_states(surface, |data| {
             if is_fullscreen {
-                feedback.primary_scanout_feedback
+                feedback
+                    .primary_scanout_feedback
+                    .unwrap_or(feedback.render_feedback)
             } else if frame_time_filter_fn(data) == Kind::ScanoutCandidate {
                 feedback
                     .overlay_scanout_feedback
diff --git a/src/wayland/handlers/fractional_scale.rs b/src/wayland/handlers/fractional_scale.rs
index dcc8d7f9..aea0cc7e 100644
--- a/src/wayland/handlers/fractional_scale.rs
+++ b/src/wayland/handlers/fractional_scale.rs
@@ -49,10 +49,7 @@ impl FractionalScaleHandler for State {
 
         with_states(&surface, |states| {
             with_fractional_scale(states, |fractional_scale| {
-                // The 1.0 clamp is a workaround for Chromium
-                // TODO: remove if Chromium ever gets fixed
-                fractional_scale
-                    .set_preferred_scale(output.current_scale().fractional_scale().max(1.0));
+                fractional_scale.set_preferred_scale(output.current_scale().fractional_scale());
             });
         });
     }
diff --git a/src/wayland/handlers/output_configuration.rs b/src/wayland/handlers/output_configuration.rs
index 4f7000fd..6ab678f5 100644
--- a/src/wayland/handlers/output_configuration.rs
+++ b/src/wayland/handlers/output_configuration.rs
@@ -230,16 +230,6 @@ impl State {
             state.common.output_configuration_state.update();
         });
 
-        // Output scale or geometry may have changed. EI absolute-pointer regions
-        // are immutable per device, so any connected EI client (e.g. an RDP server)
-        // keeps mapping with the old scale until it reconnects. Recreate the
-        // device with the updated region so the mapping tracks the change live.
-        // (drop the backend lock first: refresh borrows `self` immutably.)
-        drop(backend);
-        if !test_only {
-            crate::libei::refresh_absolute_pointer_regions(self);
-        }
-
         true
     }
 }
diff --git a/src/wayland/handlers/tablet_manager.rs b/src/wayland/handlers/tablet_manager.rs
index e4b84434..60469ba9 100644
--- a/src/wayland/handlers/tablet_manager.rs
+++ b/src/wayland/handlers/tablet_manager.rs
@@ -3,12 +3,10 @@
 use crate::state::State;
 use smithay::{
     backend::input::TabletToolDescriptor, input::pointer::CursorImageStatus,
-    input::tablet::TabletSeatHandler, reexports::wayland_server::protocol::wl_surface,
+    wayland::tablet_manager::TabletSeatHandler,
 };
 
 impl TabletSeatHandler for State {
-    type ToolFocus = wl_surface::WlSurface;
-
     fn tablet_tool_image(&mut self, _tool: &TabletToolDescriptor, _image: CursorImageStatus) {
         // TODO display cursor for each tablet tool
     }
diff --git a/src/wayland/handlers/xdg_shell/mod.rs b/src/wayland/handlers/xdg_shell/mod.rs
index b4f16c4c..b8288019 100644
--- a/src/wayland/handlers/xdg_shell/mod.rs
+++ b/src/wayland/handlers/xdg_shell/mod.rs
@@ -333,15 +333,17 @@ impl XdgShellHandler for State {
                     if let Some(ref grab) = grab {
                         if grab.has_ended() {
                             should_ungrab = true;
-                        } else if let Some(target) = grab.current_grab()
-                            && let Some(wl_surface) = target.wl_surface()
-                            && (wl_surface.as_ref() == surface.wl_surface()
-                                || smithay::desktop::PopupManager::popups_for_surface(
-                                    surface.wl_surface(),
-                                )
-                                .any(|(p, _)| p.wl_surface() == wl_surface.as_ref()))
-                        {
-                            should_ungrab = true;
+                        } else if let Some(target) = grab.current_grab() {
+                            if let Some(wl_surface) = target.wl_surface() {
+                                if wl_surface.as_ref() == surface.wl_surface()
+                                    || smithay::desktop::PopupManager::popups_for_surface(
+                                        surface.wl_surface(),
+                                    )
+                                    .any(|(p, _)| p.wl_surface() == wl_surface.as_ref())
+                                {
+                                    should_ungrab = true;
+                                }
+                            }
                         }
                     }
                     if should_ungrab {
diff --git a/src/wayland/protocols/corner_radius.rs b/src/wayland/protocols/corner_radius.rs
index 51dc1153..be6f9ca0 100644
--- a/src/wayland/protocols/corner_radius.rs
+++ b/src/wayland/protocols/corner_radius.rs
@@ -190,7 +190,7 @@ where
                     let radius_exists = with_states(surface.wl_surface(), |surface_data| {
                         let hook_id = surface_data
                             .data_map
-                            .get_or_insert_threadsafe(|| LayerHookId::new(None));
+                            .get_or_insert_threadsafe(|| ToplevelHookId::new(None));
                         let guard = hook_id.lock().unwrap();
                         guard.as_ref().map(|(_, t)| t.upgrade().is_ok())
                     });
diff --git a/src/wayland/protocols/drm.rs b/src/wayland/protocols/drm.rs
index d2902c98..c86e5ff0 100644
--- a/src/wayland/protocols/drm.rs
+++ b/src/wayland/protocols/drm.rs
@@ -38,11 +38,7 @@ use smithay::{
 };
 use tracing::trace;
 
-use std::{
-    convert::TryFrom,
-    path::PathBuf,
-    sync::{Arc, Mutex},
-};
+use std::{convert::TryFrom, path::PathBuf, sync::Arc};
 
 pub enum ImportError {
     Failed,
@@ -56,28 +52,19 @@ pub trait DrmHandler<R: 'static> {
     }
 }
 
-#[derive(Debug)]
-pub struct WlDrmState<R> {
-    device: Arc<Mutex<DrmGlobalDeviceData>>,
-    global: GlobalId,
-    _marker: std::marker::PhantomData<R>,
-}
-
-#[derive(Debug)]
-pub struct DrmGlobalDeviceData {
-    formats: Vec<Fourcc>,
-    path: PathBuf,
-}
+#[derive(Debug, Default)]
+pub struct WlDrmState<R>(std::marker::PhantomData<R>);
 
 /// Data associated with a drm global.
 pub struct DrmGlobalData {
     filter: Box<dyn for<'a> Fn(&'a Client) -> bool + Send + Sync>,
+    formats: Arc<Vec<Fourcc>>,
+    device_path: PathBuf,
     dmabuf_global: DmabufGlobal,
-    device: Arc<Mutex<DrmGlobalDeviceData>>,
 }
 
 pub struct DrmInstanceData {
-    device: Arc<Mutex<DrmGlobalDeviceData>>,
+    formats: Arc<Vec<Fourcc>>,
     dmabuf_global: DmabufGlobal,
 }
 
@@ -99,24 +86,16 @@ where
         data_init: &mut DataInit<'_, D>,
     ) {
         let data = DrmInstanceData {
-            device: global_data.device.clone(),
+            formats: global_data.formats.clone(),
             dmabuf_global: global_data.dmabuf_global,
         };
         let drm_instance = data_init.init(resource, data);
 
-        drm_instance.device(
-            global_data
-                .device
-                .lock()
-                .unwrap()
-                .path
-                .to_string_lossy()
-                .into_owned(),
-        );
+        drm_instance.device(global_data.device_path.to_string_lossy().into_owned());
         if drm_instance.version() >= 2 {
             drm_instance.capabilities(wl_drm::Capability::Prime as u32);
         }
-        for format in global_data.device.lock().unwrap().formats.iter() {
+        for format in global_data.formats.iter() {
             if let Ok(converted) = wl_drm::Format::try_from(*format as u32) {
                 drm_instance.format(converted as u32);
             }
@@ -169,7 +148,7 @@ where
             } => {
                 let format = match Fourcc::try_from(format) {
                     Ok(format) => {
-                        if !data.device.lock().unwrap().formats.contains(&format) {
+                        if !data.formats.contains(&format) {
                             drm.post_error(
                                 wl_drm::Error::InvalidFormat,
                                 String::from("Format not advertised by wl_drm"),
@@ -241,12 +220,13 @@ where
 }
 
 impl<R: 'static> WlDrmState<R> {
-    pub fn new<D>(
+    pub fn create_global<D>(
+        &mut self,
         display: &DisplayHandle,
         device_path: PathBuf,
         formats: FormatSet,
         dmabuf_global: &DmabufGlobal,
-    ) -> Self
+    ) -> GlobalId
     where
         D: GlobalDispatch<wl_drm::WlDrm, DrmGlobalData>
             + Dispatch<wl_drm::WlDrm, DrmInstanceData>
@@ -254,16 +234,19 @@ impl<R: 'static> WlDrmState<R> {
             + DmabufHandler
             + 'static,
     {
-        Self::new_with_filter::<D, _>(display, device_path, formats, dmabuf_global, |_| true)
+        self.create_global_with_filter::<D, _>(display, device_path, formats, dmabuf_global, |_| {
+            true
+        })
     }
 
-    pub fn new_with_filter<D, F>(
+    pub fn create_global_with_filter<D, F>(
+        &mut self,
         display: &DisplayHandle,
         device_path: PathBuf,
         formats: FormatSet,
         dmabuf_global: &DmabufGlobal,
         client_filter: F,
-    ) -> Self
+    ) -> GlobalId
     where
         D: GlobalDispatch<wl_drm::WlDrm, DrmGlobalData>
             + Dispatch<wl_drm::WlDrm, DrmInstanceData>
@@ -272,45 +255,21 @@ impl<R: 'static> WlDrmState<R> {
             + 'static,
         F: for<'a> Fn(&'a Client) -> bool + Send + Sync + 'static,
     {
-        let device = Arc::new(Mutex::new(DrmGlobalDeviceData {
-            formats: formats
+        let formats = Arc::new(
+            formats
                 .into_iter()
                 .filter(|f| f.modifier == Modifier::Invalid)
                 .map(|f| f.code)
                 .collect(),
-            path: device_path,
-        }));
-
+        );
         let data = DrmGlobalData {
             filter: Box::new(client_filter),
-            device: device.clone(),
+            formats,
+            device_path,
             dmabuf_global: *dmabuf_global,
         };
 
-        let global = display.create_global::<D, wl_drm::WlDrm, _>(2, data);
-
-        WlDrmState {
-            device,
-            global,
-            _marker: Default::default(),
-        }
-    }
-
-    pub fn update_device(&mut self, device_path: PathBuf, formats: FormatSet) {
-        let new_device = DrmGlobalDeviceData {
-            formats: formats
-                .into_iter()
-                .filter(|f| f.modifier == Modifier::Invalid)
-                .map(|f| f.code)
-                .collect(),
-            path: device_path,
-        };
-
-        *self.device.lock().unwrap() = new_device;
-    }
-
-    pub fn global(&self) -> &GlobalId {
-        &self.global
+        display.create_global::<D, wl_drm::WlDrm, _>(2, data)
     }
 }
 
diff --git a/src/wayland/protocols/output_configuration/mod.rs b/src/wayland/protocols/output_configuration/mod.rs
index d413e634..4bd1c0bd 100644
--- a/src/wayland/protocols/output_configuration/mod.rs
+++ b/src/wayland/protocols/output_configuration/mod.rs
@@ -1,6 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-use calloop::LoopHandle;
+use calloop::{
+    LoopHandle,
+    timer::{TimeoutAction, Timer},
+};
 use cosmic_comp_config::output::comp::AdaptiveSync;
 use cosmic_protocols::output_management::v1::server::{
     zcosmic_output_configuration_head_v1::ZcosmicOutputConfigurationHeadV1,
@@ -27,7 +30,7 @@ use smithay::{
     utils::{Logical, Physical, Point, Size, Transform},
     wayland::output::WlOutputData,
 };
-use std::{convert::TryFrom, sync::Mutex};
+use std::{convert::TryFrom, sync::Mutex, time::Duration};
 
 mod handlers;
 
@@ -516,6 +519,26 @@ where
     }
 }
 
+fn remove_global_with_timer<D: 'static>(
+    dh: &DisplayHandle,
+    event_loop_handle: &LoopHandle<D>,
+    id: GlobalId,
+) {
+    dh.disable_global::<D>(id.clone());
+    let source = Timer::from_duration(Duration::from_secs(5));
+    let dh = dh.clone();
+    let res = event_loop_handle.insert_source(source, move |_, _, _state| {
+        dh.remove_global::<D>(id.clone());
+        TimeoutAction::Drop
+    });
+    if let Err(err) = res {
+        tracing::error!(
+            "failed to insert timer source to destroy output global: {}",
+            err
+        );
+    }
+}
+
 macro_rules! delegate_output_configuration {
     ($(@<$( $lt:tt $( : $clt:tt $(+ $dlt:tt )* )? ),+>)? $ty: ty) => {
         smithay::reexports::wayland_server::delegate_global_dispatch!($(@< $( $lt $( : $clt $(+ $dlt )* )? ),+ >)? $ty: [
@@ -555,4 +578,4 @@ macro_rules! delegate_output_configuration {
 }
 pub(crate) use delegate_output_configuration;
 
-use crate::utils::{global::remove_global_with_timer, prelude::OutputExt};
+use crate::utils::prelude::OutputExt;
diff --git a/src/xwayland.rs b/src/xwayland.rs
index da3fb36b..25b8b0e0 100644
--- a/src/xwayland.rs
+++ b/src/xwayland.rs
@@ -115,7 +115,7 @@ impl State {
             &self.common.display_handle,
             None,
             std::iter::empty::<(OsString, OsString)>(),
-            ["-enable-ei-portal"],
+            std::iter::empty::<OsString>(),
             true,
             Stdio::null(),
             Stdio::null(),
@@ -394,7 +394,6 @@ impl Common {
         sym: Keysym,
         code: Keycode,
         state: KeyState,
-        modifiers: ModifiersState,
         serial: Serial,
         time: u32,
     ) {
@@ -419,6 +418,7 @@ impl Common {
             .last_active()
             .get_keyboard()
             .unwrap();
+        let modifiers = keyboard.modifier_state();
         let is_modifier = sym.is_modifier_key();
 
         let xstate = self.xwayland_state.as_mut().unwrap();
@@ -858,7 +858,7 @@ impl XwmHandler for State {
             if let Some(target) = res {
                 let seat = shell.seats.last_active().clone();
                 std::mem::drop(shell);
-                Shell::set_focus_on_x11_map(self, &target, &seat, false);
+                Shell::set_focus(self, Some(&target), &seat, None, false);
             }
         }
     }