diff --git a/Cargo.lock b/Cargo.lock
index ae17e10089..11b417eded 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -24,19 +24,6 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
-[[package]]
-name = "ahash"
-version = "0.8.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
-dependencies = [
- "cfg-if",
- "getrandom 0.3.4",
- "once_cell",
- "version_check",
- "zerocopy",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "1.1.4"
@@ -161,11 +148,11 @@ dependencies = [
  "clipboard-win",
  "image",
  "log",
- "objc2 0.6.4",
- "objc2-app-kit 0.3.2",
+ "objc2",
+ "objc2-app-kit",
  "objc2-core-foundation",
  "objc2-core-graphics",
- "objc2-foundation 0.3.2",
+ "objc2-foundation",
  "parking_lot",
  "percent-encoding",
  "windows-sys 0.60.2",
@@ -311,7 +298,7 @@ dependencies = [
  "futures-lite",
  "parking",
  "polling",
- "rustix 1.1.4",
+ "rustix",
  "slab",
  "windows-sys 0.61.2",
 ]
@@ -353,7 +340,7 @@ dependencies = [
  "cfg-if",
  "event-listener",
  "futures-lite",
- "rustix 1.1.4",
+ "rustix",
 ]
 
 [[package]]
@@ -379,7 +366,7 @@ dependencies = [
  "cfg-if",
  "futures-core",
  "futures-io",
- "rustix 1.1.4",
+ "rustix",
  "signal-hook-registry",
  "slab",
  "windows-sys 0.61.2",
@@ -585,22 +572,13 @@ dependencies = [
  "generic-array",
 ]
 
-[[package]]
-name = "block2"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
-dependencies = [
- "objc2 0.5.2",
-]
-
 [[package]]
 name = "block2"
 version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
 dependencies = [
- "objc2 0.6.4",
+ "objc2",
 ]
 
 [[package]]
@@ -622,6 +600,16 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e79769241dcd44edf79a732545e8b5cec84c247ac060f5252cd51885d093a8fc"
 
+[[package]]
+name = "borsh"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a88b7ea17d208c4193f2c1e6de3c35fe71f98c96982d5ced308bdcc749ff6e1f"
+dependencies = [
+ "bytes",
+ "cfg_aliases",
+]
+
 [[package]]
 name = "built"
 version = "0.8.1"
@@ -680,26 +668,25 @@ checksum = "2e93abca9e28e0a1b9877922aacb20576e05d4679ffa78c3d6dc22a26a216659"
 
 [[package]]
 name = "calloop"
-version = "0.13.0"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
+checksum = "4dbf9978365bac10f54d1d4b04f7ce4427e51f71d61f2fe15e3fed5166474df7"
 dependencies = [
  "bitflags 2.13.0",
- "log",
  "polling",
- "rustix 0.38.44",
+ "rustix",
  "slab",
- "thiserror 1.0.69",
+ "tracing",
 ]
 
 [[package]]
 name = "calloop-wayland-source"
-version = "0.3.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20"
+checksum = "138efcf0940a02ebf0cc8d1eff41a1682a46b431630f4c52450d6265876021fa"
 dependencies = [
  "calloop",
- "rustix 0.38.44",
+ "rustix",
  "wayland-backend",
  "wayland-client",
 ]
@@ -742,9 +729,9 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "cfg_aliases"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527"
 
 [[package]]
 name = "chacha20"
@@ -959,30 +946,6 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
-[[package]]
-name = "core-graphics"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation 0.9.4",
- "core-graphics-types",
- "foreign-types 0.5.0",
- "libc",
-]
-
-[[package]]
-name = "core-graphics-types"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation 0.9.4",
- "libc",
-]
-
 [[package]]
 name = "core_maths"
 version = "0.1.1"
@@ -1280,9 +1243,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
 dependencies = [
  "bitflags 2.13.0",
- "block2 0.6.2",
+ "block2",
  "libc",
- "objc2 0.6.4",
+ "objc2",
 ]
 
 [[package]]
@@ -1330,8 +1293,8 @@ dependencies = [
 
 [[package]]
 name = "dpi"
-version = "0.1.1"
-source = "git+https://github.com/iced-rs/winit.git?rev=05b8ff17a06562f0a10bb46e6eaacbe2a95cb5ed#05b8ff17a06562f0a10bb46e6eaacbe2a95cb5ed"
+version = "0.1.2"
+source = "git+https://github.com/rust-windowing/winit.git?rev=f5e20bd7da25934f39abe8dc44a0597110ef6357#f5e20bd7da25934f39abe8dc44a0597110ef6357"
 
 [[package]]
 name = "dtor"
@@ -1636,28 +1599,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 dependencies = [
- "foreign-types-shared 0.1.1",
-]
-
-[[package]]
-name = "foreign-types"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
-dependencies = [
- "foreign-types-macros",
- "foreign-types-shared 0.3.1",
-]
-
-[[package]]
-name = "foreign-types-macros"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "foreign-types-shared",
 ]
 
 [[package]]
@@ -1666,12 +1608,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
-[[package]]
-name = "foreign-types-shared"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
-
 [[package]]
 name = "form_urlencoded"
 version = "1.2.2"
@@ -1830,7 +1766,7 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
 dependencies = [
- "rustix 1.1.4",
+ "rustix",
  "windows-link",
 ]
 
@@ -2450,7 +2386,7 @@ dependencies = [
  "resvg",
  "rustc-hash 2.1.3",
  "softbuffer",
- "tiny-skia",
+ "tiny-skia 0.11.4",
 ]
 
 [[package]]
@@ -2499,7 +2435,6 @@ dependencies = [
  "iced_runtime",
  "log",
  "mundy",
- "objc2 0.5.2",
  "rustc-hash 2.1.3",
  "sysinfo",
  "thiserror 2.0.18",
@@ -2892,6 +2827,16 @@ dependencies = [
  "mutate_once",
 ]
 
+[[package]]
+name = "keyboard-types"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fbe853b403ae61a04233030ae8a79d94975281ed9770a1f9e246732b534b28d"
+dependencies = [
+ "bitflags 2.13.0",
+ "serde",
+]
+
 [[package]]
 name = "khronos-egl"
 version = "6.0.0"
@@ -3021,12 +2966,6 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.12.1"
@@ -3185,7 +3124,7 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad38eb12aea514a0466ea40a80fd8cc83637065948eb4a426e4aa46261175227"
 dependencies = [
- "rustix 1.1.4",
+ "rustix",
 ]
 
 [[package]]
@@ -3290,9 +3229,9 @@ dependencies = [
  "futures-lite",
  "jni",
  "ndk-context",
- "objc2 0.6.4",
- "objc2-app-kit 0.3.2",
- "objc2-foundation 0.3.2",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
  "pin-project-lite",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -3507,22 +3446,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "objc-sys"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
-
-[[package]]
-name = "objc2"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
-dependencies = [
- "objc-sys",
- "objc2-encode",
-]
-
 [[package]]
 name = "objc2"
 version = "0.6.4"
@@ -3532,22 +3455,6 @@ dependencies = [
  "objc2-encode",
 ]
 
-[[package]]
-name = "objc2-app-kit"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
-dependencies = [
- "bitflags 2.13.0",
- "block2 0.5.1",
- "libc",
- "objc2 0.5.2",
- "objc2-core-data 0.2.2",
- "objc2-core-image 0.2.2",
- "objc2-foundation 0.2.2",
- "objc2-quartz-core 0.2.2",
-]
-
 [[package]]
 name = "objc2-app-kit"
 version = "0.3.2"
@@ -3555,31 +3462,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
 dependencies = [
  "bitflags 2.13.0",
- "block2 0.6.2",
+ "block2",
  "libc",
- "objc2 0.6.4",
- "objc2-cloud-kit 0.3.2",
- "objc2-core-data 0.3.2",
+ "objc2",
+ "objc2-cloud-kit",
+ "objc2-core-data",
  "objc2-core-foundation",
  "objc2-core-graphics",
- "objc2-core-image 0.3.2",
+ "objc2-core-image",
  "objc2-core-text",
  "objc2-core-video",
- "objc2-foundation 0.3.2",
- "objc2-quartz-core 0.3.2",
-]
-
-[[package]]
-name = "objc2-cloud-kit"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
-dependencies = [
- "bitflags 2.13.0",
- "block2 0.5.1",
- "objc2 0.5.2",
- "objc2-core-location",
- "objc2-foundation 0.2.2",
+ "objc2-foundation",
+ "objc2-quartz-core",
 ]
 
 [[package]]
@@ -3589,31 +3483,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
 dependencies = [
  "bitflags 2.13.0",
- "objc2 0.6.4",
- "objc2-foundation 0.3.2",
-]
-
-[[package]]
-name = "objc2-contacts"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
-dependencies = [
- "block2 0.5.1",
- "objc2 0.5.2",
- "objc2-foundation 0.2.2",
-]
-
-[[package]]
-name = "objc2-core-data"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
-dependencies = [
- "bitflags 2.13.0",
- "block2 0.5.1",
- "objc2 0.5.2",
- "objc2-foundation 0.2.2",
+ "objc2",
+ "objc2-foundation",
 ]
 
 [[package]]
@@ -3623,8 +3494,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
 dependencies = [
  "bitflags 2.13.0",
- "objc2 0.6.4",
- "objc2-foundation 0.3.2",
+ "objc2",
+ "objc2-foundation",
 ]
 
 [[package]]
@@ -3634,8 +3505,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
  "bitflags 2.13.0",
+ "block2",
  "dispatch2",
- "objc2 0.6.4",
+ "objc2",
 ]
 
 [[package]]
@@ -3646,43 +3518,20 @@ checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
 dependencies = [
  "bitflags 2.13.0",
  "dispatch2",
- "objc2 0.6.4",
+ "libc",
+ "objc2",
  "objc2-core-foundation",
  "objc2-io-surface",
 ]
 
-[[package]]
-name = "objc2-core-image"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
-dependencies = [
- "block2 0.5.1",
- "objc2 0.5.2",
- "objc2-foundation 0.2.2",
- "objc2-metal 0.2.2",
-]
-
 [[package]]
 name = "objc2-core-image"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006"
 dependencies = [
- "objc2 0.6.4",
- "objc2-foundation 0.3.2",
-]
-
-[[package]]
-name = "objc2-core-location"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
-dependencies = [
- "block2 0.5.1",
- "objc2 0.5.2",
- "objc2-contacts",
- "objc2-foundation 0.2.2",
+ "objc2",
+ "objc2-foundation",
 ]
 
 [[package]]
@@ -3692,7 +3541,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
 dependencies = [
  "bitflags 2.13.0",
- "objc2 0.6.4",
+ "objc2",
  "objc2-core-foundation",
  "objc2-core-graphics",
 ]
@@ -3704,7 +3553,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6"
 dependencies = [
  "bitflags 2.13.0",
- "objc2 0.6.4",
+ "objc2",
  "objc2-core-foundation",
  "objc2-core-graphics",
  "objc2-io-surface",
@@ -3716,19 +3565,6 @@ version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33"
 
-[[package]]
-name = "objc2-foundation"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
-dependencies = [
- "bitflags 2.13.0",
- "block2 0.5.1",
- "dispatch",
- "libc",
- "objc2 0.5.2",
-]
-
 [[package]]
 name = "objc2-foundation"
 version = "0.3.2"
@@ -3736,9 +3572,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
 dependencies = [
  "bitflags 2.13.0",
- "block2 0.6.2",
+ "block2",
  "libc",
- "objc2 0.6.4",
+ "objc2",
  "objc2-core-foundation",
 ]
 
@@ -3749,34 +3585,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
 dependencies = [
  "bitflags 2.13.0",
- "objc2 0.6.4",
+ "objc2",
  "objc2-core-foundation",
 ]
 
-[[package]]
-name = "objc2-link-presentation"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
-dependencies = [
- "block2 0.5.1",
- "objc2 0.5.2",
- "objc2-app-kit 0.2.2",
- "objc2-foundation 0.2.2",
-]
-
-[[package]]
-name = "objc2-metal"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
-dependencies = [
- "bitflags 2.13.0",
- "block2 0.5.1",
- "objc2 0.5.2",
- "objc2-foundation 0.2.2",
-]
-
 [[package]]
 name = "objc2-metal"
 version = "0.3.2"
@@ -3784,22 +3596,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0125f776a10d00af4152d74616409f0d4a2053a6f57fa5b7d6aa2854ac04794"
 dependencies = [
  "bitflags 2.13.0",
- "block2 0.6.2",
- "objc2 0.6.4",
- "objc2-foundation 0.3.2",
-]
-
-[[package]]
-name = "objc2-quartz-core"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
-dependencies = [
- "bitflags 2.13.0",
- "block2 0.5.1",
- "objc2 0.5.2",
- "objc2-foundation 0.2.2",
- "objc2-metal 0.2.2",
+ "block2",
+ "objc2",
+ "objc2-foundation",
 ]
 
 [[package]]
@@ -3809,65 +3608,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
 dependencies = [
  "bitflags 2.13.0",
- "objc2 0.6.4",
+ "objc2",
  "objc2-core-foundation",
- "objc2-foundation 0.3.2",
- "objc2-metal 0.3.2",
-]
-
-[[package]]
-name = "objc2-symbols"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc"
-dependencies = [
- "objc2 0.5.2",
- "objc2-foundation 0.2.2",
+ "objc2-foundation",
+ "objc2-metal",
 ]
 
 [[package]]
 name = "objc2-ui-kit"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
-dependencies = [
- "bitflags 2.13.0",
- "block2 0.5.1",
- "objc2 0.5.2",
- "objc2-cloud-kit 0.2.2",
- "objc2-core-data 0.2.2",
- "objc2-core-image 0.2.2",
- "objc2-core-location",
- "objc2-foundation 0.2.2",
- "objc2-link-presentation",
- "objc2-quartz-core 0.2.2",
- "objc2-symbols",
- "objc2-uniform-type-identifiers",
- "objc2-user-notifications",
-]
-
-[[package]]
-name = "objc2-uniform-type-identifiers"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
-dependencies = [
- "block2 0.5.1",
- "objc2 0.5.2",
- "objc2-foundation 0.2.2",
-]
-
-[[package]]
-name = "objc2-user-notifications"
-version = "0.2.2"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
+checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
 dependencies = [
  "bitflags 2.13.0",
- "block2 0.5.1",
- "objc2 0.5.2",
- "objc2-core-location",
- "objc2-foundation 0.2.2",
+ "objc2",
+ "objc2-core-foundation",
+ "objc2-foundation",
 ]
 
 [[package]]
@@ -3900,7 +3656,7 @@ checksum = "77823a27f0babb03091cb9ed9ef80af3b39dbc82f97e8fa530374b7dafd87a45"
 dependencies = [
  "bitflags 2.13.0",
  "cfg-if",
- "foreign-types 0.3.2",
+ "foreign-types",
  "libc",
  "openssl-macros",
  "openssl-sys",
@@ -3943,11 +3699,10 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
 [[package]]
 name = "orbclient"
-version = "0.3.55"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5df339f526ea9a60e371768d50efc2f2508c7203290731565d1f7a6f71d21747"
+checksum = "bb08138df30517916447489a70848de31244c40c7b520bcf5ebdc9db6299da59"
 dependencies = [
- "libc",
  "libredox",
 ]
 
@@ -4301,7 +4056,7 @@ dependencies = [
  "concurrent-queue",
  "hermit-abi",
  "pin-project-lite",
- "rustix 1.1.4",
+ "rustix",
  "windows-sys 0.61.2",
 ]
 
@@ -4646,10 +4401,10 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40d213455a5f1dc59214213c7330e074ddf8114c9a42411eb890c767357ce135"
 dependencies = [
- "objc2 0.6.4",
+ "objc2",
  "objc2-core-foundation",
- "objc2-foundation 0.3.2",
- "objc2-quartz-core 0.3.2",
+ "objc2-foundation",
+ "objc2-quartz-core",
 ]
 
 [[package]]
@@ -4694,12 +4449,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "redox_syscall"
-version = "0.4.1"
+name = "redox_event"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+checksum = "c5018d583d6d2f5499352aea8d177e9067d1eb03ab17c78169d5ba7a30001b15"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.13.0",
+ "libredox",
 ]
 
 [[package]]
@@ -4821,7 +4577,7 @@ dependencies = [
  "pico-args",
  "rgb",
  "svgtypes",
- "tiny-skia",
+ "tiny-skia 0.11.4",
  "usvg",
  "zune-jpeg 0.4.21",
 ]
@@ -4833,14 +4589,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a15ad77d9e70a92437d8f74c35d99b4e4691128df018833e99f90bcd36152672"
 dependencies = [
  "ashpd",
- "block2 0.6.2",
+ "block2",
  "dispatch2",
  "js-sys",
  "log",
- "objc2 0.6.4",
- "objc2-app-kit 0.3.2",
+ "objc2",
+ "objc2-app-kit",
  "objc2-core-foundation",
- "objc2-foundation 0.3.2",
+ "objc2-foundation",
  "pollster",
  "raw-window-handle",
  "urlencoding",
@@ -4900,19 +4656,6 @@ dependencies = [
  "semver",
 ]
 
-[[package]]
-name = "rustix"
-version = "0.38.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
-dependencies = [
- "bitflags 2.13.0",
- "errno",
- "libc",
- "linux-raw-sys 0.4.15",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "rustix"
 version = "1.1.4"
@@ -4922,7 +4665,7 @@ dependencies = [
  "bitflags 2.13.0",
  "errno",
  "libc",
- "linux-raw-sys 0.12.1",
+ "linux-raw-sys",
  "windows-sys 0.61.2",
 ]
 
@@ -5045,15 +4788,15 @@ dependencies = [
 
 [[package]]
 name = "sctk-adwaita"
-version = "0.10.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec"
+checksum = "1f8ea028b7cb32e2f577b0a55a7b54cb206376bdb1221bd5c81dcf20b68db1fb"
 dependencies = [
  "ab_glyph",
  "log",
  "memmap2",
  "smithay-client-toolkit",
- "tiny-skia",
+ "tiny-skia 0.12.0",
 ]
 
 [[package]]
@@ -5322,24 +5065,24 @@ checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
 
 [[package]]
 name = "smithay-client-toolkit"
-version = "0.19.2"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
+checksum = "74dc9ee14b0fdcb535f9556141bacac070c994a977d2240ee455d7438a617f00"
 dependencies = [
  "bitflags 2.13.0",
  "calloop",
  "calloop-wayland-source",
  "cursor-icon",
- "libc",
  "log",
  "memmap2",
- "rustix 0.38.44",
- "thiserror 1.0.69",
- "wayland-backend",
+ "rustix",
+ "thiserror 2.0.18",
  "wayland-client",
  "wayland-csd-frame",
  "wayland-cursor",
  "wayland-protocols",
+ "wayland-protocols-experimental",
+ "wayland-protocols-misc",
  "wayland-protocols-wlr",
  "wayland-scanner",
  "xkeysym",
@@ -5376,6 +5119,10 @@ name = "smol_str"
 version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4aaa7368fcf4852a4c2dd92df0cace6a71f2091ca0a23391ce7f3a31833f1523"
+dependencies = [
+ "borsh",
+ "serde_core",
+]
 
 [[package]]
 name = "socket2"
@@ -5399,14 +5146,14 @@ dependencies = [
  "js-sys",
  "memmap2",
  "ndk",
- "objc2 0.6.4",
+ "objc2",
  "objc2-core-foundation",
  "objc2-core-graphics",
- "objc2-foundation 0.3.2",
- "objc2-quartz-core 0.3.2",
+ "objc2-foundation",
+ "objc2-quartz-core",
  "raw-window-handle",
  "redox_syscall 0.5.18",
- "rustix 1.1.4",
+ "rustix",
  "tiny-xlib",
  "tracing",
  "wasm-bindgen",
@@ -5661,7 +5408,7 @@ dependencies = [
  "fastrand",
  "getrandom 0.4.3",
  "once_cell",
- "rustix 1.1.4",
+ "rustix",
  "windows-sys 0.61.2",
 ]
 
@@ -5795,7 +5542,21 @@ dependencies = [
  "cfg-if",
  "log",
  "png 0.17.16",
- "tiny-skia-path",
+ "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",
 ]
 
 [[package]]
@@ -5809,6 +5570,17 @@ 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.5"
@@ -6299,7 +6071,7 @@ dependencies = [
  "siphasher",
  "strict-num",
  "svgtypes",
- "tiny-skia-path",
+ "tiny-skia-path 0.11.4",
  "unicode-bidi",
  "unicode-script",
  "unicode-vo",
@@ -6534,7 +6306,7 @@ checksum = "2857dd20b54e916ec7253b3d6b4d5c4d7d4ca2c33c2e11c6c76a99bd8744755d"
 dependencies = [
  "cc",
  "downcast-rs",
- "rustix 1.1.4",
+ "rustix",
  "scoped-tls",
  "smallvec",
  "wayland-sys",
@@ -6547,7 +6319,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144"
 dependencies = [
  "bitflags 2.13.0",
- "rustix 1.1.4",
+ "rustix",
  "wayland-backend",
  "wayland-scanner",
 ]
@@ -6569,7 +6341,7 @@ version = "0.31.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a52d18780be9b1314328a3de5f930b73d2200112e3849ca6cb11822793fb34d"
 dependencies = [
- "rustix 1.1.4",
+ "rustix",
  "wayland-client",
  "xcursor",
 ]
@@ -6586,6 +6358,32 @@ dependencies = [
  "wayland-scanner",
 ]
 
+[[package]]
+name = "wayland-protocols-experimental"
+version = "20251230.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91c6c3e7178e553d093d46999032bc79aafea9dedd71dd702c8ace7bbc25cf13"
+dependencies = [
+ "bitflags 2.13.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols-misc"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e9567599ef23e09b8dad6e429e5738d4509dfc46b3b21f32841a304d16b29c8"
+dependencies = [
+ "bitflags 2.13.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+]
+
 [[package]]
 name = "wayland-protocols-plasma"
 version = "0.3.12"
@@ -6665,8 +6463,8 @@ dependencies = [
  "jni",
  "log",
  "ndk-context",
- "objc2 0.6.4",
- "objc2-foundation 0.3.2",
+ "objc2",
+ "objc2-foundation",
  "url",
  "web-sys",
 ]
@@ -6807,7 +6605,7 @@ dependencies = [
  "ash",
  "bit-set 0.9.1",
  "bitflags 2.13.0",
- "block2 0.6.2",
+ "block2",
  "bytemuck",
  "cfg-if",
  "cfg_aliases",
@@ -6823,11 +6621,11 @@ dependencies = [
  "log",
  "naga",
  "ndk-sys",
- "objc2 0.6.4",
+ "objc2",
  "objc2-core-foundation",
- "objc2-foundation 0.3.2",
- "objc2-metal 0.3.2",
- "objc2-quartz-core 0.3.2",
+ "objc2-foundation",
+ "objc2-metal",
+ "objc2-quartz-core",
  "once_cell",
  "ordered-float",
  "parking_lot",
@@ -7079,15 +6877,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.60.2"
@@ -7246,50 +7035,219 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
 [[package]]
 name = "winit"
-version = "0.30.8"
-source = "git+https://github.com/iced-rs/winit.git?rev=05b8ff17a06562f0a10bb46e6eaacbe2a95cb5ed#05b8ff17a06562f0a10bb46e6eaacbe2a95cb5ed"
+version = "0.31.0-beta.2"
+source = "git+https://github.com/rust-windowing/winit.git?rev=f5e20bd7da25934f39abe8dc44a0597110ef6357#f5e20bd7da25934f39abe8dc44a0597110ef6357"
 dependencies = [
- "ahash",
- "android-activity",
- "atomic-waker",
  "bitflags 2.13.0",
- "block2 0.5.1",
- "bytemuck",
- "calloop",
  "cfg_aliases",
- "concurrent-queue",
- "core-foundation 0.9.4",
- "core-graphics",
  "cursor-icon",
  "dpi",
- "js-sys",
  "libc",
- "memmap2",
+ "raw-window-handle",
+ "rustix",
+ "smol_str 0.3.6",
+ "tracing",
+ "winit-android",
+ "winit-appkit",
+ "winit-common",
+ "winit-core",
+ "winit-orbital",
+ "winit-uikit",
+ "winit-wayland",
+ "winit-web",
+ "winit-win32",
+ "winit-x11",
+]
+
+[[package]]
+name = "winit-android"
+version = "0.31.0-beta.2"
+source = "git+https://github.com/rust-windowing/winit.git?rev=f5e20bd7da25934f39abe8dc44a0597110ef6357#f5e20bd7da25934f39abe8dc44a0597110ef6357"
+dependencies = [
+ "android-activity",
+ "bitflags 2.13.0",
+ "dpi",
  "ndk",
- "objc2 0.5.2",
- "objc2-app-kit 0.2.2",
- "objc2-foundation 0.2.2",
- "objc2-ui-kit",
+ "raw-window-handle",
+ "smol_str 0.3.6",
+ "tracing",
+ "winit-core",
+]
+
+[[package]]
+name = "winit-appkit"
+version = "0.31.0-beta.2"
+source = "git+https://github.com/rust-windowing/winit.git?rev=f5e20bd7da25934f39abe8dc44a0597110ef6357#f5e20bd7da25934f39abe8dc44a0597110ef6357"
+dependencies = [
+ "bitflags 2.13.0",
+ "block2",
+ "dispatch2",
+ "dpi",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-core-video",
+ "objc2-foundation",
+ "raw-window-handle",
+ "smol_str 0.3.6",
+ "tracing",
+ "winit-common",
+ "winit-core",
+]
+
+[[package]]
+name = "winit-common"
+version = "0.31.0-beta.2"
+source = "git+https://github.com/rust-windowing/winit.git?rev=f5e20bd7da25934f39abe8dc44a0597110ef6357#f5e20bd7da25934f39abe8dc44a0597110ef6357"
+dependencies = [
+ "block2",
+ "memmap2",
+ "objc2",
+ "objc2-core-foundation",
+ "objc2-foundation",
+ "smol_str 0.3.6",
+ "tracing",
+ "winit-core",
+ "x11-dl",
+ "xkbcommon-dl",
+]
+
+[[package]]
+name = "winit-core"
+version = "0.31.0-beta.2"
+source = "git+https://github.com/rust-windowing/winit.git?rev=f5e20bd7da25934f39abe8dc44a0597110ef6357#f5e20bd7da25934f39abe8dc44a0597110ef6357"
+dependencies = [
+ "bitflags 2.13.0",
+ "cursor-icon",
+ "dpi",
+ "keyboard-types",
+ "raw-window-handle",
+ "smol_str 0.3.6",
+ "url",
+ "web-time",
+]
+
+[[package]]
+name = "winit-orbital"
+version = "0.31.0-beta.2"
+source = "git+https://github.com/rust-windowing/winit.git?rev=f5e20bd7da25934f39abe8dc44a0597110ef6357#f5e20bd7da25934f39abe8dc44a0597110ef6357"
+dependencies = [
+ "bitflags 2.13.0",
+ "dpi",
+ "libredox",
  "orbclient",
+ "raw-window-handle",
+ "redox_event",
+ "smol_str 0.3.6",
+ "tracing",
+ "winit-core",
+]
+
+[[package]]
+name = "winit-uikit"
+version = "0.31.0-beta.2"
+source = "git+https://github.com/rust-windowing/winit.git?rev=f5e20bd7da25934f39abe8dc44a0597110ef6357#f5e20bd7da25934f39abe8dc44a0597110ef6357"
+dependencies = [
+ "bitflags 2.13.0",
+ "block2",
+ "dispatch2",
+ "dpi",
+ "objc2",
+ "objc2-core-foundation",
+ "objc2-foundation",
+ "objc2-ui-kit",
+ "raw-window-handle",
+ "smol_str 0.3.6",
+ "tracing",
+ "winit-common",
+ "winit-core",
+]
+
+[[package]]
+name = "winit-wayland"
+version = "0.31.0-beta.2"
+source = "git+https://github.com/rust-windowing/winit.git?rev=f5e20bd7da25934f39abe8dc44a0597110ef6357#f5e20bd7da25934f39abe8dc44a0597110ef6357"
+dependencies = [
+ "bitflags 2.13.0",
+ "calloop",
+ "cursor-icon",
+ "dpi",
+ "foldhash 0.2.0",
+ "libc",
+ "memmap2",
  "percent-encoding",
- "pin-project",
  "raw-window-handle",
- "redox_syscall 0.4.1",
- "rustix 0.38.44",
+ "rustix",
  "sctk-adwaita",
  "smithay-client-toolkit",
- "smol_str 0.2.2",
+ "smol_str 0.3.6",
  "tracing",
- "unicode-segmentation",
- "wasm-bindgen",
- "wasm-bindgen-futures",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
  "wayland-protocols-plasma",
+ "winit-common",
+ "winit-core",
+]
+
+[[package]]
+name = "winit-web"
+version = "0.31.0-beta.2"
+source = "git+https://github.com/rust-windowing/winit.git?rev=f5e20bd7da25934f39abe8dc44a0597110ef6357#f5e20bd7da25934f39abe8dc44a0597110ef6357"
+dependencies = [
+ "atomic-waker",
+ "bitflags 2.13.0",
+ "concurrent-queue",
+ "cursor-icon",
+ "dpi",
+ "js-sys",
+ "pin-project",
+ "raw-window-handle",
+ "smol_str 0.3.6",
+ "tracing",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
  "web-sys",
  "web-time",
- "windows-sys 0.52.0",
+ "winit-core",
+]
+
+[[package]]
+name = "winit-win32"
+version = "0.31.0-beta.2"
+source = "git+https://github.com/rust-windowing/winit.git?rev=f5e20bd7da25934f39abe8dc44a0597110ef6357#f5e20bd7da25934f39abe8dc44a0597110ef6357"
+dependencies = [
+ "bitflags 2.13.0",
+ "cursor-icon",
+ "dpi",
+ "raw-window-handle",
+ "smol_str 0.3.6",
+ "tracing",
+ "unicode-segmentation",
+ "url",
+ "windows-sys 0.61.2",
+ "winit-core",
+]
+
+[[package]]
+name = "winit-x11"
+version = "0.31.0-beta.2"
+source = "git+https://github.com/rust-windowing/winit.git?rev=f5e20bd7da25934f39abe8dc44a0597110ef6357#f5e20bd7da25934f39abe8dc44a0597110ef6357"
+dependencies = [
+ "bitflags 2.13.0",
+ "bytemuck",
+ "calloop",
+ "cursor-icon",
+ "dpi",
+ "libc",
+ "percent-encoding",
+ "raw-window-handle",
+ "rustix",
+ "smol_str 0.3.6",
+ "tracing",
+ "winit-common",
+ "winit-core",
  "x11-dl",
  "x11rb",
  "xkbcommon-dl",
@@ -7319,7 +7277,7 @@ dependencies = [
  "libc",
  "log",
  "os_pipe",
- "rustix 1.1.4",
+ "rustix",
  "thiserror 2.0.18",
  "tree_magic_mini",
  "wayland-backend",
@@ -7356,8 +7314,9 @@ dependencies = [
  "libc",
  "libloading",
  "once_cell",
- "rustix 1.1.4",
+ "rustix",
  "x11rb-protocol",
+ "xcursor",
 ]
 
 [[package]]
@@ -7475,7 +7434,7 @@ dependencies = [
  "hex",
  "libc",
  "ordered-stream",
- "rustix 1.1.4",
+ "rustix",
  "serde",
  "serde_repr",
  "tracing",
diff --git a/Cargo.toml b/Cargo.toml
index 23d4d09013..74a7077caf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -244,7 +244,7 @@ wasmtimer = "0.4.2"
 web-sys = "=0.3.85"
 web-time = "1.1"
 wgpu = { version = "29", default-features = false, features = ["std", "wgsl"] }
-winit = { git = "https://github.com/iced-rs/winit.git", rev = "05b8ff17a06562f0a10bb46e6eaacbe2a95cb5ed", default-features = false, features = ["rwh_06"] }
+winit = { git = "https://github.com/rust-windowing/winit.git", rev = "f5e20bd7da25934f39abe8dc44a0597110ef6357", default-features = false }
 
 [workspace.lints.rust]
 rust_2018_idioms = { level = "deny", priority = -1 }
diff --git a/benches/cpu.rs b/benches/cpu.rs
index 46a9fd8d2c..235ff1d639 100644
--- a/benches/cpu.rs
+++ b/benches/cpu.rs
@@ -2,7 +2,7 @@
 use criterion::{Bencher, Criterion, criterion_group, criterion_main};
 
 use iced::border;
-use iced::mouse;
+use iced::pointer::mouse;
 use iced::widget::{canvas, center_y, column, container, row, scrollable, space, text};
 use iced::{Center, Color, Element, Fill, Length, Never, Point, Rectangle, Size, Theme};
 use iced_renderer::Renderer;
diff --git a/benches/wgpu.rs b/benches/wgpu.rs
index 2ff4e209b5..268726648e 100644
--- a/benches/wgpu.rs
+++ b/benches/wgpu.rs
@@ -2,7 +2,7 @@
 use criterion::{Bencher, Criterion, criterion_group, criterion_main};
 
 use iced::alignment;
-use iced::mouse;
+use iced::pointer::mouse;
 use iced::widget::{canvas, scrollable, stack, text};
 use iced::{Color, Element, Font, Length, Pixels, Point, Rectangle, Size, Theme};
 use iced_wgpu::Renderer;
diff --git a/core/src/element.rs b/core/src/element.rs
index a8c0d6adec..bcf0f06d79 100644
--- a/core/src/element.rs
+++ b/core/src/element.rs
@@ -1,6 +1,6 @@
 use crate::layout;
-use crate::mouse;
 use crate::overlay;
+use crate::pointer::mouse;
 use crate::renderer;
 use crate::shell;
 use crate::widget;
diff --git a/core/src/event.rs b/core/src/event.rs
index f5325a57de..07b9d8636a 100644
--- a/core/src/event.rs
+++ b/core/src/event.rs
@@ -2,8 +2,7 @@
 use crate::clipboard;
 use crate::input_method;
 use crate::keyboard;
-use crate::mouse;
-use crate::touch;
+use crate::pointer;
 use crate::window;
 
 /// A user interface event.
@@ -17,15 +16,12 @@ pub enum Event {
     /// A keyboard event
     Keyboard(keyboard::Event),
 
-    /// A mouse event
-    Mouse(mouse::Event),
+    /// A pointer event
+    Pointer(pointer::Event),
 
     /// A window event
     Window(window::Event),
 
-    /// A touch event
-    Touch(touch::Event),
-
     /// An input method event
     InputMethod(input_method::Event),
 
diff --git a/core/src/lib.rs b/core/src/lib.rs
index a6b67b8de2..3c621993d9 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -23,16 +23,15 @@ pub mod input_method;
 pub mod keyboard;
 pub mod layout;
 pub mod length;
-pub mod mouse;
 pub mod overlay;
 pub mod padding;
+pub mod pointer;
 pub mod renderer;
 pub mod shell;
 pub mod svg;
 pub mod text;
 pub mod theme;
 pub mod time;
-pub mod touch;
 pub mod widget;
 pub mod window;
 
diff --git a/core/src/mouse.rs b/core/src/mouse.rs
deleted file mode 100644
index d13a60fbc1..0000000000
--- a/core/src/mouse.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-//! Handle mouse events.
-pub mod click;
-
-mod button;
-mod cursor;
-mod event;
-mod interaction;
-
-pub use button::Button;
-pub use click::Click;
-pub use cursor::Cursor;
-pub use event::{Event, ScrollDelta};
-pub use interaction::Interaction;
diff --git a/core/src/mouse/event.rs b/core/src/mouse/event.rs
deleted file mode 100644
index 7f5585ada0..0000000000
--- a/core/src/mouse/event.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-use crate::Point;
-
-use super::Button;
-
-/// A mouse event.
-///
-/// _**Note:** This type is largely incomplete! If you need to track
-/// additional events, feel free to [open an issue] and share your use case!_
-///
-/// [open an issue]: https://github.com/iced-rs/iced/issues
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum Event {
-    /// The mouse cursor entered the window.
-    CursorEntered,
-
-    /// The mouse cursor left the window.
-    CursorLeft,
-
-    /// The mouse cursor was moved
-    CursorMoved {
-        /// The new position of the mouse cursor
-        position: Point,
-    },
-
-    /// A mouse button was pressed.
-    ButtonPressed(Button),
-
-    /// A mouse button was released.
-    ButtonReleased(Button),
-
-    /// The mouse wheel was scrolled.
-    WheelScrolled {
-        /// The scroll movement.
-        delta: ScrollDelta,
-    },
-}
-
-/// A scroll movement.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum ScrollDelta {
-    /// A line-based scroll movement
-    Lines {
-        /// The number of horizontal lines scrolled
-        x: f32,
-
-        /// The number of vertical lines scrolled
-        y: f32,
-    },
-    /// A pixel-based scroll movement
-    Pixels {
-        /// The number of horizontal pixels scrolled
-        x: f32,
-        /// The number of vertical pixels scrolled
-        y: f32,
-    },
-}
diff --git a/core/src/overlay.rs b/core/src/overlay.rs
index 5882e3dadc..7fa061f316 100644
--- a/core/src/overlay.rs
+++ b/core/src/overlay.rs
@@ -8,7 +8,7 @@ pub use group::Group;
 pub use nested::Nested;
 
 use crate::layout;
-use crate::mouse;
+use crate::pointer::mouse;
 use crate::renderer;
 use crate::widget;
 use crate::widget::Tree;
diff --git a/core/src/overlay/element.rs b/core/src/overlay/element.rs
index d6db752679..ba975d3b42 100644
--- a/core/src/overlay/element.rs
+++ b/core/src/overlay/element.rs
@@ -1,7 +1,7 @@
 pub use crate::Overlay;
 
 use crate::layout;
-use crate::mouse;
+use crate::pointer::mouse;
 use crate::renderer;
 use crate::shell;
 use crate::widget;
diff --git a/core/src/overlay/group.rs b/core/src/overlay/group.rs
index 788ebcb5c3..c63c3aca64 100644
--- a/core/src/overlay/group.rs
+++ b/core/src/overlay/group.rs
@@ -1,6 +1,6 @@
 use crate::layout;
-use crate::mouse;
 use crate::overlay;
+use crate::pointer::mouse;
 use crate::renderer;
 use crate::widget;
 use crate::{Event, Layout, Overlay, Shell, Size};
diff --git a/core/src/overlay/nested.rs b/core/src/overlay/nested.rs
index 0846031c35..5ba3a16bdb 100644
--- a/core/src/overlay/nested.rs
+++ b/core/src/overlay/nested.rs
@@ -1,7 +1,7 @@
 use crate::event;
 use crate::layout;
-use crate::mouse;
 use crate::overlay;
+use crate::pointer::mouse;
 use crate::renderer;
 use crate::widget;
 use crate::{Event, Layout, Shell, Size};
diff --git a/core/src/pointer.rs b/core/src/pointer.rs
new file mode 100644
index 0000000000..1bf0aada9b
--- /dev/null
+++ b/core/src/pointer.rs
@@ -0,0 +1,65 @@
+//! Handle pointer events.
+
+pub mod button;
+pub mod mouse;
+pub mod tablet;
+pub mod touch;
+
+mod event;
+
+pub use event::Event;
+
+/// The kind of device that produced a pointer event.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum Kind {
+    /// A mouse.
+    Mouse,
+
+    /// A finger touching a screen.
+    Touch(touch::Finger),
+
+    /// A tablet tool.
+    TabletTool(tablet::Kind),
+
+    /// An unknown pointer device.
+    Unknown,
+}
+
+/// The device and associated data that produced a pointer event.
+#[derive(Debug, Clone, PartialEq)]
+pub enum Source {
+    /// A mouse.
+    Mouse,
+
+    /// A finger touching a screen.
+    Touch {
+        /// The identifier of the finger.
+        finger_id: touch::Finger,
+
+        /// The force of the touch, if reported by the device.
+        force: Option<touch::Force>,
+    },
+
+    /// A tablet tool.
+    TabletTool {
+        /// The kind of tablet tool.
+        kind: tablet::Kind,
+
+        /// Data describing how the tool is held and used.
+        data: tablet::Data,
+    },
+
+    /// An unknown pointer device.
+    Unknown,
+}
+
+impl From<Source> for crate::pointer::Kind {
+    fn from(source: Source) -> Self {
+        match source {
+            Source::Mouse => Self::Mouse,
+            Source::Touch { finger_id, .. } => Self::Touch(finger_id),
+            Source::TabletTool { kind, .. } => Self::TabletTool(kind),
+            Source::Unknown => Self::Unknown,
+        }
+    }
+}
diff --git a/core/src/pointer/button.rs b/core/src/pointer/button.rs
new file mode 100644
index 0000000000..0c2bf657a0
--- /dev/null
+++ b/core/src/pointer/button.rs
@@ -0,0 +1,34 @@
+//! Handle pointer buttons.
+
+use crate::pointer::{mouse, tablet, touch};
+
+/// The source and button of a pointer button event.
+#[derive(Debug, Clone, PartialEq)]
+pub enum Source {
+    /// A mouse button.
+    Mouse(mouse::Button),
+
+    /// A touch contact.
+    Touch {
+        /// The identifier of the finger.
+        finger_id: touch::Finger,
+
+        /// The force of the touch, if reported by the device.
+        force: Option<touch::Force>,
+    },
+
+    /// A tablet tool button.
+    TabletTool {
+        /// The kind of tablet tool.
+        kind: tablet::Kind,
+
+        /// The button that changed state.
+        button: tablet::Button,
+
+        /// Data describing how the tool is held and used.
+        data: tablet::Data,
+    },
+
+    /// A button from an unknown pointer source.
+    Unknown(u16),
+}
diff --git a/core/src/pointer/event.rs b/core/src/pointer/event.rs
new file mode 100644
index 0000000000..3126f312f5
--- /dev/null
+++ b/core/src/pointer/event.rs
@@ -0,0 +1,119 @@
+use crate::Point;
+use crate::pointer;
+use crate::pointer::{button, mouse, tablet};
+
+/// A pointer event.
+#[derive(Debug, Clone, PartialEq)]
+pub enum Event {
+    /// A pointer entered the window.
+    PointerEntered {
+        /// The position of the pointer when it entered the window.
+        position: Point,
+
+        /// The kind of pointer that entered the window.
+        kind: pointer::Kind,
+    },
+
+    /// A pointer left the window.
+    PointerLeft {
+        /// The kind of pointer that left the window.
+        kind: pointer::Kind,
+    },
+
+    /// A pointer moved within the window.
+    PointerMoved {
+        /// The new position of the pointer.
+        position: Point,
+
+        /// The source of the pointer movement.
+        source: pointer::Source,
+    },
+
+    /// A pointer button was pressed.
+    PointerPressed {
+        /// The position of the pointer when the button was pressed.
+        position: Point,
+
+        /// The source and button that were pressed.
+        button: button::Source,
+    },
+
+    /// A pointer button was released.
+    PointerReleased {
+        /// The position of the pointer when the button was released.
+        position: Point,
+
+        /// The source and button that were released.
+        button: button::Source,
+    },
+
+    /// A mouse wheel or touchpad was scrolled.
+    WheelScrolled {
+        /// The scroll movement.
+        delta: mouse::ScrollDelta,
+    },
+}
+
+impl Event {
+    /// Returns whether the event is a mouse left click, finger press, or tablet contact.
+    pub fn is_primary_click(&self) -> bool {
+        matches!(
+            self,
+            Self::PointerPressed {
+                button: button::Source::Mouse(mouse::Button::Left)
+                    | button::Source::Touch { .. }
+                    | button::Source::TabletTool {
+                        button: tablet::Button::Contact,
+                        ..
+                    },
+                ..
+            }
+        )
+    }
+
+    /// Returns whether the event is a mouse left release, finger lift, or tablet contact release.
+    pub fn is_primary_release(&self) -> bool {
+        matches!(
+            self,
+            Self::PointerReleased {
+                button: button::Source::Mouse(mouse::Button::Left)
+                    | button::Source::Touch { .. }
+                    | button::Source::TabletTool {
+                        button: tablet::Button::Contact,
+                        ..
+                    },
+                ..
+            }
+        )
+    }
+
+    /// Returns whether the event is a mouse right click or tablet barrel press.
+    pub fn is_secondary_click(&self) -> bool {
+        matches!(
+            self,
+            Self::PointerPressed {
+                button: button::Source::Mouse(mouse::Button::Right)
+                    | button::Source::TabletTool {
+                        button: tablet::Button::Barrel,
+                        ..
+                    },
+                ..
+            }
+        )
+    }
+
+    /// Returns whether the event is a mouse right release or tablet barrel lift.
+    pub fn is_secondary_release(&self) -> bool {
+        matches!(
+            self,
+            Self::PointerReleased {
+                button: button::Source::Mouse(mouse::Button::Right)
+                    | button::Source::TabletTool {
+                        button: tablet::Button::Barrel,
+                        ..
+                    },
+                ..
+            }
+        )
+    }
+}
diff --git a/core/src/pointer/mouse.rs b/core/src/pointer/mouse.rs
new file mode 100644
index 0000000000..1e059db15f
--- /dev/null
+++ b/core/src/pointer/mouse.rs
@@ -0,0 +1,34 @@
+//! Handle mouse input.
+
+pub mod click;
+
+mod button;
+mod cursor;
+mod interaction;
+
+pub use button::Button;
+pub use click::Click;
+pub use cursor::Cursor;
+pub use interaction::Interaction;
+
+/// A scroll movement.
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum ScrollDelta {
+    /// A line-based scroll movement.
+    Lines {
+        /// The number of horizontal lines scrolled.
+        x: f32,
+
+        /// The number of vertical lines scrolled.
+        y: f32,
+    },
+
+    /// A pixel-based scroll movement.
+    Pixels {
+        /// The number of horizontal pixels scrolled.
+        x: f32,
+
+        /// The number of vertical pixels scrolled.
+        y: f32,
+    },
+}
diff --git a/core/src/mouse/button.rs b/core/src/pointer/mouse/button.rs
similarity index 100%
rename from core/src/mouse/button.rs
rename to core/src/pointer/mouse/button.rs
diff --git a/core/src/mouse/click.rs b/core/src/pointer/mouse/click.rs
similarity index 98%
rename from core/src/mouse/click.rs
rename to core/src/pointer/mouse/click.rs
index 8a1c461c41..ed0437ad0e 100644
--- a/core/src/mouse/click.rs
+++ b/core/src/pointer/mouse/click.rs
@@ -1,10 +1,11 @@
 //! Track mouse clicks.
-use crate::mouse::Button;
 use crate::time::Instant;
 use crate::{Point, Transformation};
 
 use std::ops::Mul;
 
+use super::Button;
+
 /// A mouse click.
 #[derive(Debug, Clone, Copy)]
 pub struct Click {
diff --git a/core/src/mouse/cursor.rs b/core/src/pointer/mouse/cursor.rs
similarity index 100%
rename from core/src/mouse/cursor.rs
rename to core/src/pointer/mouse/cursor.rs
diff --git a/core/src/mouse/interaction.rs b/core/src/pointer/mouse/interaction.rs
similarity index 100%
rename from core/src/mouse/interaction.rs
rename to core/src/pointer/mouse/interaction.rs
diff --git a/core/src/pointer/tablet.rs b/core/src/pointer/tablet.rs
new file mode 100644
index 0000000000..2b1e81c25c
--- /dev/null
+++ b/core/src/pointer/tablet.rs
@@ -0,0 +1,107 @@
+//! Handle tablet tool input.
+
+use crate::pointer::mouse;
+use crate::pointer::touch::Force;
+
+/// The kind of tool used with a tablet.
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum Kind {
+    /// A pen.
+    #[default]
+    Pen,
+
+    /// An eraser.
+    Eraser,
+
+    /// A brush.
+    Brush,
+
+    /// A pencil.
+    Pencil,
+
+    /// An airbrush.
+    Airbrush,
+
+    /// A finger-like tool.
+    Finger,
+
+    /// A mouse-like tool.
+    Mouse,
+
+    /// A lens cursor.
+    Lens,
+}
+
+/// Data describing how a tablet tool is held and used.
+#[derive(Debug, Default, Clone, PartialEq)]
+pub struct Data {
+    /// The force applied to the tool against the surface.
+    pub force: Option<Force>,
+
+    /// The normalized tangential, or barrel, pressure in the range `-1.0..=1.0`.
+    pub tangential_force: Option<f32>,
+
+    /// The clockwise rotation of the tool in degrees, in the range `0..=359`.
+    pub twist: Option<u16>,
+
+    /// The plane angle of the tool in degrees.
+    pub tilt: Option<Tilt>,
+
+    /// The angular position of the tool in radians.
+    pub angle: Option<Angle>,
+}
+
+/// The plane angle of a tablet tool in degrees.
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct Tilt {
+    /// The angle between the surface Y-Z plane and the tool's surface Y plane.
+    pub x: i8,
+
+    /// The angle between the surface X-Z plane and the tool's surface X plane.
+    pub y: i8,
+}
+
+/// The angular position of a tablet tool in radians.
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub struct Angle {
+    /// The angle between the tool and the surface X-Y plane.
+    pub altitude: f64,
+
+    /// The clockwise rotation between the tool's major axis and the surface X-Y plane.
+    pub azimuth: f64,
+}
+
+impl Default for Angle {
+    fn default() -> Self {
+        Self {
+            altitude: std::f64::consts::FRAC_2_PI,
+            azimuth: 0.0,
+        }
+    }
+}
+
+/// A button of a tablet tool.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub enum Button {
+    /// Contact between the tool and tablet surface.
+    Contact,
+
+    /// The tool's barrel button.
+    Barrel,
+
+    /// Another tablet tool button.
+    Other(u16),
+}
+
+impl From<Button> for Option<mouse::Button> {
+    fn from(button: Button) -> Self {
+        Some(match button {
+            Button::Contact => mouse::Button::Left,
+            Button::Barrel => mouse::Button::Right,
+            Button::Other(1) => mouse::Button::Middle,
+            Button::Other(3) => mouse::Button::Back,
+            Button::Other(4) => mouse::Button::Forward,
+            Button::Other(_) => return None,
+        })
+    }
+}
diff --git a/core/src/pointer/touch.rs b/core/src/pointer/touch.rs
new file mode 100644
index 0000000000..cff8808d0e
--- /dev/null
+++ b/core/src/pointer/touch.rs
@@ -0,0 +1,21 @@
+//! Handle touch input.
+
+/// A unique identifier representing a finger in a touch interaction.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct Finger(pub u64);
+
+/// The force of a touch or tablet interaction.
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum Force {
+    /// A force calibrated by the platform.
+    Calibrated {
+        /// The applied force, where `1.0` represents an average touch.
+        force: f64,
+
+        /// The maximum force supported by the device.
+        max_possible_force: f64,
+    },
+
+    /// A force normalized to the range from `0.0` to `1.0`.
+    Normalized(f64),
+}
diff --git a/core/src/text/editor.rs b/core/src/text/editor.rs
index ec8dd84b51..fe1dbc4682 100644
--- a/core/src/text/editor.rs
+++ b/core/src/text/editor.rs
@@ -3,7 +3,7 @@ use crate::clipboard;
 use crate::input_method;
 use crate::keyboard;
 use crate::keyboard::key;
-use crate::mouse;
+use crate::pointer::{self, mouse};
 use crate::renderer;
 use crate::text::highlighter::{self, Highlighter};
 use crate::text::{self, Alignment, LineHeight, Position, Wrapping};
@@ -384,72 +384,64 @@ impl State {
                     text.clone(),
                 )))))
             }
-            Event::Mouse(event) => match event {
-                mouse::Event::ButtonPressed(mouse::Button::Left) => {
-                    if let Some(cursor_position) = cursor.position_in(bounds) {
-                        let cursor_position =
-                            cursor_position - Vector::new(padding.left, padding.top);
-
-                        let click = mouse::Click::new(
-                            cursor_position,
-                            mouse::Button::Left,
-                            self.last_click,
-                        );
-
-                        self.focus = Some(Focus::now());
-                        self.last_click = Some(click);
-                        self.is_dragging = true;
-
-                        Some(Update::Action(Action::Click(
-                            click.position(),
-                            click.kind(),
-                        )))
-                    } else if self.focus.is_some() {
-                        self.focus = None;
-
-                        Some(Update::Unfocus)
-                    } else {
-                        None
-                    }
-                }
-                mouse::Event::ButtonReleased(mouse::Button::Left) => {
-                    self.is_dragging = false;
+            Event::Pointer(event) if event.is_primary_click() => {
+                if let Some(cursor_position) = cursor.position_in(bounds) {
+                    let cursor_position = cursor_position - Vector::new(padding.left, padding.top);
 
-                    Some(Update::Release)
-                }
-                mouse::Event::CursorMoved { .. } if self.is_dragging => {
-                    let position =
-                        cursor.position_in(bounds)? - Vector::new(padding.left, padding.top);
+                    let click =
+                        mouse::Click::new(cursor_position, mouse::Button::Left, self.last_click);
 
-                    Some(Update::Action(Action::Drag(position)))
+                    self.focus = Some(Focus::now());
+                    self.last_click = Some(click);
+                    self.is_dragging = true;
+
+                    Some(Update::Action(Action::Click(
+                        click.position(),
+                        click.kind(),
+                    )))
+                } else if self.focus.is_some() {
+                    self.focus = None;
+
+                    Some(Update::Unfocus)
+                } else {
+                    None
                 }
-                mouse::Event::WheelScrolled { delta } if cursor.is_over(bounds) => {
-                    let bounds = editor.bounds();
+            }
+            Event::Pointer(event) if event.is_primary_release() => {
+                self.is_dragging = false;
 
-                    if bounds.height >= i32::MAX as f32 {
-                        return None;
-                    }
+                Some(Update::Release)
+            }
+            Event::Pointer(pointer::Event::PointerMoved { .. }) if self.is_dragging => {
+                let position = cursor.position_in(bounds)? - Vector::new(padding.left, padding.top);
 
-                    let lines = match delta {
-                        mouse::ScrollDelta::Lines { y, .. } => {
-                            if y.abs() > 0.0 {
-                                y.signum() * -(y.abs() * 4.0).max(1.0)
-                            } else {
-                                0.0
-                            }
+                Some(Update::Action(Action::Drag(position)))
+            }
+            Event::Pointer(pointer::Event::WheelScrolled { delta }) if cursor.is_over(bounds) => {
+                let bounds = editor.bounds();
+
+                if bounds.height >= i32::MAX as f32 {
+                    return None;
+                }
+
+                let lines = match delta {
+                    mouse::ScrollDelta::Lines { y, .. } => {
+                        if y.abs() > 0.0 {
+                            y.signum() * -(y.abs() * 4.0).max(1.0)
+                        } else {
+                            0.0
                         }
-                        mouse::ScrollDelta::Pixels { y, .. } => -y / 4.0,
-                    };
+                    }
+                    mouse::ScrollDelta::Pixels { y, .. } => -y / 4.0,
+                };
 
-                    let lines = lines + self.partial_scroll;
-                    self.partial_scroll = lines.fract();
+                let lines = lines + self.partial_scroll;
+                self.partial_scroll = lines.fract();
 
-                    Some(Update::Action(Action::Scroll {
-                        lines: lines as i32,
-                    }))
-                }
-                _ => None,
-            },
+                Some(Update::Action(Action::Scroll {
+                    lines: lines as i32,
+                }))
+            }
             Event::InputMethod(event) => match event {
                 input_method::Event::Opened | input_method::Event::Closed => {
                     let is_open = matches!(event, input_method::Event::Opened);
diff --git a/core/src/text/input.rs b/core/src/text/input.rs
index 91c7bdc491..16a85342d1 100644
--- a/core/src/text/input.rs
+++ b/core/src/text/input.rs
@@ -2,7 +2,7 @@
 use crate::alignment;
 use crate::clipboard;
 use crate::layout;
-use crate::mouse;
+use crate::pointer::mouse;
 use crate::text::editor;
 use crate::text::paragraph;
 use crate::text::{self, Alignment, Editor, LineHeight, Position, Text, Wrapping};
diff --git a/core/src/touch.rs b/core/src/touch.rs
deleted file mode 100644
index 1812064481..0000000000
--- a/core/src/touch.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-//! Build touch events.
-use crate::Point;
-
-/// A touch interaction.
-#[derive(Debug, Clone, Copy, PartialEq)]
-#[allow(missing_docs)]
-pub enum Event {
-    /// A touch interaction was started.
-    FingerPressed { id: Finger, position: Point },
-
-    /// An on-going touch interaction was moved.
-    FingerMoved { id: Finger, position: Point },
-
-    /// A touch interaction was ended.
-    FingerLifted { id: Finger, position: Point },
-
-    /// A touch interaction was canceled.
-    FingerLost { id: Finger, position: Point },
-}
-
-/// A unique identifier representing a finger on a touch interaction.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct Finger(pub u64);
diff --git a/core/src/widget.rs b/core/src/widget.rs
index 488a48a612..7321124244 100644
--- a/core/src/widget.rs
+++ b/core/src/widget.rs
@@ -11,8 +11,8 @@ pub use text::Text;
 pub use tree::Tree;
 
 use crate::layout::{self, Layout};
-use crate::mouse;
 use crate::overlay;
+use crate::pointer::mouse;
 use crate::renderer;
 use crate::{Event, Length, Rectangle, Shell, Size, Vector};
 
diff --git a/core/src/widget/text.rs b/core/src/widget/text.rs
index 3627cd4112..16c27c57fd 100644
--- a/core/src/widget/text.rs
+++ b/core/src/widget/text.rs
@@ -22,7 +22,7 @@
 //! ```
 use crate::alignment;
 use crate::layout;
-use crate::mouse;
+use crate::pointer::mouse;
 use crate::renderer;
 use crate::text;
 use crate::text::paragraph::{self, Paragraph};
diff --git a/examples/arc/src/main.rs b/examples/arc/src/main.rs
index 0dca551814..c686c2b667 100644
--- a/examples/arc/src/main.rs
+++ b/examples/arc/src/main.rs
@@ -1,6 +1,6 @@
 use std::{f32::consts::PI, time::Instant};
 
-use iced::mouse;
+use iced::pointer::mouse;
 use iced::widget::canvas::{self, Cache, Canvas, Geometry, Path, Stroke, stroke};
 use iced::window;
 use iced::{Element, Fill, Point, Rectangle, Renderer, Subscription, Theme};
diff --git a/examples/bezier_tool/src/main.rs b/examples/bezier_tool/src/main.rs
index de8eea72f3..b3355a7f66 100644
--- a/examples/bezier_tool/src/main.rs
+++ b/examples/bezier_tool/src/main.rs
@@ -54,7 +54,7 @@ impl Example {
 }
 
 mod bezier {
-    use iced::mouse;
+    use iced::pointer::{self, mouse};
     use iced::widget::canvas::{self, Canvas, Event, Frame, Geometry, Path, Stroke};
     use iced::{Element, Fill, Point, Rectangle, Renderer, Theme};
 
@@ -97,7 +97,7 @@ mod bezier {
             let cursor_position = cursor.position_in(bounds)?;
 
             match event {
-                Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => Some(
+                Event::Pointer(event) if event.is_primary_click() => Some(
                     match *state {
                         None => {
                             *state = Some(Pending::One {
@@ -126,7 +126,7 @@ mod bezier {
                     }
                     .and_capture(),
                 ),
-                Event::Mouse(mouse::Event::CursorMoved { .. }) if state.is_some() => {
+                Event::Pointer(pointer::Event::PointerMoved { .. }) if state.is_some() => {
                     Some(canvas::Action::request_redraw())
                 }
                 _ => None,
diff --git a/examples/clock/src/main.rs b/examples/clock/src/main.rs
index 87f8c798d5..d69fe4b8ea 100644
--- a/examples/clock/src/main.rs
+++ b/examples/clock/src/main.rs
@@ -1,5 +1,5 @@
 use iced::alignment;
-use iced::mouse;
+use iced::pointer::mouse;
 use iced::time::{self, milliseconds};
 use iced::widget::canvas::{Cache, Geometry, LineCap, Path, Stroke, stroke};
 use iced::widget::{canvas, container, text};
diff --git a/examples/color_palette/src/main.rs b/examples/color_palette/src/main.rs
index 799ff8ac37..af50a177c3 100644
--- a/examples/color_palette/src/main.rs
+++ b/examples/color_palette/src/main.rs
@@ -1,5 +1,5 @@
 use iced::alignment;
-use iced::mouse;
+use iced::pointer::mouse;
 use iced::theme;
 use iced::widget::canvas::{self, Canvas, Frame, Geometry, Path};
 use iced::widget::{Slider, column, row, text};
diff --git a/examples/custom_quad/src/main.rs b/examples/custom_quad/src/main.rs
index f9c9c4b6d2..da96b37006 100644
--- a/examples/custom_quad/src/main.rs
+++ b/examples/custom_quad/src/main.rs
@@ -130,7 +130,7 @@ mod quad {
     use iced::advanced::renderer;
     use iced::advanced::widget::{self, Widget};
     use iced::border;
-    use iced::mouse;
+    use iced::pointer::mouse;
     use iced::{Border, Color, Element, Length, Rectangle, Shadow, Size};
 
     pub struct CustomQuad {
diff --git a/examples/custom_shader/src/scene.rs b/examples/custom_shader/src/scene.rs
index 5b9c6d0184..d48c5b1a37 100644
--- a/examples/custom_shader/src/scene.rs
+++ b/examples/custom_shader/src/scene.rs
@@ -7,7 +7,7 @@ use pipeline::Pipeline;
 use crate::wgpu;
 use pipeline::cube::{self, Cube};
 
-use iced::mouse;
+use iced::pointer::mouse;
 use iced::time::Duration;
 use iced::widget::shader::{self, Viewport};
 use iced::{Color, Rectangle};
diff --git a/examples/custom_widget/src/main.rs b/examples/custom_widget/src/main.rs
index b9a134754b..e01a3f5417 100644
--- a/examples/custom_widget/src/main.rs
+++ b/examples/custom_widget/src/main.rs
@@ -4,7 +4,7 @@ mod circle {
     use iced::advanced::renderer;
     use iced::advanced::widget::{self, Widget};
     use iced::border;
-    use iced::mouse;
+    use iced::pointer::mouse;
     use iced::{Color, Element, Length, Rectangle, Size};
 
     pub struct Circle {
diff --git a/examples/delineate/src/main.rs b/examples/delineate/src/main.rs
index f42b9b093e..6ce30cf105 100644
--- a/examples/delineate/src/main.rs
+++ b/examples/delineate/src/main.rs
@@ -1,5 +1,5 @@
 use iced::event::{self, Event};
-use iced::mouse;
+use iced::pointer;
 use iced::widget::{self, column, container, row, scrollable, selector, space, text};
 use iced::window;
 use iced::{Center, Color, Element, Fill, Font, Point, Rectangle, Subscription, Task, Theme};
@@ -137,7 +137,7 @@ impl Example {
 
     fn subscription(&self) -> Subscription<Message> {
         event::listen_with(|event, _status, _window| match event {
-            Event::Mouse(mouse::Event::CursorMoved { position }) => {
+            Event::Pointer(pointer::Event::PointerMoved { position, .. }) => {
                 Some(Message::MouseMoved(position))
             }
             Event::Window(window::Event::Resized { .. }) => Some(Message::WindowResized),
diff --git a/examples/game_of_life/src/main.rs b/examples/game_of_life/src/main.rs
index 92d12998ab..0ae77c54b9 100644
--- a/examples/game_of_life/src/main.rs
+++ b/examples/game_of_life/src/main.rs
@@ -177,9 +177,8 @@ fn view_controls<'a>(
 mod grid {
     use crate::Preset;
     use iced::alignment;
-    use iced::mouse;
+    use iced::pointer::{self, button, mouse};
     use iced::time::{Duration, Instant};
-    use iced::touch;
     use iced::widget::canvas;
     use iced::widget::canvas::{Cache, Canvas, Event, Frame, Geometry, Path, Text};
     use iced::widget::text;
@@ -365,7 +364,11 @@ mod grid {
             bounds: Rectangle,
             cursor: mouse::Cursor,
         ) -> Option<canvas::Action<Message>> {
-            if let Event::Mouse(mouse::Event::ButtonReleased(_)) = event {
+            if let Event::Pointer(pointer::Event::PointerReleased {
+                button: button::Source::Mouse(_),
+                ..
+            }) = event
+            {
                 *interaction = Interaction::None;
             }
 
@@ -381,7 +384,10 @@ mod grid {
             };
 
             match event {
-                Event::Touch(touch::Event::FingerMoved { .. }) => {
+                Event::Pointer(pointer::Event::PointerMoved {
+                    source: pointer::Source::Touch { .. },
+                    ..
+                }) => {
                     let message = {
                         *interaction = if is_populated {
                             Interaction::Erasing
@@ -399,96 +405,93 @@ mod grid {
                             .and_capture(),
                     )
                 }
-                Event::Mouse(mouse_event) => match mouse_event {
-                    mouse::Event::ButtonPressed(button) => {
-                        let message = match button {
-                            mouse::Button::Left => {
-                                *interaction = if is_populated {
-                                    Interaction::Erasing
-                                } else {
-                                    Interaction::Drawing
-                                };
-
-                                populate.or(unpopulate)
-                            }
-                            mouse::Button::Right => {
-                                *interaction = Interaction::Panning {
-                                    translation: self.translation,
-                                    start: cursor_position,
-                                };
+                Event::Pointer(pointer::Event::PointerPressed {
+                    button: button::Source::Mouse(button),
+                    ..
+                }) => {
+                    let message = match button {
+                        mouse::Button::Left => {
+                            *interaction = if is_populated {
+                                Interaction::Erasing
+                            } else {
+                                Interaction::Drawing
+                            };
 
-                                None
-                            }
-                            _ => None,
-                        };
+                            populate.or(unpopulate)
+                        }
+                        mouse::Button::Right => {
+                            *interaction = Interaction::Panning {
+                                translation: self.translation,
+                                start: cursor_position,
+                            };
 
-                        Some(
-                            message
-                                .map(canvas::Action::publish)
-                                .unwrap_or(canvas::Action::request_redraw())
-                                .and_capture(),
-                        )
-                    }
-                    mouse::Event::CursorMoved { .. } => {
-                        let message = match *interaction {
-                            Interaction::Drawing => populate,
-                            Interaction::Erasing => unpopulate,
-                            Interaction::Panning { translation, start } => {
-                                Some(Message::Translated(
-                                    translation + (cursor_position - start) * (1.0 / self.scaling),
-                                ))
-                            }
-                            Interaction::None => None,
-                        };
+                            None
+                        }
+                        _ => None,
+                    };
 
-                        let action = message
+                    Some(
+                        message
                             .map(canvas::Action::publish)
-                            .unwrap_or(canvas::Action::request_redraw());
+                            .unwrap_or(canvas::Action::request_redraw())
+                            .and_capture(),
+                    )
+                }
+                Event::Pointer(pointer::Event::PointerMoved { .. }) => {
+                    let message = match *interaction {
+                        Interaction::Drawing => populate,
+                        Interaction::Erasing => unpopulate,
+                        Interaction::Panning { translation, start } => Some(Message::Translated(
+                            translation + (cursor_position - start) * (1.0 / self.scaling),
+                        )),
+                        Interaction::None => None,
+                    };
 
-                        Some(match interaction {
-                            Interaction::None => action,
-                            _ => action.and_capture(),
-                        })
-                    }
-                    mouse::Event::WheelScrolled { delta } => match *delta {
-                        mouse::ScrollDelta::Lines { y, .. }
-                        | mouse::ScrollDelta::Pixels { y, .. } => {
-                            if y < 0.0 && self.scaling > Self::MIN_SCALING
-                                || y > 0.0 && self.scaling < Self::MAX_SCALING
+                    let action = message
+                        .map(canvas::Action::publish)
+                        .unwrap_or(canvas::Action::request_redraw());
+
+                    Some(match interaction {
+                        Interaction::None => action,
+                        _ => action.and_capture(),
+                    })
+                }
+                Event::Pointer(pointer::Event::WheelScrolled { delta }) => match *delta {
+                    mouse::ScrollDelta::Lines { y, .. } | mouse::ScrollDelta::Pixels { y, .. } => {
+                        if y < 0.0 && self.scaling > Self::MIN_SCALING
+                            || y > 0.0 && self.scaling < Self::MAX_SCALING
+                        {
+                            let old_scaling = self.scaling;
+
+                            let scaling = (self.scaling * (1.0 + y / 30.0))
+                                .clamp(Self::MIN_SCALING, Self::MAX_SCALING);
+
+                            let translation = if let Some(cursor_to_center) =
+                                cursor.position_from(bounds.center())
                             {
-                                let old_scaling = self.scaling;
-
-                                let scaling = (self.scaling * (1.0 + y / 30.0))
-                                    .clamp(Self::MIN_SCALING, Self::MAX_SCALING);
-
-                                let translation = if let Some(cursor_to_center) =
-                                    cursor.position_from(bounds.center())
-                                {
-                                    let factor = scaling - old_scaling;
-
-                                    Some(
-                                        self.translation
-                                            - Vector::new(
-                                                cursor_to_center.x * factor
-                                                    / (old_scaling * old_scaling),
-                                                cursor_to_center.y * factor
-                                                    / (old_scaling * old_scaling),
-                                            ),
-                                    )
-                                } else {
-                                    None
-                                };
+                                let factor = scaling - old_scaling;
 
                                 Some(
-                                    canvas::Action::publish(Message::Scaled(scaling, translation))
-                                        .and_capture(),
+                                    self.translation
+                                        - Vector::new(
+                                            cursor_to_center.x * factor
+                                                / (old_scaling * old_scaling),
+                                            cursor_to_center.y * factor
+                                                / (old_scaling * old_scaling),
+                                        ),
                                 )
                             } else {
-                                Some(canvas::Action::capture())
-                            }
+                                None
+                            };
+
+                            Some(
+                                canvas::Action::publish(Message::Scaled(scaling, translation))
+                                    .and_capture(),
+                            )
+                        } else {
+                            Some(canvas::Action::capture())
                         }
-                    },
-                    _ => None,
+                    }
                 },
                 _ => None,
             }
diff --git a/examples/geometry/src/main.rs b/examples/geometry/src/main.rs
index 9b84142767..c4620608da 100644
--- a/examples/geometry/src/main.rs
+++ b/examples/geometry/src/main.rs
@@ -6,7 +6,7 @@ mod rainbow {
     use iced::advanced::layout::{self, Layout};
     use iced::advanced::renderer;
     use iced::advanced::widget::{self, Widget};
-    use iced::mouse;
+    use iced::pointer::mouse;
     use iced::{Element, Event, Length, Rectangle, Renderer, Size, Theme, Transformation, Vector};
 
     #[derive(Debug, Clone, Copy, Default)]
diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs
index 43602e6970..f596e1821c 100644
--- a/examples/integration/src/main.rs
+++ b/examples/integration/src/main.rs
@@ -7,7 +7,7 @@ use scene::Scene;
 use iced_wgpu::graphics::{Shell, Viewport};
 use iced_wgpu::{Engine, Renderer, wgpu};
 use iced_winit::conversion;
-use iced_winit::core::mouse;
+use iced_winit::core::pointer::mouse;
 use iced_winit::core::renderer;
 use iced_winit::core::shell;
 use iced_winit::core::time::Instant;
@@ -35,7 +35,7 @@ pub fn main() -> Result<(), winit::error::EventLoopError> {
     enum Runner {
         Loading,
         Ready {
-            window: Arc<winit::window::Window>,
+            window: Arc<dyn winit::window::Window>,
             queue: wgpu::Queue,
             device: wgpu::Device,
             surface: wgpu::Surface<'static>,
@@ -53,15 +53,15 @@ pub fn main() -> Result<(), winit::error::EventLoopError> {
     }
 
     impl winit::application::ApplicationHandler for Runner {
-        fn resumed(&mut self, event_loop: &winit::event_loop::ActiveEventLoop) {
+        fn resumed(&mut self, event_loop: &dyn winit::event_loop::ActiveEventLoop) {
             if let Self::Loading = self {
-                let window = Arc::new(
+                let window: Arc<dyn winit::window::Window> = Arc::from(
                     event_loop
                         .create_window(winit::window::WindowAttributes::default())
                         .expect("Create window"),
                 );
 
-                let physical_size = window.inner_size();
+                let physical_size = window.surface_size();
                 let viewport = Viewport::with_physical_size(
                     Size::new(physical_size.width, physical_size.height),
                     renderer::Scale {
@@ -174,9 +174,11 @@ pub fn main() -> Result<(), winit::error::EventLoopError> {
             }
         }
 
+        fn can_create_surfaces(&mut self, _event_loop: &dyn winit::event_loop::ActiveEventLoop) {}
+
         fn window_event(
             &mut self,
-            event_loop: &winit::event_loop::ActiveEventLoop,
+            event_loop: &dyn winit::event_loop::ActiveEventLoop,
             _window_id: winit::window::WindowId,
             event: WindowEvent,
         ) {
@@ -207,7 +209,7 @@ pub fn main() -> Result<(), winit::error::EventLoopError> {
             match event {
                 WindowEvent::RedrawRequested => {
                     if *resized {
-                        let size = window.inner_size();
+                        let size = window.surface_size();
 
                         *viewport = Viewport::with_physical_size(
                             Size::new(size.width, size.height),
@@ -285,7 +287,7 @@ pub fn main() -> Result<(), winit::error::EventLoopError> {
                                 if let Some(icon) =
                                     iced_winit::conversion::mouse_interaction(mouse_interaction)
                                 {
-                                    window.set_cursor(icon);
+                                    window.set_cursor(winit::cursor::Cursor::Icon(icon));
                                     window.set_cursor_visible(true);
                                 } else {
                                     window.set_cursor_visible(false);
@@ -312,7 +314,7 @@ pub fn main() -> Result<(), winit::error::EventLoopError> {
                         }
                     }
                 }
-                WindowEvent::CursorMoved { position, .. } => {
+                WindowEvent::PointerMoved { position, .. } => {
                     *cursor = mouse::Cursor::Available(conversion::cursor_position(
                         position,
                         viewport.scale_factor(),
@@ -321,7 +323,7 @@ pub fn main() -> Result<(), winit::error::EventLoopError> {
                 WindowEvent::ModifiersChanged(new_modifiers) => {
                     *modifiers = new_modifiers.state();
                 }
-                WindowEvent::Resized(_) => {
+                WindowEvent::SurfaceResized(_) => {
                     *resized = true;
                 }
                 WindowEvent::CloseRequested => {
@@ -365,6 +367,6 @@ pub fn main() -> Result<(), winit::error::EventLoopError> {
         }
     }
 
-    let mut runner = Runner::Loading;
-    event_loop.run_app(&mut runner)
+    let runner = Runner::Loading;
+    event_loop.run_app(runner)
 }
diff --git a/examples/layout/src/main.rs b/examples/layout/src/main.rs
index 4fc5c362cb..b8d4c86e93 100644
--- a/examples/layout/src/main.rs
+++ b/examples/layout/src/main.rs
@@ -1,6 +1,6 @@
 use iced::border;
 use iced::keyboard;
-use iced::mouse;
+use iced::pointer::mouse;
 use iced::widget::{
     button, canvas, center, center_y, checkbox, column, container, pick_list, pin, responsive, row,
     rule, scrollable, space, stack, text,
diff --git a/examples/loading_spinners/src/circular.rs b/examples/loading_spinners/src/circular.rs
index 2d73905a4d..48fb86f748 100644
--- a/examples/loading_spinners/src/circular.rs
+++ b/examples/loading_spinners/src/circular.rs
@@ -3,7 +3,7 @@ use iced::advanced::layout;
 use iced::advanced::renderer;
 use iced::advanced::widget::tree::{self, Tree};
 use iced::advanced::{self, Layout, Shell, Widget};
-use iced::mouse;
+use iced::pointer::mouse;
 use iced::time::Instant;
 use iced::widget::canvas;
 use iced::window;
diff --git a/examples/loading_spinners/src/linear.rs b/examples/loading_spinners/src/linear.rs
index 8a55b628db..8f61800546 100644
--- a/examples/loading_spinners/src/linear.rs
+++ b/examples/loading_spinners/src/linear.rs
@@ -3,7 +3,7 @@ use iced::advanced::layout;
 use iced::advanced::renderer::{self, Quad};
 use iced::advanced::widget::tree::{self, Tree};
 use iced::advanced::{self, Layout, Shell, Widget};
-use iced::mouse;
+use iced::pointer::mouse;
 use iced::time::Instant;
 use iced::window;
 use iced::{Background, Color, Element, Event, Length, Rectangle, Size};
diff --git a/examples/loupe/src/main.rs b/examples/loupe/src/main.rs
index a2cf7b4b5f..9f3e5e789b 100644
--- a/examples/loupe/src/main.rs
+++ b/examples/loupe/src/main.rs
@@ -51,7 +51,7 @@ mod loupe {
     use iced::advanced::layout::{self, Layout};
     use iced::advanced::renderer;
     use iced::advanced::widget::{self, Widget};
-    use iced::mouse;
+    use iced::pointer::mouse;
     use iced::{Color, Element, Event, Length, Rectangle, Renderer, Size, Theme, Transformation};
 
     pub fn loupe<'a, Message>(
diff --git a/examples/multitouch/src/main.rs b/examples/multitouch/src/main.rs
index 532a06b8f1..ec1b6096f7 100644
--- a/examples/multitouch/src/main.rs
+++ b/examples/multitouch/src/main.rs
@@ -1,8 +1,7 @@
 //! This example shows how to use touch events in `Canvas` to draw
 //! a circle around each fingertip. This only works on touch-enabled
 //! computers like Microsoft Surface.
-use iced::mouse;
-use iced::touch;
+use iced::pointer::{self, button, mouse, touch};
 use iced::widget::canvas::stroke::{self, Stroke};
 use iced::widget::canvas::{self, Canvas, Event, Geometry};
 use iced::{Color, Element, Fill, Point, Rectangle, Renderer, Theme};
@@ -59,13 +58,28 @@ impl canvas::Program<Message> for Multitouch {
         _cursor: mouse::Cursor,
     ) -> Option<canvas::Action<Message>> {
         let message = match event.clone() {
-            Event::Touch(
-                touch::Event::FingerPressed { id, position }
-                | touch::Event::FingerMoved { id, position },
-            ) => Some(Message::FingerPressed { id, position }),
-            Event::Touch(
-                touch::Event::FingerLifted { id, .. } | touch::Event::FingerLost { id, .. },
-            ) => Some(Message::FingerLifted { id }),
+            Event::Pointer(
+                pointer::Event::PointerPressed {
+                    position,
+                    button: button::Source::Touch { finger_id, .. },
+                }
+                | pointer::Event::PointerMoved {
+                    position,
+                    source: pointer::Source::Touch { finger_id, .. },
+                },
+            ) => Some(Message::FingerPressed {
+                id: finger_id,
+                position,
+            }),
+            Event::Pointer(
+                pointer::Event::PointerReleased {
+                    button: button::Source::Touch { finger_id, .. },
+                    ..
+                }
+                | pointer::Event::PointerLeft {
+                    kind: pointer::Kind::Touch(finger_id),
+                },
+            ) => Some(Message::FingerLifted { id: finger_id }),
             _ => None,
         };
 
diff --git a/examples/sandpiles/src/main.rs b/examples/sandpiles/src/main.rs
index a329289982..f1cc9d2d49 100644
--- a/examples/sandpiles/src/main.rs
+++ b/examples/sandpiles/src/main.rs
@@ -1,4 +1,4 @@
-use iced::mouse;
+use iced::pointer::{self, mouse};
 use iced::widget::{canvas, column, container, row, slider, text};
 use iced::window;
 use iced::{
@@ -189,14 +189,14 @@ impl canvas::Program<Message> for Viewer<'_> {
         cursor: mouse::Cursor,
     ) -> Option<canvas::Action<Message>> {
         match event {
-            Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => {
+            Event::Pointer(event) if event.is_primary_click() => {
                 let position = cursor.position_in(bounds)? - (bounds.center() - Point::ORIGIN);
                 let row = (position.x / Self::CELL_SIZE).round() as isize;
                 let column = (position.y / Self::CELL_SIZE).round() as isize;
 
                 Some(canvas::Action::publish(Message::Add(Cell { row, column })))
             }
-            Event::Mouse(mouse::Event::CursorMoved { .. }) if cursor.is_over(bounds) => {
+            Event::Pointer(pointer::Event::PointerMoved { .. }) if cursor.is_over(bounds) => {
                 Some(canvas::Action::request_redraw())
             }
             _ => None,
diff --git a/examples/sierpinski_triangle/src/main.rs b/examples/sierpinski_triangle/src/main.rs
index 8cd8192a8e..0cd592c42f 100644
--- a/examples/sierpinski_triangle/src/main.rs
+++ b/examples/sierpinski_triangle/src/main.rs
@@ -1,4 +1,4 @@
-use iced::mouse;
+use iced::pointer::{self, button, mouse};
 use iced::widget::canvas::{self, Canvas, Event, Geometry};
 use iced::widget::{column, row, slider, text};
 use iced::{Center, Color, Element, Fill, Point, Rectangle, Renderer, Size, Theme};
@@ -82,7 +82,10 @@ impl canvas::Program<Message> for SierpinskiGraph {
         let cursor_position = cursor.position_in(bounds)?;
 
         match event {
-            Event::Mouse(mouse::Event::ButtonPressed(button)) => match button {
+            Event::Pointer(pointer::Event::PointerPressed {
+                button: button::Source::Mouse(button),
+                ..
+            }) => match button {
                 mouse::Button::Left => Some(canvas::Action::publish(Message::PointAdded(
                     cursor_position,
                 ))),
diff --git a/examples/solar_system/src/main.rs b/examples/solar_system/src/main.rs
index 5e83785b66..fb78dd4057 100644
--- a/examples/solar_system/src/main.rs
+++ b/examples/solar_system/src/main.rs
@@ -7,7 +7,7 @@
 //!
 //! [1]: https://developer.mozilla.org/en-US/docs/Web/API/Canvas_API/Tutorial/Basic_animations#An_animated_solar_system
 use iced::backend;
-use iced::mouse;
+use iced::pointer::mouse;
 use iced::widget::canvas::stroke::{self, Stroke};
 use iced::widget::canvas::{Geometry, Path};
 use iced::widget::{canvas, column, container, image, pick_list, stack, text};
diff --git a/examples/the_matrix/src/main.rs b/examples/the_matrix/src/main.rs
index 31fe31d14c..70b5793df1 100644
--- a/examples/the_matrix/src/main.rs
+++ b/examples/the_matrix/src/main.rs
@@ -1,4 +1,4 @@
-use iced::mouse;
+use iced::pointer::mouse;
 use iced::time::{self, milliseconds};
 use iced::widget::canvas;
 use iced::{Color, Element, Fill, Font, Point, Rectangle, Renderer, Subscription, Theme};
diff --git a/examples/toast/src/main.rs b/examples/toast/src/main.rs
index f54d42da18..a46a231243 100644
--- a/examples/toast/src/main.rs
+++ b/examples/toast/src/main.rs
@@ -162,7 +162,7 @@ mod toast {
     use iced::advanced::shell;
     use iced::advanced::widget::{self, Operation, Tree};
     use iced::advanced::{Shell, Widget};
-    use iced::mouse;
+    use iced::pointer::mouse;
     use iced::time::{self, Duration, Instant};
     use iced::widget::{button, column, container, row, rule, space, text};
     use iced::window;
diff --git a/examples/vectorial_text/src/main.rs b/examples/vectorial_text/src/main.rs
index 5832380fa0..f7432558e4 100644
--- a/examples/vectorial_text/src/main.rs
+++ b/examples/vectorial_text/src/main.rs
@@ -1,5 +1,5 @@
 use iced::alignment;
-use iced::mouse;
+use iced::pointer::mouse;
 use iced::widget::{canvas, checkbox, column, row, slider, space, text};
 use iced::{Center, Element, Fill, Point, Rectangle, Renderer, Theme, Vector};
 
diff --git a/graphics/src/text/editor.rs b/graphics/src/text/editor.rs
index a14164aae1..42ad3f6acc 100644
--- a/graphics/src/text/editor.rs
+++ b/graphics/src/text/editor.rs
@@ -550,13 +550,13 @@ impl editor::Editor for Editor {
                     editor.action(
                         font_system.raw(),
                         match kind {
-                            iced_core::mouse::click::Kind::Single => {
+                            iced_core::pointer::mouse::click::Kind::Single => {
                                 cosmic_text::Action::Click { x, y }
                             }
-                            iced_core::mouse::click::Kind::Double => {
+                            iced_core::pointer::mouse::click::Kind::Double => {
                                 cosmic_text::Action::DoubleClick { x, y }
                             }
-                            iced_core::mouse::click::Kind::Triple => {
+                            iced_core::pointer::mouse::click::Kind::Triple => {
                                 cosmic_text::Action::TripleClick { x, y }
                             }
                         },
diff --git a/runtime/src/user_interface.rs b/runtime/src/user_interface.rs
index 24615eb71e..18754d5cbb 100644
--- a/runtime/src/user_interface.rs
+++ b/runtime/src/user_interface.rs
@@ -1,8 +1,8 @@
 //! Implement your own event loop to drive a user interface.
 use crate::core::event::{self, Event};
 use crate::core::layout;
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::shell;
 use crate::core::widget;
@@ -142,7 +142,7 @@ where
     /// #     pub fn view(&self) -> iced_core::Element<(), (), Renderer> { unimplemented!() }
     /// #     pub fn update(&mut self, _: ()) {}
     /// # }
-    /// use iced_runtime::core::mouse;
+    /// use iced_runtime::core::pointer::mouse;
     /// use iced_runtime::core::shell;
     /// use iced_runtime::core::window;
     /// use iced_runtime::core::Size;
@@ -443,7 +443,7 @@ where
     /// #     pub fn view(&self) -> Element<(), (), Renderer> { unimplemented!() }
     /// #     pub fn update(&mut self, _: ()) {}
     /// # }
-    /// use iced_runtime::core::mouse;
+    /// use iced_runtime::core::pointer::mouse;
     /// use iced_runtime::core::renderer;
     /// use iced_runtime::core::shell;
     /// use iced_runtime::core::window;
diff --git a/src/advanced.rs b/src/advanced.rs
index a41221f6a1..937babe991 100644
--- a/src/advanced.rs
+++ b/src/advanced.rs
@@ -16,8 +16,8 @@ pub use crate::core::clipboard;
 pub use crate::core::image;
 pub use crate::core::input_method::{self, InputMethod};
 pub use crate::core::layout::{self, Layout};
-pub use crate::core::mouse;
 pub use crate::core::overlay::{self, Overlay};
+pub use crate::core::pointer::mouse;
 pub use crate::core::renderer::{self, Renderer};
 pub use crate::core::shell::{self, Shell};
 pub use crate::core::svg;
diff --git a/src/lib.rs b/src/lib.rs
index fbbb286aff..b60e53e07f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -437,14 +437,14 @@
 //!                     }
 //!                  }
 //!             } else {
-//!                 Task::none()    
+//!                 Task::none()
 //!             }
 //!         }
 //!         Message::Conversation(message) => {
 //!             if let Screen::Conversation(conversation) = &mut state.screen {
 //!                 conversation.update(message).map(Message::Conversation)
 //!             } else {
-//!                 Task::none()    
+//!                 Task::none()
 //!             }
 //!         }
 //!     }
@@ -593,9 +593,9 @@ pub mod keyboard {
     pub use iced_futures::keyboard::listen;
 }
 
-pub mod mouse {
-    //! Listen and react to mouse events.
-    pub use crate::core::mouse::{Button, Cursor, Event, Interaction, ScrollDelta};
+pub mod pointer {
+    //! Listen and react to pointer events.
+    pub use crate::core::pointer::*;
 }
 
 pub mod system {
@@ -620,11 +620,6 @@ pub mod overlay {
     pub use iced_widget::overlay::*;
 }
 
-pub mod touch {
-    //! Listen and react to touch events.
-    pub use crate::core::touch::{Event, Finger};
-}
-
 #[allow(hidden_glob_reexports)]
 pub mod widget {
     //! Use the built-in widgets or create your own.
diff --git a/src/touch.rs b/src/touch.rs
deleted file mode 100644
index f2bdfca827..0000000000
--- a/src/touch.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-//! Listen and react to touch events.
-pub use crate::core::touch::{Event, Finger};
diff --git a/test/src/emulator.rs b/test/src/emulator.rs
index a47f35aa31..477238d631 100644
--- a/test/src/emulator.rs
+++ b/test/src/emulator.rs
@@ -1,7 +1,7 @@
 //! Run your application in a headless runtime.
 use crate::core;
 use crate::core::font;
-use crate::core::mouse;
+use crate::core::pointer::{self, mouse};
 use crate::core::renderer;
 use crate::core::shell;
 use crate::core::time::Instant;
@@ -304,50 +304,54 @@ impl<P: Program + 'static> Emulator<P> {
 
         match instruction {
             Instruction::Interact(interaction) => {
-                let Some(events) = interaction.events(|target| match target {
-                    instruction::Target::Id(id) => {
-                        use widget::Operation;
-
-                        let mut operation = Selector::find(widget::Id::from(id.to_owned()));
-
-                        user_interface.operate(
-                            &self.renderer,
-                            &mut widget::operation::black_box(&mut operation),
-                        );
-
-                        match operation.finish() {
-                            widget::operation::Outcome::Some(widget) => {
-                                Some(widget?.visible_bounds()?.center())
+                let Some(events) =
+                    interaction.events(self.cursor.position(), |target| match target {
+                        instruction::Target::Id(id) => {
+                            use widget::Operation;
+
+                            let mut operation = Selector::find(widget::Id::from(id.to_owned()));
+
+                            user_interface.operate(
+                                &self.renderer,
+                                &mut widget::operation::black_box(&mut operation),
+                            );
+
+                            match operation.finish() {
+                                widget::operation::Outcome::Some(widget) => {
+                                    Some(widget?.visible_bounds()?.center())
+                                }
+                                _ => None,
                             }
-                            _ => None,
                         }
-                    }
-                    instruction::Target::Text(text) => {
-                        use widget::Operation;
+                        instruction::Target::Text(text) => {
+                            use widget::Operation;
 
-                        let mut operation = Selector::find(text.as_str());
+                            let mut operation = Selector::find(text.as_str());
 
-                        user_interface.operate(
-                            &self.renderer,
-                            &mut widget::operation::black_box(&mut operation),
-                        );
+                            user_interface.operate(
+                                &self.renderer,
+                                &mut widget::operation::black_box(&mut operation),
+                            );
 
-                        match operation.finish() {
-                            widget::operation::Outcome::Some(text) => {
-                                Some(text?.visible_bounds()?.center())
+                            match operation.finish() {
+                                widget::operation::Outcome::Some(text) => {
+                                    Some(text?.visible_bounds()?.center())
+                                }
+                                _ => None,
                             }
-                            _ => None,
                         }
-                    }
-                    instruction::Target::Point(position) => Some(*position),
-                }) else {
+                        instruction::Target::Point(position) => Some(*position),
+                    })
+                else {
                     self.runtime.send(Event::Failed(instruction.clone()));
                     self.cache = Some(user_interface.into_cache());
                     return;
                 };
 
                 for event in &events {
-                    if let core::Event::Mouse(mouse::Event::CursorMoved { position }) = event {
+                    if let core::Event::Pointer(pointer::Event::PointerMoved { position, .. }) =
+                        event
+                    {
                         self.cursor = mouse::Cursor::Available(*position);
                     }
                 }
diff --git a/test/src/instruction.rs b/test/src/instruction.rs
index 188f13362b..28abd37d87 100644
--- a/test/src/instruction.rs
+++ b/test/src/instruction.rs
@@ -1,6 +1,6 @@
 //! A step in an end-to-end test.
 use crate::core::keyboard;
-use crate::core::mouse;
+use crate::core::pointer::{self, button, mouse};
 use crate::core::{Event, Point};
 use crate::simulator;
 
@@ -48,17 +48,23 @@ impl Interaction {
     /// This can be useful for recording tests during real usage.
     pub fn from_event(event: &Event) -> Option<Self> {
         Some(match event {
-            Event::Mouse(mouse) => Self::Mouse(match mouse {
-                mouse::Event::CursorMoved { position } => Mouse::Move(Target::Point(*position)),
-                mouse::Event::ButtonPressed(button) => Mouse::Press {
-                    button: *button,
-                    target: None,
-                },
-                mouse::Event::ButtonReleased(button) => Mouse::Release {
-                    button: *button,
-                    target: None,
-                },
-                _ => None?,
+            Event::Pointer(pointer::Event::PointerMoved {
+                position,
+                source: pointer::Source::Mouse,
+            }) => Self::Mouse(Mouse::Move(Target::Point(*position))),
+            Event::Pointer(pointer::Event::PointerPressed {
+                position,
+                button: button::Source::Mouse(button),
+            }) => Self::Mouse(Mouse::Press {
+                button: *button,
+                target: Some(Target::Point(*position)),
+            }),
+            Event::Pointer(pointer::Event::PointerReleased {
+                position,
+                button: button::Source::Mouse(button),
+            }) => Self::Mouse(Mouse::Release {
+                button: *button,
+                target: Some(Target::Point(*position)),
             }),
             Event::Keyboard(keyboard) => Self::Keyboard(match keyboard {
                 keyboard::Event::KeyPressed { key, text, .. } => match key {
@@ -202,12 +208,31 @@ impl Interaction {
     ///
     /// The `find_target` closure must convert a [`Target`] into its screen
     /// coordinates.
-    pub fn events(&self, find_target: impl FnOnce(&Target) -> Option<Point>) -> Option<Vec<Event>> {
-        let mouse_move_ = |to| Event::Mouse(mouse::Event::CursorMoved { position: to });
-
-        let mouse_press = |button| Event::Mouse(mouse::Event::ButtonPressed(button));
-
-        let mouse_release = |button| Event::Mouse(mouse::Event::ButtonReleased(button));
+    pub fn events(
+        &self,
+        cursor_position: Option<Point>,
+        find_target: impl FnOnce(&Target) -> Option<Point>,
+    ) -> Option<Vec<Event>> {
+        let mouse_move = |position| {
+            Event::Pointer(pointer::Event::PointerMoved {
+                position,
+                source: pointer::Source::Mouse,
+            })
+        };
+
+        let mouse_press = |button, position| {
+            Event::Pointer(pointer::Event::PointerPressed {
+                position,
+                button: button::Source::Mouse(button),
+            })
+        };
+
+        let mouse_release = |button, position| {
+            Event::Pointer(pointer::Event::PointerReleased {
+                position,
+                button: button::Source::Mouse(button),
+            })
+        };
 
         let key_press = |key| simulator::press_key(key, None);
 
@@ -215,44 +240,53 @@ impl Interaction {
 
         Some(match self {
             Interaction::Mouse(mouse) => match mouse {
-                Mouse::Move(to) => vec![mouse_move_(find_target(to)?)],
+                Mouse::Move(to) => vec![mouse_move(find_target(to)?)],
                 Mouse::Press {
                     button,
                     target: Some(at),
-                } => vec![mouse_move_(find_target(at)?), mouse_press(*button)],
+                } => {
+                    let position = find_target(at)?;
+
+                    vec![mouse_move(position), mouse_press(*button, position)]
+                }
                 Mouse::Press {
                     button,
                     target: None,
-                } => {
-                    vec![mouse_press(*button)]
-                }
+                } => vec![mouse_press(*button, cursor_position?)],
                 Mouse::Release {
                     button,
                     target: Some(at),
                 } => {
-                    vec![mouse_move_(find_target(at)?), mouse_release(*button)]
+                    let position = find_target(at)?;
+
+                    vec![mouse_move(position), mouse_release(*button, position)]
                 }
                 Mouse::Release {
                     button,
                     target: None,
-                } => {
-                    vec![mouse_release(*button)]
-                }
+                } => vec![mouse_release(*button, cursor_position?)],
                 Mouse::Click {
                     button,
                     target: Some(at),
                 } => {
+                    let position = find_target(at)?;
+
                     vec![
-                        mouse_move_(find_target(at)?),
-                        mouse_press(*button),
-                        mouse_release(*button),
+                        mouse_move(position),
+                        mouse_press(*button, position),
+                        mouse_release(*button, position),
                     ]
                 }
                 Mouse::Click {
                     button,
                     target: None,
                 } => {
-                    vec![mouse_press(*button), mouse_release(*button)]
+                    let position = cursor_position?;
+
+                    vec![
+                        mouse_press(*button, position),
+                        mouse_release(*button, position),
+                    ]
                 }
             },
             Interaction::Keyboard(keyboard) => match keyboard {
diff --git a/test/src/simulator.rs b/test/src/simulator.rs
index 53a190d18a..9fa731ff5a 100644
--- a/test/src/simulator.rs
+++ b/test/src/simulator.rs
@@ -3,7 +3,7 @@ use crate::core;
 use crate::core::event;
 use crate::core::font;
 use crate::core::keyboard;
-use crate::core::mouse;
+use crate::core::pointer::{self, button, mouse};
 use crate::core::shell;
 use crate::core::theme;
 use crate::core::time;
@@ -143,9 +143,11 @@ where
             });
         };
 
-        self.point_at(visible_bounds.center());
+        let position = visible_bounds.center();
 
-        let _ = self.simulate(click());
+        self.point_at(position);
+
+        let _ = self.simulate(click(position));
 
         Ok(target)
     }
@@ -338,11 +340,17 @@ where
     Simulator::new(element)
 }
 
-/// Returns the sequence of events of a click.
-pub fn click() -> impl Iterator<Item = Event> {
+/// Returns the sequence of events of a click at the given position.
+pub fn click(position: Point) -> impl Iterator<Item = Event> {
     [
-        Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)),
-        Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left)),
+        Event::Pointer(pointer::Event::PointerPressed {
+            position,
+            button: button::Source::Mouse(mouse::Button::Left),
+        }),
+        Event::Pointer(pointer::Event::PointerReleased {
+            position,
+            button: button::Source::Mouse(mouse::Button::Left),
+        }),
     ]
     .into_iter()
 }
diff --git a/tester/src/lib.rs b/tester/src/lib.rs
index 1ce6635320..e052678869 100644
--- a/tester/src/lib.rs
+++ b/tester/src/lib.rs
@@ -15,7 +15,7 @@ use crate::core::Alignment::Center;
 use crate::core::Length::Fill;
 use crate::core::alignment::Horizontal::Right;
 use crate::core::border;
-use crate::core::mouse;
+use crate::core::pointer::mouse;
 use crate::core::theme;
 use crate::core::window;
 use crate::core::{Color, Element, Font, Settings, Size, Theme};
diff --git a/tester/src/recorder.rs b/tester/src/recorder.rs
index 2251aa02bf..9cc500cf66 100644
--- a/tester/src/recorder.rs
+++ b/tester/src/recorder.rs
@@ -1,6 +1,6 @@
 use crate::core::layout;
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::{self, mouse};
 use crate::core::renderer;
 use crate::core::theme;
 use crate::core::widget;
@@ -372,14 +372,15 @@ fn record<Message>(
     on_record: impl Fn(Interaction) -> Message,
     operate: impl FnMut(&mut dyn widget::Operation),
 ) {
-    if let Event::Mouse(_) = event
+    if let Event::Pointer(_) = event
         && !cursor.is_over(bounds)
     {
         return;
     }
 
-    let interaction = if let Event::Mouse(mouse::Event::CursorMoved { position }) = event {
-        Interaction::from_event(&Event::Mouse(mouse::Event::CursorMoved {
+    let interaction = if let Event::Pointer(pointer::Event::PointerMoved { position, .. }) = event {
+        Interaction::from_event(&Event::Pointer(pointer::Event::PointerMoved {
+            source: pointer::Source::Mouse,
             position: *position - (bounds.position() - Point::ORIGIN),
         }))
     } else {
diff --git a/widget/src/button.rs b/widget/src/button.rs
index f00c49d137..e847af3311 100644
--- a/widget/src/button.rs
+++ b/widget/src/button.rs
@@ -18,11 +18,10 @@
 //! ```
 use crate::core::border::{self, Border};
 use crate::core::layout;
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::{self, mouse};
 use crate::core::renderer;
 use crate::core::theme::palette;
-use crate::core::touch;
 use crate::core::widget::Operation;
 use crate::core::widget::tree::{self, Tree};
 use crate::core::window;
@@ -283,10 +282,7 @@ where
         }
 
         match event {
-            Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
-            | Event::Touch(touch::Event::FingerPressed { .. })
-                if self.on_press.is_some() =>
-            {
+            Event::Pointer(event) if event.is_primary_click() && self.on_press.is_some() => {
                 let bounds = layout.bounds();
 
                 if cursor.is_over(bounds) {
@@ -297,8 +293,7 @@ where
                     shell.capture_event();
                 }
             }
-            Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left))
-            | Event::Touch(touch::Event::FingerLifted { .. }) => {
+            Event::Pointer(event) if event.is_primary_release() => {
                 if let Some(on_press) = &self.on_press {
                     let state = tree.state.downcast_mut::<State>();
 
@@ -315,7 +310,9 @@ where
                     }
                 }
             }
-            Event::Touch(touch::Event::FingerLost { .. }) => {
+            Event::Pointer(pointer::Event::PointerLeft {
+                kind: pointer::Kind::Touch(_),
+            }) => {
                 let state = tree.state.downcast_mut::<State>();
 
                 state.is_pressed = false;
@@ -519,11 +516,11 @@ impl Default for Style {
 ///
 /// impl Catalog for MyTheme {
 ///     type Class<'a> = ButtonClass;
-///     
+///
 ///     fn default<'a>() -> Self::Class<'a> {
 ///         ButtonClass::default()
 ///     }
-///     
+///
 ///
 ///     fn style(&self, class: &Self::Class<'_>, status: Status) -> Style {
 ///         let mut style = Style::default();
diff --git a/widget/src/canvas.rs b/widget/src/canvas.rs
index 6120a527ce..156e31c1d0 100644
--- a/widget/src/canvas.rs
+++ b/widget/src/canvas.rs
@@ -6,7 +6,7 @@
 //! # pub type State = ();
 //! # pub type Element<'a, Message> = iced_widget::core::Element<'a, Message, iced_widget::Theme, iced_widget::Renderer>;
 //! #
-//! use iced::mouse;
+//! use iced::pointer::mouse;
 //! use iced::widget::canvas;
 //! use iced::{Color, Rectangle, Renderer, Theme};
 //!
@@ -62,7 +62,7 @@ pub use crate::graphics::geometry::{
 
 use crate::core::event;
 use crate::core::layout::{self, Layout};
-use crate::core::mouse;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::widget::tree::{self, Tree};
 use crate::core::window;
@@ -91,7 +91,7 @@ pub type Frame<Renderer = crate::Renderer> = geometry::Frame<Renderer>;
 /// # pub type State = ();
 /// # pub type Element<'a, Message> = iced_widget::core::Element<'a, Message, iced_widget::Theme, iced_widget::Renderer>;
 /// #
-/// use iced::mouse;
+/// use iced::pointer::mouse;
 /// use iced::widget::canvas;
 /// use iced::{Color, Rectangle, Renderer, Theme};
 ///
diff --git a/widget/src/checkbox.rs b/widget/src/checkbox.rs
index d31437a3ec..e358bd63de 100644
--- a/widget/src/checkbox.rs
+++ b/widget/src/checkbox.rs
@@ -33,11 +33,10 @@
 //! ![Checkbox drawn by `iced_wgpu`](https://github.com/iced-rs/iced/blob/7760618fb112074bc40b148944521f312152012a/docs/images/checkbox.png?raw=true)
 use crate::core::alignment;
 use crate::core::layout;
-use crate::core::mouse;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::text;
 use crate::core::theme::palette;
-use crate::core::touch;
 use crate::core::widget;
 use crate::core::widget::tree::{self, Tree};
 use crate::core::window;
@@ -320,8 +319,7 @@ where
         _viewport: &Rectangle,
     ) {
         match event {
-            Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
-            | Event::Touch(touch::Event::FingerPressed { .. }) => {
+            Event::Pointer(event) if event.is_primary_click() => {
                 let mouse_over = cursor.is_over(layout.bounds());
 
                 if mouse_over && let Some(on_toggle) = &self.on_toggle {
diff --git a/widget/src/column.rs b/widget/src/column.rs
index ecc844c668..6f95d4a129 100644
--- a/widget/src/column.rs
+++ b/widget/src/column.rs
@@ -1,8 +1,8 @@
 //! Distribute content vertically.
 use crate::core::alignment::{self, Alignment};
 use crate::core::layout;
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::widget::{Operation, Tree};
 use crate::core::{
diff --git a/widget/src/combo_box.rs b/widget/src/combo_box.rs
index f038503c92..2f47127fed 100644
--- a/widget/src/combo_box.rs
+++ b/widget/src/combo_box.rs
@@ -57,8 +57,8 @@
 use crate::core::keyboard;
 use crate::core::keyboard::key;
 use crate::core::layout::{self, Layout};
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::text;
 use crate::core::text::editor;
diff --git a/widget/src/container.rs b/widget/src/container.rs
index 4862dbaab5..c15854913c 100644
--- a/widget/src/container.rs
+++ b/widget/src/container.rs
@@ -23,8 +23,8 @@ use crate::core::alignment::{self, Alignment};
 use crate::core::border::{self, Border};
 use crate::core::gradient::{self, Gradient};
 use crate::core::layout;
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::theme;
 use crate::core::widget::tree::{self, Tree};
diff --git a/widget/src/float.rs b/widget/src/float.rs
index 9787d20bd2..a83ea97cf5 100644
--- a/widget/src/float.rs
+++ b/widget/src/float.rs
@@ -2,8 +2,8 @@
 use crate::core;
 use crate::core::border;
 use crate::core::layout;
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::widget;
 use crate::core::widget::tree;
diff --git a/widget/src/grid.rs b/widget/src/grid.rs
index 4551be12ec..4ae373c846 100644
--- a/widget/src/grid.rs
+++ b/widget/src/grid.rs
@@ -1,7 +1,7 @@
 //! Distribute content on a grid.
 use crate::core::layout::{self, Layout};
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::widget::{Operation, Tree};
 use crate::core::{Element, Event, Length, Pixels, Rectangle, Shell, Size, Vector, Widget};
diff --git a/widget/src/helpers.rs b/widget/src/helpers.rs
index 4f8c0cebb2..224510404a 100644
--- a/widget/src/helpers.rs
+++ b/widget/src/helpers.rs
@@ -583,7 +583,7 @@ where
     Renderer: core::Renderer + 'a,
 {
     use crate::core::layout::{self, Layout};
-    use crate::core::mouse;
+    use crate::core::pointer::mouse;
     use crate::core::renderer;
     use crate::core::widget::tree::{self, Tree};
     use crate::core::{Event, Rectangle, Shell, Size};
@@ -659,14 +659,16 @@ where
             shell: &mut Shell<'_, Message>,
             viewport: &Rectangle,
         ) {
-            let is_mouse_press =
-                matches!(event, core::Event::Mouse(mouse::Event::ButtonPressed(_)));
+            let is_pointer_press = matches!(
+                event,
+                core::Event::Pointer(core::pointer::Event::PointerPressed { .. })
+            );
 
             self.content
                 .as_widget_mut()
                 .update(tree, event, layout, cursor, renderer, shell, viewport);
 
-            if is_mouse_press && cursor.is_over(layout.bounds()) {
+            if is_pointer_press && cursor.is_over(layout.bounds()) {
                 shell.capture_event();
             }
         }
@@ -675,10 +677,10 @@ where
             &self,
             state: &core::widget::Tree,
             layout: core::Layout<'_>,
-            cursor: core::mouse::Cursor,
+            cursor: core::pointer::mouse::Cursor,
             viewport: &core::Rectangle,
             renderer: &Renderer,
-        ) -> core::mouse::Interaction {
+        ) -> core::pointer::mouse::Interaction {
             let interaction = self
                 .content
                 .as_widget()
@@ -726,7 +728,7 @@ where
     Renderer: core::Renderer + 'a,
 {
     use crate::core::layout::{self, Layout};
-    use crate::core::mouse;
+    use crate::core::pointer::mouse;
     use crate::core::renderer;
     use crate::core::widget::tree::{self, Tree};
     use crate::core::{Event, Rectangle, Shell, Size};
@@ -875,7 +877,10 @@ where
 
             if matches!(
                 event,
-                Event::Mouse(mouse::Event::CursorMoved { .. } | mouse::Event::ButtonReleased(_))
+                Event::Pointer(
+                    core::pointer::Event::PointerMoved { .. }
+                        | core::pointer::Event::PointerReleased { .. }
+                )
             ) || is_visible
             {
                 let redraw_request = shell.redraw_request();
@@ -1852,7 +1857,7 @@ where
 /// # pub type State = ();
 /// # pub type Element<'a, Message> = iced_widget::core::Element<'a, Message, iced_widget::Theme, iced_widget::Renderer>;
 /// #
-/// use iced::mouse;
+/// use iced::pointer::mouse;
 /// use iced::widget::canvas;
 /// use iced::{Color, Rectangle, Renderer, Theme};
 ///
diff --git a/widget/src/image.rs b/widget/src/image.rs
index 98fe156c2c..1ba497f1a0 100644
--- a/widget/src/image.rs
+++ b/widget/src/image.rs
@@ -22,7 +22,7 @@ pub use viewer::Viewer;
 use crate::core::border;
 use crate::core::image;
 use crate::core::layout;
-use crate::core::mouse;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::widget::Tree;
 use crate::core::{
diff --git a/widget/src/image/viewer.rs b/widget/src/image/viewer.rs
index 8ecb53dca9..6faf83e500 100644
--- a/widget/src/image/viewer.rs
+++ b/widget/src/image/viewer.rs
@@ -2,7 +2,7 @@
 use crate::core::border;
 use crate::core::image::{self, FilterMethod};
 use crate::core::layout;
-use crate::core::mouse;
+use crate::core::pointer::{self, mouse};
 use crate::core::renderer;
 use crate::core::widget::tree::{self, Tree};
 use crate::core::{
@@ -160,7 +160,7 @@ where
         let bounds = layout.bounds();
 
         match event {
-            Event::Mouse(mouse::Event::WheelScrolled { delta }) => {
+            Event::Pointer(pointer::Event::WheelScrolled { delta }) => {
                 let Some(cursor_position) = cursor.position_over(bounds) else {
                     return;
                 };
@@ -214,7 +214,7 @@ where
                 shell.request_redraw();
                 shell.capture_event();
             }
-            Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => {
+            Event::Pointer(event) if event.is_primary_click() => {
                 let Some(cursor_position) = cursor.position_over(bounds) else {
                     return;
                 };
@@ -226,12 +226,12 @@ where
 
                 shell.capture_event();
             }
-            Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left)) => {
+            Event::Pointer(event) if event.is_primary_release() => {
                 let state = tree.state.downcast_mut::<State>();
 
                 state.cursor_grabbed_at = None;
             }
-            Event::Mouse(mouse::Event::CursorMoved { position }) => {
+            Event::Pointer(pointer::Event::PointerMoved { position, .. }) => {
                 let state = tree.state.downcast_mut::<State>();
 
                 if let Some(origin) = state.cursor_grabbed_at {
diff --git a/widget/src/keyed/column.rs b/widget/src/keyed/column.rs
index 9351563738..71564528f5 100644
--- a/widget/src/keyed/column.rs
+++ b/widget/src/keyed/column.rs
@@ -1,7 +1,7 @@
 //! Keyed columns distribute content vertically while keeping continuity.
 use crate::core::layout;
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::widget::Operation;
 use crate::core::widget::tree::{self, Tree};
diff --git a/widget/src/lazy.rs b/widget/src/lazy.rs
index 7a78f11672..609e83a1b5 100644
--- a/widget/src/lazy.rs
+++ b/widget/src/lazy.rs
@@ -10,8 +10,8 @@ mod cache;
 
 use crate::core::Element;
 use crate::core::layout::{self, Layout};
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::widget::tree::{self, Tree};
 use crate::core::widget::{self, Widget};
diff --git a/widget/src/lazy/component.rs b/widget/src/lazy/component.rs
index dd0317e642..6ea99ddd67 100644
--- a/widget/src/lazy/component.rs
+++ b/widget/src/lazy/component.rs
@@ -1,8 +1,8 @@
 //! Build and reuse custom widgets using The Elm Architecture.
 #![allow(deprecated)]
 use crate::core::layout::{self, Layout};
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::shell;
 use crate::core::widget;
diff --git a/widget/src/mouse_area.rs b/widget/src/mouse_area.rs
index 256a33f6e8..d29e5448eb 100644
--- a/widget/src/mouse_area.rs
+++ b/widget/src/mouse_area.rs
@@ -1,9 +1,8 @@
 //! A container for capturing mouse events.
 use crate::core::layout;
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::{self, button, mouse};
 use crate::core::renderer;
-use crate::core::touch;
 use crate::core::widget::{Operation, Tree, tree};
 use crate::core::{Element, Event, Layout, Length, Point, Rectangle, Shell, Size, Vector, Widget};
 
@@ -345,8 +344,7 @@ fn update<Message: Clone, Theme, Renderer>(
     }
 
     match event {
-        Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
-        | Event::Touch(touch::Event::FingerPressed { .. }) => {
+        Event::Pointer(event) if event.is_primary_click() => {
             if let Some(message) = widget.on_press.as_ref() {
                 shell.publish(message.clone());
                 shell.capture_event();
@@ -369,35 +367,40 @@ fn update<Message: Clone, Theme, Renderer>(
                 shell.capture_event();
             }
         }
-        Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left))
-        | Event::Touch(touch::Event::FingerLifted { .. }) => {
+        Event::Pointer(event) if event.is_primary_release() => {
             if let Some(message) = widget.on_release.as_ref() {
                 shell.publish(message.clone());
             }
         }
-        Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Right)) => {
+        Event::Pointer(event) if event.is_secondary_click() => {
             if let Some(message) = widget.on_right_press.as_ref() {
                 shell.publish(message.clone());
                 shell.capture_event();
             }
         }
-        Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Right)) => {
+        Event::Pointer(event) if event.is_secondary_release() => {
             if let Some(message) = widget.on_right_release.as_ref() {
                 shell.publish(message.clone());
             }
         }
-        Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Middle)) => {
+        Event::Pointer(pointer::Event::PointerPressed {
+            button: button::Source::Mouse(mouse::Button::Middle),
+            ..
+        }) => {
             if let Some(message) = widget.on_middle_press.as_ref() {
                 shell.publish(message.clone());
                 shell.capture_event();
             }
         }
-        Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Middle)) => {
+        Event::Pointer(pointer::Event::PointerReleased {
+            button: button::Source::Mouse(mouse::Button::Middle),
+            ..
+        }) => {
             if let Some(message) = widget.on_middle_release.as_ref() {
                 shell.publish(message.clone());
             }
         }
-        Event::Mouse(mouse::Event::WheelScrolled { delta }) => {
+        Event::Pointer(pointer::Event::WheelScrolled { delta }) => {
             if let Some(on_scroll) = widget.on_scroll.as_ref() {
                 shell.publish(on_scroll(*delta));
                 shell.capture_event();
diff --git a/widget/src/overlay/menu.rs b/widget/src/overlay/menu.rs
index a8e479d0c9..a141a008d0 100644
--- a/widget/src/overlay/menu.rs
+++ b/widget/src/overlay/menu.rs
@@ -2,11 +2,10 @@
 use crate::core::alignment;
 use crate::core::border::{self, Border};
 use crate::core::layout::{self, Layout};
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::{self, button, mouse};
 use crate::core::renderer;
 use crate::core::text::{self, Text};
-use crate::core::touch;
 use crate::core::widget::tree::{self, Tree};
 use crate::core::window;
 use crate::core::{
@@ -410,7 +409,7 @@ where
             .min(self.options.len().saturating_sub(1));
 
         match event {
-            Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => {
+            Event::Pointer(event) if event.is_primary_click() => {
                 if cursor.is_over(layout.bounds())
                     && let Some(option) = self.options.get(hovered_option)
                 {
@@ -418,7 +417,7 @@ where
                     shell.capture_event();
                 }
             }
-            Event::Mouse(mouse::Event::CursorMoved { .. }) => {
+            Event::Pointer(pointer::Event::PointerMoved { .. }) => {
                 if let Some(cursor_position) = cursor.position_in(layout.bounds()) {
                     let text_size = self.text_size.unwrap_or_else(|| renderer.default_size());
 
@@ -440,7 +439,10 @@ where
                     *self.hovered_option = Some(new_hovered_option);
                 }
             }
-            Event::Touch(touch::Event::FingerPressed { .. }) => {
+            Event::Pointer(pointer::Event::PointerPressed {
+                button: button::Source::Touch { .. },
+                ..
+            }) => {
                 if let Some(cursor_position) = cursor.position_in(layout.bounds()) {
                     let text_size = self.text_size.unwrap_or_else(|| renderer.default_size());
 
diff --git a/widget/src/pane_grid.rs b/widget/src/pane_grid.rs
index cb4554f76e..efc0030876 100644
--- a/widget/src/pane_grid.rs
+++ b/widget/src/pane_grid.rs
@@ -80,10 +80,9 @@ pub use title_bar::TitleBar;
 
 use crate::container;
 use crate::core::layout;
-use crate::core::mouse;
 use crate::core::overlay::{self, Group};
+use crate::core::pointer::{self, mouse};
 use crate::core::renderer;
-use crate::core::touch;
 use crate::core::widget;
 use crate::core::widget::tree::{self, Tree};
 use crate::core::window;
@@ -499,8 +498,7 @@ where
         }
 
         match event {
-            Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
-            | Event::Touch(touch::Event::FingerPressed { .. }) => {
+            Event::Pointer(event) if event.is_primary_click() => {
                 let bounds = layout.bounds();
 
                 if let Some(cursor_position) = cursor.position_over(bounds) {
@@ -552,9 +550,15 @@ where
                     }
                 }
             }
-            Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left))
-            | Event::Touch(touch::Event::FingerLifted { .. })
-            | Event::Touch(touch::Event::FingerLost { .. }) => {
+            Event::Pointer(event)
+                if event.is_primary_release()
+                    || matches!(
+                        event,
+                        pointer::Event::PointerLeft {
+                            kind: pointer::Kind::Touch(_),
+                        }
+                    ) =>
+            {
                 if let Some((pane, origin)) = action.picked_pane()
                     && let Some(on_drag) = on_drag
                     && let Some(cursor_position) = cursor.position()
@@ -596,8 +600,7 @@ where
 
                 *action = state::Action::Idle;
             }
-            Event::Mouse(mouse::Event::CursorMoved { .. })
-            | Event::Touch(touch::Event::FingerMoved { .. }) => {
+            Event::Pointer(pointer::Event::PointerMoved { .. }) => {
                 if let Some((_, on_resize)) = &self.on_resize {
                     if let Some((split, _)) = action.picked_split() {
                         let bounds = layout.bounds();
diff --git a/widget/src/pane_grid/content.rs b/widget/src/pane_grid/content.rs
index 557b0aa185..aa64b6c72a 100644
--- a/widget/src/pane_grid/content.rs
+++ b/widget/src/pane_grid/content.rs
@@ -1,7 +1,7 @@
 use crate::container;
 use crate::core::layout;
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::widget::{self, Tree};
 use crate::core::{self, Element, Event, Layout, Point, Rectangle, Shell, Size, Vector};
diff --git a/widget/src/pane_grid/title_bar.rs b/widget/src/pane_grid/title_bar.rs
index a23708e0f9..fdd33ac37a 100644
--- a/widget/src/pane_grid/title_bar.rs
+++ b/widget/src/pane_grid/title_bar.rs
@@ -1,7 +1,7 @@
 use crate::container;
 use crate::core::layout;
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::widget::{self, Tree};
 use crate::core::{self, Element, Event, Layout, Padding, Point, Rectangle, Shell, Size, Vector};
diff --git a/widget/src/pick_list.rs b/widget/src/pick_list.rs
index b98fb0643f..6ebfeaee9d 100644
--- a/widget/src/pick_list.rs
+++ b/widget/src/pick_list.rs
@@ -64,12 +64,11 @@
 use crate::core::alignment;
 use crate::core::keyboard;
 use crate::core::layout;
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::{self, mouse};
 use crate::core::renderer;
 use crate::core::text::paragraph;
 use crate::core::text::{self, Text};
-use crate::core::touch;
 use crate::core::widget::tree::{self, Tree};
 use crate::core::window;
 use crate::core::{
@@ -440,8 +439,7 @@ where
         let state = tree.state.downcast_mut::<State<Renderer::Paragraph>>();
 
         match event {
-            Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
-            | Event::Touch(touch::Event::FingerPressed { .. }) => {
+            Event::Pointer(event) if event.is_primary_click() => {
                 if state.is_open {
                     // Event wasn't processed by overlay, so cursor was clicked either outside its
                     // bounds or on the drop-down, either way we close the overlay.
@@ -469,7 +467,7 @@ where
                     shell.capture_event();
                 }
             }
-            Event::Mouse(mouse::Event::WheelScrolled {
+            Event::Pointer(pointer::Event::WheelScrolled {
                 delta: mouse::ScrollDelta::Lines { y, .. },
             }) => {
                 let Some(on_select) = &self.on_select else {
diff --git a/widget/src/pin.rs b/widget/src/pin.rs
index f5ee63d112..29c20b8b68 100644
--- a/widget/src/pin.rs
+++ b/widget/src/pin.rs
@@ -20,8 +20,8 @@
 //! }
 //! ```
 use crate::core::layout;
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::widget;
 use crate::core::{
diff --git a/widget/src/progress_bar.rs b/widget/src/progress_bar.rs
index ae879dd544..9ff7c74356 100644
--- a/widget/src/progress_bar.rs
+++ b/widget/src/progress_bar.rs
@@ -21,7 +21,7 @@
 //! ```
 use crate::core::border::{self, Border};
 use crate::core::layout;
-use crate::core::mouse;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::widget::Tree;
 use crate::core::{
diff --git a/widget/src/qr_code.rs b/widget/src/qr_code.rs
index e664d1a2f1..d7666ef05b 100644
--- a/widget/src/qr_code.rs
+++ b/widget/src/qr_code.rs
@@ -23,7 +23,7 @@
 use crate::Renderer;
 use crate::canvas;
 use crate::core::layout;
-use crate::core::mouse;
+use crate::core::pointer::mouse;
 use crate::core::renderer::{self, Renderer as _};
 use crate::core::widget::tree::{self, Tree};
 use crate::core::{
diff --git a/widget/src/radio.rs b/widget/src/radio.rs
index 1433f90e4d..6b9d1f18a8 100644
--- a/widget/src/radio.rs
+++ b/widget/src/radio.rs
@@ -59,10 +59,9 @@
 use crate::core::alignment;
 use crate::core::border::{self, Border};
 use crate::core::layout;
-use crate::core::mouse;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::text;
-use crate::core::touch;
 use crate::core::widget;
 use crate::core::widget::tree::{self, Tree};
 use crate::core::window;
@@ -328,9 +327,8 @@ where
         _viewport: &Rectangle,
     ) {
         match event {
-            Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
-            | Event::Touch(touch::Event::FingerPressed { .. })
-                if cursor.is_over(layout.bounds()) =>
+            Event::Pointer(event)
+                if event.is_primary_click() && cursor.is_over(layout.bounds()) =>
             {
                 shell.publish(self.on_click.clone());
                 shell.capture_event();
diff --git a/widget/src/responsive.rs b/widget/src/responsive.rs
index fe31cec1a1..39d7b76ddd 100644
--- a/widget/src/responsive.rs
+++ b/widget/src/responsive.rs
@@ -1,6 +1,6 @@
 use crate::core::layout::{self, Layout};
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::widget;
 use crate::core::widget::Tree;
diff --git a/widget/src/row.rs b/widget/src/row.rs
index 949babb28e..563c018c1e 100644
--- a/widget/src/row.rs
+++ b/widget/src/row.rs
@@ -1,8 +1,8 @@
 //! Distribute content horizontally.
 use crate::core::alignment::{self, Alignment};
 use crate::core::layout::{self, Layout};
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::widget::{Operation, Tree};
 use crate::core::{
diff --git a/widget/src/rule.rs b/widget/src/rule.rs
index c98c483e0c..5f14e2da1c 100644
--- a/widget/src/rule.rs
+++ b/widget/src/rule.rs
@@ -19,7 +19,7 @@
 use crate::core;
 use crate::core::border;
 use crate::core::layout;
-use crate::core::mouse;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::widget::Tree;
 use crate::core::{Color, Element, Layout, Length, Pixels, Rectangle, Size, Theme, Widget};
diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index 3289c93f17..5524d60914 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -24,12 +24,11 @@ use crate::core::alignment;
 use crate::core::border::{self, Border};
 use crate::core::keyboard;
 use crate::core::layout;
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::{self, button, mouse};
 use crate::core::renderer;
 use crate::core::text;
 use crate::core::time::{Duration, Instant};
-use crate::core::touch;
 use crate::core::widget;
 use crate::core::widget::operation::{self, Operation};
 use crate::core::widget::tree::{self, Tree};
@@ -564,12 +563,12 @@ where
 
         if let Some(last_scrolled) = state.last_scrolled {
             let clear_transaction = match event {
-                Event::Mouse(
-                    mouse::Event::ButtonPressed(_)
-                    | mouse::Event::ButtonReleased(_)
-                    | mouse::Event::CursorLeft,
+                Event::Pointer(
+                    pointer::Event::PointerPressed { .. }
+                    | pointer::Event::PointerReleased { .. }
+                    | pointer::Event::PointerLeft { .. },
                 ) => true,
-                Event::Mouse(mouse::Event::CursorMoved { .. }) => {
+                Event::Pointer(pointer::Event::PointerMoved { .. }) => {
                     last_scrolled.elapsed() > Duration::from_millis(100)
                 }
                 _ => last_scrolled.elapsed() > Duration::from_millis(1500),
@@ -583,8 +582,7 @@ where
         let mut update = || {
             if let Some(scroller_grabbed_at) = state.y_scroller_grabbed_at() {
                 match event {
-                    Event::Mouse(mouse::Event::CursorMoved { .. })
-                    | Event::Touch(touch::Event::FingerMoved { .. }) => {
+                    Event::Pointer(pointer::Event::PointerMoved { .. }) => {
                         if let Some(scrollbar) = scrollbars.y {
                             let Some(cursor_position) = cursor.land().position() else {
                                 return;
@@ -611,8 +609,7 @@ where
                 }
             } else if mouse_over_y_scrollbar {
                 match event {
-                    Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
-                    | Event::Touch(touch::Event::FingerPressed { .. }) => {
+                    Event::Pointer(event) if event.is_primary_click() => {
                         let Some(cursor_position) = cursor.position() else {
                             return;
                         };
@@ -645,8 +642,7 @@ where
 
             if let Some(scroller_grabbed_at) = state.x_scroller_grabbed_at() {
                 match event {
-                    Event::Mouse(mouse::Event::CursorMoved { .. })
-                    | Event::Touch(touch::Event::FingerMoved { .. }) => {
+                    Event::Pointer(pointer::Event::PointerMoved { .. }) => {
                         let Some(cursor_position) = cursor.land().position() else {
                             return;
                         };
@@ -673,8 +669,7 @@ where
                 }
             } else if mouse_over_x_scrollbar {
                 match event {
-                    Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
-                    | Event::Touch(touch::Event::FingerPressed { .. }) => {
+                    Event::Pointer(event) if event.is_primary_click() => {
                         let Some(cursor_position) = cursor.position() else {
                             return;
                         };
@@ -708,10 +703,25 @@ where
             if matches!(state.interaction, Interaction::AutoScrolling { .. })
                 && matches!(
                     event,
-                    Event::Mouse(
-                        mouse::Event::ButtonPressed(_) | mouse::Event::WheelScrolled { .. }
-                    ) | Event::Touch(_)
-                        | Event::Keyboard(_)
+                    Event::Pointer(
+                        pointer::Event::PointerPressed { .. }
+                            | pointer::Event::WheelScrolled { .. }
+                            | pointer::Event::PointerEntered {
+                                kind: pointer::Kind::Touch(_),
+                                ..
+                            }
+                            | pointer::Event::PointerLeft {
+                                kind: pointer::Kind::Touch(_),
+                            }
+                            | pointer::Event::PointerMoved {
+                                source: pointer::Source::Touch { .. },
+                                ..
+                            }
+                            | pointer::Event::PointerReleased {
+                                button: button::Source::Touch { .. },
+                                ..
+                            }
+                    ) | Event::Keyboard(_)
                 )
             {
                 state.interaction = Interaction::None;
@@ -722,7 +732,7 @@ where
             }
 
             if state.last_scrolled.is_none()
-                || !matches!(event, Event::Mouse(mouse::Event::WheelScrolled { .. }))
+                || !matches!(event, Event::Pointer(pointer::Event::WheelScrolled { .. }))
             {
                 let translation = state.translation(self.direction, bounds, content_bounds);
 
@@ -758,13 +768,15 @@ where
                 }
             };
 
-            if matches!(
-                event,
-                Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left))
-                    | Event::Touch(
-                        touch::Event::FingerLifted { .. } | touch::Event::FingerLost { .. }
-                    )
-            ) {
+            if let Event::Pointer(event) = event
+                && (event.is_primary_release()
+                    || matches!(
+                        event,
+                        pointer::Event::PointerLeft {
+                            kind: pointer::Kind::Touch(_),
+                        }
+                    ))
+            {
                 state.interaction = Interaction::None;
                 return;
             }
@@ -774,7 +786,7 @@ where
             }
 
             match event {
-                Event::Mouse(mouse::Event::WheelScrolled { delta }) => {
+                Event::Pointer(pointer::Event::WheelScrolled { delta }) => {
                     if cursor_over_scrollable.is_none() {
                         return;
                     }
@@ -813,9 +825,10 @@ where
                         shell.capture_event();
                     }
                 }
-                Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Middle))
-                    if self.auto_scroll && matches!(state.interaction, Interaction::None) =>
-                {
+                Event::Pointer(pointer::Event::PointerPressed {
+                    button: button::Source::Mouse(mouse::Button::Middle),
+                    ..
+                }) if self.auto_scroll && matches!(state.interaction, Interaction::None) => {
                     let Some(origin) = cursor_over_scrollable else {
                         return;
                     };
@@ -830,19 +843,27 @@ where
                     shell.invalidate_layout();
                     shell.request_redraw();
                 }
-                Event::Touch(event)
-                    if matches!(state.interaction, Interaction::TouchScrolling(_))
-                        || (!mouse_over_y_scrollbar && !mouse_over_x_scrollbar) =>
+                Event::Pointer(
+                    event @ (pointer::Event::PointerPressed {
+                        button: button::Source::Touch { .. },
+                        ..
+                    }
+                    | pointer::Event::PointerMoved {
+                        source: pointer::Source::Touch { .. },
+                        ..
+                    }),
+                ) if matches!(state.interaction, Interaction::TouchScrolling(_))
+                    || (!mouse_over_y_scrollbar && !mouse_over_x_scrollbar) =>
                 {
                     match event {
-                        touch::Event::FingerPressed { .. } => {
+                        pointer::Event::PointerPressed { .. } => {
                             let Some(position) = cursor_over_scrollable else {
                                 return;
                             };
 
                             state.interaction = Interaction::TouchScrolling(position);
                         }
-                        touch::Event::FingerMoved { .. } => {
+                        pointer::Event::PointerMoved { .. } => {
                             let Interaction::TouchScrolling(scroll_box_touched_at) =
                                 state.interaction
                             else {
@@ -876,7 +897,7 @@ where
 
                     shell.capture_event();
                 }
-                Event::Mouse(mouse::Event::CursorMoved { position }) => {
+                Event::Pointer(pointer::Event::PointerMoved { position, .. }) => {
                     if let Interaction::AutoScrolling {
                         origin, last_frame, ..
                     } = state.interaction
diff --git a/widget/src/sensor.rs b/widget/src/sensor.rs
index a2e5c7741f..eb212152bd 100644
--- a/widget/src/sensor.rs
+++ b/widget/src/sensor.rs
@@ -1,7 +1,7 @@
 //! Generate messages when content pops in and out of view.
 use crate::core::layout;
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::time::{Duration, Instant};
 use crate::core::widget;
diff --git a/widget/src/shader.rs b/widget/src/shader.rs
index 8faf06378e..6e29621b4a 100644
--- a/widget/src/shader.rs
+++ b/widget/src/shader.rs
@@ -5,7 +5,7 @@ pub use program::Program;
 
 use crate::core::event;
 use crate::core::layout::{self, Layout};
-use crate::core::mouse;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::widget::tree::{self, Tree};
 use crate::core::widget::{self, Widget};
diff --git a/widget/src/shader/program.rs b/widget/src/shader/program.rs
index bbea937c9a..5ecae35de3 100644
--- a/widget/src/shader/program.rs
+++ b/widget/src/shader/program.rs
@@ -1,5 +1,5 @@
 use crate::core::Rectangle;
-use crate::core::mouse;
+use crate::core::pointer::mouse;
 use crate::renderer::wgpu::Primitive;
 use crate::shader::{self, Action};
 
diff --git a/widget/src/slider.rs b/widget/src/slider.rs
index cf5f77e091..c4e0b48d4d 100644
--- a/widget/src/slider.rs
+++ b/widget/src/slider.rs
@@ -32,9 +32,8 @@ use crate::core::border::{self, Border};
 use crate::core::keyboard;
 use crate::core::keyboard::key::{self, Key};
 use crate::core::layout;
-use crate::core::mouse;
+use crate::core::pointer::{self, mouse};
 use crate::core::renderer;
-use crate::core::touch;
 use crate::core::widget::tree::{self, Tree};
 use crate::core::window;
 use crate::core::{
@@ -328,8 +327,7 @@ where
             };
 
             match &event {
-                Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
-                | Event::Touch(touch::Event::FingerPressed { .. }) => {
+                Event::Pointer(event) if event.is_primary_click() => {
                     if let Some(cursor_position) = cursor.position_over(layout.bounds()) {
                         if state.keyboard_modifiers.command() {
                             let _ = self.default.map(change);
@@ -342,25 +340,27 @@ where
                         shell.capture_event();
                     }
                 }
-                Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left))
-                | Event::Touch(touch::Event::FingerLifted { .. })
-                | Event::Touch(touch::Event::FingerLost { .. })
-                    if state.is_dragging =>
+                Event::Pointer(event)
+                    if state.is_dragging
+                        && (event.is_primary_release()
+                            || matches!(
+                                event,
+                                pointer::Event::PointerLeft {
+                                    kind: pointer::Kind::Touch(_),
+                                }
+                            )) =>
                 {
                     if let Some(on_release) = self.on_release.clone() {
                         shell.publish(on_release);
                     }
                     state.is_dragging = false;
                 }
-                Event::Mouse(mouse::Event::CursorMoved { .. })
-                | Event::Touch(touch::Event::FingerMoved { .. })
-                    if state.is_dragging =>
-                {
+                Event::Pointer(pointer::Event::PointerMoved { .. }) if state.is_dragging => {
                     let _ = cursor.land().position().and_then(locate).map(change);
 
                     shell.capture_event();
                 }
-                Event::Mouse(mouse::Event::WheelScrolled { delta })
+                Event::Pointer(pointer::Event::WheelScrolled { delta })
                     if state.keyboard_modifiers.control() && cursor.is_over(layout.bounds()) =>
                 {
                     let delta = match delta {
diff --git a/widget/src/space.rs b/widget/src/space.rs
index ee1d920d1f..cd9037007b 100644
--- a/widget/src/space.rs
+++ b/widget/src/space.rs
@@ -1,7 +1,7 @@
 //! Add some explicit spacing between elements.
 use crate::core;
 use crate::core::layout;
-use crate::core::mouse;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::widget::Tree;
 use crate::core::{Element, Layout, Length, Rectangle, Size, Widget};
diff --git a/widget/src/stack.rs b/widget/src/stack.rs
index 1513d4a00c..00d658625f 100644
--- a/widget/src/stack.rs
+++ b/widget/src/stack.rs
@@ -1,7 +1,7 @@
 //! Display content on top of other content.
 use crate::core::layout;
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::widget::{Operation, Tree};
 use crate::core::{Element, Event, Layout, Length, Rectangle, Shell, Size, Vector, Widget};
diff --git a/widget/src/svg.rs b/widget/src/svg.rs
index 3852344fb1..2032231546 100644
--- a/widget/src/svg.rs
+++ b/widget/src/svg.rs
@@ -16,7 +16,7 @@
 //! }
 //! ```
 use crate::core::layout;
-use crate::core::mouse;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::svg;
 use crate::core::widget::Tree;
diff --git a/widget/src/table.rs b/widget/src/table.rs
index 56cb2a26eb..33a2421c11 100644
--- a/widget/src/table.rs
+++ b/widget/src/table.rs
@@ -2,8 +2,8 @@
 use crate::core;
 use crate::core::alignment;
 use crate::core::layout;
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::widget;
 use crate::core::{
diff --git a/widget/src/text/rich.rs b/widget/src/text/rich.rs
index 840e8913b6..c742bd886c 100644
--- a/widget/src/text/rich.rs
+++ b/widget/src/text/rich.rs
@@ -1,6 +1,6 @@
 use crate::core::alignment;
 use crate::core::layout;
-use crate::core::mouse;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::text::{Paragraph, Span};
 use crate::core::widget::text::{
@@ -384,7 +384,7 @@ where
         }
 
         match event {
-            Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => {
+            Event::Pointer(event) if event.is_primary_click() => {
                 let state = tree
                     .state
                     .downcast_mut::<State<Link, Renderer::Paragraph>>();
@@ -394,7 +394,7 @@ where
                     shell.capture_event();
                 }
             }
-            Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left)) => {
+            Event::Pointer(event) if event.is_primary_release() => {
                 let state = tree
                     .state
                     .downcast_mut::<State<Link, Renderer::Paragraph>>();
diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index 11ff833bea..9d871aca8a 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -34,7 +34,7 @@
 use crate::core::alignment;
 use crate::core::clipboard;
 use crate::core::layout::{self, Layout};
-use crate::core::mouse;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::text::editor::{self, Editor as _};
 use crate::core::text::highlighter::{self, Highlighter};
diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs
index 3f5929aacd..a5dfc3c695 100644
--- a/widget/src/text_input.rs
+++ b/widget/src/text_input.rs
@@ -32,7 +32,7 @@
 //! ```
 use crate::core::keyboard;
 use crate::core::layout;
-use crate::core::mouse;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::shell;
 use crate::core::text;
diff --git a/widget/src/themer.rs b/widget/src/themer.rs
index 7eee7223bd..972682eb89 100644
--- a/widget/src/themer.rs
+++ b/widget/src/themer.rs
@@ -1,7 +1,7 @@
 use crate::container;
 use crate::core::layout;
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::theme;
 use crate::core::widget::Operation;
diff --git a/widget/src/toggler.rs b/widget/src/toggler.rs
index e8b9e9b500..84a06f1c0c 100644
--- a/widget/src/toggler.rs
+++ b/widget/src/toggler.rs
@@ -33,10 +33,9 @@
 use crate::core::alignment;
 use crate::core::border;
 use crate::core::layout;
-use crate::core::mouse;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::text;
-use crate::core::touch;
 use crate::core::widget;
 use crate::core::widget::tree::{self, Tree};
 use crate::core::window;
@@ -325,8 +324,7 @@ where
         };
 
         match event {
-            Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
-            | Event::Touch(touch::Event::FingerPressed { .. }) => {
+            Event::Pointer(event) if event.is_primary_click() => {
                 let mouse_over = cursor.is_over(layout.bounds());
 
                 if mouse_over {
diff --git a/widget/src/tooltip.rs b/widget/src/tooltip.rs
index eec0562167..835b289355 100644
--- a/widget/src/tooltip.rs
+++ b/widget/src/tooltip.rs
@@ -26,8 +26,8 @@
 //! ```
 use crate::container;
 use crate::core::layout::{self, Layout};
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::text;
 use crate::core::time::{Duration, Instant};
@@ -189,7 +189,7 @@ where
         shell: &mut Shell<'_, Message>,
         viewport: &Rectangle,
     ) {
-        if let Event::Mouse(_) | Event::Window(window::Event::RedrawRequested(_)) = event {
+        if let Event::Pointer(_) | Event::Window(window::Event::RedrawRequested(_)) = event {
             let state = tree.state.downcast_mut::<State>();
             let now = Instant::now();
             let cursor_position = cursor.position_over(layout.bounds());
diff --git a/widget/src/transition.rs b/widget/src/transition.rs
index e9ab050474..39ab5209d5 100644
--- a/widget/src/transition.rs
+++ b/widget/src/transition.rs
@@ -3,8 +3,8 @@ use std::hash::{DefaultHasher, Hash, Hasher};
 
 use crate::core::animation::{Animation, Float};
 use crate::core::layout::{self, Layout};
-use crate::core::mouse;
 use crate::core::overlay;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::shell;
 use crate::core::time::Instant;
diff --git a/widget/src/vertical_slider.rs b/widget/src/vertical_slider.rs
index 06500ad277..4025e4baf4 100644
--- a/widget/src/vertical_slider.rs
+++ b/widget/src/vertical_slider.rs
@@ -36,9 +36,8 @@ use crate::core::border::Border;
 use crate::core::keyboard;
 use crate::core::keyboard::key::{self, Key};
 use crate::core::layout::{self, Layout};
-use crate::core::mouse;
+use crate::core::pointer::{self, mouse};
 use crate::core::renderer;
-use crate::core::touch;
 use crate::core::widget::tree::{self, Tree};
 use crate::core::window;
 use crate::core::{self, Element, Event, Length, Pixels, Point, Rectangle, Shell, Size, Widget};
@@ -331,8 +330,7 @@ where
         };
 
         match event {
-            Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
-            | Event::Touch(touch::Event::FingerPressed { .. }) => {
+            Event::Pointer(event) if event.is_primary_click() => {
                 if let Some(cursor_position) = cursor.position_over(layout.bounds()) {
                     if state.keyboard_modifiers.control() || state.keyboard_modifiers.command() {
                         let _ = self.default.map(change);
@@ -345,25 +343,27 @@ where
                     shell.capture_event();
                 }
             }
-            Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left))
-            | Event::Touch(touch::Event::FingerLifted { .. })
-            | Event::Touch(touch::Event::FingerLost { .. })
-                if is_dragging =>
+            Event::Pointer(event)
+                if is_dragging
+                    && (event.is_primary_release()
+                        || matches!(
+                            event,
+                            pointer::Event::PointerLeft {
+                                kind: pointer::Kind::Touch(_),
+                            }
+                        )) =>
             {
                 if let Some(on_release) = self.on_release.clone() {
                     shell.publish(on_release);
                 }
                 state.is_dragging = false;
             }
-            Event::Mouse(mouse::Event::CursorMoved { .. })
-            | Event::Touch(touch::Event::FingerMoved { .. })
-                if is_dragging =>
-            {
+            Event::Pointer(pointer::Event::PointerMoved { .. }) if is_dragging => {
                 let _ = cursor.land().position().and_then(locate).map(change);
 
                 shell.capture_event();
             }
-            Event::Mouse(mouse::Event::WheelScrolled { delta })
+            Event::Pointer(pointer::Event::WheelScrolled { delta })
                 if state.keyboard_modifiers.control() && cursor.is_over(layout.bounds()) =>
             {
                 let delta = match *delta {
diff --git a/winit/Cargo.toml b/winit/Cargo.toml
index 8a6de0687f..dbfe110335 100644
--- a/winit/Cargo.toml
+++ b/winit/Cargo.toml
@@ -48,7 +48,3 @@ wasm-bindgen-futures.workspace = true
 [target.'cfg(target_os = "linux")'.dependencies]
 mundy.workspace = true
 mundy.optional = true
-
-# Delete once we update to `winit 0.31`
-[target.'cfg(target_os = "macos")'.dependencies]
-objc2 = { version = "0.5", features = ["relax-sign-encoding"] }
diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
index 259f145848..984be51a67 100644
--- a/winit/src/conversion.rs
+++ b/winit/src/conversion.rs
@@ -2,11 +2,11 @@
 //!
 //! [`winit`]: https://github.com/rust-windowing/winit
 //! [`iced_runtime`]: https://github.com/iced-rs/iced/tree/master/runtime
+
 use crate::core::input_method;
 use crate::core::keyboard;
-use crate::core::mouse;
+use crate::core::pointer::{self, button, mouse, tablet, touch};
 use crate::core::theme;
-use crate::core::touch;
 use crate::core::window;
 use crate::core::{Event, Point, Size};
 
@@ -36,7 +36,7 @@ pub fn window_attributes(
 
     attributes = attributes
         .with_title(title)
-        .with_inner_size(winit::dpi::LogicalSize {
+        .with_surface_size(winit::dpi::LogicalSize {
             width: settings.size.width * scale_factor,
             height: settings.size.height * scale_factor,
         })
@@ -44,7 +44,7 @@ pub fn window_attributes(
         .with_fullscreen(
             settings
                 .fullscreen
-                .then_some(winit::window::Fullscreen::Borderless(None)),
+                .then_some(winit::monitor::Fullscreen::Borderless(None)),
         )
         .with_resizable(settings.resizable)
         .with_enabled_buttons(buttons)
@@ -60,14 +60,14 @@ pub fn window_attributes(
     }
 
     if let Some(min_size) = settings.min_size {
-        attributes = attributes.with_min_inner_size(winit::dpi::LogicalSize {
+        attributes = attributes.with_min_surface_size(winit::dpi::LogicalSize {
             width: min_size.width,
             height: min_size.height,
         });
     }
 
     if let Some(max_size) = settings.max_size {
-        attributes = attributes.with_max_inner_size(winit::dpi::LogicalSize {
+        attributes = attributes.with_max_surface_size(winit::dpi::LogicalSize {
             width: max_size.width,
             height: max_size.height,
         });
@@ -80,65 +80,71 @@ pub fn window_attributes(
         target_os = "openbsd"
     ))]
     {
-        use ::winit::platform::wayland::WindowAttributesExtWayland;
+        use ::winit::platform::wayland::WindowAttributesWayland;
 
         if let Some(id) = _id {
-            attributes = attributes.with_name(id.clone(), id);
+            attributes = attributes.with_platform_attributes(Box::new(
+                WindowAttributesWayland::default().with_name(id.clone(), id),
+            ));
         }
     }
 
     #[cfg(target_os = "windows")]
     {
         use window::settings::platform;
-        use winit::platform::windows::{CornerPreference, WindowAttributesExtWindows};
-
-        attributes = attributes.with_drag_and_drop(settings.platform_specific.drag_and_drop);
-
-        attributes = attributes.with_skip_taskbar(settings.platform_specific.skip_taskbar);
-
-        attributes =
-            attributes.with_undecorated_shadow(settings.platform_specific.undecorated_shadow);
-
-        attributes =
-            attributes.with_corner_preference(match settings.platform_specific.corner_preference {
-                platform::CornerPreference::Default => CornerPreference::Default,
-                platform::CornerPreference::DoNotRound => CornerPreference::DoNotRound,
-                platform::CornerPreference::Round => CornerPreference::Round,
-                platform::CornerPreference::RoundSmall => CornerPreference::RoundSmall,
-            });
+        use winit::platform::windows::{CornerPreference, WindowAttributesWindows};
+
+        attributes = attributes.with_platform_attributes(Box::new(
+            WindowAttributesWindows::default()
+                .with_drag_and_drop(settings.platform_specific.drag_and_drop)
+                .with_skip_taskbar(settings.platform_specific.skip_taskbar)
+                .with_undecorated_shadow(settings.platform_specific.undecorated_shadow)
+                .with_corner_preference(match settings.platform_specific.corner_preference {
+                    platform::CornerPreference::Default => CornerPreference::Default,
+                    platform::CornerPreference::DoNotRound => CornerPreference::DoNotRound,
+                    platform::CornerPreference::Round => CornerPreference::Round,
+                    platform::CornerPreference::RoundSmall => CornerPreference::RoundSmall,
+                }),
+        ));
     }
 
     #[cfg(target_os = "macos")]
     {
-        use winit::platform::macos::WindowAttributesExtMacOS;
-
-        attributes = attributes
-            .with_title_hidden(settings.platform_specific.title_hidden)
-            .with_titlebar_transparent(settings.platform_specific.titlebar_transparent)
-            .with_fullsize_content_view(settings.platform_specific.fullsize_content_view);
+        use winit::platform::macos::WindowAttributesMacOS;
+
+        attributes = attributes.with_platform_attributes(Box::new(
+            WindowAttributesMacOS::default()
+                .with_title_hidden(settings.platform_specific.title_hidden)
+                .with_titlebar_transparent(settings.platform_specific.titlebar_transparent)
+                .with_fullsize_content_view(settings.platform_specific.fullsize_content_view),
+        ));
     }
 
     #[cfg(target_os = "linux")]
     {
         #[cfg(feature = "x11")]
         {
-            use winit::platform::x11::WindowAttributesExtX11;
-
-            attributes = attributes
-                .with_override_redirect(settings.platform_specific.override_redirect)
-                .with_name(
-                    &settings.platform_specific.application_id,
-                    &settings.platform_specific.application_id,
-                );
+            use winit::platform::x11::WindowAttributesX11;
+
+            attributes = attributes.with_platform_attributes(Box::new(
+                WindowAttributesX11::default()
+                    .with_override_redirect(settings.platform_specific.override_redirect)
+                    .with_name(
+                        &settings.platform_specific.application_id,
+                        &settings.platform_specific.application_id,
+                    ),
+            ));
         }
         #[cfg(feature = "wayland")]
         {
-            use winit::platform::wayland::WindowAttributesExtWayland;
+            use winit::platform::wayland::WindowAttributesWayland;
 
-            attributes = attributes.with_name(
-                &settings.platform_specific.application_id,
-                &settings.platform_specific.application_id,
-            );
+            attributes = attributes.with_platform_attributes(Box::new(
+                WindowAttributesWayland::default().with_name(
+                    &settings.platform_specific.application_id,
+                    &settings.platform_specific.application_id,
+                ),
+            ));
         }
     }
 
@@ -155,7 +161,7 @@ pub fn window_event(
     use winit::event::WindowEvent;
 
     match event {
-        WindowEvent::Resized(new_size) => {
+        WindowEvent::SurfaceResized(new_size) => {
             let logical_size = new_size.to_logical(f64::from(scale_factor));
 
             Some(Event::Window(window::Event::Resized(Size {
@@ -164,74 +170,74 @@ pub fn window_event(
             })))
         }
         WindowEvent::CloseRequested => Some(Event::Window(window::Event::CloseRequested)),
-        WindowEvent::CursorMoved { position, .. } => {
+        WindowEvent::PointerMoved {
+            position, source, ..
+        } => {
             let position = position.to_logical::<f64>(f64::from(scale_factor));
 
-            Some(Event::Mouse(mouse::Event::CursorMoved {
+            Some(Event::Pointer(pointer::Event::PointerMoved {
                 position: Point::new(position.x as f32, position.y as f32),
+                source: pointer_source(source)?,
             }))
         }
-        WindowEvent::CursorEntered { .. } => Some(Event::Mouse(mouse::Event::CursorEntered)),
-        WindowEvent::CursorLeft { .. } => Some(Event::Mouse(mouse::Event::CursorLeft)),
-        WindowEvent::MouseInput { button, state, .. } => {
-            let button = mouse_button(button);
-
-            Some(Event::Mouse(match state {
-                winit::event::ElementState::Pressed => mouse::Event::ButtonPressed(button),
-                winit::event::ElementState::Released => mouse::Event::ButtonReleased(button),
+        WindowEvent::PointerEntered { position, kind, .. } => {
+            let position = position.to_logical::<f64>(f64::from(scale_factor));
+
+            Some(Event::Pointer(pointer::Event::PointerEntered {
+                position: Point::new(position.x as f32, position.y as f32),
+                kind: pointer_kind(kind)?,
             }))
         }
-        WindowEvent::MouseWheel { delta, .. } => match delta {
-            winit::event::MouseScrollDelta::LineDelta(delta_x, delta_y) => {
-                Some(Event::Mouse(mouse::Event::WheelScrolled {
-                    delta: mouse::ScrollDelta::Lines {
-                        x: delta_x,
-                        y: delta_y,
-                    },
-                }))
-            }
-            winit::event::MouseScrollDelta::PixelDelta(position) => {
-                Some(Event::Mouse(mouse::Event::WheelScrolled {
-                    delta: mouse::ScrollDelta::Pixels {
-                        x: position.x as f32,
-                        y: position.y as f32,
-                    },
-                }))
-            }
-        },
-        // Ignore keyboard presses/releases during window focus/unfocus
-        WindowEvent::KeyboardInput { is_synthetic, .. } if is_synthetic => None,
-        WindowEvent::KeyboardInput { event, .. } => Some(Event::Keyboard({
-            let key = {
-                #[cfg(not(target_arch = "wasm32"))]
-                {
-                    use winit::platform::modifier_supplement::KeyEventExtModifierSupplement;
-                    event.key_without_modifiers()
-                }
+        WindowEvent::PointerLeft { kind, .. } => {
+            Some(Event::Pointer(pointer::Event::PointerLeft {
+                kind: pointer_kind(kind)?,
+            }))
+        }
+        WindowEvent::PointerButton {
+            button,
+            state,
+            position,
+            ..
+        } => {
+            let position = position.to_logical::<f64>(f64::from(scale_factor));
+            let position = Point::new(position.x as f32, position.y as f32);
+            let button = button_source(button)?;
 
-                #[cfg(target_arch = "wasm32")]
-                {
-                    // TODO: Fix inconsistent API on Wasm
-                    event.logical_key.clone()
+            Some(Event::Pointer(match state {
+                winit::event::ElementState::Pressed => {
+                    pointer::Event::PointerPressed { position, button }
                 }
-            };
-
-            let text = {
-                #[cfg(not(target_arch = "wasm32"))]
-                {
-                    use crate::core::SmolStr;
-                    use winit::platform::modifier_supplement::KeyEventExtModifierSupplement;
-
-                    event.text_with_all_modifiers().map(SmolStr::new)
+                winit::event::ElementState::Released => {
+                    pointer::Event::PointerReleased { position, button }
                 }
+            }))
+        }
+        WindowEvent::MouseWheel { delta, .. } => {
+            Some(Event::Pointer(pointer::Event::WheelScrolled {
+                delta: match delta {
+                    winit::event::MouseScrollDelta::LineDelta(x, y) => {
+                        pointer::mouse::ScrollDelta::Lines { x, y }
+                    }
+                    winit::event::MouseScrollDelta::PixelDelta(position) => {
+                        pointer::mouse::ScrollDelta::Pixels {
+                            x: position.x as f32,
+                            y: position.y as f32,
+                        }
+                    }
+                    _ => return None,
+                },
+            }))
+        }
+        // Ignore keyboard presses/releases during window focus/unfocus
+        WindowEvent::KeyboardInput { is_synthetic, .. } if is_synthetic => None,
+        WindowEvent::KeyboardInput { event, .. } => Some(Event::Keyboard({
+            let key = event.key_without_modifiers.clone();
 
-                #[cfg(target_arch = "wasm32")]
-                {
-                    // TODO: Fix inconsistent API on Wasm
-                    event.text
-                }
-            }
-            .filter(|text| !text.as_str().chars().any(is_private_use));
+            let text = event
+                .text_with_all_modifiers
+                .clone()
+                .map(|text| crate::core::SmolStr::new(text.as_str()))
+                .filter(|text| !text.as_str().chars().any(is_private_use));
 
             let winit::event::KeyEvent {
                 state,
@@ -283,20 +289,14 @@ pub fn window_event(
             }
             Ime::Commit(content) => input_method::Event::Commit(content),
             Ime::Disabled => input_method::Event::Closed,
+            Ime::DeleteSurrounding { .. } => return None,
+            _ => return None,
         })),
         WindowEvent::Focused(focused) => Some(Event::Window(if focused {
             window::Event::Focused
         } else {
             window::Event::Unfocused
         })),
-        WindowEvent::HoveredFile(path) => {
-            Some(Event::Window(window::Event::FileHovered(path.clone())))
-        }
-        WindowEvent::DroppedFile(path) => {
-            Some(Event::Window(window::Event::FileDropped(path.clone())))
-        }
-        WindowEvent::HoveredFileCancelled => Some(Event::Window(window::Event::FilesHoveredLeft)),
-        WindowEvent::Touch(touch) => Some(Event::Touch(touch_event(touch, scale_factor))),
         WindowEvent::Moved(position) => {
             let winit::dpi::LogicalPosition { x, y } = position.to_logical(f64::from(scale_factor));
 
@@ -338,10 +338,15 @@ pub fn position(
         }
         window::Position::SpecificWith(to_position) => {
             if let Some(monitor) = monitor {
-                let start = monitor.position();
+                let start = monitor
+                    .position()
+                    .unwrap_or(winit::dpi::PhysicalPosition::new(0, 0));
 
-                let resolution: winit::dpi::LogicalSize<f32> =
-                    monitor.size().to_logical(monitor.scale_factor());
+                let resolution: winit::dpi::LogicalSize<f32> = monitor
+                    .current_video_mode()
+                    .map(|mode| mode.size())
+                    .unwrap_or(winit::dpi::PhysicalSize::new(1, 1))
+                    .to_logical(monitor.scale_factor());
 
                 let position = to_position(size, Size::new(resolution.width, resolution.height));
 
@@ -363,10 +368,15 @@ pub fn position(
         }
         window::Position::Centered => {
             if let Some(monitor) = monitor {
-                let start = monitor.position();
+                let start = monitor
+                    .position()
+                    .unwrap_or(winit::dpi::PhysicalPosition::new(0, 0));
 
-                let resolution: winit::dpi::LogicalSize<f64> =
-                    monitor.size().to_logical(monitor.scale_factor());
+                let resolution: winit::dpi::LogicalSize<f64> = monitor
+                    .current_video_mode()
+                    .map(|mode| mode.size())
+                    .unwrap_or(winit::dpi::PhysicalSize::new(1, 1))
+                    .to_logical(monitor.scale_factor());
 
                 let centered: winit::dpi::PhysicalPosition<i32> = winit::dpi::LogicalPosition {
                     x: (resolution.width - f64::from(size.width)) / 2.0,
@@ -393,10 +403,10 @@ pub fn position(
 pub fn fullscreen(
     monitor: Option<winit::monitor::MonitorHandle>,
     mode: window::Mode,
-) -> Option<winit::window::Fullscreen> {
+) -> Option<winit::monitor::Fullscreen> {
     match mode {
         window::Mode::Windowed | window::Mode::Hidden => None,
-        window::Mode::Fullscreen => Some(winit::window::Fullscreen::Borderless(monitor)),
+        window::Mode::Fullscreen => Some(winit::monitor::Fullscreen::Borderless(monitor)),
     }
 }
 
@@ -411,7 +421,7 @@ pub fn visible(mode: window::Mode) -> bool {
 /// Converts a [`winit`] fullscreen mode into a [`window::Mode`].
 ///
 /// [`winit`]: https://github.com/rust-windowing/winit
-pub fn mode(mode: Option<winit::window::Fullscreen>) -> window::Mode {
+pub fn mode(mode: Option<winit::monitor::Fullscreen>) -> window::Mode {
     match mode {
         None => window::Mode::Windowed,
         Some(_) => window::Mode::Fullscreen,
@@ -442,55 +452,190 @@ pub fn window_theme(mode: theme::Mode) -> Option<winit::window::Theme> {
 /// Converts a [`mouse::Interaction`] into a [`winit`] cursor icon.
 ///
 /// [`winit`]: https://github.com/rust-windowing/winit
-pub fn mouse_interaction(interaction: mouse::Interaction) -> Option<winit::window::CursorIcon> {
+pub fn mouse_interaction(interaction: mouse::Interaction) -> Option<winit::cursor::CursorIcon> {
     use mouse::Interaction;
 
     let icon = match interaction {
         Interaction::Hidden => {
             return None;
         }
-        Interaction::None | Interaction::Idle => winit::window::CursorIcon::Default,
-        Interaction::ContextMenu => winit::window::CursorIcon::ContextMenu,
-        Interaction::Help => winit::window::CursorIcon::Help,
-        Interaction::Pointer => winit::window::CursorIcon::Pointer,
-        Interaction::Progress => winit::window::CursorIcon::Progress,
-        Interaction::Wait => winit::window::CursorIcon::Wait,
-        Interaction::Cell => winit::window::CursorIcon::Cell,
-        Interaction::Crosshair => winit::window::CursorIcon::Crosshair,
-        Interaction::Text => winit::window::CursorIcon::Text,
-        Interaction::Alias => winit::window::CursorIcon::Alias,
-        Interaction::Copy => winit::window::CursorIcon::Copy,
-        Interaction::Move => winit::window::CursorIcon::Move,
-        Interaction::NoDrop => winit::window::CursorIcon::NoDrop,
-        Interaction::NotAllowed => winit::window::CursorIcon::NotAllowed,
-        Interaction::Grab => winit::window::CursorIcon::Grab,
-        Interaction::Grabbing => winit::window::CursorIcon::Grabbing,
-        Interaction::ResizingHorizontally => winit::window::CursorIcon::EwResize,
-        Interaction::ResizingVertically => winit::window::CursorIcon::NsResize,
-        Interaction::ResizingDiagonallyUp => winit::window::CursorIcon::NeswResize,
-        Interaction::ResizingDiagonallyDown => winit::window::CursorIcon::NwseResize,
-        Interaction::ResizingColumn => winit::window::CursorIcon::ColResize,
-        Interaction::ResizingRow => winit::window::CursorIcon::RowResize,
-        Interaction::AllScroll => winit::window::CursorIcon::AllScroll,
-        Interaction::ZoomIn => winit::window::CursorIcon::ZoomIn,
-        Interaction::ZoomOut => winit::window::CursorIcon::ZoomOut,
+        Interaction::None | Interaction::Idle => winit::cursor::CursorIcon::Default,
+        Interaction::ContextMenu => winit::cursor::CursorIcon::ContextMenu,
+        Interaction::Help => winit::cursor::CursorIcon::Help,
+        Interaction::Pointer => winit::cursor::CursorIcon::Pointer,
+        Interaction::Progress => winit::cursor::CursorIcon::Progress,
+        Interaction::Wait => winit::cursor::CursorIcon::Wait,
+        Interaction::Cell => winit::cursor::CursorIcon::Cell,
+        Interaction::Crosshair => winit::cursor::CursorIcon::Crosshair,
+        Interaction::Text => winit::cursor::CursorIcon::Text,
+        Interaction::Alias => winit::cursor::CursorIcon::Alias,
+        Interaction::Copy => winit::cursor::CursorIcon::Copy,
+        Interaction::Move => winit::cursor::CursorIcon::Move,
+        Interaction::NoDrop => winit::cursor::CursorIcon::NoDrop,
+        Interaction::NotAllowed => winit::cursor::CursorIcon::NotAllowed,
+        Interaction::Grab => winit::cursor::CursorIcon::Grab,
+        Interaction::Grabbing => winit::cursor::CursorIcon::Grabbing,
+        Interaction::ResizingHorizontally => winit::cursor::CursorIcon::EwResize,
+        Interaction::ResizingVertically => winit::cursor::CursorIcon::NsResize,
+        Interaction::ResizingDiagonallyUp => winit::cursor::CursorIcon::NeswResize,
+        Interaction::ResizingDiagonallyDown => winit::cursor::CursorIcon::NwseResize,
+        Interaction::ResizingColumn => winit::cursor::CursorIcon::ColResize,
+        Interaction::ResizingRow => winit::cursor::CursorIcon::RowResize,
+        Interaction::AllScroll => winit::cursor::CursorIcon::AllScroll,
+        Interaction::ZoomIn => winit::cursor::CursorIcon::ZoomIn,
+        Interaction::ZoomOut => winit::cursor::CursorIcon::ZoomOut,
     };
 
     Some(icon)
 }
 
-/// Converts a `MouseButton` from [`winit`] to an [`iced`] mouse button.
+/// Converts a `MouseButton` from [`winit`] to an [`iced`] pointer button.
 ///
 /// [`winit`]: https://github.com/rust-windowing/winit
-/// [`iced`]: https://github.com/iced-rs/iced/tree/0.12
-pub fn mouse_button(mouse_button: winit::event::MouseButton) -> mouse::Button {
+pub fn mouse_button(mouse_button: winit::event::MouseButton) -> pointer::mouse::Button {
+    use pointer::mouse::Button;
+
     match mouse_button {
-        winit::event::MouseButton::Left => mouse::Button::Left,
-        winit::event::MouseButton::Right => mouse::Button::Right,
-        winit::event::MouseButton::Middle => mouse::Button::Middle,
-        winit::event::MouseButton::Back => mouse::Button::Back,
-        winit::event::MouseButton::Forward => mouse::Button::Forward,
-        winit::event::MouseButton::Other(other) => mouse::Button::Other(other),
+        winit::event::MouseButton::Left => Button::Left,
+        winit::event::MouseButton::Right => Button::Right,
+        winit::event::MouseButton::Middle => Button::Middle,
+        winit::event::MouseButton::Back => Button::Back,
+        winit::event::MouseButton::Forward => Button::Forward,
+        winit::event::MouseButton::Button6 => Button::Other(6),
+        winit::event::MouseButton::Button7 => Button::Other(7),
+        winit::event::MouseButton::Button8 => Button::Other(8),
+        winit::event::MouseButton::Button9 => Button::Other(9),
+        winit::event::MouseButton::Button10 => Button::Other(10),
+        winit::event::MouseButton::Button11 => Button::Other(11),
+        winit::event::MouseButton::Button12 => Button::Other(12),
+        winit::event::MouseButton::Button13 => Button::Other(13),
+        winit::event::MouseButton::Button14 => Button::Other(14),
+        winit::event::MouseButton::Button15 => Button::Other(15),
+        winit::event::MouseButton::Button16 => Button::Other(16),
+        winit::event::MouseButton::Button17 => Button::Other(17),
+        winit::event::MouseButton::Button18 => Button::Other(18),
+        winit::event::MouseButton::Button19 => Button::Other(19),
+        winit::event::MouseButton::Button20 => Button::Other(20),
+        winit::event::MouseButton::Button21 => Button::Other(21),
+        winit::event::MouseButton::Button22 => Button::Other(22),
+        winit::event::MouseButton::Button23 => Button::Other(23),
+        winit::event::MouseButton::Button24 => Button::Other(24),
+        winit::event::MouseButton::Button25 => Button::Other(25),
+        winit::event::MouseButton::Button26 => Button::Other(26),
+        winit::event::MouseButton::Button27 => Button::Other(27),
+        winit::event::MouseButton::Button28 => Button::Other(28),
+        winit::event::MouseButton::Button29 => Button::Other(29),
+        winit::event::MouseButton::Button30 => Button::Other(30),
+        winit::event::MouseButton::Button31 => Button::Other(31),
+        winit::event::MouseButton::Button32 => Button::Other(32),
+    }
+}
+
+fn pointer_kind(kind: winit::event::PointerKind) -> Option<pointer::Kind> {
+    Some(match kind {
+        winit::event::PointerKind::Mouse => pointer::Kind::Mouse,
+        winit::event::PointerKind::Touch(finger_id) => {
+            pointer::Kind::Touch(pointer::touch::Finger(finger_id.into_raw() as u64))
+        }
+        winit::event::PointerKind::TabletTool(kind) => {
+            pointer::Kind::TabletTool(tablet_tool_kind(kind)?)
+        }
+        winit::event::PointerKind::Unknown => pointer::Kind::Unknown,
+        _ => return None,
+    })
+}
+
+fn pointer_source(source: winit::event::PointerSource) -> Option<pointer::Source> {
+    Some(match source {
+        winit::event::PointerSource::Mouse => pointer::Source::Mouse,
+        winit::event::PointerSource::Touch { finger_id, force } => pointer::Source::Touch {
+            finger_id: pointer::touch::Finger(finger_id.into_raw() as u64),
+            force: force.map(pointer_force),
+        },
+        winit::event::PointerSource::TabletTool { kind, data } => pointer::Source::TabletTool {
+            kind: tablet_tool_kind(kind)?,
+            data: tablet_tool_data(data),
+        },
+        winit::event::PointerSource::Unknown => pointer::Source::Unknown,
+        _ => return None,
+    })
+}
+
+fn button_source(source: winit::event::ButtonSource) -> Option<button::Source> {
+    Some(match source {
+        winit::event::ButtonSource::Mouse(button) => button::Source::Mouse(mouse_button(button)),
+        winit::event::ButtonSource::Touch { finger_id, force } => button::Source::Touch {
+            finger_id: touch::Finger(finger_id.into_raw() as u64),
+            force: force.map(pointer_force),
+        },
+        winit::event::ButtonSource::TabletTool { kind, button, data } => {
+            button::Source::TabletTool {
+                kind: tablet_tool_kind(kind)?,
+                button: tablet_tool_button(button),
+                data: tablet_tool_data(data),
+            }
+        }
+        winit::event::ButtonSource::Unknown(button) => button::Source::Unknown(button),
+        _ => return None,
+    })
+}
+
+fn pointer_force(force: winit::event::Force) -> touch::Force {
+    match force {
+        winit::event::Force::Calibrated {
+            force,
+            max_possible_force,
+        } => touch::Force::Calibrated {
+            force,
+            max_possible_force,
+        },
+        winit::event::Force::Normalized(force) => touch::Force::Normalized(force),
+    }
+}
+
+fn tablet_tool_kind(kind: winit::event::TabletToolKind) -> Option<tablet::Kind> {
+    Some(match kind {
+        winit::event::TabletToolKind::Pen => tablet::Kind::Pen,
+        winit::event::TabletToolKind::Eraser => tablet::Kind::Eraser,
+        winit::event::TabletToolKind::Brush => tablet::Kind::Brush,
+        winit::event::TabletToolKind::Pencil => tablet::Kind::Pencil,
+        winit::event::TabletToolKind::Airbrush => tablet::Kind::Airbrush,
+        winit::event::TabletToolKind::Finger => tablet::Kind::Finger,
+        winit::event::TabletToolKind::Mouse => tablet::Kind::Mouse,
+        winit::event::TabletToolKind::Lens => tablet::Kind::Lens,
+        _ => return None,
+    })
+}
+
+fn tablet_tool_data(data: winit::event::TabletToolData) -> tablet::Data {
+    tablet::Data {
+        force: data.force.map(pointer_force),
+        tangential_force: data.tangential_force,
+        twist: data.twist,
+        tilt: data.tilt.map(tablet_tool_tilt),
+        angle: data.angle.map(tablet_tool_angle),
+    }
+}
+
+fn tablet_tool_tilt(tilt: winit::event::TabletToolTilt) -> tablet::Tilt {
+    tablet::Tilt {
+        x: tilt.x,
+        y: tilt.y,
+    }
+}
+
+fn tablet_tool_angle(angle: winit::event::TabletToolAngle) -> tablet::Angle {
+    tablet::Angle {
+        altitude: angle.altitude,
+        azimuth: angle.azimuth,
+    }
+}
+
+fn tablet_tool_button(button: winit::event::TabletToolButton) -> tablet::Button {
+    match button {
+        winit::event::TabletToolButton::Contact => tablet::Button::Contact,
+        winit::event::TabletToolButton::Barrel => tablet::Button::Barrel,
+        winit::event::TabletToolButton::Other(button) => tablet::Button::Other(button),
     }
 }
 
@@ -505,7 +650,7 @@ pub fn modifiers(modifiers: winit::keyboard::ModifiersState) -> keyboard::Modifi
     result.set(keyboard::Modifiers::SHIFT, modifiers.shift_key());
     result.set(keyboard::Modifiers::CTRL, modifiers.control_key());
     result.set(keyboard::Modifiers::ALT, modifiers.alt_key());
-    result.set(keyboard::Modifiers::LOGO, modifiers.super_key());
+    result.set(keyboard::Modifiers::LOGO, modifiers.meta_key());
 
     result
 }
@@ -517,36 +662,20 @@ pub fn cursor_position(position: winit::dpi::PhysicalPosition<f64>, scale_factor
     Point::new(logical_position.x, logical_position.y)
 }
 
-/// Converts a `Touch` from [`winit`] to an [`iced`] touch event.
-///
-/// [`winit`]: https://github.com/rust-windowing/winit
-/// [`iced`]: https://github.com/iced-rs/iced/tree/0.12
-pub fn touch_event(touch: winit::event::Touch, scale_factor: f32) -> touch::Event {
-    let id = touch::Finger(touch.id);
-    let position = {
-        let location = touch.location.to_logical::<f64>(f64::from(scale_factor));
-
-        Point::new(location.x as f32, location.y as f32)
-    };
-
-    match touch.phase {
-        winit::event::TouchPhase::Started => touch::Event::FingerPressed { id, position },
-        winit::event::TouchPhase::Moved => touch::Event::FingerMoved { id, position },
-        winit::event::TouchPhase::Ended => touch::Event::FingerLifted { id, position },
-        winit::event::TouchPhase::Cancelled => touch::Event::FingerLost { id, position },
-    }
-}
-
 /// Converts a `Key` from [`winit`] to an [`iced`] key.
 ///
 /// [`winit`]: https://github.com/rust-windowing/winit
 /// [`iced`]: https://github.com/iced-rs/iced/tree/0.12
+#[allow(deprecated)]
 pub fn key(key: winit::keyboard::Key) -> keyboard::Key {
     use keyboard::key::Named;
     use winit::keyboard::NamedKey;
 
     match key {
-        winit::keyboard::Key::Character(c) => keyboard::Key::Character(c),
+        winit::keyboard::Key::Character(c) if c == " " => keyboard::Key::Named(Named::Space),
+        winit::keyboard::Key::Character(c) => {
+            keyboard::Key::Character(crate::core::SmolStr::new(c.as_str()))
+        }
         winit::keyboard::Key::Named(named_key) => keyboard::Key::Named(match named_key {
             NamedKey::Alt => Named::Alt,
             NamedKey::AltGraph => Named::AltGraph,
@@ -564,7 +693,6 @@ pub fn key(key: winit::keyboard::Key) -> keyboard::Key {
             NamedKey::Super => Named::Super,
             NamedKey::Enter => Named::Enter,
             NamedKey::Tab => Named::Tab,
-            NamedKey::Space => Named::Space,
             NamedKey::ArrowDown => Named::ArrowDown,
             NamedKey::ArrowLeft => Named::ArrowLeft,
             NamedKey::ArrowRight => Named::ArrowRight,
@@ -881,6 +1009,7 @@ pub fn physical_key(physical_key: winit::keyboard::PhysicalKey) -> keyboard::key
 ///
 /// [`winit`]: https://github.com/rust-windowing/winit
 /// [`iced`]: https://github.com/iced-rs/iced/tree/0.12
+#[allow(deprecated)]
 pub fn key_code(key_code: winit::keyboard::KeyCode) -> Option<keyboard::key::Code> {
     use winit::keyboard::KeyCode;
 
@@ -943,8 +1072,8 @@ pub fn key_code(key_code: winit::keyboard::KeyCode) -> Option<keyboard::key::Cod
         KeyCode::ControlLeft => keyboard::key::Code::ControlLeft,
         KeyCode::ControlRight => keyboard::key::Code::ControlRight,
         KeyCode::Enter => keyboard::key::Code::Enter,
-        KeyCode::SuperLeft => keyboard::key::Code::SuperLeft,
-        KeyCode::SuperRight => keyboard::key::Code::SuperRight,
+        KeyCode::MetaLeft => keyboard::key::Code::SuperLeft,
+        KeyCode::MetaRight => keyboard::key::Code::SuperRight,
         KeyCode::ShiftLeft => keyboard::key::Code::ShiftLeft,
         KeyCode::ShiftRight => keyboard::key::Code::ShiftRight,
         KeyCode::Space => keyboard::key::Code::Space,
@@ -1027,7 +1156,6 @@ pub fn key_code(key_code: winit::keyboard::KeyCode) -> Option<keyboard::key::Cod
         KeyCode::AudioVolumeMute => keyboard::key::Code::AudioVolumeMute,
         KeyCode::AudioVolumeUp => keyboard::key::Code::AudioVolumeUp,
         KeyCode::WakeUp => keyboard::key::Code::WakeUp,
-        KeyCode::Meta => keyboard::key::Code::Meta,
         KeyCode::Hyper => keyboard::key::Code::Hyper,
         KeyCode::Turbo => keyboard::key::Code::Turbo,
         KeyCode::Abort => keyboard::key::Code::Abort,
@@ -1098,6 +1226,7 @@ pub fn native_key_code(
         NativeKeyCode::MacOS(code) => keyboard::key::NativeCode::MacOS(code),
         NativeKeyCode::Windows(code) => keyboard::key::NativeCode::Windows(code),
         NativeKeyCode::Xkb(code) => keyboard::key::NativeCode::Xkb(code),
+        _ => keyboard::key::NativeCode::Unidentified,
     }
 }
 
@@ -1128,10 +1257,12 @@ pub fn resize_direction(resize_direction: window::Direction) -> winit::window::R
 /// Converts some [`window::Icon`] into its `winit` counterpart.
 ///
 /// Returns `None` if there is an error during the conversion.
-pub fn icon(icon: window::Icon) -> Option<winit::window::Icon> {
+pub fn icon(icon: window::Icon) -> Option<winit::icon::Icon> {
     let (pixels, size) = icon.into_raw();
 
-    winit::window::Icon::from_rgba(pixels, size.width, size.height).ok()
+    winit::icon::RgbaIcon::new(pixels, size.width, size.height)
+        .map(Into::into)
+        .ok()
 }
 
 /// Converts some [`input_method::Purpose`] into its `winit` counterpart.
diff --git a/winit/src/lib.rs b/winit/src/lib.rs
index f7d2ca1b81..e225753a40 100644
--- a/winit/src/lib.rs
+++ b/winit/src/lib.rs
@@ -38,7 +38,7 @@ pub use error::Error;
 pub use proxy::Proxy;
 
 use crate::core::backend;
-use crate::core::mouse;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::shell;
 use crate::core::theme;
@@ -78,15 +78,13 @@ where
     let settings = program.settings();
     let window_settings = program.window();
 
-    let event_loop = EventLoop::with_user_event()
-        .build()
-        .expect("Create event loop");
+    let event_loop = EventLoop::new().expect("Create event loop");
 
     let backend_settings = backend::Settings::from(&settings);
     let renderer_settings = renderer::Settings::from(&settings);
     let display_handle = event_loop.owned_display_handle();
 
-    let (proxy, worker) = Proxy::new(event_loop.create_proxy());
+    let (proxy, worker, outbox) = Proxy::new(event_loop.create_proxy());
 
     #[cfg(feature = "debug")]
     {
@@ -151,8 +149,10 @@ where
         id: Option<String>,
         sender: mpsc::UnboundedSender<Event<Action<Message>>>,
         receiver: mpsc::UnboundedReceiver<Control>,
+        outbox: mpsc::UnboundedReceiver<Action<Message>>,
         error: Option<Error>,
         system_theme: Option<oneshot::Sender<theme::Mode>>,
+        drag: Option<DragSession>,
 
         #[cfg(target_arch = "wasm32")]
         canvas: Option<web_sys::HtmlCanvasElement>,
@@ -164,8 +164,10 @@ where
         id: settings.id,
         sender: event_sender,
         receiver: control_receiver,
+        outbox,
         error: None,
         system_theme: Some(system_theme_sender),
+        drag: None,
 
         #[cfg(target_arch = "wasm32")]
         canvas: None,
@@ -173,11 +175,11 @@ where
 
     boot_span.finish();
 
-    impl<Message, F> winit::application::ApplicationHandler<Action<Message>> for Runner<Message, F>
+    impl<Message, F> winit::application::ApplicationHandler for Runner<Message, F>
     where
         F: Future<Output = ()>,
     {
-        fn resumed(&mut self, event_loop: &winit::event_loop::ActiveEventLoop) {
+        fn resumed(&mut self, event_loop: &dyn winit::event_loop::ActiveEventLoop) {
             if let Some(sender) = self.system_theme.take() {
                 let _ = sender.send(
                     event_loop
@@ -188,33 +190,45 @@ where
             }
         }
 
+        fn can_create_surfaces(&mut self, _event_loop: &dyn winit::event_loop::ActiveEventLoop) {}
+
         fn new_events(
             &mut self,
-            event_loop: &winit::event_loop::ActiveEventLoop,
+            event_loop: &dyn winit::event_loop::ActiveEventLoop,
             cause: winit::event::StartCause,
         ) {
             self.process_event(
                 event_loop,
-                Event::EventLoopAwakened(winit::event::Event::NewEvents(cause)),
+                Event::EventLoopAwakened(EventLoopEvent::NewEvents(cause)),
             );
         }
 
         fn window_event(
             &mut self,
-            event_loop: &winit::event_loop::ActiveEventLoop,
+            event_loop: &dyn winit::event_loop::ActiveEventLoop,
             window_id: winit::window::WindowId,
             event: winit::event::WindowEvent,
         ) {
             #[cfg(target_os = "windows")]
             let is_move_or_resize = matches!(
                 event,
-                winit::event::WindowEvent::Resized(_) | winit::event::WindowEvent::Moved(_)
+                winit::event::WindowEvent::SurfaceResized(_) | winit::event::WindowEvent::Moved(_)
             );
 
-            self.process_event(
-                event_loop,
-                Event::EventLoopAwakened(winit::event::Event::WindowEvent { window_id, event }),
-            );
+            match event {
+                event @ (winit::event::WindowEvent::DragEntered { .. }
+                | winit::event::WindowEvent::DragDropped { .. }
+                | winit::event::WindowEvent::DragLeft { .. }
+                | winit::event::WindowEvent::DataTransferReceived { .. }) => {
+                    self.handle_drag_event(event_loop, window_id, event);
+                }
+                event => {
+                    self.process_event(
+                        event_loop,
+                        Event::EventLoopAwakened(EventLoopEvent::WindowEvent { window_id, event }),
+                    );
+                }
+            }
 
             // TODO: Remove when unnecessary
             // On Windows, we emulate an `AboutToWait` event after every `Resized` event
@@ -225,36 +239,25 @@ where
                 if is_move_or_resize {
                     self.process_event(
                         event_loop,
-                        Event::EventLoopAwakened(winit::event::Event::AboutToWait),
+                        Event::EventLoopAwakened(EventLoopEvent::AboutToWait),
                     );
                 }
             }
         }
 
-        fn user_event(
-            &mut self,
-            event_loop: &winit::event_loop::ActiveEventLoop,
-            action: Action<Message>,
-        ) {
-            self.process_event(
-                event_loop,
-                Event::EventLoopAwakened(winit::event::Event::UserEvent(action)),
-            );
-        }
-
-        fn received_url(&mut self, event_loop: &winit::event_loop::ActiveEventLoop, url: String) {
-            self.process_event(
-                event_loop,
-                Event::EventLoopAwakened(winit::event::Event::PlatformSpecific(
-                    winit::event::PlatformSpecific::MacOS(winit::event::MacOS::ReceivedUrl(url)),
-                )),
-            );
+        fn proxy_wake_up(&mut self, event_loop: &dyn winit::event_loop::ActiveEventLoop) {
+            while let Ok(action) = self.outbox.try_recv() {
+                self.process_event(
+                    event_loop,
+                    Event::EventLoopAwakened(EventLoopEvent::UserEvent(action)),
+                );
+            }
         }
 
-        fn about_to_wait(&mut self, event_loop: &winit::event_loop::ActiveEventLoop) {
+        fn about_to_wait(&mut self, event_loop: &dyn winit::event_loop::ActiveEventLoop) {
             self.process_event(
                 event_loop,
-                Event::EventLoopAwakened(winit::event::Event::AboutToWait),
+                Event::EventLoopAwakened(EventLoopEvent::AboutToWait),
             );
         }
     }
@@ -265,7 +268,7 @@ where
     {
         fn process_event(
             &mut self,
-            event_loop: &winit::event_loop::ActiveEventLoop,
+            event_loop: &dyn winit::event_loop::ActiveEventLoop,
             event: Event<Action<Message>>,
         ) {
             if event_loop.exiting() {
@@ -321,8 +324,13 @@ where
 
                                 #[cfg(target_arch = "wasm32")]
                                 let window_attributes = {
-                                    use winit::platform::web::WindowAttributesExtWebSys;
-                                    window_attributes.with_canvas(self.canvas.take())
+                                    use winit::platform::web::WindowAttributesWeb;
+                                    let attributes = winit::window::WindowAttributes::default()
+                                        .with_platform_attributes(Box::new(
+                                            WindowAttributesWeb::default()
+                                                .with_canvas(self.canvas.take()),
+                                        ));
+                                    attributes
                                 };
 
                                 log::info!(
@@ -349,7 +357,7 @@ where
 
                                 #[cfg(target_arch = "wasm32")]
                                 {
-                                    use winit::platform::web::WindowExtWebSys;
+                                    use winit::platform::web::WindowExtWeb;
 
                                     let canvas = window.canvas().expect("Get window canvas");
 
@@ -386,7 +394,7 @@ where
                                     event_loop,
                                     Event::WindowCreated {
                                         id,
-                                        window: Arc::new(window),
+                                        window: Arc::from(window),
                                         exit_on_close_request,
                                         make_visible: visible,
                                         on_open,
@@ -421,20 +429,135 @@ where
                 };
             }
         }
+
+        fn handle_drag_event(
+            &mut self,
+            event_loop: &dyn winit::event_loop::ActiveEventLoop,
+            window_id: winit::window::WindowId,
+            event: winit::event::WindowEvent,
+        ) {
+            use winit::data_transfer::TypeHint;
+            use winit::event_loop::DndAction;
+
+            match event {
+                winit::event::WindowEvent::DragEntered { id, .. } => {
+                    let _ = event_loop.set_valid_dnd_actions(id, &[DndAction::Copy]);
+
+                    self.drag = Some(DragSession {
+                        window_id,
+                        id,
+                        path: None,
+                        dropped: false,
+                    });
+
+                    let _ = event_loop.fetch_data_transfer(id, &TypeHint::UriList);
+                }
+                winit::event::WindowEvent::DataTransferReceived { id, value, .. } => {
+                    let Some(drag) = &mut self.drag else {
+                        return;
+                    };
+
+                    if drag.id != id || drag.path.is_some() || drag.window_id != window_id {
+                        return;
+                    }
+
+                    let paths = match value.try_as_file_paths() {
+                        Ok(paths) => paths,
+                        Err(error) if error.kind() == std::io::ErrorKind::WouldBlock => {
+                            let _ = event_loop.fetch_data_transfer(id, &TypeHint::UriList);
+
+                            return;
+                        }
+                        Err(_) => return,
+                    };
+
+                    if drag.dropped {
+                        self.drag = None;
+
+                        for path in paths {
+                            let _ = self.sender.start_send(Event::EventLoopAwakened(
+                                EventLoopEvent::FileEvent {
+                                    window_id,
+                                    event: crate::core::Event::Window(window::Event::FileDropped(
+                                        path,
+                                    )),
+                                },
+                            ));
+                        }
+                    } else {
+                        drag.path = Some(paths.clone());
+
+                        for path in paths {
+                            let _ = self.sender.start_send(Event::EventLoopAwakened(
+                                EventLoopEvent::FileEvent {
+                                    window_id,
+                                    event: crate::core::Event::Window(window::Event::FileHovered(
+                                        path,
+                                    )),
+                                },
+                            ));
+                        }
+                    }
+                }
+                winit::event::WindowEvent::DragDropped { id, .. } => {
+                    let Some(drag) = &mut self.drag else {
+                        return;
+                    };
+
+                    if drag.id != id || drag.window_id != window_id {
+                        return;
+                    }
+
+                    if let Some(path) = drag.path.take() {
+                        self.drag = None;
+
+                        for path in path {
+                            let _ = self.sender.start_send(Event::EventLoopAwakened(
+                                EventLoopEvent::FileEvent {
+                                    window_id,
+                                    event: crate::core::Event::Window(window::Event::FileDropped(
+                                        path,
+                                    )),
+                                },
+                            ));
+                        }
+                    } else {
+                        drag.dropped = true;
+
+                        let _ = event_loop.fetch_data_transfer(id, &TypeHint::UriList);
+                    }
+                }
+                winit::event::WindowEvent::DragLeft { id, .. } => {
+                    if self
+                        .drag
+                        .take_if(|drag| drag.id == id && drag.window_id == window_id)
+                        .is_some()
+                    {
+                        let _ = self.sender.start_send(Event::EventLoopAwakened(
+                            EventLoopEvent::FileEvent {
+                                window_id,
+                                event: crate::core::Event::Window(window::Event::FilesHoveredLeft),
+                            },
+                        ));
+                    }
+                }
+                _ => {}
+            }
+        }
     }
 
     #[cfg(not(target_arch = "wasm32"))]
     {
         let mut runner = runner;
-        let _ = event_loop.run_app(&mut runner);
+        let error = runner.error.take();
+        let _ = event_loop.run_app(runner);
 
-        runner.error.map(Err).unwrap_or(Ok(()))
+        error.map(Err).unwrap_or(Ok(()))
     }
 
     #[cfg(target_arch = "wasm32")]
     {
-        use winit::platform::web::EventLoopExtWebSys;
-        let _ = event_loop.spawn_app(runner);
+        let _ = event_loop.run_app(runner).expect("Run application");
 
         Ok(())
     }
@@ -444,15 +567,38 @@ where
 enum Event<Message: 'static> {
     WindowCreated {
         id: window::Id,
-        window: Arc<winit::window::Window>,
+        window: Arc<dyn winit::window::Window>,
         exit_on_close_request: bool,
         make_visible: bool,
         on_open: oneshot::Sender<window::Id>,
     },
-    EventLoopAwakened(winit::event::Event<Message>),
+    EventLoopAwakened(EventLoopEvent<Message>),
     Exit,
 }
 
+#[derive(Debug)]
+enum EventLoopEvent<Message: 'static> {
+    NewEvents(winit::event::StartCause),
+    UserEvent(Message),
+    WindowEvent {
+        window_id: winit::window::WindowId,
+        event: winit::event::WindowEvent,
+    },
+    FileEvent {
+        window_id: winit::window::WindowId,
+        event: crate::core::Event,
+    },
+    AboutToWait,
+}
+
+#[derive(Debug)]
+struct DragSession {
+    window_id: winit::window::WindowId,
+    id: winit::data_transfer::DataTransferId,
+    path: Option<Vec<std::path::PathBuf>>,
+    dropped: bool,
+}
+
 #[derive(Debug)]
 enum Control {
     ChangeFlow(winit::event_loop::ControlFlow),
@@ -686,12 +832,12 @@ async fn run_instance<P>(
             }
             Event::EventLoopAwakened(event) => {
                 match event {
-                    event::Event::NewEvents(event::StartCause::Init) => {
+                    EventLoopEvent::NewEvents(event::StartCause::Init) => {
                         for (_id, window) in window_manager.iter_mut() {
                             window.raw.request_redraw();
                         }
                     }
-                    event::Event::NewEvents(event::StartCause::ResumeTimeReached { .. }) => {
+                    EventLoopEvent::NewEvents(event::StartCause::ResumeTimeReached { .. }) => {
                         let now = Instant::now();
 
                         for (_id, window) in window_manager.iter_mut() {
@@ -711,16 +857,7 @@ async fn run_instance<P>(
                                 control_sender.start_send(Control::ChangeFlow(ControlFlow::Wait));
                         }
                     }
-                    event::Event::PlatformSpecific(event::PlatformSpecific::MacOS(
-                        event::MacOS::ReceivedUrl(url),
-                    )) => {
-                        runtime.broadcast(subscription::Event::PlatformSpecific(
-                            subscription::PlatformSpecific::MacOS(
-                                subscription::MacOS::ReceivedUrl(url),
-                            ),
-                        ));
-                    }
-                    event::Event::UserEvent(action) => {
+                    EventLoopEvent::UserEvent(action) => {
                         run_action(
                             action,
                             &program,
@@ -740,7 +877,7 @@ async fn run_instance<P>(
                         );
                         actions += 1;
                     }
-                    event::Event::WindowEvent {
+                    EventLoopEvent::WindowEvent {
                         window_id: id,
                         event: event::WindowEvent::RedrawRequested,
                         ..
@@ -991,7 +1128,7 @@ async fn run_instance<P>(
                             },
                         }
                     }
-                    event::Event::WindowEvent {
+                    EventLoopEvent::WindowEvent {
                         event: window_event,
                         window_id,
                     } => {
@@ -1012,7 +1149,7 @@ async fn run_instance<P>(
                         };
 
                         match window_event {
-                            winit::event::WindowEvent::Resized(_)
+                            winit::event::WindowEvent::SurfaceResized(_)
                             | winit::event::WindowEvent::Occluded(false) => {
                                 window.raw.request_redraw();
                             }
@@ -1050,7 +1187,7 @@ async fn run_instance<P>(
                                 &mut renderer_settings,
                             );
                         } else {
-                            window.state.update(&program, &window.raw, &window_event);
+                            window.state.update(&program, &*window.raw, &window_event);
 
                             if let Some(event) = conversion::window_event(
                                 window_event,
@@ -1061,7 +1198,12 @@ async fn run_instance<P>(
                             }
                         }
                     }
-                    event::Event::AboutToWait => {
+                    EventLoopEvent::FileEvent { window_id, event } => {
+                        if let Some((id, _)) = window_manager.get_mut_alias(window_id) {
+                            events.push((id, event));
+                        }
+                    }
+                    EventLoopEvent::AboutToWait => {
                         if actions > 0 {
                             proxy.free_slots(actions);
                             actions = 0;
@@ -1379,46 +1521,52 @@ fn run_action<'a, P, C>(
             }
             window::Action::Resize(id, size) => {
                 if let Some(window) = window_manager.get_mut(id) {
-                    let _ = window.raw.request_inner_size(
+                    let _ = window.raw.request_surface_size(
                         winit::dpi::LogicalSize {
                             width: size.width,
                             height: size.height,
                         }
-                        .to_physical::<f32>(f64::from(window.state.scale_factor())),
+                        .to_physical::<f32>(f64::from(window.state.scale_factor()))
+                        .into(),
                     );
                 }
             }
             window::Action::SetMinSize(id, size) => {
                 if let Some(window) = window_manager.get_mut(id) {
-                    window.raw.set_min_inner_size(size.map(|size| {
+                    window.raw.set_min_surface_size(size.map(|size| {
                         winit::dpi::LogicalSize {
                             width: size.width,
                             height: size.height,
                         }
                         .to_physical::<f32>(f64::from(window.state.scale_factor()))
+                        .into()
                     }));
                 }
             }
             window::Action::SetMaxSize(id, size) => {
                 if let Some(window) = window_manager.get_mut(id) {
-                    window.raw.set_max_inner_size(size.map(|size| {
+                    window.raw.set_max_surface_size(size.map(|size| {
                         winit::dpi::LogicalSize {
                             width: size.width,
                             height: size.height,
                         }
                         .to_physical::<f32>(f64::from(window.state.scale_factor()))
+                        .into()
                     }));
                 }
             }
             window::Action::SetResizeIncrements(id, increments) => {
                 if let Some(window) = window_manager.get_mut(id) {
-                    window.raw.set_resize_increments(increments.map(|size| {
-                        winit::dpi::LogicalSize {
-                            width: size.width,
-                            height: size.height,
-                        }
-                        .to_physical::<f32>(f64::from(window.state.scale_factor()))
-                    }));
+                    window
+                        .raw
+                        .set_surface_resize_increments(increments.map(|size| {
+                            winit::dpi::LogicalSize {
+                                width: size.width,
+                                height: size.height,
+                            }
+                            .to_physical::<f32>(f64::from(window.state.scale_factor()))
+                            .into()
+                        }));
                 }
             }
             window::Action::SetResizable(id, resizable) => {
@@ -1476,10 +1624,13 @@ fn run_action<'a, P, C>(
             }
             window::Action::Move(id, position) => {
                 if let Some(window) = window_manager.get_mut(id) {
-                    window.raw.set_outer_position(winit::dpi::LogicalPosition {
-                        x: position.x,
-                        y: position.y,
-                    });
+                    window.raw.set_outer_position(
+                        winit::dpi::LogicalPosition {
+                            x: position.x,
+                            y: position.y,
+                        }
+                        .into(),
+                    );
                 }
             }
             window::Action::SetMode(id, mode) => {
@@ -1537,15 +1688,18 @@ fn run_action<'a, P, C>(
                 if let Some(window) = window_manager.get_mut(id)
                     && let mouse::Cursor::Available(point) = window.state.cursor()
                 {
-                    window.raw.show_window_menu(winit::dpi::LogicalPosition {
-                        x: point.x,
-                        y: point.y,
-                    });
+                    window.raw.show_window_menu(
+                        winit::dpi::LogicalPosition {
+                            x: point.x,
+                            y: point.y,
+                        }
+                        .into(),
+                    );
                 }
             }
             window::Action::GetRawId(id, channel) => {
                 if let Some(window) = window_manager.get_mut(id) {
-                    let _ = channel.send(window.raw.id().into());
+                    let _ = channel.send(window.raw.id().into_raw() as u64);
                 }
             }
             window::Action::Run(id, f) => {
@@ -1582,11 +1736,13 @@ fn run_action<'a, P, C>(
             }
             window::Action::GetMonitorSize(id, channel) => {
                 if let Some(window) = window_manager.get(id) {
-                    let size = window.raw.current_monitor().map(|monitor| {
+                    let size = window.raw.current_monitor().and_then(|monitor| {
                         let scale = window.state.scale_factor();
-                        let size = monitor.size().to_logical(f64::from(scale));
+                        let size = monitor
+                            .current_video_mode()
+                            .map(|mode| mode.size().to_logical(f64::from(scale)));
 
-                        Size::new(size.width, size.height)
+                        size.map(|size| Size::new(size.width, size.height))
                     });
 
                     let _ = channel.send(size);
@@ -1647,7 +1803,7 @@ fn run_action<'a, P, C>(
                 for (_id, window) in window_manager.iter_mut() {
                     window.state.update(
                         program,
-                        &window.raw,
+                        &*window.raw,
                         &winit::event::WindowEvent::ThemeChanged(theme),
                     );
                 }
@@ -1815,7 +1971,7 @@ where
     for (id, window) in window_manager.iter_mut() {
         let old_size = window.state.logical_size();
 
-        window.state.synchronize(program, id, &window.raw);
+        window.state.synchronize(program, id, &*window.raw);
 
         let new_size = window.state.logical_size();
 
@@ -1870,7 +2026,7 @@ pub fn user_force_quit(
                     ..
                 },
             ..
-        } if c == "q" && _modifiers.super_key() => true,
+        } if c == "q" && _modifiers.meta_key() => true,
         _ => false,
     }
 }
diff --git a/winit/src/proxy.rs b/winit/src/proxy.rs
index 1aa3100aae..63cc7133cd 100644
--- a/winit/src/proxy.rs
+++ b/winit/src/proxy.rs
@@ -12,9 +12,10 @@ use std::pin::Pin;
 /// An event loop proxy with backpressure that implements `Sink`.
 #[derive(Debug)]
 pub struct Proxy<T: 'static> {
-    raw: winit::event_loop::EventLoopProxy<Action<T>>,
+    raw: winit::event_loop::EventLoopProxy,
     sender: mpsc::Sender<Action<T>>,
     notifier: mpsc::Sender<usize>,
+    outbox: mpsc::UnboundedSender<Action<T>>,
 }
 
 impl<T: 'static> Clone for Proxy<T> {
@@ -23,6 +24,7 @@ impl<T: 'static> Clone for Proxy<T> {
             raw: self.raw.clone(),
             sender: self.sender.clone(),
             notifier: self.notifier.clone(),
+            outbox: self.outbox.clone(),
         }
     }
 }
@@ -32,10 +34,16 @@ impl<T: 'static> Proxy<T> {
 
     /// Creates a new [`Proxy`] from an `EventLoopProxy`.
     pub fn new(
-        raw: winit::event_loop::EventLoopProxy<Action<T>>,
-    ) -> (Self, impl Future<Output = ()>) {
+        raw: winit::event_loop::EventLoopProxy,
+    ) -> (
+        Self,
+        impl Future<Output = ()>,
+        mpsc::UnboundedReceiver<Action<T>>,
+    ) {
         let (notifier, mut processed) = mpsc::channel(Self::MAX_SIZE);
         let (sender, mut receiver) = mpsc::channel(Self::MAX_SIZE);
+        let (outbox, outbox_receiver) = mpsc::unbounded();
+        let worker_outbox = outbox.clone();
         let proxy = raw.clone();
 
         let worker = async move {
@@ -45,7 +53,8 @@ impl<T: 'static> Proxy<T> {
                 if count < Self::MAX_SIZE {
                     select! {
                         message = receiver.select_next_some() => {
-                            let _ = proxy.send_event(message);
+                            let _ = worker_outbox.unbounded_send(message);
+                            proxy.wake_up();
                             count += 1;
                         }
                         amount = processed.select_next_some() => {
@@ -69,8 +78,10 @@ impl<T: 'static> Proxy<T> {
                 raw,
                 sender,
                 notifier,
+                outbox,
             },
             worker,
+            outbox_receiver,
         )
     }
 
@@ -92,7 +103,8 @@ impl<T: 'static> Proxy<T> {
     /// Note: This skips the backpressure mechanism with an unbounded
     /// channel. Use sparingly!
     pub fn send_action(&self, action: Action<T>) {
-        let _ = self.raw.send_event(action);
+        let _ = self.outbox.unbounded_send(action);
+        self.raw.wake_up();
     }
 
     /// Frees an amount of slots for additional messages to be queued in
diff --git a/winit/src/window.rs b/winit/src/window.rs
index 5f9ef0e611..4768545cc6 100644
--- a/winit/src/window.rs
+++ b/winit/src/window.rs
@@ -9,7 +9,7 @@ use crate::conversion;
 use crate::core;
 use crate::core::alignment;
 use crate::core::input_method;
-use crate::core::mouse;
+use crate::core::pointer::mouse;
 use crate::core::renderer;
 use crate::core::shell;
 use crate::core::text;
@@ -51,7 +51,7 @@ where
     pub fn insert(
         &mut self,
         id: Id,
-        window: Arc<winit::window::Window>,
+        window: Arc<dyn winit::window::Window>,
         program: &program::Instance<P>,
         compositor: &mut C,
         proxy: Proxy<P::Message>,
@@ -59,7 +59,7 @@ where
         exit_on_close_request: bool,
         system_theme: theme::Mode,
     ) -> &mut Window<P, C> {
-        let state = State::new(program, id, &window, system_theme);
+        let state = State::new(program, id, &*window, system_theme);
         let surface_size = state.physical_size();
         let surface_version = state.surface_version();
         let surface =
@@ -175,7 +175,7 @@ where
     C: Compositor<Renderer = P::Renderer>,
     P::Theme: theme::Base,
 {
-    pub raw: Arc<winit::window::Window>,
+    pub raw: Arc<dyn winit::window::Window>,
     pub waker: shell::Waker,
     pub state: State<P>,
     pub exit_on_close_request: bool,
@@ -255,7 +255,7 @@ where
     pub fn update_mouse(&mut self, interaction: mouse::Interaction) {
         if interaction != self.mouse_interaction {
             if let Some(icon) = conversion::mouse_interaction(interaction) {
-                self.raw.set_cursor(icon);
+                self.raw.set_cursor(winit::cursor::Cursor::Icon(icon));
 
                 if self.mouse_interaction == mouse::Interaction::Hidden {
                     self.raw.set_cursor_visible(true);
@@ -280,25 +280,31 @@ where
     }
 
     fn enable_ime(&mut self, cursor: Rectangle, purpose: input_method::Purpose) {
-        if self.ime_state.is_none() {
-            self.raw.set_ime_allowed(true);
-        }
+        #[allow(deprecated)]
+        {
+            if self.ime_state.is_none() {
+                self.raw.set_ime_allowed(true);
+            }
 
-        if self.ime_state != Some((cursor, purpose)) {
-            self.raw.set_ime_cursor_area(
-                LogicalPosition::new(cursor.x, cursor.y),
-                LogicalSize::new(cursor.width, cursor.height),
-            );
-            self.raw.set_ime_purpose(conversion::ime_purpose(purpose));
+            if self.ime_state != Some((cursor, purpose)) {
+                self.raw.set_ime_cursor_area(
+                    LogicalPosition::new(cursor.x, cursor.y).into(),
+                    LogicalSize::new(cursor.width, cursor.height).into(),
+                );
+                self.raw.set_ime_purpose(conversion::ime_purpose(purpose));
 
-            self.ime_state = Some((cursor, purpose));
+                self.ime_state = Some((cursor, purpose));
+            }
         }
     }
 
     fn disable_ime(&mut self) {
-        if self.ime_state.is_some() {
-            self.raw.set_ime_allowed(false);
-            self.ime_state = None;
+        #[allow(deprecated)]
+        {
+            if self.ime_state.is_some() {
+                self.raw.set_ime_allowed(false);
+                self.ime_state = None;
+            }
         }
 
         self.preedit = None;
diff --git a/winit/src/window/state.rs b/winit/src/window/state.rs
index 40590c2687..56e5682009 100644
--- a/winit/src/window/state.rs
+++ b/winit/src/window/state.rs
@@ -1,11 +1,11 @@
 use crate::conversion;
 use crate::core::renderer;
 use crate::core::{Color, Size};
-use crate::core::{mouse, theme, window};
+use crate::core::{pointer::mouse, theme, window};
 use crate::graphics::Viewport;
 use crate::program::{self, Program};
 
-use winit::event::{Touch, WindowEvent};
+use winit::event::{PointerKind, WindowEvent};
 use winit::window::Window;
 
 use std::fmt::{Debug, Formatter};
@@ -48,7 +48,7 @@ where
     pub fn new(
         program: &program::Instance<P>,
         window_id: window::Id,
-        window: &Window,
+        window: &dyn Window,
         system_theme: theme::Mode,
     ) -> Self {
         let title = program.title(window_id);
@@ -59,7 +59,7 @@ where
         let style = program.style(theme.as_ref().unwrap_or(&default_theme));
 
         let viewport = {
-            let physical_size = window.inner_size();
+            let physical_size = window.surface_size();
 
             Viewport::with_physical_size(
                 Size::new(physical_size.width, physical_size.height),
@@ -136,9 +136,14 @@ where
         self.style.text_color
     }
 
-    pub fn update(&mut self, program: &program::Instance<P>, window: &Window, event: &WindowEvent) {
+    pub fn update(
+        &mut self,
+        program: &program::Instance<P>,
+        window: &dyn Window,
+        event: &WindowEvent,
+    ) {
         match event {
-            WindowEvent::Resized(new_size) => {
+            WindowEvent::SurfaceResized(new_size) => {
                 let size = Size::new(new_size.width, new_size.height);
 
                 self.viewport = Viewport::with_physical_size(
@@ -165,13 +170,13 @@ where
                 );
                 self.surface_version += 1;
             }
-            WindowEvent::CursorMoved { position, .. }
-            | WindowEvent::Touch(Touch {
-                location: position, ..
-            }) => {
+            WindowEvent::PointerMoved { position, .. } => {
                 self.cursor_position = Some(*position);
             }
-            WindowEvent::CursorLeft { .. } => {
+            WindowEvent::PointerLeft {
+                kind: PointerKind::Mouse | PointerKind::TabletTool(_) | PointerKind::Unknown,
+                ..
+            } => {
                 self.cursor_position = None;
             }
             WindowEvent::ModifiersChanged(new_modifiers) => {
@@ -194,7 +199,7 @@ where
         &mut self,
         program: &program::Instance<P>,
         window_id: window::Id,
-        window: &Window,
+        window: &dyn Window,
     ) {
         // Update window title
         let new_title = program.title(window_id);