From 0a5325ba05390028857f9a0ad81f3b3febbb58a7 Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Mon, 5 Feb 2024 16:18:36 -0500
Subject: [PATCH 1/4] chore: update libcosmic

---
 Cargo.lock      | 800 +++++++++++++++++++++++-------------------------
 Cargo.toml      |  11 +-
 src/key_bind.rs |  85 ++---
 src/main.rs     |  13 +-
 src/menu.rs     |  10 +-
 src/text_box.rs |  76 +++--
 6 files changed, 491 insertions(+), 504 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2abb29c..2a8dd90 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -21,38 +21,37 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
 [[package]]
 name = "accesskit"
 version = "0.11.0"
-source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0"
+source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#16e0d60cf91b255ed6d9ac5c47bd3d1e878f17d8"
 
 [[package]]
 name = "accesskit_consumer"
 version = "0.15.0"
-source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0"
+source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#16e0d60cf91b255ed6d9ac5c47bd3d1e878f17d8"
 dependencies = [
  "accesskit",
 ]
 
 [[package]]
 name = "accesskit_macos"
-version = "0.7.0"
-source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0"
+version = "0.7.1"
+source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#16e0d60cf91b255ed6d9ac5c47bd3d1e878f17d8"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
- "objc2",
+ "objc2 0.3.0-beta.3.patch-leaks.3",
  "once_cell",
 ]
 
 [[package]]
 name = "accesskit_unix"
-version = "0.4.0"
-source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0"
+version = "0.5.0"
+source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#16e0d60cf91b255ed6d9ac5c47bd3d1e878f17d8"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
  "async-channel 1.9.0",
  "atspi",
  "futures-lite 1.13.0",
- "log",
  "serde",
  "zbus",
 ]
@@ -60,7 +59,7 @@ dependencies = [
 [[package]]
 name = "accesskit_windows"
 version = "0.14.0"
-source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0"
+source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#16e0d60cf91b255ed6d9ac5c47bd3d1e878f17d8"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
@@ -72,14 +71,14 @@ dependencies = [
 
 [[package]]
 name = "accesskit_winit"
-version = "0.13.0"
-source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0"
+version = "0.14.1"
+source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#16e0d60cf91b255ed6d9ac5c47bd3d1e878f17d8"
 dependencies = [
  "accesskit",
  "accesskit_macos",
  "accesskit_unix",
  "accesskit_windows",
- "winit 0.28.6",
+ "winit 0.29.10",
 ]
 
 [[package]]
@@ -110,6 +109,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
 dependencies = [
  "cfg-if 1.0.0",
+ "getrandom",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -157,20 +157,23 @@ dependencies = [
 
 [[package]]
 name = "android-activity"
-version = "0.4.3"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0"
+checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289"
 dependencies = [
  "android-properties",
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "cc",
+ "cesu8",
+ "jni",
  "jni-sys",
  "libc",
  "log",
- "ndk 0.7.0",
+ "ndk 0.8.0",
  "ndk-context",
- "ndk-sys 0.4.1+23.1.7779620",
- "num_enum 0.6.1",
+ "ndk-sys 0.5.0+25.2.9519653",
+ "num_enum 0.7.2",
+ "thiserror",
 ]
 
 [[package]]
@@ -602,7 +605,16 @@ version = "0.1.0-beta.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146"
 dependencies = [
- "objc-sys",
+ "objc-sys 0.2.0-beta.2",
+]
+
+[[package]]
+name = "block-sys"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7"
+dependencies = [
+ "objc-sys 0.3.2",
 ]
 
 [[package]]
@@ -611,8 +623,18 @@ version = "0.2.0-alpha.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42"
 dependencies = [
- "block-sys",
- "objc2-encode",
+ "block-sys 0.1.0-beta.1",
+ "objc2-encode 2.0.0-pre.2",
+]
+
+[[package]]
+name = "block2"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68"
+dependencies = [
+ "block-sys 0.2.1",
+ "objc2 0.4.1",
 ]
 
 [[package]]
@@ -706,20 +728,6 @@ dependencies = [
  "nix 0.18.0",
 ]
 
-[[package]]
-name = "calloop"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8"
-dependencies = [
- "bitflags 1.3.2",
- "log",
- "nix 0.25.1",
- "slotmap",
- "thiserror",
- "vec_map",
-]
-
 [[package]]
 name = "calloop"
 version = "0.12.4"
@@ -756,6 +764,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "cesu8"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
+
 [[package]]
 name = "cfg-expr"
 version = "0.15.6"
@@ -784,6 +798,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f"
+
 [[package]]
 name = "chrono"
 version = "0.4.33"
@@ -800,13 +820,11 @@ dependencies = [
 
 [[package]]
 name = "clipboard-win"
-version = "4.5.0"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362"
+checksum = "c57002a5d9be777c1ef967e33674dac9ebd310d8893e4e3437b14d5f0f6372cc"
 dependencies = [
  "error-code",
- "str-buf",
- "winapi",
 ]
 
 [[package]]
@@ -836,7 +854,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5cf45b436634fee64c6d3981639b46a87eeea3c64e422643273fcefd1baef56c"
 dependencies = [
  "thiserror",
- "x11rb 0.13.0",
+ "x11rb",
 ]
 
 [[package]]
@@ -902,10 +920,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
-name = "com-rs"
-version = "0.2.1"
+name = "com"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642"
+checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6"
+dependencies = [
+ "com_macros",
+]
+
+[[package]]
+name = "com_macros"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5"
+dependencies = [
+ "com_macros_support",
+ "proc-macro2",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "com_macros_support"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "combine"
+version = "4.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
+dependencies = [
+ "bytes",
+ "memchr",
+]
 
 [[package]]
 name = "concurrent-queue"
@@ -1033,7 +1086,7 @@ dependencies = [
 [[package]]
 name = "cosmic-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#ca1469a6b26eb7fbdc8e28d6135e86593e6a77fd"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
 dependencies = [
  "atomicwrites",
  "cosmic-config-derive",
@@ -1050,7 +1103,7 @@ dependencies = [
 [[package]]
 name = "cosmic-config-derive"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#ca1469a6b26eb7fbdc8e28d6135e86593e6a77fd"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
 dependencies = [
  "quote",
  "syn 1.0.109",
@@ -1061,7 +1114,7 @@ name = "cosmic-edit"
 version = "0.1.0"
 dependencies = [
  "cosmic-syntax-theme",
- "cosmic-text",
+ "cosmic-text 0.10.0 (git+https://github.com/pop-os/cosmic-text)",
  "env_logger",
  "fork",
  "grep",
@@ -1076,6 +1129,7 @@ dependencies = [
  "rfd",
  "rust-embed",
  "serde",
+ "smol_str",
  "syntect",
  "systemicons",
  "tokio",
@@ -1095,7 +1149,29 @@ dependencies = [
 [[package]]
 name = "cosmic-text"
 version = "0.10.0"
-source = "git+https://github.com/pop-os/cosmic-text#be471833c9ee563866f07593354a41dd40761a18"
+source = "git+https://github.com/pop-os/cosmic-text.git?rev=1b025ae#1b025ae56e0122cff5798b9f54fc56d47a182d2b"
+dependencies = [
+ "bitflags 2.4.2",
+ "fontdb",
+ "libm",
+ "log",
+ "rangemap",
+ "rustc-hash",
+ "rustybuzz",
+ "self_cell 1.0.3",
+ "swash",
+ "sys-locale",
+ "ttf-parser 0.20.0",
+ "unicode-bidi",
+ "unicode-linebreak",
+ "unicode-script",
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "cosmic-text"
+version = "0.10.0"
+source = "git+https://github.com/pop-os/cosmic-text#cc75bb66b40794702ebc9fc9e30b1b29d7438bb5"
 dependencies = [
  "bitflags 2.4.2",
  "cosmic_undo_2",
@@ -1120,7 +1196,7 @@ dependencies = [
 [[package]]
 name = "cosmic-theme"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#ca1469a6b26eb7fbdc8e28d6135e86593e6a77fd"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
 dependencies = [
  "almost",
  "cosmic-config",
@@ -1272,9 +1348,8 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
 
 [[package]]
 name = "d3d12"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20"
+version = "0.19.0"
+source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7"
 dependencies = [
  "bitflags 2.4.2",
  "libloading 0.8.1",
@@ -1516,25 +1591,25 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
 
 [[package]]
 name = "drm"
-version = "0.10.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fb1b703ffbc7ebd216eba7900008049a56ace55580ecb2ee7fa801e8d8be87"
+checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde"
 dependencies = [
  "bitflags 2.4.2",
  "bytemuck",
  "drm-ffi",
  "drm-fourcc",
- "nix 0.27.1",
+ "rustix 0.38.31",
 ]
 
 [[package]]
 name = "drm-ffi"
-version = "0.6.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba7d1c19c4b6270e89d59fb27dc6d02a317c658a8a54e54781e1db9b5947595d"
+checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6"
 dependencies = [
  "drm-sys",
- "nix 0.27.1",
+ "rustix 0.38.31",
 ]
 
 [[package]]
@@ -1545,9 +1620,13 @@ checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
 
 [[package]]
 name = "drm-sys"
-version = "0.5.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a4f1c0468062a56cd5705f1e3b5409eb286d5596a2028ec8e947595d7e715ae"
+checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176"
+dependencies = [
+ "libc",
+ "linux-raw-sys 0.6.4",
+]
 
 [[package]]
 name = "either"
@@ -1625,13 +1704,9 @@ dependencies = [
 
 [[package]]
 name = "error-code"
-version = "2.3.1"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21"
-dependencies = [
- "libc",
- "str-buf",
-]
+checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc"
 
 [[package]]
 name = "etagere"
@@ -1697,7 +1772,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56"
 dependencies = [
  "bit_field",
- "flume 0.10.14",
+ "flume",
  "half",
  "lebe",
  "miniz_oxide 0.7.1",
@@ -1836,18 +1911,6 @@ dependencies = [
  "spin",
 ]
 
-[[package]]
-name = "flume"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
-dependencies = [
- "futures-core",
- "futures-sink",
- "nanorand",
- "spin",
-]
-
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -2133,16 +2196,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "gethostname"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "gethostname"
 version = "0.4.3"
@@ -2274,10 +2327,10 @@ dependencies = [
 
 [[package]]
 name = "glyphon"
-version = "0.4.1"
-source = "git+https://github.com/jackpot51/glyphon.git#abb70c0fda8cf1a5dfc314c1c778103d7ba951e6"
+version = "0.5.0"
+source = "git+https://github.com/wash2/glyphon.git?tag=cosmic-0.5#b6d630e2151cddaa41cb0b10133c5bc3ee9dacc6"
 dependencies = [
- "cosmic-text",
+ "cosmic-text 0.10.0 (git+https://github.com/pop-os/cosmic-text.git?rev=1b025ae)",
  "etagere",
  "lru",
  "wgpu",
@@ -2315,11 +2368,10 @@ dependencies = [
 
 [[package]]
 name = "gpu-allocator"
-version = "0.23.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40fe17c8a05d60c38c0a4e5a3c802f2f1ceb66b76c67d96ffb34bef0475a7fad"
+checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884"
 dependencies = [
- "backtrace",
  "log",
  "presser",
  "thiserror",
@@ -2496,14 +2548,14 @@ dependencies = [
 
 [[package]]
 name = "hassle-rs"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0"
+checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890"
 dependencies = [
- "bitflags 1.3.2",
- "com-rs",
+ "bitflags 2.4.2",
+ "com",
  "libc",
- "libloading 0.7.4",
+ "libloading 0.8.1",
  "thiserror",
  "widestring",
  "winapi",
@@ -2635,7 +2687,7 @@ dependencies = [
 [[package]]
 name = "iced"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#ca1469a6b26eb7fbdc8e28d6135e86593e6a77fd"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
 dependencies = [
  "iced_accessibility",
  "iced_core",
@@ -2650,7 +2702,7 @@ dependencies = [
 [[package]]
 name = "iced_accessibility"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#ca1469a6b26eb7fbdc8e28d6135e86593e6a77fd"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
 dependencies = [
  "accesskit",
  "accesskit_winit",
@@ -2659,23 +2711,24 @@ dependencies = [
 [[package]]
 name = "iced_core"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#ca1469a6b26eb7fbdc8e28d6135e86593e6a77fd"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
 dependencies = [
  "bitflags 1.3.2",
- "instant",
  "log",
  "num-traits",
  "palette",
- "raw-window-handle 0.5.2",
+ "raw-window-handle 0.6.0",
  "serde",
+ "smol_str",
  "thiserror",
+ "web-time",
  "xxhash-rust",
 ]
 
 [[package]]
 name = "iced_futures"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#ca1469a6b26eb7fbdc8e28d6135e86593e6a77fd"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
 dependencies = [
  "futures",
  "iced_core",
@@ -2688,20 +2741,21 @@ dependencies = [
 [[package]]
 name = "iced_graphics"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#ca1469a6b26eb7fbdc8e28d6135e86593e6a77fd"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
 dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
- "cosmic-text",
+ "cosmic-text 0.10.0 (git+https://github.com/pop-os/cosmic-text.git?rev=1b025ae)",
  "glam",
  "half",
  "iced_core",
+ "iced_futures",
  "image 0.24.8",
  "kamadak-exif",
  "log",
  "lyon_path",
  "once_cell",
- "raw-window-handle 0.5.2",
+ "raw-window-handle 0.6.0",
  "rustc-hash",
  "thiserror",
  "unicode-segmentation",
@@ -2711,20 +2765,19 @@ dependencies = [
 [[package]]
 name = "iced_renderer"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#ca1469a6b26eb7fbdc8e28d6135e86593e6a77fd"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
 dependencies = [
  "iced_graphics",
  "iced_tiny_skia",
  "iced_wgpu",
  "log",
- "raw-window-handle 0.5.2",
  "thiserror",
 ]
 
 [[package]]
 name = "iced_runtime"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#ca1469a6b26eb7fbdc8e28d6135e86593e6a77fd"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
 dependencies = [
  "iced_core",
  "iced_futures",
@@ -2734,7 +2787,7 @@ dependencies = [
 [[package]]
 name = "iced_style"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#ca1469a6b26eb7fbdc8e28d6135e86593e6a77fd"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
 dependencies = [
  "iced_core",
  "once_cell",
@@ -2744,25 +2797,24 @@ dependencies = [
 [[package]]
 name = "iced_tiny_skia"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#ca1469a6b26eb7fbdc8e28d6135e86593e6a77fd"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
 dependencies = [
  "bytemuck",
- "cosmic-text",
+ "cosmic-text 0.10.0 (git+https://github.com/pop-os/cosmic-text.git?rev=1b025ae)",
  "iced_graphics",
  "kurbo",
  "log",
- "raw-window-handle 0.5.2",
  "resvg",
  "rustc-hash",
  "softbuffer",
- "tiny-skia 0.11.3",
+ "tiny-skia",
  "xxhash-rust",
 ]
 
 [[package]]
 name = "iced_wgpu"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#ca1469a6b26eb7fbdc8e28d6135e86593e6a77fd"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
 dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
@@ -2774,7 +2826,6 @@ dependencies = [
  "log",
  "lyon",
  "once_cell",
- "raw-window-handle 0.5.2",
  "resvg",
  "wgpu",
 ]
@@ -2782,7 +2833,7 @@ dependencies = [
 [[package]]
 name = "iced_widget"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#ca1469a6b26eb7fbdc8e28d6135e86593e6a77fd"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
 dependencies = [
  "iced_renderer",
  "iced_runtime",
@@ -2796,7 +2847,7 @@ dependencies = [
 [[package]]
 name = "iced_winit"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#ca1469a6b26eb7fbdc8e28d6135e86593e6a77fd"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
 dependencies = [
  "iced_graphics",
  "iced_runtime",
@@ -2807,7 +2858,18 @@ dependencies = [
  "web-sys",
  "winapi",
  "window_clipboard",
- "winit 0.28.6",
+ "winit 0.29.10",
+]
+
+[[package]]
+name = "icrate"
+version = "0.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319"
+dependencies = [
+ "block2 0.3.0",
+ "dispatch",
+ "objc2 0.4.1",
 ]
 
 [[package]]
@@ -2922,9 +2984,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
  "cfg-if 1.0.0",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
 ]
 
 [[package]]
@@ -2974,6 +3033,22 @@ version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
+[[package]]
+name = "jni"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
+dependencies = [
+ "cesu8",
+ "cfg-if 1.0.0",
+ "combine",
+ "jni-sys",
+ "log",
+ "thiserror",
+ "walkdir",
+ "windows-sys 0.45.0",
+]
+
 [[package]]
 name = "jni-sys"
 version = "0.3.0"
@@ -3123,7 +3198,7 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 [[package]]
 name = "libcosmic"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#ca1469a6b26eb7fbdc8e28d6135e86593e6a77fd"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
 dependencies = [
  "apply",
  "ashpd",
@@ -3241,6 +3316,12 @@ version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4"
+
 [[package]]
 name = "locale_config"
 version = "0.3.0"
@@ -3355,15 +3436,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "memmap2"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "memmap2"
 version = "0.9.4"
@@ -3373,15 +3445,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "memoffset"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "memoffset"
 version = "0.7.1"
@@ -3519,9 +3582,10 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b"
 
 [[package]]
 name = "naga"
-version = "0.14.1"
-source = "git+https://github.com/pop-os/wgpu?branch=v0.18#868033d6754253bc51aa886f7308ac6f0fa080d7"
+version = "0.19.0"
+source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7"
 dependencies = [
+ "arrayvec 0.7.4",
  "bit-set",
  "bitflags 2.4.2",
  "codespan-reporting",
@@ -3559,15 +3623,16 @@ dependencies = [
 
 [[package]]
 name = "ndk"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
+checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "jni-sys",
- "ndk-sys 0.4.1+23.1.7779620",
- "num_enum 0.5.11",
- "raw-window-handle 0.5.2",
+ "log",
+ "ndk-sys 0.5.0+25.2.9519653",
+ "num_enum 0.7.2",
+ "raw-window-handle 0.6.0",
  "thiserror",
 ]
 
@@ -3612,9 +3677,9 @@ checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121"
 
 [[package]]
 name = "ndk-sys"
-version = "0.4.1+23.1.7779620"
+version = "0.5.0+25.2.9519653"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3"
+checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691"
 dependencies = [
  "jni-sys",
 ]
@@ -3643,31 +3708,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "nix"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
-dependencies = [
- "bitflags 1.3.2",
- "cfg-if 1.0.0",
- "libc",
- "memoffset 0.6.5",
-]
-
-[[package]]
-name = "nix"
-version = "0.25.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
-dependencies = [
- "autocfg",
- "bitflags 1.3.2",
- "cfg-if 1.0.0",
- "libc",
- "memoffset 0.6.5",
-]
-
 [[package]]
 name = "nix"
 version = "0.26.4"
@@ -3680,17 +3720,6 @@ dependencies = [
  "memoffset 0.7.1",
 ]
 
-[[package]]
-name = "nix"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
-dependencies = [
- "bitflags 2.4.2",
- "cfg-if 1.0.0",
- "libc",
-]
-
 [[package]]
 name = "nom"
 version = "5.1.3"
@@ -3866,11 +3895,11 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.6.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
+checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
 dependencies = [
- "num_enum_derive 0.6.1",
+ "num_enum_derive 0.7.2",
 ]
 
 [[package]]
@@ -3887,9 +3916,9 @@ dependencies = [
 
 [[package]]
 name = "num_enum_derive"
-version = "0.6.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
+checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
 dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2",
@@ -3924,15 +3953,31 @@ version = "0.2.0-beta.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7"
 
+[[package]]
+name = "objc-sys"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459"
+
 [[package]]
 name = "objc2"
 version = "0.3.0-beta.3.patch-leaks.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468"
 dependencies = [
- "block2",
- "objc-sys",
- "objc2-encode",
+ "block2 0.2.0-alpha.6",
+ "objc-sys 0.2.0-beta.2",
+ "objc2-encode 2.0.0-pre.2",
+]
+
+[[package]]
+name = "objc2"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d"
+dependencies = [
+ "objc-sys 0.3.2",
+ "objc2-encode 3.0.0",
 ]
 
 [[package]]
@@ -3941,9 +3986,15 @@ version = "2.0.0-pre.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512"
 dependencies = [
- "objc-sys",
+ "objc-sys 0.2.0-beta.2",
 ]
 
+[[package]]
+name = "objc2-encode"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666"
+
 [[package]]
 name = "objc_exception"
 version = "0.1.2"
@@ -4576,6 +4627,12 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
 
+[[package]]
+name = "raw-window-handle"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544"
+
 [[package]]
 name = "rayon"
 version = "1.8.1"
@@ -4703,7 +4760,7 @@ dependencies = [
  "png 0.17.11",
  "rgb",
  "svgtypes",
- "tiny-skia 0.11.3",
+ "tiny-skia",
  "usvg",
 ]
 
@@ -4920,14 +4977,15 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "sctk-adwaita"
-version = "0.5.4"
-source = "git+https://github.com/pop-os/sctk-adwaita?branch=wayland-resize#da85380dfb8f0c13aed51c5bddaad0ba3654cb1f"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550"
 dependencies = [
  "ab_glyph",
  "log",
- "memmap2 0.5.10",
- "smithay-client-toolkit 0.16.1",
- "tiny-skia 0.8.4",
+ "memmap2 0.9.4",
+ "smithay-client-toolkit 0.18.0",
+ "tiny-skia",
 ]
 
 [[package]]
@@ -5106,24 +5164,6 @@ dependencies = [
  "wayland-protocols 0.28.6",
 ]
 
-[[package]]
-name = "smithay-client-toolkit"
-version = "0.16.1"
-source = "git+https://github.com/pop-os/client-toolkit?branch=wayland-resize#515820fc86cf8cb3ac8d087dc6c87852767627ca"
-dependencies = [
- "bitflags 1.3.2",
- "calloop 0.10.6",
- "dlib 0.5.2",
- "lazy_static",
- "log",
- "memmap2 0.5.10",
- "nix 0.24.3",
- "pkg-config",
- "wayland-client 0.29.5",
- "wayland-cursor 0.29.5",
- "wayland-protocols 0.29.5",
-]
-
 [[package]]
 name = "smithay-client-toolkit"
 version = "0.18.0"
@@ -5160,6 +5200,15 @@ dependencies = [
  "wayland-backend",
 ]
 
+[[package]]
+name = "smol_str"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "socket2"
 version = "0.4.10"
@@ -5182,12 +5231,12 @@ dependencies = [
 
 [[package]]
 name = "softbuffer"
-version = "0.3.3"
-source = "git+https://github.com/pop-os/softbuffer?tag=v0.3-cosmic#6f0371ccece51d124c6c5d37082189df0dc5f9ba"
+version = "0.4.1"
+source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#0bb85989353f0d17deb593dedb00ee4392a871e7"
 dependencies = [
  "as-raw-xcb-connection",
  "bytemuck",
- "cfg_aliases",
+ "cfg_aliases 0.2.0",
  "cocoa 0.25.0",
  "core-graphics 0.23.1",
  "drm",
@@ -5197,7 +5246,7 @@ dependencies = [
  "log",
  "memmap2 0.9.4",
  "objc",
- "raw-window-handle 0.5.2",
+ "raw-window-handle 0.6.0",
  "redox_syscall 0.4.1",
  "rustix 0.38.31",
  "tiny-xlib",
@@ -5206,8 +5255,8 @@ dependencies = [
  "wayland-client 0.31.2",
  "wayland-sys 0.31.1",
  "web-sys",
- "windows-sys 0.48.0",
- "x11rb 0.12.0",
+ "windows-sys 0.52.0",
+ "x11rb",
 ]
 
 [[package]]
@@ -5221,12 +5270,11 @@ dependencies = [
 
 [[package]]
 name = "spirv"
-version = "0.2.0+1.5.4"
+version = "0.3.0+sdk-1.3.268.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830"
+checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
 dependencies = [
- "bitflags 1.3.2",
- "num-traits",
+ "bitflags 2.4.2",
 ]
 
 [[package]]
@@ -5235,12 +5283,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
-[[package]]
-name = "str-buf"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
-
 [[package]]
 name = "strict-num"
 version = "0.1.1"
@@ -5490,20 +5532,6 @@ dependencies = [
  "crunchy",
 ]
 
-[[package]]
-name = "tiny-skia"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67"
-dependencies = [
- "arrayref",
- "arrayvec 0.7.4",
- "bytemuck",
- "cfg-if 1.0.0",
- "png 0.17.11",
- "tiny-skia-path 0.8.4",
-]
-
 [[package]]
 name = "tiny-skia"
 version = "0.11.3"
@@ -5516,18 +5544,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "log",
  "png 0.17.11",
- "tiny-skia-path 0.11.3",
-]
-
-[[package]]
-name = "tiny-skia-path"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c"
-dependencies = [
- "arrayref",
- "bytemuck",
- "strict-num",
+ "tiny-skia-path",
 ]
 
 [[package]]
@@ -5914,15 +5931,9 @@ dependencies = [
  "rctree",
  "strict-num",
  "svgtypes",
- "tiny-skia-path 0.11.3",
+ "tiny-skia-path",
 ]
 
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
 [[package]]
 name = "version-compare"
 version = "0.1.1"
@@ -6063,27 +6074,11 @@ dependencies = [
  "libc",
  "nix 0.20.0",
  "scoped-tls",
- "wayland-commons 0.28.6",
+ "wayland-commons",
  "wayland-scanner 0.28.6",
  "wayland-sys 0.28.6",
 ]
 
-[[package]]
-name = "wayland-client"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715"
-dependencies = [
- "bitflags 1.3.2",
- "downcast-rs",
- "libc",
- "nix 0.24.3",
- "scoped-tls",
- "wayland-commons 0.29.5",
- "wayland-scanner 0.29.5",
- "wayland-sys 0.29.5",
-]
-
 [[package]]
 name = "wayland-client"
 version = "0.31.2"
@@ -6108,18 +6103,6 @@ dependencies = [
  "wayland-sys 0.28.6",
 ]
 
-[[package]]
-name = "wayland-commons"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902"
-dependencies = [
- "nix 0.24.3",
- "once_cell",
- "smallvec",
- "wayland-sys 0.29.5",
-]
-
 [[package]]
 name = "wayland-csd-frame"
 version = "0.3.0"
@@ -6142,17 +6125,6 @@ dependencies = [
  "xcursor",
 ]
 
-[[package]]
-name = "wayland-cursor"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661"
-dependencies = [
- "nix 0.24.3",
- "wayland-client 0.29.5",
- "xcursor",
-]
-
 [[package]]
 name = "wayland-cursor"
 version = "0.31.1"
@@ -6172,22 +6144,10 @@ checksum = "286620ea4d803bacf61fa087a4242ee316693099ee5a140796aaba02b29f861f"
 dependencies = [
  "bitflags 1.3.2",
  "wayland-client 0.28.6",
- "wayland-commons 0.28.6",
+ "wayland-commons",
  "wayland-scanner 0.28.6",
 ]
 
-[[package]]
-name = "wayland-protocols"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6"
-dependencies = [
- "bitflags 1.3.2",
- "wayland-client 0.29.5",
- "wayland-commons 0.29.5",
- "wayland-scanner 0.29.5",
-]
-
 [[package]]
 name = "wayland-protocols"
 version = "0.31.2"
@@ -6200,6 +6160,19 @@ dependencies = [
  "wayland-scanner 0.31.1",
 ]
 
+[[package]]
+name = "wayland-protocols-plasma"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479"
+dependencies = [
+ "bitflags 2.4.2",
+ "wayland-backend",
+ "wayland-client 0.31.2",
+ "wayland-protocols 0.31.2",
+ "wayland-scanner 0.31.1",
+]
+
 [[package]]
 name = "wayland-protocols-wlr"
 version = "0.2.0"
@@ -6224,17 +6197,6 @@ dependencies = [
  "xml-rs",
 ]
 
-[[package]]
-name = "wayland-scanner"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53"
-dependencies = [
- "proc-macro2",
- "quote",
- "xml-rs",
-]
-
 [[package]]
 name = "wayland-scanner"
 version = "0.31.1"
@@ -6257,17 +6219,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "wayland-sys"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4"
-dependencies = [
- "dlib 0.5.2",
- "lazy_static",
- "pkg-config",
-]
-
 [[package]]
 name = "wayland-sys"
 version = "0.31.1"
@@ -6282,9 +6233,19 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.64"
+version = "0.3.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
+checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -6298,18 +6259,18 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
 
 [[package]]
 name = "wgpu"
-version = "0.18.0"
-source = "git+https://github.com/pop-os/wgpu?branch=v0.18#868033d6754253bc51aa886f7308ac6f0fa080d7"
+version = "0.19.0"
+source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7"
 dependencies = [
  "arrayvec 0.7.4",
  "cfg-if 1.0.0",
- "flume 0.11.0",
+ "cfg_aliases 0.1.1",
  "js-sys",
  "log",
  "naga",
- "parking_lot 0.12.1",
+ "parking_lot 0.11.2",
  "profiling",
- "raw-window-handle 0.5.2",
+ "raw-window-handle 0.6.0",
  "smallvec",
  "static_assertions",
  "wasm-bindgen",
@@ -6322,18 +6283,21 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "0.18.1"
-source = "git+https://github.com/pop-os/wgpu?branch=v0.18#868033d6754253bc51aa886f7308ac6f0fa080d7"
+version = "0.19.0"
+source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7"
 dependencies = [
  "arrayvec 0.7.4",
  "bit-vec",
  "bitflags 2.4.2",
+ "cfg_aliases 0.1.1",
  "codespan-reporting",
+ "indexmap",
  "log",
  "naga",
- "parking_lot 0.12.1",
+ "once_cell",
+ "parking_lot 0.11.2",
  "profiling",
- "raw-window-handle 0.5.2",
+ "raw-window-handle 0.6.0",
  "rustc-hash",
  "smallvec",
  "thiserror",
@@ -6344,8 +6308,8 @@ dependencies = [
 
 [[package]]
 name = "wgpu-hal"
-version = "0.18.0"
-source = "git+https://github.com/pop-os/wgpu?branch=v0.18#868033d6754253bc51aa886f7308ac6f0fa080d7"
+version = "0.19.0"
+source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7"
 dependencies = [
  "android_system_properties",
  "arrayvec 0.7.4",
@@ -6353,6 +6317,7 @@ dependencies = [
  "bit-set",
  "bitflags 2.4.2",
  "block",
+ "cfg_aliases 0.1.1",
  "core-graphics-types",
  "d3d12",
  "glow",
@@ -6370,10 +6335,10 @@ dependencies = [
  "naga",
  "objc",
  "once_cell",
- "parking_lot 0.12.1",
+ "parking_lot 0.11.2",
  "profiling",
  "range-alloc",
- "raw-window-handle 0.5.2",
+ "raw-window-handle 0.6.0",
  "renderdoc-sys",
  "rustc-hash",
  "smallvec",
@@ -6386,8 +6351,8 @@ dependencies = [
 
 [[package]]
 name = "wgpu-types"
-version = "0.18.0"
-source = "git+https://github.com/pop-os/wgpu?branch=v0.18#868033d6754253bc51aa886f7308ac6f0fa080d7"
+version = "0.19.0"
+source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7"
 dependencies = [
  "bitflags 2.4.2",
  "js-sys",
@@ -6425,15 +6390,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "winapi-wsapoll"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
@@ -6442,15 +6398,15 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "window_clipboard"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63287c9c4396ccf5346d035a9b0fcaead9e18377637f5eaa78b7ac65c873ff7d"
+checksum = "c6a197337269a469b5b2583d65dd7dfe475fd79a525be0aa647ff6d37ac6612c"
 dependencies = [
  "clipboard-win",
  "clipboard_macos",
  "clipboard_wayland",
  "clipboard_x11",
- "raw-window-handle 0.5.2",
+ "raw-window-handle 0.6.0",
  "thiserror",
 ]
 
@@ -6747,36 +6703,49 @@ dependencies = [
 
 [[package]]
 name = "winit"
-version = "0.28.6"
-source = "git+https://github.com/pop-os/winit.git?branch=master#c6ad672264b2e320cd15a531f67e133d9ecd39bf"
+version = "0.29.10"
+source = "git+https://github.com/iced-rs/winit.git?rev=b91e39ece2c0d378c3b80da7f3ab50e17bb798a5#b91e39ece2c0d378c3b80da7f3ab50e17bb798a5"
 dependencies = [
+ "ahash",
  "android-activity",
- "bitflags 1.3.2",
- "cfg_aliases",
+ "atomic-waker",
+ "bitflags 2.4.2",
+ "bytemuck",
+ "calloop 0.12.4",
+ "cfg_aliases 0.1.1",
  "core-foundation 0.9.4",
- "core-graphics 0.22.3",
- "dispatch",
- "instant",
+ "core-graphics 0.23.1",
+ "cursor-icon",
+ "icrate",
+ "js-sys",
  "libc",
  "log",
- "mio 0.8.10",
- "ndk 0.7.0",
- "objc2",
+ "memmap2 0.9.4",
+ "ndk 0.8.0",
+ "ndk-sys 0.5.0+25.2.9519653",
+ "objc2 0.4.1",
  "once_cell",
  "orbclient",
  "percent-encoding",
- "raw-window-handle 0.5.2",
+ "raw-window-handle 0.6.0",
  "redox_syscall 0.3.5",
+ "rustix 0.38.31",
  "sctk-adwaita",
- "smithay-client-toolkit 0.16.1",
+ "smithay-client-toolkit 0.18.0",
+ "smol_str",
+ "unicode-segmentation",
  "wasm-bindgen",
- "wayland-client 0.29.5",
- "wayland-commons 0.29.5",
- "wayland-protocols 0.29.5",
- "wayland-scanner 0.29.5",
+ "wasm-bindgen-futures",
+ "wayland-backend",
+ "wayland-client 0.31.2",
+ "wayland-protocols 0.31.2",
+ "wayland-protocols-plasma",
  "web-sys",
- "windows-sys 0.45.0",
+ "web-time",
+ "windows-sys 0.48.0",
  "x11-dl",
+ "x11rb",
+ "xkbcommon-dl",
 ]
 
 [[package]]
@@ -6799,41 +6768,19 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "x11rb"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a"
-dependencies = [
- "as-raw-xcb-connection",
- "gethostname 0.3.0",
- "libc",
- "libloading 0.7.4",
- "nix 0.26.4",
- "once_cell",
- "winapi",
- "winapi-wsapoll",
- "x11rb-protocol 0.12.0",
-]
-
 [[package]]
 name = "x11rb"
 version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a"
 dependencies = [
- "gethostname 0.4.3",
+ "as-raw-xcb-connection",
+ "gethostname",
+ "libc",
+ "libloading 0.8.1",
+ "once_cell",
  "rustix 0.38.31",
- "x11rb-protocol 0.13.0",
-]
-
-[[package]]
-name = "x11rb-protocol"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc"
-dependencies = [
- "nix 0.26.4",
+ "x11rb-protocol",
 ]
 
 [[package]]
@@ -6877,6 +6824,19 @@ dependencies = [
  "unicase",
 ]
 
+[[package]]
+name = "xkbcommon-dl"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6924668544c48c0133152e7eec86d644a056ca3d09275eb8d5cdb9855f9d8699"
+dependencies = [
+ "bitflags 2.4.2",
+ "dlib 0.5.2",
+ "log",
+ "once_cell",
+ "xkeysym",
+]
+
 [[package]]
 name = "xkeysym"
 version = "0.2.0"
diff --git a/Cargo.toml b/Cargo.toml
index 31d4db3..37139fb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,7 +36,8 @@ features = ["syntect", "vi"]
 git = "https://github.com/pop-os/libcosmic"
 default-features = false
 features = ["tokio", "winit"]
-#path = "../libcosmic"
+# TODO remove before merging
+branch = "update-iced-latest"
 
 [dependencies.rfd]
 version = "0.13.0"
@@ -44,6 +45,10 @@ default-features = false
 features = ["tokio", "xdg-portal"]
 optional = true
 
+[dependencies.smol_str]
+version = "0.2.1"
+features = ["serde"]
+
 #TODO: clean up and send changes upstream
 [dependencies.systemicons]
 git = "https://github.com/jackpot51/systemicons"
@@ -56,9 +61,7 @@ default = ["rfd", "wgpu"]
 wgpu = ["libcosmic/wgpu"]
 
 [patch.crates-io]
-smithay-client-toolkit = { git = "https://github.com/pop-os/client-toolkit", branch = "wayland-resize" }
-# https://github.com/gfx-rs/wgpu/pull/4959
-wgpu = { git = "https://github.com/pop-os/wgpu", branch = "v0.18" }
+wgpu = { git = "https://github.com/gfx-rs/wgpu", rev = "faed98b" }
 
 [profile.release-with-debug]
 inherits = "release"
diff --git a/src/key_bind.rs b/src/key_bind.rs
index ef1444c..40714c1 100644
--- a/src/key_bind.rs
+++ b/src/key_bind.rs
@@ -1,4 +1,7 @@
-use cosmic::iced::keyboard::{KeyCode, Modifiers};
+use cosmic::{
+    iced::keyboard::{Key, Modifiers},
+    iced_core::keyboard::key::Named,
+};
 use serde::{Deserialize, Serialize};
 use std::{collections::HashMap, fmt};
 
@@ -15,12 +18,12 @@ pub enum Modifier {
 #[derive(Clone, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)]
 pub struct KeyBind {
     pub modifiers: Vec<Modifier>,
-    pub key_code: KeyCode,
+    pub key: Key,
 }
 
 impl KeyBind {
-    pub fn matches(&self, modifiers: Modifiers, key_code: KeyCode) -> bool {
-        self.key_code == key_code
+    pub fn matches(&self, modifiers: Modifiers, key: Key) -> bool {
+        self.key == key
             && modifiers.logo() == self.modifiers.contains(&Modifier::Super)
             && modifiers.control() == self.modifiers.contains(&Modifier::Ctrl)
             && modifiers.alt() == self.modifiers.contains(&Modifier::Alt)
@@ -33,7 +36,7 @@ impl fmt::Display for KeyBind {
         for modifier in self.modifiers.iter() {
             write!(f, "{:?} + ", modifier)?;
         }
-        write!(f, "{:?}", self.key_code)
+        write!(f, "{:?}", self.key)
     }
 }
 
@@ -42,47 +45,55 @@ pub fn key_binds() -> HashMap<KeyBind, Action> {
     let mut key_binds = HashMap::new();
 
     macro_rules! bind {
-        ([$($modifier:ident),+ $(,)?], $key_code:ident, $action:ident) => {{
+        ([$($modifier:ident),+ $(,)?], $key:expr, $action:ident) => {{
             key_binds.insert(
                 KeyBind {
                     modifiers: vec![$(Modifier::$modifier),+],
-                    key_code: KeyCode::$key_code,
+                    key: $key,
                 },
                 Action::$action,
             );
         }};
     }
 
-    bind!([Ctrl], W, CloseFile);
-    bind!([Ctrl], X, Cut);
-    bind!([Ctrl], C, Copy);
-    bind!([Ctrl], F, Find);
-    bind!([Ctrl], H, FindAndReplace);
-    bind!([Ctrl], V, Paste);
-    bind!([Ctrl], T, NewFile);
-    bind!([Ctrl], N, NewWindow);
-    bind!([Ctrl], O, OpenFileDialog);
-    bind!([Ctrl, Shift], O, OpenProjectDialog);
-    bind!([Ctrl], Q, Quit);
-    bind!([Ctrl, Shift], Z, Redo);
-    bind!([Ctrl], S, Save);
-    bind!([Ctrl], A, SelectAll);
-    bind!([Ctrl], Key1, TabActivate0);
-    bind!([Ctrl], Key2, TabActivate1);
-    bind!([Ctrl], Key3, TabActivate2);
-    bind!([Ctrl], Key4, TabActivate3);
-    bind!([Ctrl], Key5, TabActivate4);
-    bind!([Ctrl], Key6, TabActivate5);
-    bind!([Ctrl], Key7, TabActivate6);
-    bind!([Ctrl], Key8, TabActivate7);
-    bind!([Ctrl], Key9, TabActivate8);
-    bind!([Ctrl], Tab, TabNext);
-    bind!([Ctrl, Shift], Tab, TabPrev);
-    bind!([Ctrl, Shift], G, ToggleGitManagement);
-    bind!([Ctrl, Shift], F, ToggleProjectSearch);
-    bind!([Ctrl], Comma, ToggleSettingsPage);
-    bind!([Alt], Z, ToggleWordWrap);
-    bind!([Ctrl], Z, Undo);
+    bind!([Ctrl], Key::Character("w".into()), CloseFile);
+    bind!([Ctrl], Key::Character("x".into()), Cut);
+    bind!([Ctrl], Key::Character("c".into()), Copy);
+    bind!([Ctrl], Key::Character("f".into()), Find);
+    bind!([Ctrl], Key::Character("h".into()), FindAndReplace);
+    bind!([Ctrl], Key::Character("v".into()), Paste);
+    bind!([Ctrl], Key::Character("t".into()), NewFile);
+    bind!([Ctrl], Key::Character("n".into()), NewWindow);
+    bind!([Ctrl], Key::Character("o".into()), OpenFileDialog);
+    bind!([Ctrl, Shift], Key::Character("O".into()), OpenProjectDialog);
+    bind!([Ctrl], Key::Character("q".into()), Quit);
+    bind!([Ctrl, Shift], Key::Character("z".into()), Redo);
+    bind!([Ctrl], Key::Character("s".into()), Save);
+    bind!([Ctrl], Key::Character("a".into()), SelectAll);
+    bind!([Ctrl], Key::Character("1".into()), TabActivate0);
+    bind!([Ctrl], Key::Character("2".into()), TabActivate1);
+    bind!([Ctrl], Key::Character("3".into()), TabActivate2);
+    bind!([Ctrl], Key::Character("4".into()), TabActivate3);
+    bind!([Ctrl], Key::Character("5".into()), TabActivate4);
+    bind!([Ctrl], Key::Character("6".into()), TabActivate5);
+    bind!([Ctrl], Key::Character("7".into()), TabActivate6);
+    bind!([Ctrl], Key::Character("8".into()), TabActivate7);
+    bind!([Ctrl], Key::Character("9".into()), TabActivate8);
+    bind!([Ctrl], Key::Named(Named::Tab), TabNext);
+    bind!([Ctrl, Shift], Key::Named(Named::Tab), TabPrev);
+    bind!(
+        [Ctrl, Shift],
+        Key::Character("G".into()),
+        ToggleGitManagement
+    );
+    bind!(
+        [Ctrl, Shift],
+        Key::Character("F".into()),
+        ToggleProjectSearch
+    );
+    bind!([Ctrl], Key::Character(",".into()), ToggleSettingsPage);
+    bind!([Alt], Key::Character("z".into()), ToggleWordWrap);
+    bind!([Ctrl], Key::Character("z".into()), Undo);
 
     key_binds
 }
diff --git a/src/main.rs b/src/main.rs
index 74c36ff..1b22c05 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -295,7 +295,7 @@ pub enum Message {
     FindReplaceValueChanged(String),
     FindSearchValueChanged(String),
     GitProjectStatus(Vec<(String, PathBuf, Vec<GitStatus>)>),
-    Key(Modifiers, keyboard::KeyCode),
+    Key(Modifiers, keyboard::Key),
     Modifiers(Modifiers),
     NewFile,
     NewWindow,
@@ -1389,9 +1389,9 @@ impl Application for App {
             Message::GitProjectStatus(project_status) => {
                 self.git_project_status = Some(project_status);
             }
-            Message::Key(modifiers, key_code) => {
+            Message::Key(modifiers, key) => {
                 for (key_bind, action) in self.key_binds.iter() {
-                    if key_bind.matches(modifiers, key_code) {
+                    if key_bind.matches(modifiers, key.clone()) {
                         return self.update(action.message());
                     }
                 }
@@ -2173,10 +2173,9 @@ impl Application for App {
 
         subscription::Subscription::batch([
             event::listen_with(|event, _status| match event {
-                event::Event::Keyboard(keyboard::Event::KeyPressed {
-                    modifiers,
-                    key_code,
-                }) => Some(Message::Key(modifiers, key_code)),
+                event::Event::Keyboard(keyboard::Event::KeyPressed { modifiers, key, .. }) => {
+                    Some(Message::Key(modifiers, key))
+                }
                 event::Event::Keyboard(keyboard::Event::ModifiersChanged(modifiers)) => {
                     Some(Message::Modifiers(modifiers))
                 }
diff --git a/src/menu.rs b/src/menu.rs
index fae5458..d09e4a0 100644
--- a/src/menu.rs
+++ b/src/menu.rs
@@ -6,6 +6,7 @@ use cosmic::{
         widget::{column, horizontal_rule},
         Alignment, Background, Length,
     },
+    iced_core::Border,
     theme,
     widget::{
         self, horizontal_space,
@@ -71,9 +72,12 @@ pub fn context_menu<'a>(
             icon_color: Some(component.on.into()),
             text_color: Some(component.on.into()),
             background: Some(Background::Color(component.base.into())),
-            border_radius: 8.0.into(),
-            border_width: 1.0,
-            border_color: component.divider.into(),
+            border: Border {
+                radius: 8.0.into(),
+                width: 1.0,
+                color: component.divider.into(),
+            },
+            ..Default::default()
         }
     }))
     .width(Length::Fixed(240.0))
diff --git a/src/text_box.rs b/src/text_box.rs
index 6affe9e..619fe88 100644
--- a/src/text_box.rs
+++ b/src/text_box.rs
@@ -4,13 +4,14 @@ use cosmic::{
     cosmic_theme::palette::{blend::Compose, WithAlpha},
     iced::{
         event::{Event, Status},
-        keyboard::{Event as KeyEvent, KeyCode, Modifiers},
+        keyboard::{Event as KeyEvent, Modifiers},
         mouse::{self, Button, Event as MouseEvent, ScrollDelta},
         Color, Element, Length, Padding, Point, Rectangle, Size, Vector,
     },
     iced_core::{
         clipboard::Clipboard,
         image,
+        keyboard::{key::Named, Key},
         layout::{self, Layout},
         renderer::{self, Quad, Renderer as _},
         widget::{
@@ -18,7 +19,7 @@ use cosmic::{
             operation::{self, Operation, OperationOutputWrapper},
             tree, Id, Widget,
         },
-        Shell,
+        Border, Shell,
     },
     theme::Theme,
     Renderer,
@@ -215,7 +216,7 @@ fn draw_rect(
     }
 }
 
-impl<'a, Message> Widget<Message, Renderer> for TextBox<'a, Message>
+impl<'a, Message> Widget<Message, cosmic::Theme, Renderer> for TextBox<'a, Message>
 where
     Message: Clone,
 {
@@ -227,12 +228,8 @@ where
         tree::State::new(State::new())
     }
 
-    fn width(&self) -> Length {
-        Length::Fill
-    }
-
-    fn height(&self) -> Length {
-        Length::Fill
+    fn size(&self) -> Size<Length> {
+        Size::new(Length::Fill, Length::Fill)
     }
 
     fn layout(
@@ -261,7 +258,7 @@ where
             let height = layout_lines as f32 * buffer.metrics().line_height;
             let size = Size::new(limits.max().width, height);
 
-            layout::Node::new(limits.resolve(size))
+            layout::Node::new(limits.resolve(Length::Fill, Length::Fill, size))
         })
     }
 
@@ -609,9 +606,12 @@ where
                         Point::new(image_position.x + scrollbar_rect.x, image_position.y),
                         Size::new(scrollbar_rect.width, layout.bounds().height),
                     ),
-                    border_radius: (scrollbar_rect.width / 2.0).into(),
-                    border_width: 0.0,
-                    border_color: Color::TRANSPARENT,
+                    border: Border {
+                        radius: (scrollbar_rect.width / 2.0).into(),
+                        width: 0.0,
+                        color: Color::TRANSPARENT,
+                    },
+                    ..Default::default()
                 },
                 Color::from(track_color),
             );
@@ -666,9 +666,12 @@ where
             renderer.fill_quad(
                 Quad {
                     bounds: scrollbar_draw,
-                    border_radius: (scrollbar_draw.width / 2.0).into(),
-                    border_width: 0.0,
-                    border_color: Color::TRANSPARENT,
+                    border: Border {
+                        radius: (scrollbar_draw.width / 2.0).into(),
+                        width: 0.0,
+                        color: Color::TRANSPARENT,
+                    },
+                    ..Default::default()
                 },
                 Color::from(scrollbar_color),
             );
@@ -702,58 +705,59 @@ where
         let mut status = Status::Ignored;
         match event {
             Event::Keyboard(KeyEvent::KeyPressed {
-                key_code,
+                key: Key::Named(key),
                 modifiers,
-            }) if state.is_focused => match key_code {
-                KeyCode::Left => {
+                ..
+            }) if state.is_focused => match key {
+                Named::ArrowLeft => {
                     editor.action(Action::Motion(Motion::Left));
                     status = Status::Captured;
                 }
-                KeyCode::Right => {
+                Named::ArrowRight => {
                     editor.action(Action::Motion(Motion::Right));
                     status = Status::Captured;
                 }
-                KeyCode::Up => {
+                Named::ArrowUp => {
                     editor.action(Action::Motion(Motion::Up));
                     status = Status::Captured;
                 }
-                KeyCode::Down => {
+                Named::ArrowDown => {
                     editor.action(Action::Motion(Motion::Down));
                     status = Status::Captured;
                 }
-                KeyCode::Home => {
+                Named::Home => {
                     editor.action(Action::Motion(Motion::Home));
                     status = Status::Captured;
                 }
-                KeyCode::End => {
+                Named::End => {
                     editor.action(Action::Motion(Motion::End));
                     status = Status::Captured;
                 }
-                KeyCode::PageUp => {
+                Named::PageUp => {
                     editor.action(Action::Motion(Motion::PageUp));
                     status = Status::Captured;
                 }
-                KeyCode::PageDown => {
+                Named::PageDown => {
                     editor.action(Action::Motion(Motion::PageDown));
                     status = Status::Captured;
                 }
-                KeyCode::Escape => {
+                Named::Escape => {
                     editor.action(Action::Escape);
                     status = Status::Captured;
                 }
-                KeyCode::Enter => {
+                Named::Enter => {
                     editor.action(Action::Enter);
                     status = Status::Captured;
                 }
-                KeyCode::Backspace => {
+                Named::Backspace => {
                     editor.action(Action::Backspace);
                     status = Status::Captured;
                 }
-                KeyCode::Delete => {
+                Named::Delete => {
                     editor.action(Action::Delete);
                     status = Status::Captured;
                 }
-                KeyCode::Tab => {
+                Named::Tab => {
                     if modifiers.shift() {
                         editor.action(Action::Unindent);
                     } else {
@@ -766,7 +770,13 @@ where
             Event::Keyboard(KeyEvent::ModifiersChanged(modifiers)) => {
                 state.modifiers = modifiers;
             }
-            Event::Keyboard(KeyEvent::CharacterReceived(character)) if state.is_focused => {
+            Event::Keyboard(KeyEvent::KeyPressed {
+                key: Key::Character(character),
+                modifiers,
+                text,
+                ..
+            }) if state.is_focused => {
+                let character = character.chars().next().unwrap_or_default();
                 // Only parse keys when Super, Ctrl, and Alt are not pressed
                 if !state.modifiers.logo() && !state.modifiers.control() && !state.modifiers.alt() {
                     if !character.is_control() {
@@ -939,7 +949,7 @@ where
     }
 }
 
-impl<'a, Message> From<TextBox<'a, Message>> for Element<'a, Message, Renderer>
+impl<'a, Message> From<TextBox<'a, Message>> for Element<'a, Message, cosmic::Theme, Renderer>
 where
     Message: Clone + 'a,
 {

From cad0f01606a20b74f2064fd7e9b2f7352d3d2a87 Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Tue, 6 Feb 2024 00:26:53 -0500
Subject: [PATCH 2/4] chore: update

---
 Cargo.lock | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2a8dd90..878a01f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1086,7 +1086,7 @@ dependencies = [
 [[package]]
 name = "cosmic-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
 dependencies = [
  "atomicwrites",
  "cosmic-config-derive",
@@ -1103,7 +1103,7 @@ dependencies = [
 [[package]]
 name = "cosmic-config-derive"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
 dependencies = [
  "quote",
  "syn 1.0.109",
@@ -1196,7 +1196,7 @@ dependencies = [
 [[package]]
 name = "cosmic-theme"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
 dependencies = [
  "almost",
  "cosmic-config",
@@ -2687,7 +2687,7 @@ dependencies = [
 [[package]]
 name = "iced"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
 dependencies = [
  "iced_accessibility",
  "iced_core",
@@ -2702,7 +2702,7 @@ dependencies = [
 [[package]]
 name = "iced_accessibility"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
 dependencies = [
  "accesskit",
  "accesskit_winit",
@@ -2711,7 +2711,7 @@ dependencies = [
 [[package]]
 name = "iced_core"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
 dependencies = [
  "bitflags 1.3.2",
  "log",
@@ -2728,7 +2728,7 @@ dependencies = [
 [[package]]
 name = "iced_futures"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
 dependencies = [
  "futures",
  "iced_core",
@@ -2741,7 +2741,7 @@ dependencies = [
 [[package]]
 name = "iced_graphics"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
 dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
@@ -2765,7 +2765,7 @@ dependencies = [
 [[package]]
 name = "iced_renderer"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
 dependencies = [
  "iced_graphics",
  "iced_tiny_skia",
@@ -2777,7 +2777,7 @@ dependencies = [
 [[package]]
 name = "iced_runtime"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
 dependencies = [
  "iced_core",
  "iced_futures",
@@ -2787,7 +2787,7 @@ dependencies = [
 [[package]]
 name = "iced_style"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
 dependencies = [
  "iced_core",
  "once_cell",
@@ -2797,7 +2797,7 @@ dependencies = [
 [[package]]
 name = "iced_tiny_skia"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
 dependencies = [
  "bytemuck",
  "cosmic-text 0.10.0 (git+https://github.com/pop-os/cosmic-text.git?rev=1b025ae)",
@@ -2814,7 +2814,7 @@ dependencies = [
 [[package]]
 name = "iced_wgpu"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
 dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
@@ -2833,7 +2833,7 @@ dependencies = [
 [[package]]
 name = "iced_widget"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
 dependencies = [
  "iced_renderer",
  "iced_runtime",
@@ -2847,7 +2847,7 @@ dependencies = [
 [[package]]
 name = "iced_winit"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
 dependencies = [
  "iced_graphics",
  "iced_runtime",
@@ -3198,7 +3198,7 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 [[package]]
 name = "libcosmic"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396"
+source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
 dependencies = [
  "apply",
  "ashpd",
@@ -6268,7 +6268,7 @@ dependencies = [
  "js-sys",
  "log",
  "naga",
- "parking_lot 0.11.2",
+ "parking_lot 0.12.1",
  "profiling",
  "raw-window-handle 0.6.0",
  "smallvec",
@@ -6295,7 +6295,7 @@ dependencies = [
  "log",
  "naga",
  "once_cell",
- "parking_lot 0.11.2",
+ "parking_lot 0.12.1",
  "profiling",
  "raw-window-handle 0.6.0",
  "rustc-hash",
@@ -6335,7 +6335,7 @@ dependencies = [
  "naga",
  "objc",
  "once_cell",
- "parking_lot 0.11.2",
+ "parking_lot 0.12.1",
  "profiling",
  "range-alloc",
  "raw-window-handle 0.6.0",

From 3ca971f739e390ea52ce594881598457caf53ce5 Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Tue, 6 Feb 2024 11:53:59 -0500
Subject: [PATCH 3/4] chore: remove branch

---
 Cargo.lock | 32 ++++++++++++++++----------------
 Cargo.toml |  2 --
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 878a01f..f4126b6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1086,7 +1086,7 @@ dependencies = [
 [[package]]
 name = "cosmic-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
+source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
 dependencies = [
  "atomicwrites",
  "cosmic-config-derive",
@@ -1103,7 +1103,7 @@ dependencies = [
 [[package]]
 name = "cosmic-config-derive"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
+source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
 dependencies = [
  "quote",
  "syn 1.0.109",
@@ -1196,7 +1196,7 @@ dependencies = [
 [[package]]
 name = "cosmic-theme"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
+source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
 dependencies = [
  "almost",
  "cosmic-config",
@@ -2687,7 +2687,7 @@ dependencies = [
 [[package]]
 name = "iced"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
+source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
 dependencies = [
  "iced_accessibility",
  "iced_core",
@@ -2702,7 +2702,7 @@ dependencies = [
 [[package]]
 name = "iced_accessibility"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
+source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
 dependencies = [
  "accesskit",
  "accesskit_winit",
@@ -2711,7 +2711,7 @@ dependencies = [
 [[package]]
 name = "iced_core"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
+source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
 dependencies = [
  "bitflags 1.3.2",
  "log",
@@ -2728,7 +2728,7 @@ dependencies = [
 [[package]]
 name = "iced_futures"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
+source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
 dependencies = [
  "futures",
  "iced_core",
@@ -2741,7 +2741,7 @@ dependencies = [
 [[package]]
 name = "iced_graphics"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
+source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
 dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
@@ -2765,7 +2765,7 @@ dependencies = [
 [[package]]
 name = "iced_renderer"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
+source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
 dependencies = [
  "iced_graphics",
  "iced_tiny_skia",
@@ -2777,7 +2777,7 @@ dependencies = [
 [[package]]
 name = "iced_runtime"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
+source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
 dependencies = [
  "iced_core",
  "iced_futures",
@@ -2787,7 +2787,7 @@ dependencies = [
 [[package]]
 name = "iced_style"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
+source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
 dependencies = [
  "iced_core",
  "once_cell",
@@ -2797,7 +2797,7 @@ dependencies = [
 [[package]]
 name = "iced_tiny_skia"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
+source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
 dependencies = [
  "bytemuck",
  "cosmic-text 0.10.0 (git+https://github.com/pop-os/cosmic-text.git?rev=1b025ae)",
@@ -2814,7 +2814,7 @@ dependencies = [
 [[package]]
 name = "iced_wgpu"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
+source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
 dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
@@ -2833,7 +2833,7 @@ dependencies = [
 [[package]]
 name = "iced_widget"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
+source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
 dependencies = [
  "iced_renderer",
  "iced_runtime",
@@ -2847,7 +2847,7 @@ dependencies = [
 [[package]]
 name = "iced_winit"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
+source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
 dependencies = [
  "iced_graphics",
  "iced_runtime",
@@ -3198,7 +3198,7 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 [[package]]
 name = "libcosmic"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic?branch=update-iced-latest#6bbfa423dafd46ee7003c4dbd95562d03158ad46"
+source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
 dependencies = [
  "apply",
  "ashpd",
diff --git a/Cargo.toml b/Cargo.toml
index 37139fb..f3442a2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,8 +36,6 @@ features = ["syntect", "vi"]
 git = "https://github.com/pop-os/libcosmic"
 default-features = false
 features = ["tokio", "winit"]
-# TODO remove before merging
-branch = "update-iced-latest"
 
 [dependencies.rfd]
 version = "0.13.0"

From 4ae67187621669c04539cf1fc42c994d12da44aa Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Wed, 7 Feb 2024 11:52:32 -0500
Subject: [PATCH 4/4] chore: udpate dependencies

---
 Cargo.lock | 78 ++++++++++++++++++++----------------------------------
 Cargo.toml |  4 ---
 2 files changed, 28 insertions(+), 54 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f4126b6..3fd291e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1086,7 +1086,7 @@ dependencies = [
 [[package]]
 name = "cosmic-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
+source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20"
 dependencies = [
  "atomicwrites",
  "cosmic-config-derive",
@@ -1103,7 +1103,7 @@ dependencies = [
 [[package]]
 name = "cosmic-config-derive"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
+source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20"
 dependencies = [
  "quote",
  "syn 1.0.109",
@@ -1114,7 +1114,7 @@ name = "cosmic-edit"
 version = "0.1.0"
 dependencies = [
  "cosmic-syntax-theme",
- "cosmic-text 0.10.0 (git+https://github.com/pop-os/cosmic-text)",
+ "cosmic-text",
  "env_logger",
  "fork",
  "grep",
@@ -1149,29 +1149,7 @@ dependencies = [
 [[package]]
 name = "cosmic-text"
 version = "0.10.0"
-source = "git+https://github.com/pop-os/cosmic-text.git?rev=1b025ae#1b025ae56e0122cff5798b9f54fc56d47a182d2b"
-dependencies = [
- "bitflags 2.4.2",
- "fontdb",
- "libm",
- "log",
- "rangemap",
- "rustc-hash",
- "rustybuzz",
- "self_cell 1.0.3",
- "swash",
- "sys-locale",
- "ttf-parser 0.20.0",
- "unicode-bidi",
- "unicode-linebreak",
- "unicode-script",
- "unicode-segmentation",
-]
-
-[[package]]
-name = "cosmic-text"
-version = "0.10.0"
-source = "git+https://github.com/pop-os/cosmic-text#cc75bb66b40794702ebc9fc9e30b1b29d7438bb5"
+source = "git+https://github.com/pop-os/cosmic-text#be471833c9ee563866f07593354a41dd40761a18"
 dependencies = [
  "bitflags 2.4.2",
  "cosmic_undo_2",
@@ -1196,7 +1174,7 @@ dependencies = [
 [[package]]
 name = "cosmic-theme"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
+source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20"
 dependencies = [
  "almost",
  "cosmic-config",
@@ -1349,7 +1327,7 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
 [[package]]
 name = "d3d12"
 version = "0.19.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7"
+source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109"
 dependencies = [
  "bitflags 2.4.2",
  "libloading 0.8.1",
@@ -2328,9 +2306,9 @@ dependencies = [
 [[package]]
 name = "glyphon"
 version = "0.5.0"
-source = "git+https://github.com/wash2/glyphon.git?tag=cosmic-0.5#b6d630e2151cddaa41cb0b10133c5bc3ee9dacc6"
+source = "git+https://github.com/pop-os/glyphon.git?tag=v0.5.0#1b0646ff8f74da92d3be704dfc2257d7f4d7eed8"
 dependencies = [
- "cosmic-text 0.10.0 (git+https://github.com/pop-os/cosmic-text.git?rev=1b025ae)",
+ "cosmic-text",
  "etagere",
  "lru",
  "wgpu",
@@ -2687,7 +2665,7 @@ dependencies = [
 [[package]]
 name = "iced"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
+source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20"
 dependencies = [
  "iced_accessibility",
  "iced_core",
@@ -2702,7 +2680,7 @@ dependencies = [
 [[package]]
 name = "iced_accessibility"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
+source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20"
 dependencies = [
  "accesskit",
  "accesskit_winit",
@@ -2711,7 +2689,7 @@ dependencies = [
 [[package]]
 name = "iced_core"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
+source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20"
 dependencies = [
  "bitflags 1.3.2",
  "log",
@@ -2728,7 +2706,7 @@ dependencies = [
 [[package]]
 name = "iced_futures"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
+source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20"
 dependencies = [
  "futures",
  "iced_core",
@@ -2741,11 +2719,11 @@ dependencies = [
 [[package]]
 name = "iced_graphics"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
+source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20"
 dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
- "cosmic-text 0.10.0 (git+https://github.com/pop-os/cosmic-text.git?rev=1b025ae)",
+ "cosmic-text",
  "glam",
  "half",
  "iced_core",
@@ -2765,7 +2743,7 @@ dependencies = [
 [[package]]
 name = "iced_renderer"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
+source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20"
 dependencies = [
  "iced_graphics",
  "iced_tiny_skia",
@@ -2777,7 +2755,7 @@ dependencies = [
 [[package]]
 name = "iced_runtime"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
+source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20"
 dependencies = [
  "iced_core",
  "iced_futures",
@@ -2787,7 +2765,7 @@ dependencies = [
 [[package]]
 name = "iced_style"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
+source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20"
 dependencies = [
  "iced_core",
  "once_cell",
@@ -2797,10 +2775,10 @@ dependencies = [
 [[package]]
 name = "iced_tiny_skia"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
+source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20"
 dependencies = [
  "bytemuck",
- "cosmic-text 0.10.0 (git+https://github.com/pop-os/cosmic-text.git?rev=1b025ae)",
+ "cosmic-text",
  "iced_graphics",
  "kurbo",
  "log",
@@ -2814,7 +2792,7 @@ dependencies = [
 [[package]]
 name = "iced_wgpu"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
+source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20"
 dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
@@ -2833,7 +2811,7 @@ dependencies = [
 [[package]]
 name = "iced_widget"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
+source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20"
 dependencies = [
  "iced_renderer",
  "iced_runtime",
@@ -2847,7 +2825,7 @@ dependencies = [
 [[package]]
 name = "iced_winit"
 version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
+source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20"
 dependencies = [
  "iced_graphics",
  "iced_runtime",
@@ -3198,7 +3176,7 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 [[package]]
 name = "libcosmic"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6"
+source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20"
 dependencies = [
  "apply",
  "ashpd",
@@ -3583,7 +3561,7 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b"
 [[package]]
 name = "naga"
 version = "0.19.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7"
+source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109"
 dependencies = [
  "arrayvec 0.7.4",
  "bit-set",
@@ -6260,7 +6238,7 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
 [[package]]
 name = "wgpu"
 version = "0.19.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7"
+source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109"
 dependencies = [
  "arrayvec 0.7.4",
  "cfg-if 1.0.0",
@@ -6284,7 +6262,7 @@ dependencies = [
 [[package]]
 name = "wgpu-core"
 version = "0.19.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7"
+source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109"
 dependencies = [
  "arrayvec 0.7.4",
  "bit-vec",
@@ -6309,7 +6287,7 @@ dependencies = [
 [[package]]
 name = "wgpu-hal"
 version = "0.19.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7"
+source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109"
 dependencies = [
  "android_system_properties",
  "arrayvec 0.7.4",
@@ -6352,7 +6330,7 @@ dependencies = [
 [[package]]
 name = "wgpu-types"
 version = "0.19.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7"
+source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109"
 dependencies = [
  "bitflags 2.4.2",
  "js-sys",
diff --git a/Cargo.toml b/Cargo.toml
index f3442a2..cfca138 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,7 +30,6 @@ git = "https://github.com/pop-os/cosmic-syntax-theme"
 [dependencies.cosmic-text]
 git = "https://github.com/pop-os/cosmic-text"
 features = ["syntect", "vi"]
-#path = "../cosmic-text"
 
 [dependencies.libcosmic]
 git = "https://github.com/pop-os/libcosmic"
@@ -58,9 +57,6 @@ fork = "0.1"
 default = ["rfd", "wgpu"]
 wgpu = ["libcosmic/wgpu"]
 
-[patch.crates-io]
-wgpu = { git = "https://github.com/gfx-rs/wgpu", rev = "faed98b" }
-
 [profile.release-with-debug]
 inherits = "release"
 debug = true