diff --git a/Cargo.lock b/Cargo.lock
index 56ebce6..ae1b905 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -109,9 +109,9 @@ checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "aes"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66bd29a732b644c0431c6140f370d097879203d79b80c94a6747ba0872adaef8"
+checksum = "f1fc76eaeac4c9164506c466d4ffdd8ec9d0c5bf57ee97177c4d8eceb3a0e138"
 dependencies = [
  "cipher",
  "cpubits",
@@ -334,12 +334,6 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
-[[package]]
-name = "as-raw-xcb-connection"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
-
 [[package]]
 name = "as-slice"
 version = "0.2.1"
@@ -611,9 +605,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
 
 [[package]]
 name = "av-scenechange"
@@ -786,9 +780,9 @@ dependencies = [
 
 [[package]]
 name = "brotli-decompressor"
-version = "5.0.0"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03"
+checksum = "5962523e1b92ce1b5e793d9169b9943eece10d39f62550bc04bb605d75b94924"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -825,15 +819,15 @@ dependencies = [
 
 [[package]]
 name = "built"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4ad8f11f288f48ca24471bbd51ac257aaeaaa07adae295591266b792902ae64"
+checksum = "5c0e531d93d39c34eef561e929e8a7f86d77a5af08aac4f6d6e39976c51858e9"
 
 [[package]]
 name = "bumpalo"
-version = "3.20.2"
+version = "3.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
+checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
 
 [[package]]
 name = "by_address"
@@ -984,11 +978,11 @@ dependencies = [
 
 [[package]]
 name = "cipher"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e34d8227fe1ba289043aeb13792056ff80fd6de1a9f49137a5f499de8e8c78ea"
+checksum = "e8cf2a2c93cd704877c0858356ed03480ff301ee950b43f1cbe4573b088bfa6c"
 dependencies = [
- "crypto-common 0.2.1",
+ "crypto-common 0.2.2",
  "inout",
 ]
 
@@ -1004,7 +998,6 @@ dependencies = [
 [[package]]
 name = "clipboard_macos"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c"
 dependencies = [
  "objc",
  "objc-foundation",
@@ -1014,27 +1007,17 @@ dependencies = [
 [[package]]
 name = "clipboard_wayland"
 version = "0.2.2"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c"
 dependencies = [
  "dnd",
  "mime 0.1.0",
  "smithay-clipboard",
 ]
 
-[[package]]
-name = "clipboard_x11"
-version = "0.4.2"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c"
-dependencies = [
- "thiserror 1.0.69",
- "x11rb",
-]
-
 [[package]]
 name = "cmov"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f88a43d011fc4a6876cb7344703e297c71dda42494fee094d5f7c76bf13f746"
+checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a"
 
 [[package]]
 name = "cocoa"
@@ -1338,7 +1321,6 @@ dependencies = [
 [[package]]
 name = "cosmic-client-toolkit"
 version = "0.2.0"
-source = "git+https://github.com/pop-os/cosmic-protocols?rev=160b086#160b086abe03cd34a8a375d7fbe47b24308d1f38"
 dependencies = [
  "bitflags 2.11.1",
  "cosmic-protocols",
@@ -1351,7 +1333,6 @@ dependencies = [
 [[package]]
 name = "cosmic-config"
 version = "1.0.0"
-source = "git+https://github.com/pop-os/libcosmic.git#4fab6c777dbd1a023440f08fb2b729c86492366c"
 dependencies = [
  "atomicwrites",
  "cosmic-config-derive",
@@ -1372,7 +1353,6 @@ dependencies = [
 [[package]]
 name = "cosmic-config-derive"
 version = "1.0.0"
-source = "git+https://github.com/pop-os/libcosmic.git#4fab6c777dbd1a023440f08fb2b729c86492366c"
 dependencies = [
  "quote",
  "syn",
@@ -1380,7 +1360,7 @@ dependencies = [
 
 [[package]]
 name = "cosmic-files"
-version = "1.0.13"
+version = "1.0.14"
 dependencies = [
  "anyhow",
  "atomic_float",
@@ -1406,7 +1386,7 @@ dependencies = [
  "jiff-icu",
  "jxl-oxide",
  "libc",
- "libcosmic",
+ "libcosmic-yoda",
  "log",
  "lzma-rust2",
  "md-5",
@@ -1448,7 +1428,7 @@ dependencies = [
 
 [[package]]
 name = "cosmic-files-applet"
-version = "1.0.13"
+version = "1.0.14"
 dependencies = [
  "cosmic-files",
  "log",
@@ -1458,7 +1438,6 @@ dependencies = [
 [[package]]
 name = "cosmic-freedesktop-icons"
 version = "0.4.0"
-source = "git+https://github.com/pop-os/freedesktop-icons#9c562fe3ecf03241a46a60c0078cd6ea10bd75ce"
 dependencies = [
  "bstr",
  "btoi",
@@ -1471,8 +1450,8 @@ dependencies = [
 
 [[package]]
 name = "cosmic-mime-apps"
-version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-mime-apps.git#673f3758920a7b20d307d356d586deef714df6b0"
+version = "0.2.0"
+source = "git+https://github.com/pop-os/cosmic-mime-apps.git#a95c8043a7b41ca3c143a1fad5b3b8a5a3411008"
 dependencies = [
  "freedesktop-desktop-entry",
  "mime 0.3.17",
@@ -1483,7 +1462,6 @@ dependencies = [
 [[package]]
 name = "cosmic-protocols"
 version = "0.2.0"
-source = "git+https://github.com/pop-os/cosmic-protocols?rev=160b086#160b086abe03cd34a8a375d7fbe47b24308d1f38"
 dependencies = [
  "bitflags 2.11.1",
  "wayland-backend",
@@ -1497,7 +1475,6 @@ dependencies = [
 [[package]]
 name = "cosmic-settings-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-settings-daemon#716da6d6af0b252e2f78aba2ad72ee19ae0241e0"
 dependencies = [
  "cosmic-config",
  "ron 0.11.0",
@@ -1509,8 +1486,7 @@ dependencies = [
 
 [[package]]
 name = "cosmic-settings-daemon"
-version = "0.1.0"
-source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75"
+version = "0.1.1-yoda.1"
 dependencies = [
  "zbus 5.15.0",
 ]
@@ -1518,8 +1494,6 @@ dependencies = [
 [[package]]
 name = "cosmic-text"
 version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be17b688510d934ce13f48a2beba700e11583e281e0fda99c22bb256a14eda73"
 dependencies = [
  "bitflags 2.11.1",
  "fontdb",
@@ -1537,18 +1511,19 @@ dependencies = [
  "unicode-linebreak",
  "unicode-script",
  "unicode-segmentation",
+ "unicode-width",
 ]
 
 [[package]]
 name = "cosmic-theme"
 version = "1.0.0"
-source = "git+https://github.com/pop-os/libcosmic.git#4fab6c777dbd1a023440f08fb2b729c86492366c"
 dependencies = [
  "almost",
  "configparser",
  "cosmic-config",
  "csscolorparser",
  "dirs 6.0.0",
+ "hex_color",
  "palette",
  "ron 0.12.1",
  "serde",
@@ -1632,7 +1607,6 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 [[package]]
 name = "cryoglyph"
 version = "0.1.0"
-source = "git+https://github.com/iced-rs/cryoglyph.git?rev=e429a025df36ab8145708acb309080ae3deec17a#e429a025df36ab8145708acb309080ae3deec17a"
 dependencies = [
  "cosmic-text",
  "etagere",
@@ -1653,9 +1627,9 @@ dependencies = [
 
 [[package]]
 name = "crypto-common"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77727bb15fa921304124b128af125e7e3b968275d1b108b379190264f4423710"
+checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453"
 dependencies = [
  "hybrid-array",
 ]
@@ -1678,15 +1652,6 @@ dependencies = [
  "uncased",
 ]
 
-[[package]]
-name = "ctor"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83cf0d42651b16c6dfe68685716d18480d18a9c39c62d76e8cf3eb6ed5d8bcbf"
-dependencies = [
- "dtor",
-]
-
 [[package]]
 name = "ctutils"
 version = "0.4.2"
@@ -1834,7 +1799,7 @@ checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2"
 dependencies = [
  "block-buffer 0.12.0",
  "const-oid",
- "crypto-common 0.2.1",
+ "crypto-common 0.2.2",
  "ctutils",
  "zeroize",
 ]
@@ -1916,9 +1881,9 @@ dependencies = [
 
 [[package]]
 name = "displaydoc"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1937,7 +1902,6 @@ dependencies = [
 [[package]]
 name = "dnd"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c"
 dependencies = [
  "bitflags 2.11.1",
  "mime 0.1.0",
@@ -1964,52 +1928,6 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
 [[package]]
 name = "dpi"
 version = "0.1.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
-
-[[package]]
-name = "drm"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde"
-dependencies = [
- "bitflags 2.11.1",
- "bytemuck",
- "drm-ffi",
- "drm-fourcc",
- "rustix 0.38.44",
-]
-
-[[package]]
-name = "drm-ffi"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6"
-dependencies = [
- "drm-sys",
- "rustix 0.38.44",
-]
-
-[[package]]
-name = "drm-fourcc"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
-
-[[package]]
-name = "drm-sys"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176"
-dependencies = [
- "libc",
- "linux-raw-sys 0.6.5",
-]
-
-[[package]]
-name = "dtor"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edf234dd1594d6dd434a8fb8cada51ddbbc593e40e4a01556a0b31c62da2775b"
 
 [[package]]
 name = "dyn-clone"
@@ -2019,9 +1937,9 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
 
 [[package]]
 name = "either"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
 
 [[package]]
 name = "endi"
@@ -2206,9 +2124,9 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.28"
+version = "0.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d5b2eef6fafbf69f877e55509ce5b11a760690ac9700a2921be067aa6afaef6"
+checksum = "5c287a33c7f0a620c38e641e7f60827713987b3c0f26e8ddc9462cc69cf75759"
 dependencies = [
  "cfg-if",
  "libc",
@@ -2581,16 +2499,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "gethostname"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
-dependencies = [
- "rustix 1.1.4",
- "windows-link 0.2.1",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.17"
@@ -2822,7 +2730,7 @@ dependencies = [
  "log",
  "presser",
  "thiserror 2.0.18",
- "windows 0.62.2",
+ "windows 0.61.3",
 ]
 
 [[package]]
@@ -2942,6 +2850,17 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "hex_color"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d37f101bf4c633f7ca2e4b5e136050314503dd198e78e325ea602c327c484ef0"
+dependencies = [
+ "arrayvec",
+ "rand 0.8.6",
+ "serde",
+]
+
 [[package]]
 name = "hexf-parse"
 version = "0.2.1"
@@ -3060,7 +2979,6 @@ dependencies = [
 [[package]]
 name = "iced"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic.git#4fab6c777dbd1a023440f08fb2b729c86492366c"
 dependencies = [
  "dnd",
  "iced_accessibility",
@@ -3081,7 +2999,6 @@ dependencies = [
 [[package]]
 name = "iced_accessibility"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic.git#4fab6c777dbd1a023440f08fb2b729c86492366c"
 dependencies = [
  "accesskit",
  "accesskit_winit",
@@ -3090,7 +3007,6 @@ dependencies = [
 [[package]]
 name = "iced_core"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic.git#4fab6c777dbd1a023440f08fb2b729c86492366c"
 dependencies = [
  "bitflags 2.11.1",
  "bytes",
@@ -3107,6 +3023,7 @@ dependencies = [
  "serde",
  "smol_str",
  "thiserror 2.0.18",
+ "unicode-segmentation",
  "web-time",
  "window_clipboard",
 ]
@@ -3114,7 +3031,6 @@ dependencies = [
 [[package]]
 name = "iced_debug"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic.git#4fab6c777dbd1a023440f08fb2b729c86492366c"
 dependencies = [
  "iced_core",
  "iced_futures",
@@ -3124,7 +3040,6 @@ dependencies = [
 [[package]]
 name = "iced_futures"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic.git#4fab6c777dbd1a023440f08fb2b729c86492366c"
 dependencies = [
  "futures",
  "iced_core",
@@ -3138,7 +3053,6 @@ dependencies = [
 [[package]]
 name = "iced_graphics"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic.git#4fab6c777dbd1a023440f08fb2b729c86492366c"
 dependencies = [
  "bitflags 2.11.1",
  "bytemuck",
@@ -3159,7 +3073,6 @@ dependencies = [
 [[package]]
 name = "iced_program"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic.git#4fab6c777dbd1a023440f08fb2b729c86492366c"
 dependencies = [
  "iced_graphics",
  "iced_runtime",
@@ -3168,7 +3081,6 @@ dependencies = [
 [[package]]
 name = "iced_renderer"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic.git#4fab6c777dbd1a023440f08fb2b729c86492366c"
 dependencies = [
  "iced_graphics",
  "iced_tiny_skia",
@@ -3180,7 +3092,6 @@ dependencies = [
 [[package]]
 name = "iced_runtime"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic.git#4fab6c777dbd1a023440f08fb2b729c86492366c"
 dependencies = [
  "bytes",
  "cosmic-client-toolkit",
@@ -3195,7 +3106,6 @@ dependencies = [
 [[package]]
 name = "iced_tiny_skia"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic.git#4fab6c777dbd1a023440f08fb2b729c86492366c"
 dependencies = [
  "bytemuck",
  "cosmic-text",
@@ -3212,9 +3122,7 @@ dependencies = [
 [[package]]
 name = "iced_wgpu"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic.git#4fab6c777dbd1a023440f08fb2b729c86492366c"
 dependencies = [
- "as-raw-xcb-connection",
  "bitflags 2.11.1",
  "bytemuck",
  "cosmic-client-toolkit",
@@ -3231,19 +3139,16 @@ dependencies = [
  "rustc-hash 2.1.2",
  "rustix 0.38.44",
  "thiserror 2.0.18",
- "tiny-xlib",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
  "wayland-sys",
  "wgpu",
- "x11rb",
 ]
 
 [[package]]
 name = "iced_widget"
 version = "0.14.2"
-source = "git+https://github.com/pop-os/libcosmic.git#4fab6c777dbd1a023440f08fb2b729c86492366c"
 dependencies = [
  "cosmic-client-toolkit",
  "dnd",
@@ -3261,7 +3166,6 @@ dependencies = [
 [[package]]
 name = "iced_winit"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic.git#4fab6c777dbd1a023440f08fb2b729c86492366c"
 dependencies = [
  "cosmic-client-toolkit",
  "cursor-icon",
@@ -3954,9 +3858,9 @@ checksum = "2ceaf4c6c48465bead8cb6a0b7c4ee0c86ecbb31239032b9c66ab9a08d2f3ee1"
 
 [[package]]
 name = "jiff"
-version = "0.2.24"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f00b5dbd620d61dfdcb6007c9c1f6054ebd75319f163d886a9055cec1155073d"
+checksum = "6835eea34fb6321b9b3aa7b685c2b433948c09447e389dc017fdf687d5d11e65"
 dependencies = [
  "jiff-static",
  "jiff-tzdb-platform",
@@ -3980,9 +3884,9 @@ dependencies = [
 
 [[package]]
 name = "jiff-static"
-version = "0.2.24"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e000de030ff8022ea1da3f466fbb0f3a809f5e51ed31f6dd931c35181ad8e6d7"
+checksum = "3c22e04db9c58f5136eb1757f3d5c49a7b187f49e52185228cbd2f5acdfcc08c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4074,9 +3978,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.98"
+version = "0.3.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08"
+checksum = "142bc4740e452c1e57ade0cbc129f139c9093e354346f0872ef985f4f5cf5f11"
 dependencies = [
  "cfg-if",
  "futures-util",
@@ -4321,9 +4225,9 @@ dependencies = [
 
 [[package]]
 name = "kqueue-sys"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "285efcf12ef41bec907b3000d5ffaeb54191d4d9d83c0d6157e6cbc2db255e64"
+checksum = "07293a4e297ac234359b510362495713f75ea345d5307140414f20c69ffeb087"
 dependencies = [
  "bitflags 2.11.1",
  "libc",
@@ -4370,9 +4274,9 @@ checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8"
 
 [[package]]
 name = "libbz2-rs-sys"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8fc329e1457d97a9d58a4e2ca49e3be572431a7e096008efc2e3a3c19d428f4"
+checksum = "34b357333733e8260735ba5894eb928c02ecc69c78715f01a8019e7fa7f2db4c"
 
 [[package]]
 name = "libc"
@@ -4381,9 +4285,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
 
 [[package]]
-name = "libcosmic"
-version = "1.0.0"
-source = "git+https://github.com/pop-os/libcosmic.git#4fab6c777dbd1a023440f08fb2b729c86492366c"
+name = "libcosmic-yoda"
+version = "0.1.0-yoda.2"
 dependencies = [
  "apply",
  "ashpd 0.12.3",
@@ -4396,6 +4299,7 @@ dependencies = [
  "cosmic-theme",
  "css-color",
  "derive_setters",
+ "enumflags2",
  "float-cmp 0.10.0",
  "freedesktop-desktop-entry",
  "futures",
@@ -4461,14 +4365,14 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
 
 [[package]]
 name = "libredox"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c"
+checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3"
 dependencies = [
  "bitflags 2.11.1",
  "libc",
  "plain",
- "redox_syscall 0.7.5",
+ "redox_syscall 0.8.0",
 ]
 
 [[package]]
@@ -4492,12 +4396,6 @@ version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.12.1"
@@ -4540,9 +4438,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.29"
+version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+checksum = "616ec5685824bcc94416c6d4a7a446eea774a31efd7062c8480ba6fd06d7a6e5"
 
 [[package]]
 name = "loom"
@@ -4627,11 +4525,11 @@ dependencies = [
 
 [[package]]
 name = "lzma-rust2"
-version = "0.16.2"
+version = "0.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47bb1e988e6fb779cf720ad431242d3f03167c1b3f2b1aae7f1a94b2495b36ae"
+checksum = "5e9ceaec84b54518262de7cf06b8b43e83c808349960f1610b21b0bfc9640f20"
 dependencies = [
- "sha2",
+ "sha2 0.11.0",
 ]
 
 [[package]]
@@ -4686,9 +4584,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.8.0"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
+checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8"
 
 [[package]]
 name = "memmap2"
@@ -4735,7 +4633,6 @@ dependencies = [
 [[package]]
 name = "mime"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c"
 dependencies = [
  "smithay-clipboard",
 ]
@@ -4774,9 +4671,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1"
+checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda"
 dependencies = [
  "libc",
  "log",
@@ -4984,9 +4881,9 @@ dependencies = [
 
 [[package]]
 name = "num-conv"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967"
+checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441"
 
 [[package]]
 name = "num-derive"
@@ -5301,9 +5198,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
 [[package]]
 name = "orbclient"
-version = "0.3.54"
+version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a570f6bca41d29acb2139229a7c873ec99bc9a313bd10804081d89bfac8ff329"
+checksum = "5df339f526ea9a60e371768d50efc2f2508c7203290731565d1f7a6f71d21747"
 dependencies = [
  "libc",
  "libredox",
@@ -5565,18 +5462,18 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 
 [[package]]
 name = "pin-project"
-version = "1.1.12"
+version = "1.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf0d9e68100b3a7989b4901972f265cd542e560a3a8a724e1e20322f4d06ce9"
+checksum = "2466b2336ed02bcdca6b294417127b90ec92038d1d5c4fbeac971a922e0e0924"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.12"
+version = "1.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a990e22f43e84855daf260dded30524ef4a9021cc7541c26540500a50b624389"
+checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6077,6 +5974,16 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "redox_event"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c07d0d6d291e3a951bd847b1cd4af32fc6243d64116cf7702838c02797688b7"
+dependencies = [
+ "bitflags 2.11.1",
+ "libredox",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.5.18"
@@ -6088,9 +5995,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4666a1a60d8412eab19d94f6d13dcc9cea0a5ef4fdf6a5db306537413c661b1b"
+checksum = "7c7591fa2c6b601dfcfe5f043f65a1c39fcdf50efefcd7f1572e538c1f4b398d"
 dependencies = [
  "bitflags 2.11.1",
 ]
@@ -6285,7 +6192,7 @@ version = "8.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5bcdef0be6fe7f6fa333b1073c949729274b05f123a0ad7efcb8efd878e5c3b1"
 dependencies = [
- "sha2",
+ "sha2 0.10.9",
  "walkdir",
 ]
 
@@ -6462,9 +6369,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.149"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
+checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
 dependencies = [
  "indexmap 2.14.0",
  "itoa",
@@ -6559,6 +6466,17 @@ dependencies = [
  "digest 0.10.7",
 ]
 
+[[package]]
+name = "sha2"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.3.0",
+ "digest 0.11.3",
+]
+
 [[package]]
 name = "sharded-slab"
 version = "0.1.7"
@@ -6694,7 +6612,6 @@ dependencies = [
 [[package]]
 name = "smithay-clipboard"
 version = "0.8.0"
-source = "git+https://github.com/pop-os/smithay-clipboard?tag=sctk-0.20#859b02c88f45c554049a67c6ddeec1692ce0e20b"
 dependencies = [
  "libc",
  "raw-window-handle",
@@ -6714,9 +6631,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
+checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51"
 dependencies = [
  "libc",
  "windows-sys 0.61.2",
@@ -6725,14 +6642,11 @@ dependencies = [
 [[package]]
 name = "softbuffer"
 version = "0.4.1"
-source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#c2b2c19ddb38ff17495643699f97cb1f2064a1be"
 dependencies = [
- "as-raw-xcb-connection",
  "bytemuck",
  "cfg_aliases",
  "cocoa",
  "core-graphics",
- "drm",
  "fastrand",
  "foreign-types",
  "js-sys",
@@ -6742,14 +6656,12 @@ dependencies = [
  "raw-window-handle",
  "redox_syscall 0.5.18",
  "rustix 0.38.44",
- "tiny-xlib",
  "wasm-bindgen",
  "wayland-backend",
  "wayland-client",
  "wayland-sys",
  "web-sys",
  "windows-sys 0.52.0",
- "x11rb",
 ]
 
 [[package]]
@@ -6892,9 +6804,9 @@ dependencies = [
 
 [[package]]
 name = "tar"
-version = "0.4.45"
+version = "0.4.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22692a6476a21fa75fdfc11d452fda482af402c008cdbaf3476414e122040973"
+checksum = "3f6221d9a6003c78398e3b239969f352578258df48c8eb051caadae0015bc840"
 dependencies = [
  "filetime",
  "libc",
@@ -7126,19 +7038,6 @@ dependencies = [
  "strict-num",
 ]
 
-[[package]]
-name = "tiny-xlib"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a90a0ca3ee6a69f2ad28fd11621a4c3f03b371f366be500b64df260c4ffbafb4"
-dependencies = [
- "as-raw-xcb-connection",
- "ctor",
- "libloading",
- "pkg-config",
- "tracing",
-]
-
 [[package]]
 name = "tinystr"
 version = "0.8.3"
@@ -7239,9 +7138,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.25.11+spec-1.1.0"
+version = "0.25.12+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b59c4d22ed448339746c59b905d24568fcbb3ab65a500494f7b8c3e97739f2b"
+checksum = "d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7"
 dependencies = [
  "indexmap 2.14.0",
  "toml_datetime",
@@ -7640,9 +7539,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.121"
+version = "0.2.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790"
+checksum = "3ed04576f974d2b2fba0f38c51dbc5518011e38c36bf1143164be765528fd409"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -7653,9 +7552,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.71"
+version = "0.4.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96492d0d3ffba25305a7dc88720d250b1401d7edca02cc3bcd50633b424673b8"
+checksum = "9473dbd2991ae90b6291c3c32c30c6187ac49aa32f9905d1cce280ec1e110b0f"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -7663,9 +7562,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.121"
+version = "0.2.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578"
+checksum = "916151b09da36bd82f6615cbf3a419e2f0ba23a03c6160e8e92eb6bd4aa1dec6"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -7673,9 +7572,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.121"
+version = "0.2.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2"
+checksum = "299047362ccbfce148b67ab7e73349f77748e00c8296f9542adfad2ad82c5c5e"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -7686,9 +7585,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.121"
+version = "0.2.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441"
+checksum = "9a929b2c61f11ba3e9bc35b50c1f25cb38e0e892c0c231ae2b8cf78d5dad4437"
 dependencies = [
  "unicode-ident",
 ]
@@ -7893,9 +7792,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.98"
+version = "0.3.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b572dff8bcf38bad0fa19729c89bb5748b2b9b1d8be70cf90df697e3a8f32aa"
+checksum = "6d621441cfc37b84979402712047321980c178f299193a3589d05b99e8763436"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -8107,12 +8006,10 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 [[package]]
 name = "window_clipboard"
 version = "0.4.1"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c"
 dependencies = [
  "clipboard-win",
  "clipboard_macos",
  "clipboard_wayland",
- "clipboard_x11",
  "dnd",
  "mime 0.1.0",
  "raw-window-handle",
@@ -8614,7 +8511,6 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 [[package]]
 name = "winit"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
 dependencies = [
  "bitflags 2.11.1",
  "cfg_aliases",
@@ -8634,13 +8530,11 @@ dependencies = [
  "winit-wayland",
  "winit-web",
  "winit-win32",
- "winit-x11",
 ]
 
 [[package]]
 name = "winit-android"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
 dependencies = [
  "android-activity",
  "bitflags 2.11.1",
@@ -8655,7 +8549,6 @@ dependencies = [
 [[package]]
 name = "winit-appkit"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
 dependencies = [
  "bitflags 2.11.1",
  "block2 0.6.2",
@@ -8677,7 +8570,6 @@ dependencies = [
 [[package]]
 name = "winit-common"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
 dependencies = [
  "memmap2 0.9.10",
  "objc2 0.6.4",
@@ -8685,14 +8577,12 @@ dependencies = [
  "smol_str",
  "tracing",
  "winit-core",
- "x11-dl",
  "xkbcommon-dl",
 ]
 
 [[package]]
 name = "winit-core"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
 dependencies = [
  "bitflags 2.11.1",
  "cursor-icon",
@@ -8706,14 +8596,13 @@ dependencies = [
 [[package]]
 name = "winit-orbital"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
 dependencies = [
  "bitflags 2.11.1",
  "dpi",
  "libredox",
  "orbclient",
  "raw-window-handle",
- "redox_syscall 0.7.5",
+ "redox_event",
  "smol_str",
  "tracing",
  "winit-core",
@@ -8722,7 +8611,6 @@ dependencies = [
 [[package]]
 name = "winit-uikit"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
 dependencies = [
  "bitflags 2.11.1",
  "block2 0.6.2",
@@ -8742,7 +8630,6 @@ dependencies = [
 [[package]]
 name = "winit-wayland"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
 dependencies = [
  "ahash",
  "bitflags 2.11.1",
@@ -8768,7 +8655,6 @@ dependencies = [
 [[package]]
 name = "winit-web"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
 dependencies = [
  "atomic-waker",
  "bitflags 2.11.1",
@@ -8790,7 +8676,6 @@ dependencies = [
 [[package]]
 name = "winit-win32"
 version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
 dependencies = [
  "bitflags 2.11.1",
  "cursor-icon",
@@ -8803,34 +8688,11 @@ dependencies = [
  "winit-core",
 ]
 
-[[package]]
-name = "winit-x11"
-version = "0.31.0-beta.2"
-source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
-dependencies = [
- "bitflags 2.11.1",
- "bytemuck",
- "calloop",
- "cursor-icon",
- "dpi",
- "libc",
- "percent-encoding",
- "raw-window-handle",
- "rustix 1.1.4",
- "smol_str",
- "tracing",
- "winit-common",
- "winit-core",
- "x11-dl",
- "x11rb",
- "xkbcommon-dl",
-]
-
 [[package]]
 name = "winnow"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ee1708bef14716a11bae175f579062d4554d95be2c6829f518df847b7b3fdd0"
+checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1"
 dependencies = [
  "memchr",
 ]
@@ -8944,39 +8806,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "x11-dl"
-version = "2.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f"
-dependencies = [
- "libc",
- "once_cell",
- "pkg-config",
-]
-
-[[package]]
-name = "x11rb"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414"
-dependencies = [
- "as-raw-xcb-connection",
- "gethostname",
- "libc",
- "libloading",
- "once_cell",
- "rustix 1.1.4",
- "x11rb-protocol",
- "xcursor",
-]
-
-[[package]]
-name = "x11rb-protocol"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
-
 [[package]]
 name = "xattr"
 version = "1.6.1"
@@ -9324,18 +9153,18 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524"
 
 [[package]]
 name = "zerocopy"
-version = "0.8.48"
+version = "0.8.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9"
+checksum = "bce33a6288fa3f072a8c2c7d0f2fdbb90e28298f0135c1f99b96c3db2efcc60b"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.48"
+version = "0.8.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4"
+checksum = "8fd425244944f4ab65ccff928e7323354c5a018c75838362fdce749dfad2ee1e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9599,3 +9428,7 @@ dependencies = [
  "syn",
  "winnow",
 ]
+
+[[patch.unused]]
+name = "winit-x11"
+version = "0.31.0-beta.2"
diff --git a/Cargo.toml b/Cargo.toml
index 9059e13..95dd3d5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cosmic-files"
-version = "1.0.13"
+version = "1.0.14"
 authors = ["Jeremy Soller <jeremy@system76.com>"]
 edition = "2024"
 license = "GPL-3.0-only"
@@ -11,7 +11,7 @@ anyhow = "1"
 jiff = "0.2"
 jiff-icu = "0.2"
 icu = { version = "2.2.0", features = ["compiled_data"] }
-cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "160b086", optional = true }
+cctk = { path = "../cosmic-protocols/client-toolkit", package = "cosmic-client-toolkit", optional = true }
 cosmic-mime-apps = { git = "https://github.com/pop-os/cosmic-mime-apps.git", optional = true }
 dirs = "6.0.0"
 gio = { version = "0.21", optional = true }
@@ -73,8 +73,9 @@ version = "0.18"
 default-features = false
 features = ["fs", "io", "macros", "polling", "runtime"]
 
-[dependencies.libcosmic]
-git = "https://github.com/pop-os/libcosmic.git"
+# Yoda fork — depend on libcosmic-yoda directly by path (no git/no patch).
+[dependencies.libcosmic-yoda]
+path = "../libcosmic"
 default-features = false
 #TODO: a11y feature crashes
 features = [
@@ -83,7 +84,7 @@ features = [
     "autosize",
     "multi-window",
     "tokio",
-    "winit",
+    "wayland",
     "surface-message",
 ]
 
@@ -111,15 +112,15 @@ default = [
     "wayland",
     "wgpu",
 ]
-dbus-config = ["libcosmic/dbus-config"]
-desktop = ["libcosmic/desktop", "dep:cosmic-mime-apps", "dep:xdg"]
+dbus-config = ["libcosmic-yoda/dbus-config"]
+desktop = ["libcosmic-yoda/desktop", "dep:cosmic-mime-apps", "dep:xdg"]
 desktop-applet = []
 gvfs = ["dep:gio", "dep:glib"]
 io-uring = ["compio/io-uring"]
 jemalloc = ["dep:tikv-jemallocator"]
 notify = ["dep:notify-rust"]
-wayland = ["libcosmic/wayland", "dep:cctk", "dep:wayland-client"]
-wgpu = ["libcosmic/wgpu"]
+wayland = ["libcosmic-yoda/wayland", "dep:cctk", "dep:wayland-client"]
+wgpu = ["libcosmic-yoda/wgpu"]
 
 [profile.dev]
 opt-level = 1
@@ -145,20 +146,12 @@ fastrand = "2"
 test-log = "0.2"
 tokio = { version = "1", features = ["rt", "macros"] }
 
-# [patch.'https://github.com/pop-os/cosmic-text']
-# cosmic-text = { path = "../cosmic-text" }
+# Yoda fork — libcosmic dep is now a direct path dep (libcosmic-yoda above),
+# no [patch] block needed anymore. Keeping the block below would be a no-op
+# since nothing in the dep graph still asks for pop-os/libcosmic.git.
 
-# [patch.'https://github.com/pop-os/libcosmic']
-# libcosmic = { path = "../libcosmic" }
-# cosmic-config = { path = "../libcosmic/cosmic-config" }
-# cosmic-theme = { path = "../libcosmic/cosmic-theme" }
-# libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "iced-rebase" }
-# cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "iced-rebase" }
-# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", branch = "iced-rebase" }
-
-
-# [patch.'https://github.com/pop-os/smithay-clipboard']
-# smithay-clipboard = { path = "../smithay-clipboard" }
+[patch.'https://github.com/pop-os/cosmic-text.git']
+cosmic-text = { path = "../cosmic-text" }
 
 [workspace]
 members = ["cosmic-files-applet"]
diff --git a/cosmic-files-applet/Cargo.toml b/cosmic-files-applet/Cargo.toml
index 8fcf2bd..b802913 100644
--- a/cosmic-files-applet/Cargo.toml
+++ b/cosmic-files-applet/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cosmic-files-applet"
-version = "1.0.13"
+version = "1.0.14"
 edition = "2024"
 
 [dependencies]
diff --git a/debian/changelog b/debian/changelog
index e4697d2..347d255 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cosmic-files (1.0.14) noble; urgency=medium
+
+  * Epoch 1.0.14 version update
+
+ -- Jeremy Soller <jeremy@system76.com>  Tue, 26 May 2026 08:30:59 -0600
+
 cosmic-files (1.0.13) noble; urgency=medium
 
   * Epoch 1.0.13 version update
diff --git a/docs/local-performance-and-portal-notes.md b/docs/local-performance-and-portal-notes.md
new file mode 100644
index 0000000..a3dabbe
--- /dev/null
+++ b/docs/local-performance-and-portal-notes.md
@@ -0,0 +1,78 @@
+# Local performance and portal notes
+
+Date: 2026-05-05
+
+This repository carries a local patch aimed at improving initial directory
+display latency in large folders, plus a system-level workaround for a COSMIC
+portal FileChooser crash observed with Firefox and Chromium.
+
+## Directory listing latency
+
+The slow path was the initial construction of `Item` values in `src/tab.rs`.
+On a test folder with about 2000 entries, raw filesystem enumeration and stat
+calls completed in a few milliseconds, while COSMIC Files took multiple seconds
+before showing the directory.
+
+The local patch keeps initial item construction cheap:
+
+- directory child counts are no longer computed synchronously in
+  `item_from_entry` and `item_from_gvfs_info`;
+- initial MIME detection uses extension-based `mime_guess`;
+- regular files use a generic file icon during the initial scan instead of
+  resolving the full MIME icon immediately.
+
+This keeps folders and `.desktop` files special-cased, while avoiding expensive
+per-file work for ordinary files during first paint.
+
+Measured locally during investigation:
+
+- before the MIME/icon changes: about 3.1 seconds for `~/Téléchargements`;
+- after avoiding full MIME icon resolution during scan: below the temporary
+  100 ms perf-log threshold for the same folder.
+
+## File chooser portal workaround
+
+Firefox and Chromium were failing to open `Save As` on the first attempt because
+`xdg-desktop-portal-cosmic` crashed while handling `FileChooser`.
+
+Logs showed:
+
+```text
+Backend call failed: Remote peer disconnected
+xdg-desktop-portal-cosmic ... status=11/SEGV
+```
+
+The working local system workaround is to remove
+`org.freedesktop.impl.portal.FileChooser` from:
+
+```text
+/usr/share/xdg-desktop-portal/portals/cosmic.portal
+```
+
+so the file chooser falls back to GTK. The resulting local `cosmic.portal`
+keeps COSMIC for the other interfaces:
+
+```ini
+[portal]
+DBusName=org.freedesktop.impl.portal.desktop.cosmic
+Interfaces=org.freedesktop.impl.portal.Access;org.freedesktop.impl.portal.Screenshot;org.freedesktop.impl.portal.Settings;org.freedesktop.impl.portal.ScreenCast
+UseIn=COSMIC
+```
+
+Backups created locally:
+
+```text
+/usr/share/xdg-desktop-portal/portals/cosmic.portal.bak-codex-20260505-filechooser
+/usr/share/xdg-desktop-portal/cosmic-portals.conf.bak-codex-20260505
+/usr/share/xdg-desktop-portal/cosmic-portals.conf.bak-codex-20260505-2
+```
+
+After editing portal files, restart:
+
+```sh
+systemctl --user restart xdg-desktop-portal.service xdg-desktop-portal-gtk.service
+```
+
+Package updates may overwrite `/usr/share/xdg-desktop-portal/portals/cosmic.portal`.
+If `Save As` starts needing two attempts again, re-check that `FileChooser` has
+not been reintroduced in `cosmic.portal`.
diff --git a/i18n/cs/cosmic_files.ftl b/i18n/cs/cosmic_files.ftl
index 29814ba..fac1794 100644
--- a/i18n/cs/cosmic_files.ftl
+++ b/i18n/cs/cosmic_files.ftl
@@ -427,3 +427,4 @@ context-action-confirm-warning =
        *[other] položek
     }.
 run = Spustit
+rename-confirm = Přejmenovat
diff --git a/i18n/de/cosmic_files.ftl b/i18n/de/cosmic_files.ftl
index 993af2d..65a5ebf 100644
--- a/i18n/de/cosmic_files.ftl
+++ b/i18n/de/cosmic_files.ftl
@@ -437,3 +437,4 @@ context-action-confirm-warning =
        *[other] Elementen
     }.
 run = Ausführen
+rename-confirm = Umbenennen
diff --git a/i18n/el/cosmic_files.ftl b/i18n/el/cosmic_files.ftl
index 7471630..c75e419 100644
--- a/i18n/el/cosmic_files.ftl
+++ b/i18n/el/cosmic_files.ftl
@@ -327,3 +327,4 @@ context-action-confirm-warning =
         [one] στοιχείο
        *[other] στοιχεία
     }.
+rename-confirm = Μετονομασία
diff --git a/i18n/en/cosmic_files.ftl b/i18n/en/cosmic_files.ftl
index 45965ef..489ff7a 100644
--- a/i18n/en/cosmic_files.ftl
+++ b/i18n/en/cosmic_files.ftl
@@ -96,6 +96,7 @@ save-file = Save file
 
 ## Open With Dialog
 open-with-title = How do you want to open "{$name}"?
+open-with-set-default = Always use this app for this file type
 browse-store = Browse {$store}
 other-apps = Other applications
 related-apps = Related applications
@@ -139,6 +140,11 @@ open-with = Open with
 owner = Owner
 group = Group
 other = Other
+toolbar = Toolbar
+toolbar-available = Available
+toolbar-empty-hint = No buttons. Drag or add from below.
+toolbar-reset = Reset to defaults
+parent-directory = Parent directory
 mixed = Mixed
 ### Mode 0
 none = None
diff --git a/i18n/fi/cosmic_files.ftl b/i18n/fi/cosmic_files.ftl
index f1c3c58..6000bc7 100644
--- a/i18n/fi/cosmic_files.ftl
+++ b/i18n/fi/cosmic_files.ftl
@@ -414,3 +414,4 @@ context-action-confirm-warning =
        *[other] kohdetta
     }.
 run = Suorita
+rename-confirm = Nimeä uudelleen
diff --git a/i18n/fr/cosmic_files.ftl b/i18n/fr/cosmic_files.ftl
index f1454d2..e85a1f6 100644
--- a/i18n/fr/cosmic_files.ftl
+++ b/i18n/fr/cosmic_files.ftl
@@ -92,6 +92,7 @@ save-file = Enregistrer fichier
 ## Open With Dialog
 
 open-with-title = Comment souhaitez-vous ouvrir "{ $name }" ?
+open-with-set-default = Toujours utiliser cette application pour ce type de fichier
 browse-store = Parcourir { $store }
 
 ## Permanently delete Dialog
@@ -130,6 +131,11 @@ open-with = Ouvrir avec
 owner = Propriétaire
 group = Groupe
 other = Autre
+toolbar = Barre d'outils
+toolbar-available = Disponibles
+toolbar-empty-hint = Aucun bouton. Glisser-déposer ou ajouter depuis la liste ci-dessous.
+toolbar-reset = Rétablir par défaut
+parent-directory = Dossier parent
 
 ### Mode 0
 
@@ -445,3 +451,4 @@ context-action-confirm-warning =
     }.
 run = Exécuter
 context-action = Action contextuelle
+rename-confirm = Renommer
diff --git a/i18n/ga/cosmic_files.ftl b/i18n/ga/cosmic_files.ftl
index 04d546f..773c2fa 100644
--- a/i18n/ga/cosmic_files.ftl
+++ b/i18n/ga/cosmic_files.ftl
@@ -442,3 +442,4 @@ context-action-confirm-warning =
        *[other] míreanna
     }.
 run = Rith
+rename-confirm = Athainmnigh
diff --git a/i18n/hu/cosmic_files.ftl b/i18n/hu/cosmic_files.ftl
index 2cf31e6..c81703b 100644
--- a/i18n/hu/cosmic_files.ftl
+++ b/i18n/hu/cosmic_files.ftl
@@ -2,7 +2,7 @@ cosmic-files = COSMIC Fájlok
 comment = Fájlkezelő a COSMIC asztali környezethez
 keywords = mappa;fájl;kezelő;
 empty-folder = Üres mappa
-empty-folder-hidden = Üres mappa (Rejtett elemeket tartalmaz)
+empty-folder-hidden = Üres mappa (rejtett elemeket tartalmaz)
 no-results = Nincs találat
 filesystem = Fájlrendszer
 home = Saját mappa
@@ -47,13 +47,13 @@ resume = Folytatás
 
 ## Compress Dialog
 
-create-archive = Tömörített fájl létrehozása
+create-archive = Archívum létrehozása
 
 ## Extract Dialog
 
 extract-password-required = Jelszó szükséges
 extract-to = Kibontás ide…
-extract-to-title = Kibontás mappába
+extract-to-title = Kibontási cél kiválasztása
 
 ## Empty Trash Dialog
 
@@ -93,7 +93,7 @@ save-file = Fájl mentése
 
 ## Open With Dialog
 
-open-with-title = Hogyan szeretnéd megnyitni a következőt: „{ $name }”?
+open-with-title = Hogyan szeretnéd megnyitni a(z) „{ $name }” fájlt?
 browse-store = { $store } böngészése
 other-apps = Egyéb alkalmazások
 related-apps = Hasonló alkalmazások
@@ -113,7 +113,7 @@ rename-folder = Mappa átnevezése
 ## Replace Dialog
 
 replace = Csere
-replace-title = „{ $filename }” már létezik
+replace-title = „{ $filename }” már létezik ezen a helyen
 replace-warning = Szeretnéd lecserélni a meglévő fájlt a mentendő fájllal? A cserével felülírod annak tartalmát.
 replace-warning-operation = Szeretnéd lecserélni? A csere felülírja annak tartalmát.
 original-file = Eredeti fájl
@@ -133,7 +133,7 @@ set-and-launch = Beállítás és indítás
 open-with = Megnyitás ezzel
 owner = Tulajdonos
 group = Csoport
-other = Többi
+other = Mások
 
 ### Mode 0
 
@@ -172,7 +172,7 @@ read-write-execute = Olvasás, írás és végrehajtás
 favorite-path-error = Hiba a könyvtár megnyitásakor
 favorite-path-error-description =
     Nem sikerült megnyitni ezt: „{ $path }”
-    „{ $path }” lehet nem létezik, vagy nincs jogosultságod a megnyitásához
+    A(z) „{ $path }” útvonal lehet, hogy nem létezik, vagy nincs jogosultságod a megnyitásához
 
     Szeretnéd eltávolítani az oldalsávról?
 remove = Eltávolítás
@@ -187,9 +187,9 @@ keep = Megtartás
 ## Add Network Drive
 
 add-network-drive = Hálózati meghajtó hozzáadása
-connect = Csatlakozás
-connect-anonymously = Csatlakozás névtelenül
-connecting = Csatlakozás…
+connect = Kapcsolódás
+connect-anonymously = Kapcsolódás névtelenül
+connecting = Kapcsolódás…
 domain = Tartomány
 enter-server-address = Add meg a kiszolgáló címét
 network-drive-description =
@@ -209,7 +209,7 @@ network-drive-schemes =
 network-drive-error = Nem érhető el a hálózati meghajtó
 password = Jelszó
 remember-password = Jelszó megjegyzése
-try-again = Újra
+try-again = Próbáld újra
 username = Felhasználónév
 
 ## Operations
@@ -217,7 +217,7 @@ username = Felhasználónév
 cancelled = Megszakítva
 edit-history = Fájlműveleti előzmények
 history = Előzmények
-no-history = Nem találhatók elemek az előzményekben
+no-history = Nem találhatók elemek az előzményekben.
 pending = Függőben
 progress = { $percent }%
 progress-cancelled = { $percent }%, megszakítva
@@ -330,7 +330,7 @@ items = Elemek: { $items }
 item-size = Méret: { $size }
 item-created = Létrehozva: { $created }
 item-modified = Módosítva: { $modified }
-item-accessed = Hozzáférve: { $accessed }
+item-accessed = Utolsó hozzáférés: { $accessed }
 calculating = Számítás…
 
 ## Settings
@@ -350,7 +350,7 @@ light = Világos
 
 type-to-search = Gépeléssel keresés
 type-to-search-recursive = Keresés a jelenlegi mappában és almappákban
-type-to-search-enter-path = Elérési út megadása
+type-to-search-enter-path = Elérési út megnyitása
 # Context menu
 add-to-sidebar = Hozzáadás az oldalsávhoz
 compress = Tömörítés…
@@ -373,7 +373,7 @@ remove-from-recents = Eltávolítás a legutóbbiak közül
 
 change-wallpaper = Háttérkép cseréje…
 desktop-appearance = Asztali megjelenés…
-display-settings = Képernyő-beállítások…
+display-settings = Kijelzőbeállítások…
 
 # Menu
 
@@ -406,7 +406,7 @@ grid-view = Rácsnézet
 list-view = Listanézet
 show-hidden-files = Rejtett fájlok megjelenítése
 list-directories-first = Könyvtárak listázása először
-gallery-preview = Galéria előnézet
+gallery-preview = Galéria-előnézet
 menu-settings = Beállítások…
 menu-about = A COSMIC Fájlok névjegye…
 
@@ -415,8 +415,8 @@ menu-about = A COSMIC Fájlok névjegye…
 sort = Rendezés
 sort-a-z = A-Z
 sort-z-a = Z-A
-sort-newest-first = Legújabb előre
-sort-oldest-first = Legrégibb előre
+sort-newest-first = Legújabb elöl
+sort-oldest-first = Legrégibb elöl
 sort-smallest-to-largest = Legkisebbtől a legnagyobbig
 sort-largest-to-smallest = Legnagyobbtól a legkisebbig
 repository = Tároló
@@ -445,3 +445,4 @@ context-action-confirm-warning =
        *[other] elemen
     } fog lefutni.
 run = Futtatás
+rename-confirm = Átnevezés
diff --git a/i18n/nb-NO/cosmic_files.ftl b/i18n/nb-NO/cosmic_files.ftl
index e0fb82c..cae2b5b 100644
--- a/i18n/nb-NO/cosmic_files.ftl
+++ b/i18n/nb-NO/cosmic_files.ftl
@@ -98,7 +98,7 @@ permanently-delete-question = Slett permanent
 permanently-delete-warning = Er du sukker på om du vil permanent slette { $target }? Dette kan ikke angres.
 rename-file = Endre filnavn
 rename-folder = Endre mappenavn
-replace-title = "{ $filename }" finnes allerede på denne plasseringen.
+replace-title = «{ $filename }» finnes allerede på denne plasseringen
 replace-warning = Vil du bytte den ut med filen du lagrer? Dette vil overskrive innholdet.
 replace-warning-operation = Vil du erstatte den? Dette vil overskrive innholdet.
 original-file = Orginalfil
@@ -122,8 +122,8 @@ read-write = Kun skrive- og lesbar
 read-write-execute = Lesbar, skrivbar og kjørbar
 favorite-path-error = Feil ved åpning av mappen
 favorite-path-error-description =
-    Kunne ikke åpne "{ $path }".
-    Den kan ikke eksistere eller så har du ikke tilgang til å åpne den.
+    Klarte ikke åpne «{ $path }».
+    «{ $path }» finnes ikke eller så har du ikke tilgang til å åpne den.
 
     Vil du fjerne den fra sidepanelet?
 keep = Behold
@@ -140,7 +140,7 @@ zoom-out = Zoom ut
 cut = Klipp ut
 set-and-launch = Still inn og start
 domain = Domene
-enter-server-address = Angi serveradresse
+enter-server-address = Angi tjeneradresse
 network-drive-description =
     Serveradresser inkluderer ett protokollprefiks og en addresse.
     Examples: ssh://192.168.0.1, ftp://[2001:db8::1]
diff --git a/i18n/pl/cosmic_files.ftl b/i18n/pl/cosmic_files.ftl
index 9af6027..2f58d64 100644
--- a/i18n/pl/cosmic_files.ftl
+++ b/i18n/pl/cosmic_files.ftl
@@ -446,3 +446,4 @@ context-action-confirm-warning =
        *[other] elementów
     }.
 run = Uruchom
+rename-confirm = Zmień nazwę
diff --git a/i18n/pt-BR/cosmic_files.ftl b/i18n/pt-BR/cosmic_files.ftl
index 6d33279..6309e46 100644
--- a/i18n/pt-BR/cosmic_files.ftl
+++ b/i18n/pt-BR/cosmic_files.ftl
@@ -445,3 +445,4 @@ context-action-confirm-warning =
        *[other] itens
     }.
 run = Executar
+rename-confirm = Renomear
diff --git a/i18n/pt/cosmic_files.ftl b/i18n/pt/cosmic_files.ftl
index 211b094..447487e 100644
--- a/i18n/pt/cosmic_files.ftl
+++ b/i18n/pt/cosmic_files.ftl
@@ -354,3 +354,4 @@ sort-smallest-to-largest = Do menor para o maior
 sort-largest-to-smallest = Do maior para o menor
 context-action-confirm-title = Executar "{ $name }"?
 run = Executar
+rename-confirm = Renomear
diff --git a/i18n/ru/cosmic_files.ftl b/i18n/ru/cosmic_files.ftl
index f8e76c1..f34a377 100644
--- a/i18n/ru/cosmic_files.ftl
+++ b/i18n/ru/cosmic_files.ftl
@@ -389,3 +389,4 @@ context-action-confirm-warning =
        *[other] элем.
     }.
 run = Выполнить
+rename-confirm = Переименовать
diff --git a/i18n/sv/cosmic_files.ftl b/i18n/sv/cosmic_files.ftl
index 974c7dc..506be0b 100644
--- a/i18n/sv/cosmic_files.ftl
+++ b/i18n/sv/cosmic_files.ftl
@@ -418,3 +418,4 @@ context-action-confirm-warning =
        *[other] objekt
     }.
 run = Kör
+rename-confirm = Byt namn
diff --git a/i18n/uk/cosmic_files.ftl b/i18n/uk/cosmic_files.ftl
index 7299a7d..9f23949 100644
--- a/i18n/uk/cosmic_files.ftl
+++ b/i18n/uk/cosmic_files.ftl
@@ -82,7 +82,7 @@ copying =
     Копіювання { $items } { $items ->
         [one] елемента
        *[other] елементів
-    } з «{ $from }» в «{ $to }» ({ $progress })...
+    } з «{ $from }» до «{ $to }» ({ $progress })...
 copied =
     Скопійовано { $items } { $items ->
         [one] елемент
@@ -95,7 +95,7 @@ moving =
     Переміщення { $items } { $items ->
         [one] елемента
        *[other] елементів
-    } з «{ $from }» в «{ $to }» ({ $progress })...
+    } з «{ $from }» до «{ $to }» ({ $progress })...
 moved =
     Переміщено { $items } { $items ->
         [one] елемент
@@ -299,7 +299,7 @@ extracting =
     Видобування { $items } { $items ->
         [one] елемента
        *[other] елементів
-    } з «{ $from }» в «{ $to }» ({ $progress })...
+    } з «{ $from }» до «{ $to }» ({ $progress })...
 extracted =
     Видобуто { $items } { $items ->
         [one] елемент
@@ -364,10 +364,10 @@ removed-from-recents =
        *[other] елементів
     } з { recents }
 empty-trash-title = Спорожити смітник?
-type-to-search-select = Вибирає перший відповідний файл або папку
+type-to-search-select = Вибирає перший відповідний файл або теку
 pasted-image = Вставлене зображення
 pasted-text = Вставлений текст
-pasted-video = Вставлене відео
+pasted-video = Вставлене видиво
 copy-to-button-label = Копіювати
 move-to-button-label = Перемістити
 copy-to = Копіювати до…
@@ -387,3 +387,4 @@ context-action-confirm-warning =
        *[other] елементів
     }.
 context-action = Контекстна дія
+rename-confirm = Перейменувати
diff --git a/i18n/zh-CN/cosmic_files.ftl b/i18n/zh-CN/cosmic_files.ftl
index abc8fda..4807c4a 100644
--- a/i18n/zh-CN/cosmic_files.ftl
+++ b/i18n/zh-CN/cosmic_files.ftl
@@ -445,3 +445,4 @@ context-action-confirm-warning =
        *[other] 项目
     } 上运行。
 context-action = 环境行动
+rename-confirm = 重命名
diff --git a/i18n/zh-TW/cosmic_files.ftl b/i18n/zh-TW/cosmic_files.ftl
index b356db3..294ed2a 100644
--- a/i18n/zh-TW/cosmic_files.ftl
+++ b/i18n/zh-TW/cosmic_files.ftl
@@ -392,3 +392,4 @@ context-action-confirm-warning =
        *[other] 項目
     } 上執行。
 run = 執行
+rename-confirm = 重新命名
diff --git a/src/app.rs b/src/app.rs
index cc3e5c0..270979c 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -7,6 +7,7 @@ use cosmic::iced::clipboard::dnd::DndAction;
 use cosmic::iced::core::SmolStr;
 use cosmic::iced::core::widget::operation::focusable::unfocus;
 use cosmic::iced::futures::{self, SinkExt};
+use cosmic::iced::keyboard::key::Physical;
 use cosmic::iced::keyboard::{Event as KeyEvent, Key, Modifiers};
 #[cfg(all(feature = "wayland", feature = "desktop-applet"))]
 use cosmic::iced::platform_specific::shell::wayland::commands::overlap_notify::overlap_notify;
@@ -41,15 +42,21 @@ use notify_debouncer_full::notify::{self, RecommendedWatcher};
 use notify_debouncer_full::{DebouncedEvent, Debouncer, RecommendedCache, new_debouncer};
 use rustc_hash::{FxHashMap, FxHashSet};
 use slotmap::Key as SlotMapKey;
-use std::any::TypeId;
-use std::collections::{BTreeMap, BTreeSet, HashMap, VecDeque};
-use std::future::Future;
-use std::num::NonZeroU16;
-use std::path::{Path, PathBuf};
-use std::pin::Pin;
-use std::sync::{Arc, LazyLock, Mutex};
-use std::time::{self, Duration, Instant};
-use std::{env, fmt, fs, io, process};
+#[cfg(feature = "notify")]
+use std::sync::Mutex;
+use std::{
+    any::TypeId,
+    collections::{BTreeMap, BTreeSet, HashMap, VecDeque},
+    env, fmt, fs,
+    future::Future,
+    io,
+    num::NonZeroU16,
+    path::{Path, PathBuf},
+    pin::Pin,
+    process,
+    sync::{Arc, LazyLock},
+    time::{self, Duration, Instant},
+};
 use tokio::sync::mpsc;
 use trash::TrashItem;
 #[cfg(all(feature = "wayland", feature = "desktop-applet"))]
@@ -61,12 +68,12 @@ use crate::clipboard::{
 };
 use crate::config::{
     AppTheme, Config, DesktopConfig, Favorite, IconSizes, State, TIME_CONFIG_ID, TabConfig,
-    TimeConfig, TypeToSearch,
+    TimeConfig, ToolbarAction, TypeToSearch, default_toolbar,
 };
 use crate::dialog::{Dialog, DialogKind, DialogMessage, DialogResult, DialogSettings};
 use crate::key_bind::key_binds;
 use crate::localize::LANGUAGE_SORTER;
-use crate::mime_app::{self, MimeApp, MimeAppCache};
+use crate::mime_app::{MimeApp, MimeAppCache};
 use crate::mounter::{
     MOUNTERS, MounterAuth, MounterItem, MounterItems, MounterKey, MounterMessage,
 };
@@ -127,6 +134,105 @@ pub struct Flags {
     pub uris: Vec<url::Url>,
 }
 
+/// Yoda phase 3: MIME for the DnD payload carried when a user drags a
+/// toolbar row in the Settings editor. A single byte = ToolbarAction
+/// discriminant (see `ToolbarAction::to_u8`).
+const TOOLBAR_MIME: &str = "application/x-cosmic-files-toolbar-action";
+
+/// Yoda phase 3: DnD payload wrapping a ToolbarAction discriminant.
+#[derive(Clone, Debug)]
+pub struct ToolbarActionPayload(pub u8);
+
+impl cosmic::iced::clipboard::mime::AsMimeTypes for ToolbarActionPayload {
+    fn available(&self) -> std::borrow::Cow<'static, [String]> {
+        std::borrow::Cow::Owned(vec![TOOLBAR_MIME.to_owned()])
+    }
+    fn as_bytes(&self, mime_type: &str) -> Option<std::borrow::Cow<'static, [u8]>> {
+        if mime_type == TOOLBAR_MIME {
+            Some(std::borrow::Cow::Owned(vec![self.0]))
+        } else {
+            None
+        }
+    }
+}
+
+impl cosmic::iced::clipboard::mime::AllowedMimeTypes for ToolbarActionPayload {
+    fn allowed() -> std::borrow::Cow<'static, [String]> {
+        std::borrow::Cow::Owned(vec![TOOLBAR_MIME.to_owned()])
+    }
+}
+
+impl TryFrom<(Vec<u8>, String)> for ToolbarActionPayload {
+    type Error = ();
+    fn try_from((data, _mime): (Vec<u8>, String)) -> Result<Self, Self::Error> {
+        if data.len() == 1 {
+            Ok(Self(data[0]))
+        } else {
+            Err(())
+        }
+    }
+}
+
+/// Yoda phase 3 helper: map a ToolbarAction to its button UI (icon name,
+/// localized label, app Message). Shared by the toolbar renderer in
+/// `view()` and by the Settings page row renderer so the two stay in
+/// sync.
+fn toolbar_action_ui(a: ToolbarAction) -> (&'static str, String, Message) {
+    match a {
+        ToolbarAction::LocationUp => (
+            "go-up-symbolic",
+            fl!("parent-directory"),
+            Action::LocationUp.message(None),
+        ),
+        ToolbarAction::Reload => (
+            "view-refresh-symbolic",
+            fl!("reload-folder"),
+            Action::Reload.message(None),
+        ),
+        ToolbarAction::NewFolder => (
+            "folder-new-symbolic",
+            fl!("new-folder"),
+            Action::NewFolder.message(None),
+        ),
+        ToolbarAction::NewFile => (
+            "document-new-symbolic",
+            fl!("new-file"),
+            Action::NewFile.message(None),
+        ),
+        ToolbarAction::Rename => (
+            "pencil-symbolic",
+            fl!("rename"),
+            Action::Rename.message(None),
+        ),
+        ToolbarAction::Delete => (
+            "edit-delete-symbolic",
+            fl!("delete"),
+            Action::Delete.message(None),
+        ),
+        ToolbarAction::Cut => ("edit-cut-symbolic", fl!("cut"), Action::Cut.message(None)),
+        ToolbarAction::Copy => (
+            "edit-copy-symbolic",
+            fl!("copy"),
+            Action::Copy.message(None),
+        ),
+        ToolbarAction::Paste => (
+            "edit-paste-symbolic",
+            fl!("paste"),
+            Action::Paste.message(None),
+        ),
+        ToolbarAction::ToggleShowHidden => (
+            "view-reveal-symbolic",
+            fl!("show-hidden-files"),
+            Action::ToggleShowHidden.message(None),
+        ),
+        ToolbarAction::OpenTerminal => (
+            "utilities-terminal-symbolic",
+            fl!("open-in-terminal"),
+            Action::OpenTerminal.message(None),
+        ),
+    }
+}
+
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum Action {
     About,
@@ -355,7 +461,7 @@ pub enum Message {
     ExtractToResult(DialogResult),
     #[cfg(all(feature = "wayland", feature = "desktop-applet"))]
     Focused(window::Id),
-    Key(window::Id, Modifiers, Key, Option<SmolStr>),
+    Key(window::Id, Modifiers, Key, Physical, Option<SmolStr>),
     LaunchUrl(String),
     MaybeExit,
     ModifiersChanged(window::Id, Modifiers),
@@ -389,6 +495,7 @@ pub enum Message {
     OpenWithBrowse,
     OpenWithDialog(Option<Entity>),
     OpenWithSelection(usize),
+    OpenWithToggleDefault(bool),
     #[cfg(all(feature = "wayland", feature = "desktop-applet"))]
     Overlap(window::Id, OverlapNotifyEvent),
     Paste(Option<Entity>),
@@ -429,6 +536,22 @@ pub enum Message {
     SearchInput(String),
     SetShowDetails(bool),
     SetShowRecents(bool),
+    /// Yoda phase 3 — toolbar editing messages.
+    ToolbarAdd(ToolbarAction),
+    ToolbarRemove(ToolbarAction),
+    ToolbarReorder {
+        src: ToolbarAction,
+        target: ToolbarAction,
+    },
+    /// Move one step up (toward index 0) inside the enabled toolbar list.
+    ToolbarMoveUp(ToolbarAction),
+    /// Move one step down (toward the end) inside the enabled toolbar list.
+    ToolbarMoveDown(ToolbarAction),
+    ToolbarReset,
+    /// Click on a toolbar button (via segmented_button activation).
+    ToolbarTabActivate(segmented_button::Entity),
+    /// Drag-reorder inside the toolbar (via segmented_button drag).
+    ToolbarTabReorder(segmented_button::ReorderEvent),
     SetTypeToSearch(TypeToSearch),
     SystemThemeModeChange,
     Size(window::Id, Size),
@@ -559,6 +682,9 @@ pub enum DialogPage {
         mime: mime_guess::Mime,
         selected: usize,
         store_opt: Option<MimeApp>,
+        /// When true, the chosen app is written to mimeapps.list as the
+        /// default handler for `mime` after it spawns.
+        set_default: bool,
     },
     PermanentlyDelete {
         paths: Box<[PathBuf]>,
@@ -716,6 +842,11 @@ pub struct App {
     nav_bar_context_id: segmented_button::Entity,
     nav_model: segmented_button::SingleSelectModel,
     tab_model: segmented_button::Model<segmented_button::SingleSelect>,
+    /// Yoda phase 3: segmented_button model mirroring config.toolbar so the
+    /// toolbar row gets free drag-reorder + click activation (same widget
+    /// that powers the tab bar, its reorder is proven to work in this
+    /// setup unlike the generic dnd_source/dnd_destination wrappers).
+    toolbar_model: segmented_button::Model<segmented_button::SingleSelect>,
     config_handler: Option<cosmic_config::Config>,
     state_handler: Option<cosmic_config::Config>,
     config: Config,
@@ -883,6 +1014,7 @@ impl App {
 
     #[cfg(feature = "desktop")]
     fn launch_desktop_entries(paths: &[impl AsRef<Path>]) {
+        use crate::mime_app;
         use cosmic::desktop::fde::DesktopEntry;
         let locales = cosmic::desktop::fde::get_languages_from_env();
 
@@ -1071,7 +1203,7 @@ impl App {
             .sort_by(|a, b| (b.1.width * b.1.height).total_cmp(&(a.1.width * b.1.height)));
 
         for (w_id, overlap) in sorted_overlaps {
-            let Some((bl, br, tl, tr, mut size)) = self.layer_sizes.get(w_id).map(|s| {
+            let Some((bl, br, tl, tr, size)) = self.layer_sizes.get(w_id).map(|s| {
                 (
                     Rectangle::new(
                         Point::new(0., s.height / 2.),
@@ -1121,30 +1253,18 @@ impl App {
             if tl && !(tr || bl) {
                 *top += min_dim.1;
                 *left += min_dim.0;
-
-                size.height -= min_dim.1;
-                size.width -= min_dim.0;
             }
             if tr && !(tl || br) {
                 *top += min_dim.1;
                 *right += min_dim.0;
-
-                size.height -= min_dim.1;
-                size.width -= min_dim.0;
             }
             if bl && !(br || tl) {
                 *bottom += min_dim.1;
                 *left += min_dim.0;
-
-                size.height -= min_dim.1;
-                size.width -= min_dim.0;
             }
             if br && !(bl || tr) {
                 *bottom += min_dim.1;
                 *right += min_dim.0;
-
-                size.height -= min_dim.1;
-                size.width -= min_dim.0;
             }
         }
         self.margin = overlaps;
@@ -1503,12 +1623,18 @@ impl App {
     ) -> Task<Message> {
         log::info!("rescan_tab {entity:?} {location:?} {selection_paths:?}");
         let icon_sizes = self.config.tab.icon_sizes;
+        #[cfg(feature = "gvfs")]
         let mounter_items = self.mounter_items.clone();
 
         Task::future(async move {
             let location2 = location.clone();
             match tokio::task::spawn_blocking(move || location2.scan(icon_sizes)).await {
-                Ok((parent_item_opt, mut items)) => {
+                Ok((parent_item_opt, items)) => {
+                    #[cfg(feature = "gvfs")]
+                    let mut items = items;
+                    #[cfg(not(feature = "gvfs"))]
+                    let items = items;
+
                     #[cfg(feature = "gvfs")]
                     {
                         let mounter_paths: Box<[_]> = mounter_items
@@ -1678,6 +1804,7 @@ impl App {
 
     fn update_config(&mut self) -> Task<Message> {
         self.update_nav_model();
+        self.rebuild_toolbar_model();
         // Tabs are collected first to placate the borrowck
         let tabs: Box<[_]> = self.tab_model.iter().collect();
         // Update main conf and each tab with the new config
@@ -1691,6 +1818,52 @@ impl App {
         Task::batch(commands)
     }
 
+    /// Yoda phase 3: rebuild `toolbar_model` so it matches `config.toolbar`.
+    /// Called on init and on every config update. Each entity carries the
+    /// associated `ToolbarAction` as data so click/reorder handlers can
+    /// round-trip Entity → ToolbarAction without maintaining a side map.
+    ///
+    /// We insert ONLY the icon (no `.text()`) so the toolbar renders as a
+    /// clean icon row — user-visible labels stay in Settings/tooltips on
+    /// other surfaces.
+    fn rebuild_toolbar_model(&mut self) {
+        self.toolbar_model.clear();
+        for action in self.config.toolbar.iter().copied() {
+            let (icon_name, _label, _msg) = toolbar_action_ui(action);
+            self.toolbar_model
+                .insert()
+                .icon(widget::icon::from_name(icon_name).size(16).icon())
+                .data::<ToolbarAction>(action);
+        }
+    }
+
+    /// Yoda phase 3: after a drag-reorder, sync `config.toolbar` with the
+    /// new entity order in `toolbar_model`. Inlines what `config_set!`
+    /// would do (the macro lives inside update()).
+    fn sync_toolbar_config_from_model(&mut self) -> Task<Message> {
+        let new_toolbar: Vec<ToolbarAction> = self
+            .toolbar_model
+            .iter()
+            .filter_map(|e| self.toolbar_model.data::<ToolbarAction>(e).copied())
+            .collect();
+        if new_toolbar == self.config.toolbar {
+            return Task::none();
+        }
+        match self.config_handler.as_ref() {
+            Some(h) => {
+                if let Err(err) = self.config.set_toolbar(h, new_toolbar) {
+                    log::warn!("failed to save toolbar order: {err}");
+                }
+            }
+            None => self.config.toolbar = new_toolbar,
+        }
+        // Don't call update_config() — that would rebuild the
+        // toolbar_model from config and undo the reorder the user just
+        // made. The model already has the new order; config is just
+        // catching up for persistence.
+        Task::none()
+    }
+
     fn update_desktop(&mut self) -> Task<Message> {
         let needs_reload: Box<[_]> = (self.tab_model.iter())
             .filter_map(|entity| {
@@ -2268,10 +2441,134 @@ impl App {
                         .toggler(self.config.show_recents, Message::SetShowRecents)
                 })
                 .into(),
+            // Yoda phase 3: toolbar editor. Two stacked lists:
+            //   - top: enabled buttons in their current order (drag to reorder)
+            //   - bottom: available (not-yet-enabled) buttons
+            // Each row's toggle adds/removes; enabled rows are also
+            // drag sources + drop targets.
+            self.toolbar_settings_section(),
         ])
         .into()
     }
 
+    /// Yoda phase 3: build the Toolbar settings section.
+    fn toolbar_settings_section(&self) -> Element<'_, Message> {
+        use iced::clipboard::dnd::DndAction;
+        let enabled = &self.config.toolbar;
+        let disabled: Vec<ToolbarAction> = ToolbarAction::ALL
+            .iter()
+            .copied()
+            .filter(|a| !enabled.contains(a))
+            .collect();
+
+        let space_xxs = theme::active().cosmic().spacing.space_xxs;
+
+        let drag_icon = |size: u16| -> Element<'static, Message> {
+            widget::icon::from_name("list-drag-handle-symbolic")
+                .size(size)
+                .into()
+        };
+
+        let row_enabled =
+            |action: ToolbarAction, pos: usize, last: usize| -> Element<'_, Message> {
+                let (icon, label, _msg) = toolbar_action_ui(action);
+                let up_btn =
+                    widget::button::icon(widget::icon::from_name("go-up-symbolic").size(14));
+                let up_btn = if pos > 0 {
+                    up_btn.on_press(Message::ToolbarMoveUp(action))
+                } else {
+                    up_btn
+                };
+                let down_btn =
+                    widget::button::icon(widget::icon::from_name("go-down-symbolic").size(14));
+                let down_btn = if pos < last {
+                    down_btn.on_press(Message::ToolbarMoveDown(action))
+                } else {
+                    down_btn
+                };
+
+                let row_content: Element<_> = widget::row::with_children(vec![
+                    drag_icon(14),
+                    widget::icon::from_name(icon).size(16).into(),
+                    widget::text::body(label).width(Length::Fill).into(),
+                    up_btn.into(),
+                    down_btn.into(),
+                    widget::button::icon(widget::icon::from_name("list-remove-symbolic").size(14))
+                        .on_press(Message::ToolbarRemove(action))
+                        .into(),
+                ])
+                .spacing(space_xxs)
+                .align_y(Alignment::Center)
+                .into();
+
+                let row_container = widget::container(row_content)
+                    .width(Length::Fill)
+                    .padding(space_xxs);
+
+                // Wrap as DnD source (drags itself) + DnD destination (accepts
+                // drops from other enabled rows; on drop, move the src before
+                // this row).
+                let source = widget::dnd_source::<Message, ToolbarActionPayload>(row_container)
+                    .drag_content(move || ToolbarActionPayload(action.to_u8()));
+                widget::dnd_destination(source, vec![std::borrow::Cow::Borrowed(TOOLBAR_MIME)])
+                    .data_received_for::<ToolbarActionPayload>(
+                        move |payload: Option<ToolbarActionPayload>| {
+                            match payload.and_then(|p| ToolbarAction::from_u8(p.0)) {
+                                Some(src) if src != action => Message::ToolbarReorder {
+                                    src,
+                                    target: action,
+                                },
+                                // No-op if payload missing / malformed / same row.
+                                _ => Message::ToolbarReorder {
+                                    src: action,
+                                    target: action,
+                                },
+                            }
+                        },
+                    )
+                    .action(DndAction::Move)
+                    .into()
+            };
+
+        let row_disabled = |action: ToolbarAction| -> Element<'_, Message> {
+            let (icon, label, _msg) = toolbar_action_ui(action);
+            widget::row::with_children(vec![
+                widget::icon::from_name(icon).size(16).into(),
+                widget::text::body(label).width(Length::Fill).into(),
+                widget::button::icon(widget::icon::from_name("list-add-symbolic").size(14))
+                    .on_press(Message::ToolbarAdd(action))
+                    .into(),
+            ])
+            .spacing(space_xxs)
+            .align_y(Alignment::Center)
+            .padding(space_xxs)
+            .into()
+        };
+
+        let mut section = widget::settings::section().title(fl!("toolbar"));
+        if enabled.is_empty() {
+            section = section.add(widget::text::body(fl!("toolbar-empty-hint")));
+        } else {
+            let last = enabled.len() - 1;
+            for (pos, a) in enabled.iter().copied().enumerate() {
+                section = section.add(row_enabled(a, pos, last));
+            }
+        }
+
+        let mut col = widget::column::with_capacity(3).spacing(space_xxs);
+        col = col.push(section);
+        if !disabled.is_empty() {
+            let mut avail = widget::settings::section().title(fl!("toolbar-available"));
+            for a in disabled {
+                avail = avail.add(row_disabled(a));
+            }
+            col = col.push(avail);
+        }
+        col = col
+            .push(widget::button::standard(fl!("toolbar-reset")).on_press(Message::ToolbarReset));
+        col.into()
+    }
+
     fn get_apps_for_mime(&self, mime_type: &Mime) -> Vec<(&MimeApp, MimeAppMatch)> {
         let mut results = Vec::new();
 
@@ -2443,6 +2740,7 @@ impl Application for App {
             nav_bar_context_id: segmented_button::Entity::null(),
             nav_model: segmented_button::ModelBuilder::default().build(),
             tab_model: segmented_button::ModelBuilder::default().build(),
+            toolbar_model: segmented_button::ModelBuilder::default().build(),
             config_handler: flags.config_handler,
             state_handler: flags.state_handler,
             config: flags.config,
@@ -2553,7 +2851,7 @@ impl Application for App {
         .on_middle_press(|entity| {
             cosmic::Action::App(Message::NavMenuAction(NavMenuAction::OpenInNewTab(entity)))
         })
-        .context_menu(self.nav_context_menu(self.nav_bar_context_id))
+        .context_menu(self.nav_context_menu())
         .close_icon(icon::from_name("media-eject-symbolic").size(16).icon())
         .into_container();
 
@@ -2568,8 +2866,8 @@ impl Application for App {
 
     fn nav_context_menu(
         &self,
-        entity: widget::nav_bar::Id,
     ) -> Option<Vec<widget::menu::Tree<cosmic::Action<Self::Message>>>> {
+        let entity = self.nav_bar_context_id;
         let favorite_index_opt = self.nav_model.data::<FavoriteIndex>(entity);
         let location_opt = self.nav_model.data::<Location>(entity);
 
@@ -3222,6 +3520,7 @@ impl Application for App {
                             path,
                             mime,
                             selected,
+                            set_default,
                             ..
                         } => {
                             let available_apps = self.get_apps_for_mime(&mime);
@@ -3240,6 +3539,11 @@ impl Application for App {
                                                     None,
                                                 );
                                             }
+                                            // Yoda: persist as default if the user asked for it.
+                                            if set_default {
+                                                self.mime_app_cache
+                                                    .set_default(mime.clone(), app.id.clone());
+                                            }
                                         }
                                         Err(err) => {
                                             log::warn!(
@@ -3351,7 +3655,7 @@ impl Application for App {
                     return dialog.update(dialog_message);
                 }
             }
-            Message::Key(window_id, modifiers, key, text) => {
+            Message::Key(window_id, modifiers, key, physical_key, text) => {
                 #[cfg(all(feature = "wayland", feature = "desktop-applet"))]
                 let in_surface_ids = self.surface_ids.values().any(|id| *id == window_id);
                 #[cfg(not(all(feature = "wayland", feature = "desktop-applet")))]
@@ -3359,7 +3663,7 @@ impl Application for App {
                 if self.core.main_window_id() == Some(window_id) || in_surface_ids {
                     let entity = self.tab_model.active();
                     for (key_bind, action) in &self.key_binds {
-                        if key_bind.matches(modifiers, &key) {
+                        if key_bind.matches(modifiers, &key, None) {
                             return self.update(action.message(Some(entity)));
                         }
                     }
@@ -3862,6 +4166,7 @@ impl Application for App {
                                     .and_then(|mime| {
                                         self.mime_app_cache.get(&mime).first().cloned()
                                     }),
+                                set_default: false,
                             },
                             Some(CONFIRM_OPEN_WITH_BUTTON_ID.clone()),
                         );
@@ -3873,6 +4178,13 @@ impl Application for App {
                     *selected = index;
                 }
             }
+            Message::OpenWithToggleDefault(enabled) => {
+                if let Some(DialogPage::OpenWith { set_default, .. }) =
+                    self.dialog_pages.front_mut()
+                {
+                    *set_default = enabled;
+                }
+            }
             Message::Paste(entity_opt) => {
                 let entity = entity_opt.unwrap_or_else(|| self.tab_model.active());
                 if let Some(tab) = self.tab_model.data_mut::<Tab>(entity)
@@ -4349,6 +4661,86 @@ impl Application for App {
                 config_set!(show_recents, show_recents);
                 return self.update_config();
             }
+            Message::ToolbarAdd(action) => {
+                let mut tb = self.config.toolbar.clone();
+                if !tb.contains(&action) {
+                    tb.push(action);
+                }
+                config_set!(toolbar, tb);
+                return self.update_config();
+            }
+            Message::ToolbarRemove(action) => {
+                let mut tb = self.config.toolbar.clone();
+                tb.retain(|a| a != &action);
+                config_set!(toolbar, tb);
+                return self.update_config();
+            }
+            Message::ToolbarReorder { src, target } => {
+                let mut tb = self.config.toolbar.clone();
+                if let (Some(src_idx), Some(tgt_idx)) = (
+                    tb.iter().position(|a| a == &src),
+                    tb.iter().position(|a| a == &target),
+                ) && src_idx != tgt_idx
+                {
+                    // Pull src out, then insert before the target's new position.
+                    let item = tb.remove(src_idx);
+                    let new_tgt = if src_idx < tgt_idx {
+                        tgt_idx - 1
+                    } else {
+                        tgt_idx
+                    };
+                    tb.insert(new_tgt, item);
+                    config_set!(toolbar, tb);
+                    return self.update_config();
+                }
+                return Task::none();
+            }
+            Message::ToolbarMoveUp(action) => {
+                let mut tb = self.config.toolbar.clone();
+                if let Some(i) = tb.iter().position(|a| a == &action)
+                    && i > 0
+                {
+                    tb.swap(i, i - 1);
+                    config_set!(toolbar, tb);
+                    return self.update_config();
+                }
+                return Task::none();
+            }
+            Message::ToolbarMoveDown(action) => {
+                let mut tb = self.config.toolbar.clone();
+                if let Some(i) = tb.iter().position(|a| a == &action)
+                    && i + 1 < tb.len()
+                {
+                    tb.swap(i, i + 1);
+                    config_set!(toolbar, tb);
+                    return self.update_config();
+                }
+                return Task::none();
+            }
+            Message::ToolbarReset => {
+                config_set!(toolbar, default_toolbar());
+                return self.update_config();
+            }
+            Message::ToolbarTabActivate(entity) => {
+                // Dispatch the stored ToolbarAction's message, then clear
+                // the "active" selection so the button doesn't stay
+                // highlighted after a click (we use segmented_button for
+                // layout/drag but toolbar buttons are action-firing, not
+                // a mutual-exclusive choice).
+                let action = self.toolbar_model.data::<ToolbarAction>(entity).copied();
+                self.toolbar_model.deactivate();
+                if let Some(action) = action {
+                    let (_, _, msg) = toolbar_action_ui(action);
+                    return self.update(msg);
+                }
+                return Task::none();
+            }
+            Message::ToolbarTabReorder(event) => {
+                let _ = self
+                    .toolbar_model
+                    .reorder(event.dragged, event.target, event.position);
+                return self.sync_toolbar_config_from_model();
+            }
             Message::SetTypeToSearch(type_to_search) => {
                 config_set!(type_to_search, type_to_search);
                 return self.update_config();
@@ -4524,6 +4916,7 @@ impl Application for App {
                                     commands.push(self.update(Message::CheckClipboard));
                                     commands.push(self.update(Message::Surface(
                                         cosmic::surface::action::app_popup(
+                                            |_: &Self| cosmic::surface::action::LiveSettings::default(),
                                             move |app: &mut Self| -> SctkPopupSettings {
                                                 let anchor_rect = Rectangle {
                                                     x: point.x as i32,
@@ -5108,6 +5501,7 @@ impl Application for App {
                                             .and_then(|mime| {
                                                 self.mime_app_cache.get(&mime).first().cloned()
                                             }),
+                                        set_default: false,
                                     },
                                     None,
                                 );
@@ -5951,7 +6345,7 @@ impl Application for App {
                 mime,
                 selected,
                 store_opt,
-                ..
+                set_default,
             } => {
                 let name = match path.file_name() {
                     Some(file_name) => file_name.to_str(),
@@ -6036,7 +6430,21 @@ impl Application for App {
                         } else {
                             Length::Shrink
                         }
-                    }));
+                    }))
+                    // Yoda: let the user make this choice stick. A plain row
+                    // instead of settings::item::builder because the latter
+                    // returns a section Item, not an Element usable in .control().
+                    .control(
+                        widget::row::with_children([
+                            widget::text::body(fl!("open-with-set-default")).into(),
+                            widget::space::horizontal().into(),
+                            widget::toggler(*set_default)
+                                .on_toggle(Message::OpenWithToggleDefault)
+                                .into(),
+                        ])
+                        .spacing(space_s)
+                        .align_y(Alignment::Center),
+                    );
 
                 if let Some(app) = store_opt {
                     dialog = dialog.tertiary_action(
@@ -6442,7 +6850,10 @@ impl Application for App {
     /// Creates a view after each update.
     fn view(&self) -> Element<'_, Self::Message> {
         let cosmic_theme::Spacing {
-            space_xxs, space_s, ..
+            space_xxs,
+            space_xs,
+            space_s,
+            ..
         } = theme::spacing();
 
         let mut tab_column = widget::column::with_capacity(4);
@@ -6486,6 +6897,36 @@ impl Application for App {
             );
         }
 
+        // Yoda phase 3: Dolphin-style quick actions toolbar via
+        // segmented_button::horizontal — the same widget that powers the
+        // tab bar, so its built-in drag reorder works reliably (unlike the
+        // generic dnd_source+dnd_destination pairing we tried earlier).
+        // Short click = action (ToolbarTabActivate → dispatch the stored
+        // ToolbarAction's message). Drag past threshold = reorder
+        // (ToolbarTabReorder → model.reorder + sync to config).
+        if !self.config.toolbar.is_empty() {
+            // Use Control style (no TabBar underline, no bottom border)
+            // and let each button shrink to its icon. Spacing = space_xs
+            // keeps the buttons visually separated so it looks like an
+            // icon toolbar rather than a conjoined segmented control.
+            let toolbar = widget::segmented_button::horizontal(&self.toolbar_model)
+                .style(theme::SegmentedButton::Control)
+                .button_height(32)
+                .button_spacing(space_xs)
+                .button_alignment(Alignment::Center)
+                .minimum_button_width(32)
+                .maximum_button_width(32)
+                .enable_tab_drag(String::from("x-cosmic-files/toolbar-dnd"))
+                .on_reorder(Message::ToolbarTabReorder)
+                .tab_drag_threshold(8.)
+                .on_activate(Message::ToolbarTabActivate);
+            tab_column = tab_column.push(
+                widget::container(toolbar)
+                    .width(Length::Shrink)
+                    .padding([space_xxs, space_s]),
+            );
+        }
+
         let entity = self.tab_model.active();
         if let Some(tab) = self.tab_model.data::<Tab>(entity) {
             let tab_view = tab
@@ -6633,11 +7074,14 @@ impl Application for App {
                 },
                 Event::Keyboard(KeyEvent::KeyPressed {
                     key,
+                    physical_key,
                     modifiers,
                     text,
                     ..
                 }) => match status {
-                    event::Status::Ignored => Some(Message::Key(window_id, modifiers, key, text)),
+                    event::Status::Ignored => {
+                        Some(Message::Key(window_id, modifiers, key, physical_key, text))
+                    }
                     event::Status::Captured => None,
                 },
                 Event::Keyboard(KeyEvent::ModifiersChanged(modifiers)) => {
diff --git a/src/clipboard.rs b/src/clipboard.rs
index 7af2f9f..7d06be5 100644
--- a/src/clipboard.rs
+++ b/src/clipboard.rs
@@ -130,9 +130,11 @@ impl TryFrom<(Vec<u8>, String)> for ClipboardPaste {
         match mime.as_str() {
             "text/uri-list" => {
                 let text = str::from_utf8(&data)?;
-                let _lines = text.lines();
 
-                for line in text.lines() {
+                for line in text.lines().filter(|line| {
+                    let line = line.trim();
+                    !line.is_empty() && !line.starts_with('#')
+                }) {
                     let url = Url::parse(line)?;
                     match url.to_file_path() {
                         Ok(path) => paths.push(path),
diff --git a/src/config.rs b/src/config.rs
index 2138d83..8f493c0 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -170,6 +170,11 @@ pub struct Config {
     pub show_details: bool,
     pub show_recents: bool,
     pub tab: TabConfig,
+    /// Yoda phase 3: Dolphin-style quick actions toolbar. An ordered list
+    /// of enabled buttons — position in the vec drives the toolbar order.
+    /// Reorder in Settings via drag-drop; items not in the vec are
+    /// hidden. Default = the minimal-6 set from phase 1.
+    pub toolbar: Vec<ToolbarAction>,
     pub type_to_search: TypeToSearch,
 }
 
@@ -234,11 +239,97 @@ impl Default for Config {
             show_details: false,
             show_recents: true,
             tab: TabConfig::default(),
+            toolbar: default_toolbar(),
             type_to_search: TypeToSearch::Recursive,
         }
     }
 }
 
+/// Yoda phase 3: ordered enum of quick-action toolbar buttons.
+/// The Config stores `Vec<ToolbarAction>` so the user can pick BOTH
+/// visibility (just include/exclude the variant) AND order (position in
+/// the vec). Drag-drop reorder in the Settings page moves items around.
+#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
+pub enum ToolbarAction {
+    LocationUp,
+    Reload,
+    NewFolder,
+    NewFile,
+    Rename,
+    Delete,
+    Cut,
+    Copy,
+    Paste,
+    ToggleShowHidden,
+    OpenTerminal,
+}
+
+impl ToolbarAction {
+    /// Stable list of every supported action. Ordered roughly by logical
+    /// grouping (location → create/edit → clipboard → view/misc) so that
+    /// the default enabled set follows a sensible shape and the Settings
+    /// row for a not-yet-enabled action lands in a predictable spot.
+    pub const ALL: &'static [Self] = &[
+        Self::LocationUp,
+        Self::Reload,
+        Self::NewFolder,
+        Self::NewFile,
+        Self::Rename,
+        Self::Delete,
+        Self::Cut,
+        Self::Copy,
+        Self::Paste,
+        Self::ToggleShowHidden,
+        Self::OpenTerminal,
+    ];
+
+    /// u8 discriminant used to carry the action over a DnD mime payload.
+    pub const fn to_u8(self) -> u8 {
+        match self {
+            Self::LocationUp => 0,
+            Self::Reload => 1,
+            Self::NewFolder => 2,
+            Self::NewFile => 3,
+            Self::Rename => 4,
+            Self::Delete => 5,
+            Self::Cut => 6,
+            Self::Copy => 7,
+            Self::Paste => 8,
+            Self::ToggleShowHidden => 9,
+            Self::OpenTerminal => 10,
+        }
+    }
+
+    pub const fn from_u8(v: u8) -> Option<Self> {
+        match v {
+            0 => Some(Self::LocationUp),
+            1 => Some(Self::Reload),
+            2 => Some(Self::NewFolder),
+            3 => Some(Self::NewFile),
+            4 => Some(Self::Rename),
+            5 => Some(Self::Delete),
+            6 => Some(Self::Cut),
+            7 => Some(Self::Copy),
+            8 => Some(Self::Paste),
+            9 => Some(Self::ToggleShowHidden),
+            10 => Some(Self::OpenTerminal),
+            _ => None,
+        }
+    }
+}
+
+/// Default set shown on a fresh install — same "minimal 6" as phase 1/2.
+pub fn default_toolbar() -> Vec<ToolbarAction> {
+    vec![
+        ToolbarAction::NewFolder,
+        ToolbarAction::Rename,
+        ToolbarAction::Delete,
+        ToolbarAction::Cut,
+        ToolbarAction::Copy,
+        ToolbarAction::Paste,
+    ]
+}
+
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, CosmicConfigEntry, Deserialize, Serialize)]
 #[serde(default)]
 pub struct DesktopConfig {
diff --git a/src/dialog.rs b/src/dialog.rs
index 69714f9..0107fa9 100644
--- a/src/dialog.rs
+++ b/src/dialog.rs
@@ -6,7 +6,7 @@ use cosmic::app::{Core, Task, context_drawer};
 use cosmic::iced::core::SmolStr;
 use cosmic::iced::core::widget::operation;
 use cosmic::iced::futures::{self, SinkExt};
-use cosmic::iced::keyboard::key::Named;
+use cosmic::iced::keyboard::key::{Named, Physical};
 use cosmic::iced::keyboard::{Event as KeyEvent, Key, Modifiers};
 use cosmic::iced::platform_specific::shell::{self as iced_winit, SurfaceIdWrapper};
 use cosmic::iced::widget::scrollable;
@@ -456,7 +456,7 @@ enum Message {
     Escape,
     Filename(String),
     Filter(usize),
-    Key(Modifiers, Key, Option<SmolStr>),
+    Key(Modifiers, Key, Physical, Option<SmolStr>),
     ModifiersChanged(Modifiers),
     MounterItems(MounterKey, MounterItems),
     Mouse(window::Id, mouse::Button),
@@ -732,11 +732,17 @@ impl App {
     fn rescan_tab(&self, selection_paths: Option<Vec<PathBuf>>) -> Task<Message> {
         let location = self.tab.location.clone();
         let icon_sizes = self.tab.config.icon_sizes;
+        #[cfg(feature = "gvfs")]
         let mounter_items = self.mounter_items.clone();
         Task::future(async move {
             let location2 = location.clone();
             match tokio::task::spawn_blocking(move || location2.scan(icon_sizes)).await {
-                Ok((parent_item_opt, mut items)) => {
+                Ok((parent_item_opt, items)) => {
+                    #[cfg(feature = "gvfs")]
+                    let mut items = items;
+                    #[cfg(not(feature = "gvfs"))]
+                    let items = items;
+
                     #[cfg(feature = "gvfs")]
                     {
                         let mounter_paths: Box<[_]> = mounter_items
@@ -1450,16 +1456,16 @@ impl Application for App {
                 }
                 return self.rescan_tab(None);
             }
-            Message::Key(modifiers, key, text) => {
+            Message::Key(modifiers, key, physical_key, text) => {
                 for (key_bind, action) in &self.key_binds {
-                    if key_bind.matches(modifiers, &key) {
+                    if key_bind.matches(modifiers, &key, None) {
                         return self.update(Message::from(action.message()));
                     }
                 }
 
                 // Check key binds from accept label
                 if let Some(key_bind) = &self.accept_label.key_bind_opt
-                    && key_bind.matches(modifiers, &key)
+                    && key_bind.matches(modifiers, &key, None)
                 {
                     return self.update(if self.flags.kind.save() {
                         Message::Save(false)
@@ -1795,6 +1801,7 @@ impl Application for App {
                                         let autosize_id = widget::Id::unique();
                                         commands.push(self.update(Message::Surface(
                                             cosmic::surface::action::app_popup(
+                                            |_: &Self| cosmic::surface::action::LiveSettings::default(),
                                                 move |app: &mut Self| -> SctkPopupSettings {
                                                     let anchor_rect = Rectangle {
                                                         x: point.x as i32,
@@ -2050,11 +2057,14 @@ impl Application for App {
                 },
                 Event::Keyboard(KeyEvent::KeyPressed {
                     key,
+                    physical_key,
                     modifiers,
                     text,
                     ..
                 }) => match status {
-                    event::Status::Ignored => Some(Message::Key(modifiers, key, text)),
+                    event::Status::Ignored => {
+                        Some(Message::Key(modifiers, key, physical_key, text))
+                    }
                     event::Status::Captured => {
                         if key == Key::Named(Named::Escape) {
                             Some(Message::Escape)
diff --git a/src/lib.rs b/src/lib.rs
index f2d04d7..44b87f6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -38,6 +38,7 @@ mod zoom;
 
 pub(crate) type FxOrderMap<K, V> = ordermap::OrderMap<K, V, rustc_hash::FxBuildHasher>;
 
+#[cfg(feature = "gvfs")]
 pub(crate) fn err_str<T: ToString>(err: T) -> String {
     err.to_string()
 }
diff --git a/src/menu.rs b/src/menu.rs
index 4132fbf..5748956 100644
--- a/src/menu.rs
+++ b/src/menu.rs
@@ -10,6 +10,7 @@ use cosmic::widget::{
     self, Row, button, column, container, divider, responsive_menu_bar, space, text,
 };
 use cosmic::{Element, theme};
+#[cfg(feature = "desktop")]
 use i18n_embed::LanguageLoader;
 use mime_guess::Mime;
 use std::collections::HashMap;
@@ -67,17 +68,19 @@ pub fn context_menu<'a>(
         String::new()
     };
     fn key_style(theme: &cosmic::Theme) -> TextStyle {
-        let mut color = theme.cosmic().background.component.on;
+        let mut color = theme.cosmic().background(false).component.on;
         color.alpha *= 0.75;
         TextStyle {
             color: Some(color.into()),
+            ..Default::default()
         }
     }
     fn disabled_style(theme: &cosmic::Theme) -> TextStyle {
-        let mut color = theme.cosmic().background.component.on;
+        let mut color = theme.cosmic().background(false).component.on;
         color.alpha *= 0.5;
         TextStyle {
             color: Some(color.into()),
+            ..Default::default()
         }
     }
 
@@ -190,11 +193,11 @@ pub fn context_menu<'a>(
                 if !Trash::is_empty() {
                     children.push(menu_item(fl!("empty-trash"), Action::EmptyTrash).into());
                 }
-            } else if let Some(entry) = selected_desktop_entry {
+            } else if let Some(_entry) = selected_desktop_entry {
                 children.push(menu_item(fl!("open"), Action::Open).into());
                 #[cfg(feature = "desktop")]
                 {
-                    children.extend(entry.desktop_actions.into_iter().enumerate().map(
+                    children.extend(_entry.desktop_actions.into_iter().enumerate().map(
                         |(i, action)| menu_item(action.name, Action::ExecEntryAction(i)).into(),
                     ));
                 }
@@ -415,7 +418,7 @@ pub fn context_menu<'a>(
         //TODO: move style to libcosmic
         .style(|theme| {
             let cosmic = theme.cosmic();
-            let component = &cosmic.background.component;
+            let component = &cosmic.background(false).component;
             container::Style {
                 icon_color: Some(component.on.into()),
                 text_color: Some(component.on.into()),
@@ -809,7 +812,7 @@ pub fn location_context_menu<'a>(ancestor_index: usize) -> Element<'a, tab::Mess
         .padding(1)
         .style(|theme| {
             let cosmic = theme.cosmic();
-            let component = &cosmic.background.component;
+            let component = &cosmic.background(false).component;
             container::Style {
                 icon_color: Some(component.on.into()),
                 text_color: Some(component.on.into()),
diff --git a/src/mime_app.rs b/src/mime_app.rs
index 8695d79..7535556 100644
--- a/src/mime_app.rs
+++ b/src/mime_app.rs
@@ -7,12 +7,14 @@ use cosmic::desktop;
 use cosmic::widget;
 pub use mime_guess::Mime;
 use rustc_hash::FxHashMap;
-use std::cmp::Ordering;
-use std::ffi::OsStr;
-use std::os::unix::ffi::OsStrExt;
-use std::path::{Path, PathBuf};
-use std::time::Instant;
-use std::{fs, io, process};
+#[cfg(feature = "desktop")]
+use std::{cmp::Ordering, fs, io, time::Instant};
+use std::{
+    ffi::OsStr,
+    os::unix::ffi::OsStrExt,
+    path::{Path, PathBuf},
+    process,
+};
 
 pub fn exec_to_command(
     exec: &str,
@@ -364,9 +366,12 @@ impl MimeAppCache {
         // The current approach works but might not adhere to the spec (yet)
 
         // Look for and return preferred terminals
-        //TODO: fallback order beyond cosmic-term?
-
-        let mut preference_order = vec!["com.system76.CosmicTerm".to_string()];
+        // Yoda: cosmic-yoterm (our fork) wins over upstream cosmic-term if both
+        // are installed — useful when xdg-mime default is not set.
+        let mut preference_order = vec![
+            "com.aditua.CosmicYoterm".to_string(),
+            "com.system76.CosmicTerm".to_string(),
+        ];
 
         if let Some(id) = self.get_default_terminal() {
             preference_order.insert(0, id);
diff --git a/src/mounter/mod.rs b/src/mounter/mod.rs
index 3171c0f..a5ee75a 100644
--- a/src/mounter/mod.rs
+++ b/src/mounter/mod.rs
@@ -75,10 +75,10 @@ impl MounterItem {
         }
     }
 
-    pub fn icon(&self, symbolic: bool) -> Option<widget::icon::Handle> {
+    pub fn icon(&self, _symbolic: bool) -> Option<widget::icon::Handle> {
         match self {
             #[cfg(feature = "gvfs")]
-            Self::Gvfs(item) => item.icon(symbolic),
+            Self::Gvfs(item) => item.icon(_symbolic),
             Self::None => unreachable!(),
         }
     }
@@ -103,6 +103,7 @@ impl MounterItem {
 pub type MounterItems = Vec<MounterItem>;
 
 #[derive(Clone, Debug)]
+#[allow(dead_code)]
 pub enum MounterMessage {
     Items(MounterItems),
     MountResult(MounterItem, Result<bool, String>),
diff --git a/src/operation/recursive.rs b/src/operation/recursive.rs
index a3bd2c4..0f09bd6 100644
--- a/src/operation/recursive.rs
+++ b/src/operation/recursive.rs
@@ -10,6 +10,7 @@ use compio::driver::ToSharedFd;
 use compio::driver::op::AsyncifyFd;
 use compio::io::{AsyncReadAt, AsyncWriteAt};
 use cosmic::iced::futures;
+#[cfg(feature = "gvfs")]
 use futures::{FutureExt, StreamExt};
 use std::cell::Cell;
 use std::error::Error;
diff --git a/src/tab.rs b/src/tab.rs
index 25d271b..2db66a6 100644
--- a/src/tab.rs
+++ b/src/tab.rs
@@ -18,6 +18,7 @@ use cosmic::widget::menu::action::MenuAction;
 use cosmic::widget::menu::key_bind::KeyBind;
 use cosmic::widget::{self, DndDestination, DndSource, Id, RcElementWrapper, Widget, space};
 use cosmic::{Apply, Element, cosmic_theme, font, theme};
+#[cfg(feature = "desktop")]
 use i18n_embed::LanguageLoader;
 use icu::datetime::input::DateTime;
 use icu::datetime::options::TimePrecision;
@@ -179,7 +180,7 @@ fn button_appearance(
             appearance.icon_color = Some(Color::from(cosmic.on_bg_component_color()));
             appearance.text_color = Some(Color::from(cosmic.on_bg_component_color()));
             if cut {
-                appearance.text_color = Some(Color::from(cosmic.background.component.on_disabled));
+                appearance.text_color = Some(Color::from(cosmic.background(false).component.on_disabled));
             } else {
                 appearance.text_color = Some(Color::from(cosmic.on_bg_component_color()));
             }
@@ -190,12 +191,12 @@ fn button_appearance(
         appearance.background = Some(Color::from(cosmic.bg_color()).into());
         appearance.icon_color = Some(Color::from(cosmic.on_bg_color()));
         if cut {
-            appearance.text_color = Some(Color::from(cosmic.background.component.disabled));
+            appearance.text_color = Some(Color::from(cosmic.background(false).component.disabled));
         } else {
             appearance.text_color = Some(Color::from(cosmic.on_bg_color()));
         }
     } else if cut {
-        appearance.text_color = Some(Color::from(cosmic.background.component.on_disabled));
+        appearance.text_color = Some(Color::from(cosmic.background(false).component.on_disabled));
     }
     if focused && accent {
         appearance.outline_width = 1.0;
@@ -288,6 +289,26 @@ pub fn folder_icon_symbolic(path: &PathBuf, icon_size: u16) -> widget::icon::Han
     .handle()
 }
 
+fn generic_file_icons(
+    sizes: IconSizes,
+) -> (
+    widget::icon::Handle,
+    widget::icon::Handle,
+    widget::icon::Handle,
+) {
+    (
+        widget::icon::from_name("text-x-generic")
+            .size(sizes.grid())
+            .handle(),
+        widget::icon::from_name("text-x-generic")
+            .size(sizes.list())
+            .handle(),
+        widget::icon::from_name("text-x-generic")
+            .size(sizes.list_condensed())
+            .handle(),
+    )
+}
+
 //TODO: replace with Path::has_trailing_sep when stable
 fn has_trailing_sep(path: &Path) -> bool {
     path.as_os_str()
@@ -544,7 +565,7 @@ pub fn fs_kind(_metadata: &Metadata) -> FsKind {
 }
 
 #[cfg(not(feature = "desktop"))]
-fn get_desktop_file_display_name(path: &Path) -> Option<String> {
+fn get_desktop_file_display_name(_path: &Path) -> Option<String> {
     None
 }
 
@@ -563,7 +584,7 @@ fn get_desktop_file_display_name(path: &Path) -> Option<String> {
 }
 
 #[cfg(not(feature = "desktop"))]
-fn get_desktop_file_icon(path: &Path) -> Option<String> {
+fn get_desktop_file_icon(_path: &Path) -> Option<String> {
     None
 }
 
@@ -654,9 +675,9 @@ pub fn item_from_gvfs_info(path: PathBuf, file_info: gio::FileInfo, sizes: IconS
             folder_icon(&path, sizes.list_condensed()),
         )
     } else {
-        // ALWAYS assume we're remote for mime guessing here, since gvfs reading can be expensive
-        // @todo - expose this as a config option?
-        let mime = mime_for_path(&path, None, true);
+        // Keep the initial directory scan cheap. Opening files still
+        // recalculates MIME from the real path before launching apps.
+        let mime = mime_guess::from_path(&path).first_or_octet_stream();
 
         //TODO: clean this up, implement for trash
         let icon_name_opt = if mime == "application/x-desktop" {
@@ -673,28 +694,21 @@ pub fn item_from_gvfs_info(path: PathBuf, file_info: gio::FileInfo, sizes: IconS
                 desktop_icon_handle(&icon_name, sizes.list_condensed()),
             )
         } else {
+            let (icon_handle_grid, icon_handle_list, icon_handle_list_condensed) =
+                generic_file_icons(sizes);
             (
-                mime.clone(),
-                mime_icon(mime.clone(), sizes.grid()),
-                mime_icon(mime.clone(), sizes.list()),
-                mime_icon(mime, sizes.list_condensed()),
+                mime,
+                icon_handle_grid,
+                icon_handle_list,
+                icon_handle_list_condensed,
             )
         }
     };
 
-    let mut children_opt = None;
+    let children_opt = None;
     let mut dir_size = DirSize::NotDirectory;
     if is_dir && !remote {
         dir_size = DirSize::Calculating(Controller::default());
-        //TODO: calculate children in the background (and make it cancellable?)
-        match fs::read_dir(&path) {
-            Ok(entries) => {
-                children_opt = Some(entries.count());
-            }
-            Err(err) => {
-                log::warn!("failed to read directory {}: {}", path.display(), err);
-            }
-        }
     }
 
     let display_name = display_name_for_file(&path, &file_info.display_name(), false, is_desktop);
@@ -748,7 +762,10 @@ pub fn item_from_entry(
     sizes: IconSizes,
 ) -> Item {
     let mut is_desktop = false;
+    #[cfg(feature = "gvfs")]
     let mut is_gvfs = false;
+    #[cfg(not(feature = "gvfs"))]
+    let is_gvfs = false;
 
     let hidden = name.starts_with('.') || hidden_attribute(&metadata);
 
@@ -796,7 +813,9 @@ pub fn item_from_entry(
                 folder_icon(&path, sizes.list_condensed()),
             )
         } else {
-            let mime = mime_for_path(&path, Some(&metadata), remote);
+            // Keep the initial directory scan cheap. Opening files still
+            // recalculates MIME from the real path before launching apps.
+            let mime = mime_guess::from_path(&path).first_or_octet_stream();
             //TODO: clean this up, implement for trash
             let icon_name_opt = if mime == "application/x-desktop" {
                 is_desktop = true;
@@ -812,28 +831,21 @@ pub fn item_from_entry(
                     desktop_icon_handle(&icon_name, sizes.list_condensed()),
                 )
             } else {
+                let (icon_handle_grid, icon_handle_list, icon_handle_list_condensed) =
+                    generic_file_icons(sizes);
                 (
-                    mime.clone(),
-                    mime_icon(mime.clone(), sizes.grid()),
-                    mime_icon(mime.clone(), sizes.list()),
-                    mime_icon(mime, sizes.list_condensed()),
+                    mime,
+                    icon_handle_grid,
+                    icon_handle_list,
+                    icon_handle_list_condensed,
                 )
             }
         };
 
-    let mut children_opt = None;
+    let children_opt = None;
     let mut dir_size = DirSize::NotDirectory;
     if metadata.is_dir() && !remote {
         dir_size = DirSize::Calculating(Controller::default());
-        //TODO: calculate children in the background (and make it cancellable?)
-        match fs::read_dir(&path) {
-            Ok(entries) => {
-                children_opt = Some(entries.count());
-            }
-            Err(err) => {
-                log::warn!("failed to read directory {}: {}", path.display(), err);
-            }
-        }
     }
 
     let display_name = display_name_for_file(&path, &name, is_gvfs, is_desktop);
@@ -947,7 +959,10 @@ pub fn item_from_path<P: Into<PathBuf>>(path: P, sizes: IconSizes) -> Result<Ite
 pub fn scan_path(tab_path: &PathBuf, sizes: IconSizes) -> Vec<Item> {
     let mut items = Vec::new();
     let mut hidden_files = Box::from([]);
+    #[cfg(feature = "gvfs")]
     let mut remote_scannable = false;
+    #[cfg(not(feature = "gvfs"))]
+    let remote_scannable = false;
 
     #[cfg(feature = "gvfs")]
     {
@@ -7580,7 +7595,10 @@ mod tests {
                 // Text editor content may add a trailing newline
                 assert_eq!(content.text().trim_end(), "ab");
             }
-            _ => panic!("expected Text thumbnail with valid prefix only, got {:?}", thumb),
+            _ => panic!(
+                "expected Text thumbnail with valid prefix only, got {:?}",
+                thumb
+            ),
         }
         Ok(())
     }
diff --git a/src/thumbnailer.rs b/src/thumbnailer.rs
index b9de821..8e61447 100644
--- a/src/thumbnailer.rs
+++ b/src/thumbnailer.rs
@@ -5,10 +5,13 @@
 use cosmic::desktop::fde::GenericEntry;
 use mime_guess::Mime;
 use rustc_hash::FxHashMap;
-use std::path::Path;
-use std::sync::{LazyLock, Mutex};
-use std::time::Instant;
-use std::{fs, process};
+#[cfg(feature = "desktop")]
+use std::{fs, time::Instant};
+use std::{
+    path::Path,
+    process,
+    sync::{LazyLock, Mutex},
+};
 
 #[derive(Clone, Debug)]
 pub struct Thumbnailer {
diff --git a/src/trash.rs b/src/trash.rs
index 30d140f..618e77c 100644
--- a/src/trash.rs
+++ b/src/trash.rs
@@ -142,4 +142,12 @@ impl TrashExt for Trash {
         not(target_os = "android")
     )
 )))]
-impl TrashExt for Trash {}
+impl TrashExt for Trash {
+    fn scan_search<F: Fn(SearchItem) -> bool + Sync>(callback: F, regex: &Regex) {
+        log::warn!(
+            "searching trash not supported on this platform for pattern {:?}",
+            regex.as_str()
+        );
+        drop(callback);
+    }
+}