diff --git a/.github/DISCUSSION_TEMPLATE/1-q-a.yml b/.github/DISCUSSION_TEMPLATE/1-q-a.yml
index ab64c16e..394e0cf6 100644
--- a/.github/DISCUSSION_TEMPLATE/1-q-a.yml
+++ b/.github/DISCUSSION_TEMPLATE/1-q-a.yml
@@ -22,10 +22,10 @@ body:
     validations:
       required: true
   - type: textarea
-    id: debug
+    id: env
     attributes:
-      label: "`yazi --debug` output"
-      description: Please run `yazi --debug` and paste the debug information here.
+      label: "`ya env` output"
+      description: Run `ya env` and paste the environment information here.
       render: Shell
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 8c33c266..157822ba 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -26,10 +26,10 @@ body:
     validations:
       required: true
   - type: textarea
-    id: debug
+    id: env
     attributes:
-      label: "`yazi --debug` output"
-      description: Please run `yazi --debug` and paste the debug information here.
+      label: "`ya env` output"
+      description: Run `ya env` and paste the environment information here.
       render: Shell
     validations:
       required: true
@@ -65,6 +65,6 @@ body:
       options:
         - label: I tried the [latest nightly build](https://yazi-rs.github.io/docs/installation#binaries), and the issue is still reproducible
           required: true
-        - label: I updated the debug information (`yazi --debug`) input box to the nightly that I tried
+        - label: I updated the environment information (`ya env`) field to the nightly that I tried
           required: true
         - label: I can reproduce it after disabling all custom configs/plugins (`mv ~/.config/yazi ~/.config/yazi-backup`)
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
index 26ab7706..647f0534 100644
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -4,10 +4,10 @@ labels: [feature]
 assignees: []
 body:
   - type: textarea
-    id: debug
+    id: env
     attributes:
-      label: "`yazi --debug` output"
-      description: Please run `yazi --debug` and paste the debug information here.
+      label: "`ya env` output"
+      description: Run `ya env` and paste the environment information here.
       render: Shell
     validations:
       required: true
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 6ad65887..8c7716aa 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -15,3 +15,7 @@ A clear and concise description of the rationale of the changes, to help our rev
 
 If it has already been detailed in the associated issue, please skip this section.
 -->
+
+## Checklist
+
+- [ ] I have read [CONTRIBUTING.md](https://github.com/sxyazi/yazi/blob/main/CONTRIBUTING.md)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccb14fab..0240dec6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,14 +14,33 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/):
 
 ### Added
 
+- Drag and drop ([#4005])
 - Bulk create ([#3793])
+- Dynamic keymap Lua API ([#4031])
+- New `ui.Input` element ([#4040])
 - Image preview with Überzug++ on Niri ([#3990])
+- New gait for input `backward` and `forward` actions ([#4012])
 
 ### Changed
 
 - Rename `<BackTab>` to `<S-Tab>` ([#3989])
 - Remove Legacy Console Mode on Windows ([#3989])
 
+### Deprecated
+
+- Deprecate `backward --far` and `forward --far` in favor of `backward wide` and `forward wide`, respectively ([#4012])
+
+### Fixed
+
+- Normalize `\\?\`-prefixed Verbatim paths when creating relative symlinks on Windows ([#4067])
+- Keep package hashes indifferent to line endings when `ya pkg` pulls packages ([#4064])
+- Use WebP as `magick` preset preloader cache format to keep image transparency ([#4065])
+- Use cleaned and normalized `$PWD` as startup CWD to avoid MSYS2/git-bash path quirks ([#4068])
+
+### Improved
+
+- Eliminate hacks in image and UI conflict resolution ([#4022])
+
 ## [v26.5.6]
 
 ### Added
@@ -1729,3 +1748,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/):
 [#3943]: https://github.com/sxyazi/yazi/pull/3943
 [#3989]: https://github.com/sxyazi/yazi/pull/3989
 [#3990]: https://github.com/sxyazi/yazi/pull/3990
+[#4005]: https://github.com/sxyazi/yazi/pull/4005
+[#4012]: https://github.com/sxyazi/yazi/pull/4012
+[#4022]: https://github.com/sxyazi/yazi/pull/4022
+[#4031]: https://github.com/sxyazi/yazi/pull/4031
+[#4040]: https://github.com/sxyazi/yazi/pull/4040
+[#4064]: https://github.com/sxyazi/yazi/pull/4064
+[#4065]: https://github.com/sxyazi/yazi/pull/4065
+[#4067]: https://github.com/sxyazi/yazi/pull/4067
+[#4068]: https://github.com/sxyazi/yazi/pull/4068
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c74755d8..ce91de1d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,6 +11,7 @@ This guide will help you understand how to contribute to the project.
 3. [Development Setup](#development-setup)
 4. [How to Contribute](#how-to-contribute)
 5. [Pull Requests](#pull-requests)
+6. [AI Policy](#ai-policy)
 
 ## Getting Started
 
@@ -164,3 +165,10 @@ We want you to succeed, and it can be discouraging to find that a lot of re-work
    - Your code passes all tests and lints.
    - Your pull request description clearly explains the changes and why they are needed.
 4. Address any review comments. Make sure to push updates to the same branch on your fork.
+
+## AI Policy
+
+1. All issue, PR, and discussion descriptions must be written by humans, not AI.
+2. Any use of AI must be disclosed. You must declare which model you used and the extent of AI assistance.
+3. Any AI-generated code must be reviewed, tested, and simplified by a human before publishing. This requires you to fully understand how it interacts with the greater system without AI assistance.
+4. Any AI tools used must explicitly state they do not assert copyright over the work.
diff --git a/Cargo.lock b/Cargo.lock
index 363c3c2b..b0376978 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19,31 +19,31 @@ checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "aead"
-version = "0.6.0-rc.10"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b657e772794c6b04730ea897b66a058ccd866c16d1967da05eeeecec39043fe"
+checksum = "1973cfbc1a2daf9cf550e74e1f088c28e7f7d8c1e1418fb6c9dc5184b7e84c99"
 dependencies = [
- "crypto-common 0.2.2",
- "inout 0.2.2",
+ "crypto-common",
+ "inout",
 ]
 
 [[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",
- "cpufeatures 0.3.0",
+ "cpufeatures",
  "zeroize",
 ]
 
 [[package]]
 name = "aes-gcm"
-version = "0.11.0-rc.3"
+version = "0.11.0-rc.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e22c0c90bbe8d4f77c3ca9ddabe41a1f8382d6fc1f7cea89459d0f320371f972"
+checksum = "da8c919c118108f144adecad74b425b804ad075580d605d9b33c2d6d1c62a2f8"
 dependencies = [
  "aead",
  "aes",
@@ -102,7 +102,7 @@ version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e42366bb9d958f042bf58f0a85e1b2d091997c1257ca49bddd7e4827aadc65fd"
 dependencies = [
- "nom 8.0.0",
+ "nom",
  "ratatui-core",
  "simdutf8",
  "smallvec",
@@ -165,6 +165,15 @@ version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
 
+[[package]]
+name = "approx"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "arbitrary"
 version = "1.4.2"
@@ -189,7 +198,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -200,7 +209,7 @@ checksum = "7af50940b73bf4e16c15c448a2b121c63f2d68e3e54b6a8731673cb4aa0cdff5"
 dependencies = [
  "base64ct",
  "blake2",
- "cpufeatures 0.3.0",
+ "cpufeatures",
  "password-hash",
 ]
 
@@ -228,20 +237,11 @@ dependencies = [
  "event-listener",
 ]
 
-[[package]]
-name = "atomic"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a89cbf775b137e9b968e67227ef7f775587cde3fd31b0d8599dbd0f598a48340"
-dependencies = [
- "bytemuck",
-]
-
 [[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"
@@ -272,7 +272,7 @@ dependencies = [
  "anyhow",
  "arrayvec",
  "log",
- "nom 8.0.0",
+ "nom",
  "num-rational",
  "v_frame",
 ]
@@ -327,7 +327,7 @@ checksum = "144e573728da132683b9488acd528274c790e07fc06ff81ee29f9d8f8b1041e0"
 dependencies = [
  "blowfish",
  "pbkdf2",
- "sha2 0.11.0",
+ "sha2",
 ]
 
 [[package]]
@@ -349,21 +349,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "bit-set"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
-dependencies = [
- "bit-vec",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
-
 [[package]]
 name = "bit_field"
 version = "0.10.3"
@@ -372,15 +357,9 @@ checksum = "1e4b40c7323adcfc0a41c4b88143ed58346ff65a288fc144329c5c45e05d70c6"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
+checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
 dependencies = [
  "serde_core",
 ]
@@ -396,9 +375,9 @@ dependencies = [
 
 [[package]]
 name = "bitvec"
-version = "1.0.1"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+checksum = "ddcec3d12c579d40898fe0a9a358a803c23e9c52ca3c425707f81c9436211837"
 dependencies = [
  "funty",
  "radium",
@@ -412,37 +391,19 @@ version = "0.11.0-rc.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "061f1a09225e328e1ffbb378d2d49923c0ca5fee19fb5ac1cc9c1e9d52b93690"
 dependencies = [
- "digest 0.11.3",
+ "digest",
 ]
 
 [[package]]
 name = "block-buffer"
-version = "0.10.4"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array 0.14.9",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be"
+checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa"
 dependencies = [
  "hybrid-array",
  "zeroize",
 ]
 
-[[package]]
-name = "block-padding"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
-dependencies = [
- "generic-array 0.14.9",
-]
-
 [[package]]
 name = "block-padding"
 version = "0.4.2"
@@ -462,6 +423,31 @@ dependencies = [
  "cipher",
 ]
 
+[[package]]
+name = "bon"
+version = "3.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a602c73c7b0148ec6d12af6fd5cc7a46e2eacc8878271a999abac56eed12f561"
+dependencies = [
+ "bon-macros",
+ "rustversion",
+]
+
+[[package]]
+name = "bon-macros"
+version = "3.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
+dependencies = [
+ "darling",
+ "ident_case",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn",
+]
+
 [[package]]
 name = "bs58"
 version = "0.5.1"
@@ -489,9 +475,9 @@ 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"
@@ -516,7 +502,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -533,9 +519,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "bytes"
-version = "1.11.1"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
+checksum = "8ae3f5d315924270530207e2a68396c3cc547f6dca3fbdca317cfb1a51edb593"
 
 [[package]]
 name = "castaway"
@@ -557,9 +543,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.62"
+version = "1.2.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98"
+checksum = "e228eec9be7c17ccb640b59b36a5cd805ea2a564a4c5e162c2f659fea30d3b96"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -587,16 +573,16 @@ checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
 dependencies = [
  "cfg-if",
  "cipher",
- "cpufeatures 0.3.0",
+ "cpufeatures",
  "rand_core 0.10.1",
  "zeroize",
 ]
 
 [[package]]
 name = "chrono"
-version = "0.4.44"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
+checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
 dependencies = [
  "iana-time-zone",
  "js-sys",
@@ -612,9 +598,9 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8cf2a2c93cd704877c0858356ed03480ff301ee950b43f1cbe4573b088bfa6c"
 dependencies = [
- "block-buffer 0.12.0",
- "crypto-common 0.2.2",
- "inout 0.2.2",
+ "block-buffer",
+ "crypto-common",
+ "inout",
  "zeroize",
 ]
 
@@ -678,7 +664,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -698,9 +684,9 @@ dependencies = [
 
 [[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 = "color_quant"
@@ -716,9 +702,9 @@ checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
 
 [[package]]
 name = "compact_str"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb1325a1cece981e8a296ab8f0f9b63ae357bd0784a9faaf548cc7b480707a"
+checksum = "9dfdd1c2274d9aa354115b09dc9a901d6c5576818cdf70d14cae2bdb47df00ab"
 dependencies = [
  "castaway",
  "cfg-if",
@@ -756,15 +742,6 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c"
 
-[[package]]
-name = "convert_case"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9"
-dependencies = [
- "unicode-segmentation",
-]
-
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.7"
@@ -777,15 +754,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "15b85f9c39137c3a891689859392b1bd49812121d0d61c9caf00d46ed5ce06ae"
 
-[[package]]
-name = "cpufeatures"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "cpufeatures"
 version = "0.3.0"
@@ -804,6 +772,12 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "critical-section"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
+
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.15"
@@ -838,51 +812,6 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
-[[package]]
-name = "crossterm"
-version = "0.28.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
-dependencies = [
- "bitflags 2.11.1",
- "crossterm_winapi",
- "mio",
- "parking_lot",
- "rustix 0.38.44",
- "serde",
- "signal-hook 0.3.18",
- "signal-hook-mio",
- "winapi",
-]
-
-[[package]]
-name = "crossterm"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
-dependencies = [
- "bitflags 2.11.1",
- "crossterm_winapi",
- "derive_more",
- "document-features",
- "mio",
- "parking_lot",
- "rustix 1.1.4",
- "serde",
- "signal-hook 0.3.18",
- "signal-hook-mio",
- "winapi",
-]
-
-[[package]]
-name = "crossterm_winapi"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "crunchy"
 version = "0.2.4"
@@ -891,13 +820,13 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 
 [[package]]
 name = "crypto-bigint"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42a0d26b245348befa0c121944541476763dcc46ede886c88f9d12e1697d27c3"
+checksum = "97bb4a855e3b10f84c4e7e895a7de01db7f9a7b7eb7f73ed9773fd52ac686451"
 dependencies = [
  "cpubits",
  "ctutils",
- "getrandom 0.4.2",
+ "getrandom 0.4.3",
  "hybrid-array",
  "num-traits",
  "rand_core 0.10.1",
@@ -906,48 +835,27 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array 0.14.9",
- "typenum",
-]
-
 [[package]]
 name = "crypto-common"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453"
 dependencies = [
- "getrandom 0.4.2",
+ "getrandom 0.4.3",
  "hybrid-array",
  "rand_core 0.10.1",
 ]
 
 [[package]]
 name = "crypto-primes"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21f41f23de7d24cdbda7f0c4d9c0351f99a4ceb258ef30e5c1927af8987ffe5a"
+checksum = "3633a51a39c69ebbaa4feaa694bd83d241e4093901c84a0963b19d9bb3f0cf8f"
 dependencies = [
  "crypto-bigint",
- "libm",
  "rand_core 0.10.1",
 ]
 
-[[package]]
-name = "csscolorparser"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf"
-dependencies = [
- "lab",
- "phf",
-]
-
 [[package]]
 name = "ctr"
 version = "0.10.1"
@@ -969,14 +877,14 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "5.0.0-pre.6"
+version = "5.0.0-rc.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "335f1947f241137a14106b6f5acc5918a5ede29c9d71d3f2cb1678d5075d9fc3"
+checksum = "4f359e08ca85e7bd759e1fd933ff2bccd81864c60a8fba0e259c7f822b0924bf"
 dependencies = [
  "cfg-if",
- "cpufeatures 0.2.17",
+ "cpufeatures",
  "curve25519-dalek-derive",
- "digest 0.11.3",
+ "digest",
  "fiat-crypto",
  "rustc_version",
  "subtle",
@@ -991,17 +899,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "darling"
-version = "0.20.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
-dependencies = [
- "darling_core 0.20.11",
- "darling_macro 0.20.11",
+ "syn",
 ]
 
 [[package]]
@@ -1010,22 +908,8 @@ version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d"
 dependencies = [
- "darling_core 0.23.0",
- "darling_macro 0.23.0",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.20.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn 2.0.117",
+ "darling_core",
+ "darling_macro",
 ]
 
 [[package]]
@@ -1038,18 +922,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.20.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
-dependencies = [
- "darling_core 0.20.11",
- "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -1058,9 +931,9 @@ version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
 dependencies = [
- "darling_core 0.23.0",
+ "darling_core",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -1097,15 +970,9 @@ checksum = "780eb241654bf097afb00fc5f054a09b687dad862e485fdcf8399bb056565370"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
-[[package]]
-name = "deltae"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5729f5117e208430e437df2f4843f5e5952997175992d1414f94c57d61e270b4"
-
 [[package]]
 name = "der"
 version = "0.8.0"
@@ -1123,63 +990,9 @@ version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
 dependencies = [
- "powerfmt",
  "serde_core",
 ]
 
-[[package]]
-name = "derive_builder"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947"
-dependencies = [
- "derive_builder_macro",
-]
-
-[[package]]
-name = "derive_builder_core"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8"
-dependencies = [
- "darling 0.20.11",
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "derive_builder_macro"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
-dependencies = [
- "derive_builder_core",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "derive_more"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134"
-dependencies = [
- "derive_more-impl",
-]
-
-[[package]]
-name = "derive_more-impl"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb"
-dependencies = [
- "convert_case",
- "proc-macro2",
- "quote",
- "rustc_version",
- "syn 2.0.117",
-]
-
 [[package]]
 name = "des"
 version = "0.9.0"
@@ -1189,25 +1002,15 @@ dependencies = [
  "cipher",
 ]
 
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer 0.10.4",
- "crypto-common 0.1.6",
-]
-
 [[package]]
 name = "digest"
 version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2"
 dependencies = [
- "block-buffer 0.12.0",
+ "block-buffer",
  "const-oid",
- "crypto-common 0.2.2",
+ "crypto-common",
  "ctutils",
 ]
 
@@ -1232,15 +1035,6 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "document-features"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61"
-dependencies = [
- "litrs",
-]
-
 [[package]]
 name = "dyn-clone"
 version = "1.0.20"
@@ -1254,7 +1048,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "54fb064faabbee66e1fc8e5c5a9458d4269dc2d8b638fe86a425adb2510d1a96"
 dependencies = [
  "der",
- "digest 0.11.3",
+ "digest",
  "elliptic-curve",
  "rfc6979",
  "signature",
@@ -1274,15 +1068,15 @@ dependencies = [
 
 [[package]]
 name = "ed25519-dalek"
-version = "3.0.0-pre.7"
+version = "3.0.0-rc.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20449acd54b660981ae5caa2bcb56d1fe7f25f2e37a38ec507400fab034d4bb6"
+checksum = "b011170fe4f04665565b4110afef66774fe9ffff278f3eb5b81cc73d26e27d60"
 dependencies = [
  "curve25519-dalek",
  "ed25519",
  "rand_core 0.10.1",
  "serde",
- "sha2 0.11.0",
+ "sha2",
  "signature",
  "subtle",
  "zeroize",
@@ -1296,22 +1090,22 @@ checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
 
 [[package]]
 name = "elliptic-curve"
-version = "0.14.0-rc.32"
+version = "0.14.0-rc.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda94f31325c4275e9706adecbb6f0650dee2f904c915a98e3d81adaaaa757aa"
+checksum = "102d3643d30dd8b559613c5cced68317199597fffb278cdc88daa2ef7fafc935"
 dependencies = [
  "base16ct",
  "crypto-bigint",
- "crypto-common 0.2.2",
- "digest 0.11.3",
+ "crypto-common",
+ "digest",
+ "ff",
+ "group",
  "hkdf",
  "hybrid-array",
  "once_cell",
  "pem-rfc7468",
  "pkcs8",
  "rand_core 0.10.1",
- "rustcrypto-ff",
- "rustcrypto-group",
  "sec1",
  "subtle",
  "zeroize",
@@ -1332,7 +1126,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -1352,7 +1146,7 @@ checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -1388,15 +1182,6 @@ version = "3.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59"
 
-[[package]]
-name = "euclid"
-version = "0.22.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1a05365e3b1c6d1650318537c7460c6923f1abdd272ad6842baa2b509957a06"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "event-listener"
 version = "4.0.3"
@@ -1422,22 +1207,18 @@ dependencies = [
  "zune-inflate",
 ]
 
-[[package]]
-name = "fancy-regex"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2"
-dependencies = [
- "bit-set",
- "regex",
-]
-
 [[package]]
 name = "fast-srgb8"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1"
 
+[[package]]
+name = "fastrand"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
+
 [[package]]
 name = "fax"
 version = "0.2.7"
@@ -1463,41 +1244,28 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
+[[package]]
+name = "ff"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1f686ab92a9fb0eaf188f6c6c87b89490baa6fdb0db4544ba4dc47f7942489f"
+dependencies = [
+ "rand_core 0.10.1",
+ "subtle",
+]
+
 [[package]]
 name = "fiat-crypto"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64cd1e32ddd350061ae6edb1b082d7c54915b5c672c389143b9a63403a109f24"
 
-[[package]]
-name = "filedescriptor"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e40758ed24c9b2eeb76c35fb0aebc66c626084edd827e07e1552279814c6682d"
-dependencies = [
- "libc",
- "thiserror 1.0.69",
- "winapi",
-]
-
 [[package]]
 name = "find-msvc-tools"
 version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
 
-[[package]]
-name = "finl_unicode"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9844ddc3a6e533d62bba727eb6c28b5d360921d5175e9ff0f1e621a5c590a4d5"
-
-[[package]]
-name = "fixedbitset"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-
 [[package]]
 name = "flate2"
 version = "1.1.9"
@@ -1514,12 +1282,6 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
-[[package]]
-name = "foldhash"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
-
 [[package]]
 name = "foldhash"
 version = "0.2.0"
@@ -1597,7 +1359,7 @@ checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -1641,9 +1403,9 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "1.4.1"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dab9e9188e97a93276e1fe7b56401b851e2b45a46d045ca658100c1303ada649"
+checksum = "c2e55f16dcf0e9c00efbe2e655ffe45fc98e7066b52bc92f8a79e64060a79351"
 dependencies = [
  "generic-array 0.14.9",
  "rustversion",
@@ -1657,10 +1419,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
 dependencies = [
  "cfg-if",
- "js-sys",
  "libc",
  "wasi",
- "wasm-bindgen",
 ]
 
 [[package]]
@@ -1677,16 +1437,16 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
+checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "r-efi 6.0.0",
  "rand_core 0.10.1",
- "wasip2",
- "wasip3",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -1727,6 +1487,17 @@ dependencies = [
  "regex-syntax",
 ]
 
+[[package]]
+name = "group"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fd1a1c7a5206c5b7a3f5a0d7ccd3ff85d0c8f5133d62a02680255b0004af5f4"
+dependencies = [
+ "ff",
+ "rand_core 0.10.1",
+ "subtle",
+]
+
 [[package]]
 name = "half"
 version = "2.7.1"
@@ -1744,15 +1515,6 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
-[[package]]
-name = "hashbrown"
-version = "0.15.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
-dependencies = [
- "foldhash 0.1.5",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.16.1"
@@ -1761,7 +1523,7 @@ checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
 dependencies = [
  "allocator-api2",
  "equivalent",
- "foldhash 0.2.0",
+ "foldhash",
 ]
 
 [[package]]
@@ -1772,7 +1534,7 @@ checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
 dependencies = [
  "allocator-api2",
  "equivalent",
- "foldhash 0.2.0",
+ "foldhash",
  "serde",
  "serde_core",
 ]
@@ -1816,7 +1578,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f"
 dependencies = [
- "digest 0.11.3",
+ "digest",
 ]
 
 [[package]]
@@ -1855,12 +1617,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "id-arena"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
-
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -1902,9 +1658,9 @@ dependencies = [
 
 [[package]]
 name = "imgref"
-version = "1.12.1"
+version = "1.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40fac9d56ed6437b198fddba683305e8e2d651aa42647f00f5ae542e7f5c94a2"
+checksum = "89194689a993ab15268672e99e7b0e19da2da3268ac682e8f02d29d4d1434cd7"
 
 [[package]]
 name = "indexmap"
@@ -1940,11 +1696,11 @@ dependencies = [
 
 [[package]]
 name = "inotify"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd5b3eaf1a28b758ac0faa5a4254e8ab2705605496f1b1f3fbbc3988ad73d199"
+checksum = "533e68a5842e734946fe159fb03fc9bbbb254f590dd0d8ad321ae5ff7beca2c1"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags",
  "inotify-sys",
  "libc",
 ]
@@ -1958,23 +1714,13 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "inout"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
-dependencies = [
- "block-padding 0.3.3",
- "generic-array 0.14.9",
-]
-
 [[package]]
 name = "inout"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4250ce6452e92010fdf7268ccc5d14faa80bb12fc741938534c58f16804e03c7"
 dependencies = [
- "block-padding 0.4.2",
+ "block-padding",
  "hybrid-array",
 ]
 
@@ -1984,11 +1730,11 @@ version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5eb2d60ef19920a3a9193c3e371f726ec1dafc045dac788d0fb3704272458971"
 dependencies = [
- "darling 0.23.0",
+ "darling",
  "indoc",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -2011,7 +1757,16 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
+]
+
+[[package]]
+name = "inventory"
+version = "0.3.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4f0c30c76f2f4ccee3fe55a2435f691ca00c0e4bd87abe4f4a851b1d4dac39b"
+dependencies = [
+ "rustversion",
 ]
 
 [[package]]
@@ -2047,13 +1802,12 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.98"
+version = "0.3.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08"
+checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31"
 dependencies = [
  "cfg-if",
  "futures-util",
- "once_cell",
  "wasm-bindgen",
 ]
 
@@ -2075,7 +1829,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e24a010dd405bd7ed803e5253182815b41bf2e6a80cc3bfc066658e03a198aa"
 dependencies = [
  "cfg-if",
- "cpufeatures 0.3.0",
+ "cpufeatures",
 ]
 
 [[package]]
@@ -2084,15 +1838,15 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "01737161ba802849cfd486b5bd209d38ba4943494c249a8126005170c7621edd"
 dependencies = [
- "crypto-common 0.2.2",
+ "crypto-common",
  "rand_core 0.10.1",
 ]
 
 [[package]]
 name = "kqueue"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a"
+checksum = "273c0752728918e0ac4976f2b275b6fefb9ecd400585dec929419f3844cd87b5"
 dependencies = [
  "kqueue-sys",
  "libc",
@@ -2104,28 +1858,16 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07293a4e297ac234359b510362495713f75ea345d5307140414f20c69ffeb087"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags",
  "libc",
 ]
 
-[[package]]
-name = "lab"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf36173d4167ed999940f804952e6b08197cae5ad5d572eb4db150ce8ad5d58f"
-
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
-[[package]]
-name = "leb128fmt"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
-
 [[package]]
 name = "lebe"
 version = "0.5.3"
@@ -2140,9 +1882,9 @@ checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
 
 [[package]]
 name = "libfuzzer-sys"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f12a681b7dd8ce12bff52488013ba614b869148d54dd79836ab85aafdd53f08d"
+checksum = "a9fd2f41a1cba099f79a0b6b6c35656cf7c03351a7bae8ff0f28f25270f929d2"
 dependencies = [
  "arbitrary",
  "cc",
@@ -2156,9 +1898,9 @@ 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 = [
  "libc",
 ]
@@ -2169,27 +1911,15 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f50e8f47623268b5407192d26876c4d7f89d686ca130fdc53bced4814cd29f8"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags",
 ]
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
 
-[[package]]
-name = "litrs"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
-
 [[package]]
 name = "lock_api"
 version = "0.4.14"
@@ -2201,9 +1931,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.29"
+version = "0.4.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"
 
 [[package]]
 name = "loop9"
@@ -2214,15 +1944,6 @@ dependencies = [
  "imgref",
 ]
 
-[[package]]
-name = "lru"
-version = "0.16.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f66e8d5d03f609abc3a39e6f08e4164ebf1447a732906d39eb9b99b7919ef39"
-dependencies = [
- "hashbrown 0.16.1",
-]
-
 [[package]]
 name = "lru"
 version = "0.18.0"
@@ -2251,16 +1972,6 @@ dependencies = [
  "which",
 ]
 
-[[package]]
-name = "mac_address"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0aeb26bf5e836cc1c341c8106051b573f1766dfa05aa87f0b98be5e51b02303"
-dependencies = [
- "nix 0.29.0",
- "winapi",
-]
-
 [[package]]
 name = "matchers"
 version = "0.2.0"
@@ -2281,21 +1992,15 @@ dependencies = [
 
 [[package]]
 name = "md5"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
+checksum = "ae960838283323069879657ca3de837e9f7bbb4c7bf6ea7f1b290d5e9476d2e0"
 
 [[package]]
 name = "memchr"
-version = "2.8.0"
+version = "2.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
-
-[[package]]
-name = "memmem"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a64a92489e2744ce060c349162be1c5f33c6969234104dbd99ddb5feb08b8c15"
+checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4"
 
 [[package]]
 name = "memoffset"
@@ -2306,12 +2011,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.9"
@@ -2324,9 +2023,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",
@@ -2396,7 +2095,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -2426,26 +2125,13 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
-[[package]]
-name = "nix"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
-dependencies = [
- "bitflags 2.11.1",
- "cfg-if",
- "cfg_aliases",
- "libc",
- "memoffset",
-]
-
 [[package]]
 name = "nix"
 version = "0.31.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -2460,16 +2146,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
 [[package]]
 name = "nom"
 version = "8.0.0"
@@ -2491,7 +2167,7 @@ version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags",
  "fsevent-sys",
  "inotify",
  "kqueue",
@@ -2509,7 +2185,7 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags",
 ]
 
 [[package]]
@@ -2545,7 +2221,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -2597,12 +2273,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "numtoa"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aa2c4e539b869820a2b82e1aef6ff40aa85e65decdd5185e83fb4b1249cd00f"
-
 [[package]]
 name = "objc2"
 version = "0.6.4"
@@ -2624,7 +2294,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags",
  "objc2",
 ]
 
@@ -2655,7 +2325,7 @@ version = "6.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0cc3cbf698f9438986c11a880c90a6d04b9de27575afd28bbf45b154b6c709e2"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags",
  "libc",
  "once_cell",
  "onig_sys",
@@ -2686,15 +2356,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "ordered-float"
-version = "4.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "ordered-float"
 version = "5.3.0"
@@ -2708,43 +2369,43 @@ dependencies = [
 
 [[package]]
 name = "p256"
-version = "0.14.0-rc.9"
+version = "0.14.0-rc.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b97e3bf0465157ae90975ff52dbeb1362ba618924878c9f74c25baa27a65f9a"
+checksum = "41adc63effe99d48837a8cc0e6d7a77e32ae6a07f6000df466178dbc2193093e"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
  "primefield",
  "primeorder",
- "sha2 0.11.0",
+ "sha2",
 ]
 
 [[package]]
 name = "p384"
-version = "0.14.0-rc.9"
+version = "0.14.0-rc.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "437f30ebcb1e16ff48acead5f08bd69fbcdbc82421687bb48af5c315a0bfab03"
+checksum = "9bd5333afa5ae0347f39e6a0f2c9c155da431583fd71fe5555bd0521b4ccaf02"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
  "fiat-crypto",
  "primefield",
  "primeorder",
- "sha2 0.11.0",
+ "sha2",
 ]
 
 [[package]]
 name = "p521"
-version = "0.14.0-rc.9"
+version = "0.14.0-rc.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e9fd792bab86ecf6249561752fb5a413511f999887107dd054bbda5143743d7"
+checksum = "a3a5297f53dc16d35909060ba3032cff7867e8809f01e273ff325579d5f0ceae"
 dependencies = [
  "base16ct",
  "ecdsa",
  "elliptic-curve",
  "primefield",
  "primeorder",
- "sha2 0.11.0",
+ "sha2",
 ]
 
 [[package]]
@@ -2760,7 +2421,7 @@ dependencies = [
  "futures",
  "log",
  "rand 0.10.1",
- "sha2 0.11.0",
+ "sha2",
  "thiserror 2.0.18",
  "tokio",
  "windows 0.62.2",
@@ -2773,6 +2434,7 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6"
 dependencies = [
+ "approx",
  "bytemuck",
  "fast-srgb8",
  "libm",
@@ -2788,7 +2450,7 @@ dependencies = [
  "by_address",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -2847,7 +2509,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "112d82ceb8c5bf524d9af484d4e4970c9fd5a0cc15ba14ad93dccd28873b0629"
 dependencies = [
- "digest 0.11.3",
+ "digest",
  "hmac",
 ]
 
@@ -2866,49 +2528,6 @@ version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
-[[package]]
-name = "pest"
-version = "2.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0848c601009d37dfa3430c4666e147e49cdcf1b92ecd3e63657d8a5f19da662"
-dependencies = [
- "memchr",
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11f486f1ea21e6c10ed15d5a7c77165d0ee443402f0780849d1768e7d9d6fe77"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8040c4647b13b210a963c1ed407c1ff4fdfa01c31d6d2a098218702e6664f94f"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89815c69d36021a140146f26659a81d6c2afa33d216d736dd4be5381a7362220"
-dependencies = [
- "pest",
- "sha2 0.10.9",
-]
-
 [[package]]
 name = "phc"
 version = "0.6.1"
@@ -2919,58 +2538,6 @@ dependencies = [
  "ctutils",
 ]
 
-[[package]]
-name = "phf"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
-dependencies = [
- "phf_macros",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a"
-dependencies = [
- "phf_generator",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
-dependencies = [
- "phf_shared",
- "rand 0.8.6",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
-dependencies = [
- "phf_generator",
- "phf_shared",
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
-dependencies = [
- "siphasher",
-]
-
 [[package]]
 name = "pin-project-lite"
 version = "0.2.17"
@@ -2999,7 +2566,7 @@ dependencies = [
  "pbkdf2",
  "rand_core 0.10.1",
  "scrypt",
- "sha2 0.11.0",
+ "sha2",
  "spki",
 ]
 
@@ -3040,7 +2607,7 @@ version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags",
  "crc32fast",
  "fdeflate",
  "flate2",
@@ -3053,7 +2620,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a00baa632505d05512f48a963e16051c54fda9a95cc9acea1a4e3c90991c4a2e"
 dependencies = [
- "cpufeatures 0.3.0",
+ "cpufeatures",
  "universal-hash",
  "zeroize",
 ]
@@ -3065,7 +2632,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7dfc63250416fea14f5749b90725916a6c903f599d51cb635aa7a52bfd03eede"
 dependencies = [
  "cpubits",
- "cpufeatures 0.3.0",
+ "cpufeatures",
  "universal-hash",
 ]
 
@@ -3097,28 +2664,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
 dependencies = [
  "proc-macro2",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
 name = "primefield"
-version = "0.14.0-rc.9"
+version = "0.14.0-rc.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b52e6ee42db392378a95622b463c9740631171d1efce43fa445a569c1600cb6"
+checksum = "8675564771a62f69a0af716b03e89b917b963c7b173b5855575e84fd4f605ca0"
 dependencies = [
  "crypto-bigint",
- "crypto-common 0.2.2",
+ "crypto-common",
+ "ff",
  "rand_core 0.10.1",
- "rustcrypto-ff",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "primeorder"
-version = "0.14.0-rc.9"
+version = "0.14.0-rc.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0556580e42c19833f5d232aca11a7687a503ee41f937b54f5ae1d50fc2a6a36a"
+checksum = "7d2793f22b9b6fd11ef3ac1d59bf003c2573593e4968702341605c2748fd90bf"
 dependencies = [
  "elliptic-curve",
 ]
@@ -3142,7 +2709,7 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -3170,7 +2737,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4488a4a36b9a4ba6b9334a32a39971f77c1436ec82c38707bce707699cc3bbcb"
 dependencies = [
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -3273,7 +2840,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
 dependencies = [
  "chacha20",
- "getrandom 0.4.2",
+ "getrandom 0.4.3",
  "rand_core 0.10.1",
 ]
 
@@ -3311,91 +2878,43 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
 
-[[package]]
-name = "ratatui"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1ce67fb8ba4446454d1c8dbaeda0557ff5e94d39d5e5ed7f10a65eb4c8266bc"
-dependencies = [
- "instability",
- "ratatui-core",
- "ratatui-crossterm",
- "ratatui-termion",
- "ratatui-termwiz",
- "ratatui-widgets",
- "serde",
-]
-
 [[package]]
 name = "ratatui-core"
-version = "0.1.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ef8dea09a92caaf73bff7adb70b76162e5937524058a7e5bff37869cbbec293"
+checksum = "cbb175c433c8e28a809d1f5773a2ae96e68c0ce40db865cbab1020bf33ae479c"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags",
  "compact_str",
- "hashbrown 0.16.1",
- "indoc",
+ "critical-section",
+ "hashbrown 0.17.1",
  "itertools",
  "kasuari",
- "lru 0.16.4",
+ "lru",
+ "palette",
  "serde",
- "strum 0.27.2",
+ "strum",
  "thiserror 2.0.18",
  "unicode-segmentation",
  "unicode-truncate",
  "unicode-width",
 ]
 
-[[package]]
-name = "ratatui-crossterm"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "577c9b9f652b4c121fb25c6a391dd06406d3b092ba68827e6d2f09550edc54b3"
-dependencies = [
- "cfg-if",
- "crossterm 0.28.1",
- "crossterm 0.29.0",
- "instability",
- "ratatui-core",
-]
-
-[[package]]
-name = "ratatui-termion"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cade85a8591fbc911e147951422f0d6fd40f4948b271b6216c7dc01838996f8"
-dependencies = [
- "instability",
- "ratatui-core",
- "termion",
-]
-
-[[package]]
-name = "ratatui-termwiz"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f76fe0bd0ed4295f0321b1676732e2454024c15a35d01904ddb315afd3d545c"
-dependencies = [
- "ratatui-core",
- "termwiz",
-]
-
 [[package]]
 name = "ratatui-widgets"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7dbfa023cd4e604c2553483820c5fe8aa9d71a42eea5aa77c6e7f35756612db"
+checksum = "66e3d19bcc9130ca376277d93b60767ff121ace3be06f5f95f81dd68956407d1"
 dependencies = [
- "bitflags 2.11.1",
- "hashbrown 0.16.1",
+ "bitflags",
+ "hashbrown 0.17.1",
  "indoc",
  "instability",
  "itertools",
  "line-clipping",
  "ratatui-core",
  "serde",
- "strum 0.27.2",
+ "strum",
  "time",
  "unicode-segmentation",
  "unicode-width",
@@ -3476,7 +2995,7 @@ version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags",
 ]
 
 [[package]]
@@ -3507,14 +3026,14 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
 name = "regex"
-version = "1.12.3"
+version = "1.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
+checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -3535,9 +3054,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.10"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
+checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
 
 [[package]]
 name = "rfc6979"
@@ -3578,11 +3097,11 @@ dependencies = [
  "const-oid",
  "crypto-bigint",
  "crypto-primes",
- "digest 0.11.3",
+ "digest",
  "pkcs1",
  "pkcs8",
  "rand_core 0.10.1",
- "sha2 0.11.0",
+ "sha2",
  "signature",
  "spki",
  "zeroize",
@@ -3590,13 +3109,13 @@ dependencies = [
 
 [[package]]
 name = "russh"
-version = "0.61.0"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fba341d1fce5e094392f088499c5808d2a60d3a658f58fe480c26ac77b1c7dd3"
+checksum = "bbf893f64684e58da8a68d56a5e84d1cf0440226274c515770fe267707a7d0b0"
 dependencies = [
  "aes",
- "bitflags 2.11.1",
- "block-padding 0.4.2",
+ "bitflags",
+ "block-padding",
  "byteorder",
  "bytes",
  "cbc",
@@ -3607,19 +3126,18 @@ dependencies = [
  "data-encoding",
  "delegate",
  "der",
- "digest 0.11.3",
+ "digest",
  "ecdsa",
  "ed25519-dalek",
  "elliptic-curve",
  "enum_dispatch",
  "futures",
- "generic-array 1.4.1",
- "getrandom 0.2.17",
+ "generic-array 1.4.3",
+ "getrandom 0.4.3",
  "ghash",
  "hex-literal",
- "hkdf",
  "hmac",
- "inout 0.1.4",
+ "inout",
  "internal-russh-num-bigint",
  "keccak",
  "log",
@@ -3646,7 +3164,7 @@ dependencies = [
  "scrypt",
  "sec1",
  "sha1",
- "sha2 0.11.0",
+ "sha2",
  "sha3",
  "signature",
  "spki",
@@ -3667,7 +3185,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "443f6bbcfacb34a1aab2b12b99bf08e0c63abdc5a0db261901365df9d57fff51"
 dependencies = [
  "log",
- "nix 0.31.3",
+ "nix",
  "ssh-encoding",
  "windows-sys 0.61.2",
 ]
@@ -3705,50 +3223,16 @@ dependencies = [
  "semver",
 ]
 
-[[package]]
-name = "rustcrypto-ff"
-version = "0.14.0-rc.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd2a8adb347447693cd2ba0d218c4b66c62da9b0a5672b17b981e4291ec65ff6"
-dependencies = [
- "rand_core 0.10.1",
- "subtle",
-]
-
-[[package]]
-name = "rustcrypto-group"
-version = "0.14.0-rc.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "369f9b61aa45933c062c9f6b5c3c50ab710687eca83dd3802653b140b43f85ed"
-dependencies = [
- "rand_core 0.10.1",
- "rustcrypto-ff",
- "subtle",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
-dependencies = [
- "bitflags 2.11.1",
- "errno",
- "libc",
- "linux-raw-sys 0.4.15",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "rustix"
 version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags",
  "errno",
  "libc",
- "linux-raw-sys 0.12.1",
+ "linux-raw-sys",
  "windows-sys 0.61.2",
 ]
 
@@ -3831,7 +3315,7 @@ dependencies = [
  "cfg-if",
  "pbkdf2",
  "salsa20",
- "sha2 0.11.0",
+ "sha2",
 ]
 
 [[package]]
@@ -3891,7 +3375,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -3918,9 +3402,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.20.0"
+version = "3.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e72c1c2cb7b223fafb600a619537a871c2818583d619401b785e7c0b746ccde2"
+checksum = "76a5c54c7310e7b8b9577c286d7e399ddd876c3e12b3ed917a8aabc4b96e9e8c"
 dependencies = [
  "base64",
  "bs58",
@@ -3938,14 +3422,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.20.0"
+version = "3.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b90c488738ecb4fb0262f41f43bc40efc5868d9fb744319ddf5f5317f417bfac"
+checksum = "84d57bc0c8b9a17920c178daa6bb924850d54a9c97ab45194bb8c17ad66bb660"
 dependencies = [
- "darling 0.23.0",
+ "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -3965,19 +3449,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214"
 dependencies = [
  "cfg-if",
- "cpufeatures 0.3.0",
- "digest 0.11.3",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
-dependencies = [
- "cfg-if",
- "cpufeatures 0.2.17",
- "digest 0.10.7",
+ "cpufeatures",
+ "digest",
 ]
 
 [[package]]
@@ -3987,8 +3460,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4"
 dependencies = [
  "cfg-if",
- "cpufeatures 0.3.0",
- "digest 0.11.3",
+ "cpufeatures",
+ "digest",
 ]
 
 [[package]]
@@ -3997,7 +3470,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be176f1a57ce4e3d31c1a166222d9768de5954f811601fb7ca06fc8203905ce1"
 dependencies = [
- "digest 0.11.3",
+ "digest",
  "keccak",
 ]
 
@@ -4012,19 +3485,9 @@ dependencies = [
 
 [[package]]
 name = "shlex"
-version = "1.3.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
-[[package]]
-name = "signal-hook"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
+checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
 
 [[package]]
 name = "signal-hook"
@@ -4036,17 +3499,6 @@ dependencies = [
  "signal-hook-registry",
 ]
 
-[[package]]
-name = "signal-hook-mio"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b75a19a7a740b25bc7944bdee6172368f988763b744e3d4dfe753f6b4ece40cc"
-dependencies = [
- "libc",
- "mio",
- "signal-hook 0.3.18",
-]
-
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.8"
@@ -4065,7 +3517,7 @@ checksum = "e513e435a8898a0002270f29d0a708b7879708fb5c4d00e46983ca2d2d378cf0"
 dependencies = [
  "futures-core",
  "libc",
- "signal-hook 0.4.4",
+ "signal-hook",
  "tokio",
 ]
 
@@ -4075,7 +3527,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28d567dcbaf0049cb8ac2608a76cd95ff9e4412e1899d389ee400918ca7537f5"
 dependencies = [
- "digest 0.11.3",
+ "digest",
  "rand_core 0.10.1",
 ]
 
@@ -4100,12 +3552,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
 
-[[package]]
-name = "siphasher"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
-
 [[package]]
 name = "slab"
 version = "0.4.12"
@@ -4114,15 +3560,15 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
 
 [[package]]
 name = "smallvec"
-version = "1.15.1"
+version = "1.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
 
 [[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",
@@ -4168,7 +3614,7 @@ dependencies = [
  "bytes",
  "crypto-bigint",
  "ctutils",
- "digest 0.11.3",
+ "digest",
  "pem-rfc7468",
  "zeroize",
 ]
@@ -4192,7 +3638,7 @@ dependencies = [
  "rsa",
  "sec1",
  "sha1",
- "sha2 0.11.0",
+ "sha2",
  "signature",
  "ssh-cipher",
  "ssh-encoding",
@@ -4217,34 +3663,13 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
-[[package]]
-name = "strum"
-version = "0.27.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
-dependencies = [
- "strum_macros 0.27.2",
-]
-
 [[package]]
 name = "strum"
 version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9628de9b8791db39ceda2b119bbe13134770b56c138ec1d3af810d045c04f9bd"
 dependencies = [
- "strum_macros 0.28.0",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.27.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn 2.0.117",
+ "strum_macros",
 ]
 
 [[package]]
@@ -4256,7 +3681,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -4273,20 +3698,9 @@ checksum = "a7973cce6668464ea31f176d85b13c7ab3bba2cb3b77a2ed26abd7801688010a"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.117"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4320,78 +3734,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
-name = "terminfo"
-version = "0.9.0"
+name = "tempfile"
+version = "3.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4ea810f0692f9f51b382fff5893887bb4580f5fa246fde546e0b13e7fcee662"
+checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
- "fnv",
- "nom 7.1.3",
- "phf",
- "phf_codegen",
-]
-
-[[package]]
-name = "termion"
-version = "4.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f44138a9ae08f0f502f24104d82517ef4da7330c35acd638f1f29d3cd5475ecb"
-dependencies = [
- "libc",
- "numtoa",
- "serde",
-]
-
-[[package]]
-name = "termios"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "termwiz"
-version = "0.23.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4676b37242ccbd1aabf56edb093a4827dc49086c0ffd764a5705899e0f35f8f7"
-dependencies = [
- "anyhow",
- "base64",
- "bitflags 2.11.1",
- "fancy-regex",
- "filedescriptor",
- "finl_unicode",
- "fixedbitset",
- "hex",
- "lazy_static",
- "libc",
- "log",
- "memmem",
- "nix 0.29.0",
- "num-derive",
- "num-traits",
- "ordered-float 4.6.0",
- "pest",
- "pest_derive",
- "phf",
- "serde",
- "sha2 0.10.9",
- "signal-hook 0.3.18",
- "siphasher",
- "terminfo",
- "termios",
- "thiserror 1.0.69",
- "ucd-trie",
- "unicode-segmentation",
- "vtparse",
- "wezterm-bidi",
- "wezterm-blob-leases",
- "wezterm-color-types",
- "wezterm-dynamic",
- "wezterm-input-types",
- "winapi",
+ "fastrand",
+ "getrandom 0.4.3",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -4420,7 +3772,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -4431,7 +3783,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -4479,12 +3831,11 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.47"
+version = "0.3.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
+checksum = "711a53c2d47bbd818258c498c8dbfe186a2526c631495cfe7e078567f86b8469"
 dependencies = [
  "deranged",
- "itoa",
  "libc",
  "num-conv",
  "num_threads",
@@ -4496,15 +3847,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
+checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
 
 [[package]]
 name = "time-macros"
-version = "0.2.27"
+version = "0.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
+checksum = "71c652a3727a9cbb9a02f707f530b618ce00d0ccd762009c8c23bd191df3c17d"
 dependencies = [
  "num-conv",
  "time-core",
@@ -4550,7 +3901,7 @@ checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -4648,7 +3999,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -4731,15 +4082,20 @@ checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
 
 [[package]]
 name = "typenum"
-version = "1.20.0"
+version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de"
+checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
 
 [[package]]
-name = "ucd-trie"
-version = "0.1.7"
+name = "uds_windows"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
+checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e"
+dependencies = [
+ "memoffset",
+ "tempfile",
+ "windows-sys 0.61.2",
+]
 
 [[package]]
 name = "unicode-ident"
@@ -4749,9 +4105,9 @@ checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.13.2"
+version = "1.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c"
+checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8"
 
 [[package]]
 name = "unicode-truncate"
@@ -4770,19 +4126,13 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
-[[package]]
-name = "unicode-xid"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
-
 [[package]]
 name = "universal-hash"
 version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4987bdc12753382e0bec4a65c50738ffaabc998b9cdd1f952fb5f39b0048a96"
 dependencies = [
- "crypto-common 0.2.2",
+ "crypto-common",
  "ctutils",
 ]
 
@@ -4804,19 +4154,6 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
-[[package]]
-name = "uuid"
-version = "1.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76"
-dependencies = [
- "atomic",
- "getrandom 0.4.2",
- "js-sys",
- "serde_core",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "uzers"
 version = "0.12.2"
@@ -4846,12 +4183,12 @@ checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 
 [[package]]
 name = "vergen"
-version = "9.1.0"
+version = "10.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b849a1f6d8639e8de261e81ee0fc881e3e3620db1af9f2e0da015d4382ceaf75"
+checksum = "7bdf18a54cf91b4d98a8e8b67f6321606539fbcdcac02536286ad1de37b53fd2"
 dependencies = [
  "anyhow",
- "derive_builder",
+ "bon",
  "rustc_version",
  "rustversion",
  "time",
@@ -4860,12 +4197,12 @@ dependencies = [
 
 [[package]]
 name = "vergen-gitcl"
-version = "9.1.0"
+version = "10.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ff3b5300a085d6bcd8fc96a507f706a28ae3814693236c9b409db71a1d15b9"
+checksum = "4961429ed12888cb3c6dd20f7dc9508c821091a3ba5fec0156ed5a654c1c4572"
 dependencies = [
  "anyhow",
- "derive_builder",
+ "bon",
  "rustversion",
  "time",
  "vergen",
@@ -4874,12 +4211,12 @@ dependencies = [
 
 [[package]]
 name = "vergen-lib"
-version = "9.1.0"
+version = "10.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b34a29ba7e9c59e62f229ae1932fb1b8fb8a6fdcc99215a641913f5f5a59a569"
+checksum = "910e8471e27130bbc019e9bfa6bda16dfc4c6dd7c5d0793da70a9256caeae984"
 dependencies = [
  "anyhow",
- "derive_builder",
+ "bon",
  "rustversion",
 ]
 
@@ -4889,15 +4226,6 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
-[[package]]
-name = "vtparse"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d9b2acfb050df409c972a37d3b8e08cdea3bddb0c09db9d53137e504cfabed0"
-dependencies = [
- "utf8parse",
-]
-
 [[package]]
 name = "walkdir"
 version = "2.5.0"
@@ -4916,27 +4244,18 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasip2"
-version = "1.0.3+wasi-0.2.9"
+version = "1.0.4+wasi-0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
+checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487"
 dependencies = [
- "wit-bindgen 0.57.1",
-]
-
-[[package]]
-name = "wasip3"
-version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
-dependencies = [
- "wit-bindgen 0.51.0",
+ "wit-bindgen",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.121"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790"
+checksum = "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -4947,9 +4266,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.71"
+version = "0.4.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96492d0d3ffba25305a7dc88720d250b1401d7edca02cc3bcd50633b424673b8"
+checksum = "503b14d284f2c8dac03b819967e155ea753f573586193b2b2c95990cb5d69280"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -4957,9 +4276,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.121"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578"
+checksum = "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4967,175 +4286,51 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.121"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2"
+checksum = "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd"
 dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.121"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441"
+checksum = "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f"
 dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "wasm-encoder"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
-dependencies = [
- "leb128fmt",
- "wasmparser",
-]
-
-[[package]]
-name = "wasm-metadata"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
-dependencies = [
- "anyhow",
- "indexmap 2.14.0",
- "wasm-encoder",
- "wasmparser",
-]
-
-[[package]]
-name = "wasmparser"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
-dependencies = [
- "bitflags 2.11.1",
- "hashbrown 0.15.5",
- "indexmap 2.14.0",
- "semver",
-]
-
 [[package]]
 name = "weezl"
 version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88"
 
-[[package]]
-name = "wezterm-bidi"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c0a6e355560527dd2d1cf7890652f4f09bb3433b6aadade4c9b5ed76de5f3ec"
-dependencies = [
- "log",
- "wezterm-dynamic",
-]
-
-[[package]]
-name = "wezterm-blob-leases"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692daff6d93d94e29e4114544ef6d5c942a7ed998b37abdc19b17136ea428eb7"
-dependencies = [
- "getrandom 0.3.4",
- "mac_address",
- "serde",
- "sha2 0.10.9",
- "thiserror 1.0.69",
- "uuid",
-]
-
-[[package]]
-name = "wezterm-color-types"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7de81ef35c9010270d63772bebef2f2d6d1f2d20a983d27505ac850b8c4b4296"
-dependencies = [
- "csscolorparser",
- "deltae",
- "lazy_static",
- "serde",
- "wezterm-dynamic",
-]
-
-[[package]]
-name = "wezterm-dynamic"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f2ab60e120fd6eaa68d9567f3226e876684639d22a4219b313ff69ec0ccd5ac"
-dependencies = [
- "log",
- "ordered-float 4.6.0",
- "strsim",
- "thiserror 1.0.69",
- "wezterm-dynamic-derive",
-]
-
-[[package]]
-name = "wezterm-dynamic-derive"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c0cf2d539c645b448eaffec9ec494b8b19bd5077d9e58cb1ae7efece8d575b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "wezterm-input-types"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7012add459f951456ec9d6c7e6fc340b1ce15d6fc9629f8c42853412c029e57e"
-dependencies = [
- "bitflags 1.3.2",
- "euclid",
- "lazy_static",
- "serde",
- "wezterm-dynamic",
-]
-
 [[package]]
 name = "which"
-version = "8.0.2"
+version = "8.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81995fafaaaf6ae47a7d0cc83c67caf92aeb7e5331650ae6ff856f7c0c60c459"
+checksum = "48d7cd18d4acb58fb3cdfe9ea54e6cd96a4e7d4cc45c56338b236e82dad47248"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "wide"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a7714cd0430a663154667c74da5d09325c2387695bee18b3f7f72825aa3693a"
+checksum = "dfdfe6a32973f2d1b268b8895845a8a96cac2f0191e72c27cc929036060dbf89"
 dependencies = [
  "bytemuck",
  "safe_arch",
 ]
 
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
 [[package]]
 name = "winapi-util"
 version = "0.1.11"
@@ -5145,12 +4340,6 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
 [[package]]
 name = "windows"
 version = "0.56.0"
@@ -5226,7 +4415,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -5237,7 +4426,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -5248,7 +4437,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -5259,7 +4448,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -5485,100 +4674,12 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1"
 
-[[package]]
-name = "wit-bindgen"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
-dependencies = [
- "wit-bindgen-rust-macro",
-]
-
 [[package]]
 name = "wit-bindgen"
 version = "0.57.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
 
-[[package]]
-name = "wit-bindgen-core"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
-dependencies = [
- "anyhow",
- "heck",
- "wit-parser",
-]
-
-[[package]]
-name = "wit-bindgen-rust"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
-dependencies = [
- "anyhow",
- "heck",
- "indexmap 2.14.0",
- "prettyplease",
- "syn 2.0.117",
- "wasm-metadata",
- "wit-bindgen-core",
- "wit-component",
-]
-
-[[package]]
-name = "wit-bindgen-rust-macro"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
-dependencies = [
- "anyhow",
- "prettyplease",
- "proc-macro2",
- "quote",
- "syn 2.0.117",
- "wit-bindgen-core",
- "wit-bindgen-rust",
-]
-
-[[package]]
-name = "wit-component"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
-dependencies = [
- "anyhow",
- "bitflags 2.11.1",
- "indexmap 2.14.0",
- "log",
- "serde",
- "serde_derive",
- "serde_json",
- "wasm-encoder",
- "wasm-metadata",
- "wasmparser",
- "wit-parser",
-]
-
-[[package]]
-name = "wit-parser"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
-dependencies = [
- "anyhow",
- "id-arena",
- "indexmap 2.14.0",
- "log",
- "semver",
- "serde",
- "serde_derive",
- "serde_json",
- "unicode-xid",
- "wasmparser",
-]
-
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -5606,7 +4707,7 @@ dependencies = [
  "libc",
  "mlua",
  "paste",
- "ratatui",
+ "ratatui-core",
  "scopeguard",
  "tokio",
  "tokio-stream",
@@ -5642,11 +4743,12 @@ dependencies = [
  "anyhow",
  "base64",
  "image",
+ "inventory",
  "moxcms",
  "palette",
  "quantette",
- "ratatui",
- "strum 0.28.0",
+ "ratatui-core",
+ "strum",
  "tokio",
  "tracing",
  "yazi-config",
@@ -5655,8 +4757,8 @@ dependencies = [
  "yazi-macro",
  "yazi-shared",
  "yazi-shim",
- "yazi-term",
  "yazi-tty",
+ "yazi-widgets",
 ]
 
 [[package]]
@@ -5667,26 +4769,20 @@ dependencies = [
  "anyhow",
  "futures",
  "hashbrown 0.17.1",
+ "image",
  "libc",
  "mlua",
- "paste",
- "ratatui",
+ "ratatui-core",
+ "ratatui-widgets",
+ "serde",
  "serde_json",
+ "strum",
  "tokio",
- "tokio-stream",
- "tracing",
  "unicode-width",
  "windows-sys 0.61.2",
- "yazi-adapter",
  "yazi-codegen",
- "yazi-config",
- "yazi-fs",
  "yazi-macro",
- "yazi-shared",
  "yazi-shim",
- "yazi-term",
- "yazi-vfs",
- "yazi-widgets",
 ]
 
 [[package]]
@@ -5699,16 +4795,11 @@ dependencies = [
  "clap_complete_nushell",
  "futures",
  "hashbrown 0.17.1",
- "regex",
- "vergen-gitcl",
- "yazi-adapter",
- "yazi-config",
- "yazi-emulator",
  "yazi-fs",
  "yazi-macro",
  "yazi-shared",
  "yazi-shim",
- "yazi-term",
+ "yazi-version",
  "yazi-vfs",
 ]
 
@@ -5730,18 +4821,23 @@ dependencies = [
  "clap_complete_fig",
  "clap_complete_nushell",
  "hashbrown 0.17.1",
+ "regex",
  "serde",
  "serde_json",
  "tokio",
  "toml",
  "twox-hash",
- "vergen-gitcl",
+ "yazi-adapter",
  "yazi-boot",
+ "yazi-config",
  "yazi-dds",
+ "yazi-emulator",
  "yazi-fs",
  "yazi-macro",
  "yazi-shared",
  "yazi-term",
+ "yazi-tty",
+ "yazi-version",
 ]
 
 [[package]]
@@ -5750,7 +4846,7 @@ version = "26.5.6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
@@ -5759,18 +4855,20 @@ version = "26.5.6"
 dependencies = [
  "anyhow",
  "arc-swap",
- "bitflags 2.11.1",
+ "bitflags",
  "globset",
  "hashbrown 0.17.1",
  "indexmap 2.14.0",
- "ratatui",
+ "inventory",
+ "mlua",
+ "ratatui-core",
+ "ratatui-widgets",
  "regex",
  "serde",
  "serde_with",
- "strum 0.28.0",
- "tokio",
  "toml",
  "tracing",
+ "yazi-binding",
  "yazi-codegen",
  "yazi-fs",
  "yazi-macro",
@@ -5778,6 +4876,7 @@ dependencies = [
  "yazi-shim",
  "yazi-term",
  "yazi-tty",
+ "yazi-widgets",
 ]
 
 [[package]]
@@ -5790,10 +4889,11 @@ dependencies = [
  "indexmap 2.14.0",
  "mlua",
  "parking_lot",
- "ratatui",
+ "ratatui-core",
+ "ratatui-widgets",
  "serde",
  "serde_with",
- "strum 0.28.0",
+ "strum",
  "syntect",
  "tokio",
  "tokio-stream",
@@ -5812,6 +4912,7 @@ dependencies = [
  "yazi-shared",
  "yazi-shim",
  "yazi-term",
+ "yazi-tty",
  "yazi-vfs",
  "yazi-watcher",
  "yazi-widgets",
@@ -5824,8 +4925,8 @@ dependencies = [
  "anyhow",
  "hashbrown 0.17.1",
  "indexmap 2.14.0",
+ "inventory",
  "mlua",
- "ordered-float 5.3.0",
  "parking_lot",
  "paste",
  "serde",
@@ -5833,13 +4934,14 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tracing",
- "vergen-gitcl",
+ "uds_windows",
  "yazi-binding",
  "yazi-boot",
  "yazi-fs",
  "yazi-macro",
  "yazi-shared",
  "yazi-shim",
+ "yazi-version",
 ]
 
 [[package]]
@@ -5848,7 +4950,7 @@ version = "26.5.6"
 dependencies = [
  "anyhow",
  "either",
- "ratatui",
+ "ratatui-core",
  "scopeguard",
  "tokio",
  "tracing",
@@ -5880,8 +4982,8 @@ dependencies = [
  "libc",
  "mlua",
  "paste",
- "ratatui",
- "scopeguard",
+ "ratatui-core",
+ "ratatui-widgets",
  "signal-hook-tokio",
  "tikv-jemallocator",
  "tokio",
@@ -5919,13 +5021,15 @@ version = "26.5.6"
 dependencies = [
  "anyhow",
  "arc-swap",
- "bitflags 2.11.1",
+ "bitflags",
  "core-foundation-sys",
  "dirs",
  "either",
- "foldhash 0.2.0",
+ "foldhash",
  "hashbrown 0.17.1",
+ "inventory",
  "libc",
+ "mlua",
  "objc2",
  "parking_lot",
  "percent-encoding",
@@ -5933,13 +5037,14 @@ dependencies = [
  "regex",
  "scopeguard",
  "serde",
- "strum 0.28.0",
+ "strum",
  "tokio",
  "tracing",
  "trash",
  "typed-path",
  "uzers",
  "windows-sys 0.61.2",
+ "yazi-binding",
  "yazi-ffi",
  "yazi-macro",
  "yazi-shared",
@@ -5959,16 +5064,15 @@ name = "yazi-parser"
 version = "26.5.6"
 dependencies = [
  "anyhow",
- "bitflags 2.11.1",
+ "bitflags",
  "hashbrown 0.17.1",
  "mlua",
  "paste",
- "ratatui",
+ "ratatui-core",
  "serde",
  "serde_with",
- "strum 0.28.0",
+ "strum",
  "tokio",
- "yazi-binding",
  "yazi-boot",
  "yazi-config",
  "yazi-core",
@@ -5977,6 +5081,7 @@ dependencies = [
  "yazi-macro",
  "yazi-scheduler",
  "yazi-shared",
+ "yazi-shim",
  "yazi-term",
  "yazi-vfs",
  "yazi-widgets",
@@ -5989,10 +5094,12 @@ dependencies = [
  "ansi-to-tui",
  "anyhow",
  "futures",
+ "inventory",
  "libc",
  "mlua",
- "paste",
- "ratatui",
+ "percent-encoding",
+ "ratatui-core",
+ "ratatui-widgets",
  "serde_json",
  "tokio",
  "tokio-stream",
@@ -6003,6 +5110,7 @@ dependencies = [
  "yazi-adapter",
  "yazi-binding",
  "yazi-boot",
+ "yazi-codegen",
  "yazi-config",
  "yazi-core",
  "yazi-dds",
@@ -6015,6 +5123,7 @@ dependencies = [
  "yazi-shared",
  "yazi-shim",
  "yazi-term",
+ "yazi-tty",
  "yazi-vfs",
  "yazi-widgets",
 ]
@@ -6031,8 +5140,10 @@ version = "26.5.6"
 dependencies = [
  "anyhow",
  "tokio",
+ "tracing",
  "yazi-config",
  "yazi-core",
+ "yazi-dds",
  "yazi-macro",
  "yazi-scheduler",
  "yazi-shared",
@@ -6053,13 +5164,12 @@ dependencies = [
  "tokio-util",
  "tracing",
  "yazi-binding",
- "yazi-boot",
  "yazi-config",
- "yazi-dds",
  "yazi-fs",
  "yazi-macro",
  "yazi-shared",
  "yazi-shim",
+ "yazi-version",
 ]
 
 [[package]]
@@ -6068,15 +5178,15 @@ version = "26.5.6"
 dependencies = [
  "anyhow",
  "async-priority-channel",
- "foldhash 0.2.0",
+ "foldhash",
  "hashbrown 0.17.1",
  "libc",
- "lru 0.18.0",
+ "lru",
  "mlua",
  "ordered-float 5.3.0",
  "parking_lot",
  "serde",
- "strum 0.28.0",
+ "strum",
  "tokio",
  "tracing",
  "yazi-binding",
@@ -6086,6 +5196,7 @@ dependencies = [
  "yazi-macro",
  "yazi-runner",
  "yazi-shared",
+ "yazi-shim",
  "yazi-term",
  "yazi-vfs",
 ]
@@ -6094,7 +5205,7 @@ dependencies = [
 name = "yazi-sftp"
 version = "26.5.6"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags",
  "parking_lot",
  "russh",
  "serde",
@@ -6108,23 +5219,26 @@ version = "26.5.6"
 dependencies = [
  "anyhow",
  "dyn-clone",
- "foldhash 0.2.0",
+ "foldhash",
  "futures",
  "hashbrown 0.17.1",
+ "inventory",
  "libc",
  "memchr",
+ "mlua",
  "ordered-float 5.3.0",
  "parking_lot",
  "paste",
  "percent-encoding",
  "serde",
  "serde_with",
- "strum 0.28.0",
+ "strum",
  "thiserror 2.0.18",
  "tokio",
  "typed-path",
  "uzers",
  "windows-sys 0.61.2",
+ "yazi-codegen",
  "yazi-macro",
  "yazi-shim",
  "yazi-term",
@@ -6134,10 +5248,14 @@ dependencies = [
 name = "yazi-shim"
 version = "26.5.6"
 dependencies = [
+ "anyhow",
  "arc-swap",
+ "base64",
  "hashbrown 0.17.1",
  "mlua",
- "ratatui",
+ "percent-encoding",
+ "ratatui-core",
+ "ratatui-widgets",
  "serde",
  "thiserror 2.0.18",
  "toml",
@@ -6153,12 +5271,14 @@ version = "26.5.6"
 dependencies = [
  "anyhow",
  "base64",
- "bitflags 2.11.1",
+ "bitflags",
  "futures",
+ "mlua",
  "parking_lot",
- "ratatui",
- "rustix 1.1.4",
- "signal-hook 0.4.4",
+ "rustix",
+ "serde",
+ "signal-hook",
+ "strum",
  "thiserror 2.0.18",
  "tokio",
  "windows-sys 0.61.2",
@@ -6171,10 +5291,15 @@ dependencies = [
 name = "yazi-tty"
 version = "26.5.9"
 dependencies = [
+ "base64",
+ "bitflags",
  "libc",
+ "mlua",
  "parking_lot",
+ "ratatui-core",
  "tracing",
  "windows-sys 0.61.2",
+ "yazi-binding",
  "yazi-macro",
  "yazi-shim",
 ]
@@ -6184,17 +5309,25 @@ name = "yazi-tui"
 version = "26.5.9"
 dependencies = [
  "anyhow",
- "ratatui",
+ "ratatui-core",
  "tokio",
  "yazi-config",
  "yazi-emulator",
  "yazi-macro",
+ "yazi-proxy",
  "yazi-shared",
  "yazi-shim",
  "yazi-term",
  "yazi-tty",
 ]
 
+[[package]]
+name = "yazi-version"
+version = "26.5.6"
+dependencies = [
+ "vergen-gitcl",
+]
+
 [[package]]
 name = "yazi-vfs"
 version = "26.5.6"
@@ -6205,12 +5338,16 @@ dependencies = [
  "either",
  "futures",
  "hashbrown 0.17.1",
+ "mlua",
  "parking_lot",
  "russh",
+ "serde",
  "tokio",
+ "toml",
  "tracing",
  "typed-path",
- "yazi-config",
+ "yazi-binding",
+ "yazi-codegen",
  "yazi-fs",
  "yazi-macro",
  "yazi-sftp",
@@ -6245,15 +5382,21 @@ version = "26.5.6"
 dependencies = [
  "anyhow",
  "clipboard-win",
+ "dyn-clone",
  "futures",
+ "inventory",
  "mlua",
  "parking_lot",
- "ratatui",
+ "ratatui-core",
+ "ratatui-widgets",
  "serde",
+ "strum",
  "tokio",
+ "tokio-stream",
+ "tracing",
  "unicode-width",
- "yazi-adapter",
- "yazi-config",
+ "yazi-binding",
+ "yazi-dds",
  "yazi-macro",
  "yazi-shared",
  "yazi-shim",
@@ -6263,29 +5406,29 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.48"
+version = "0.8.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9"
+checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.48"
+version = "0.8.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4"
+checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.8.2"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
+checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e"
 
 [[package]]
 name = "zmij"
diff --git a/Cargo.toml b/Cargo.toml
index d7ff624f..6985c10a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,8 +39,8 @@ ansi-to-tui         = "8.0.1"
 anyhow              = "1.0.102"
 arc-swap            = { version = "1.9.1", features = [ "serde" ] }
 base64              = "0.22.1"
-bitflags            = { version = "2.11.1", features = [ "serde" ] }
-chrono              = "0.4.44"
+bitflags            = { version = "2.13.0", features = [ "serde" ] }
+chrono              = "0.4.45"
 clap                = { version = "4.6.1", features = [ "derive" ] }
 core-foundation-sys = "0.8.7"
 dirs                = "6.0.0"
@@ -50,7 +50,9 @@ foldhash            = "0.2.0"
 futures             = "0.3.32"
 globset             = "0.4.18"
 hashbrown           = { version = "0.17.1", features = [ "serde" ] }
+image               = { version = "0.25.10", default-features = false, features = [ "avif", "bmp", "dds", "exr", "ff", "gif", "hdr", "ico", "jpeg", "png", "pnm", "qoi", "tga", "tiff", "webp" ] }
 indexmap            = { version = "2.14.0", features = [ "serde" ] }
+inventory           = "0.3.24"
 libc                = "0.2.186"
 lru                 = "0.18.0"
 mlua                = { version = "0.11.6", features = [ "anyhow", "async", "error-send", "lua55", "macros", "serde" ] }
@@ -60,13 +62,14 @@ parking_lot         = "0.12.5"
 paste               = "1.0.15"
 percent-encoding    = "2.3.2"
 rand                = { version = "0.10.1", default-features = false, features = [ "std", "sys_rng" ] }
-ratatui             = { version = "0.30.0", default-features = false, features = [ "layout-cache", "serde", "underline-color", "unstable-rendered-line-info", "unstable-widget-ref" ] }
-regex               = "1.12.3"
-russh               = { version = "0.61.0", default-features = false, features = [ "ring", "rsa" ] }
+ratatui-core        = { version = "0.1.2", default-features = false, features = [ "std", "layout-cache", "serde", "underline-color" ] }
+ratatui-widgets     = { version = "0.3.2", default-features = false, features = [ "std", "unstable-rendered-line-info" ] }
+regex               = "1.12.4"
+russh               = { version = "0.61.2", default-features = false, features = [ "ring", "rsa" ] }
 scopeguard          = "1.2.0"
 serde               = { version = "1.0.228", features = [ "derive" ] }
 serde_json          = "1.0.150"
-serde_with          = "3.20.0"
+serde_with          = "3.21.0"
 strum               = { version = "0.28.0", features = [ "derive" ] }
 syntect             = { version = "5.3.0", default-features = false, features = [ "parsing", "plist-load", "regex-onig" ] }
 thiserror           = "2.0.18"
diff --git a/README.md b/README.md
index 1cd2e097..831a8ae7 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ Yazi (means "duck") is a terminal file manager written in Rust, based on non-blo
 - 💫 Vim-like input/pick/confirm/which/notify component, auto-completion for cd paths
 - 🏷️ Multi-Tab Support, Cross-directory selection, Scrollable Preview (for videos, PDFs, archives, code, directories, etc.)
 - 🔄 Bulk Rename/Create, Archive Extraction, Visual Mode, File Chooser, [Git Integration](https://github.com/yazi-rs/plugins/tree/main/git.yazi), [Mount Manager](https://github.com/yazi-rs/plugins/tree/main/mount.yazi)
-- 🎨 Theme System, Mouse Support, Trash Bin, Custom Layouts, CSI u, OSC 52
+- 🎨 Theme System, Mouse Support, Drag and Drop, Trash Bin, Custom Layouts, CSI u, OSC 52
 - ... and more!
 
 https://github.com/sxyazi/yazi/assets/17523360/92ff23fa-0cd5-4f04-b387-894c12265cc7
diff --git a/cspell.json b/cspell.json
index 289f3fd0..0685a4f8 100644
--- a/cspell.json
+++ b/cspell.json
@@ -1 +1 @@
-{"language":"en","words":["Punct","KEYMAP","splitn","crossterm","YAZI","peekable","ratatui","syntect","pbpaste","pbcopy","oneshot","Posix","Lsar","XADDOS","zoxide","cands","Deque","precache","imageops","IFBLK","IFCHR","IFDIR","IFIFO","IFLNK","IFMT","IFSOCK","IRGRP","IROTH","IRUSR","ISGID","ISUID","ISVTX","IWGRP","IWOTH","IWUSR","IXGRP","IXOTH","IXUSR","libc","winsize","TIOCGWINSZ","xpixel","ypixel","ioerr","appender","Catppuccin","macchiato","gitmodules","Dotfiles","bashprofile","vimrc","flac","webp","exiftool","mediainfo","ripgrep","indexmap","indexmap","unwatch","canonicalize","serde","fsevent","Ueberzug","iterm","wezterm","sixel","chafa","ueberzugpp","Konsole","Überzug","pkgs","pdftoppm","poppler","singlefile","jpegopt","EXIF","rustfmt","mktemp","nanos","xclip","xsel","natord","Mintty","nixos","nixpkgs","SIGTSTP","SIGCONT","SIGCONT","mlua","nonstatic","userdata","metatable","natsort","backstack","luajit","Succ","Succ","cand","fileencoding","foldmethod","lightgreen","darkgray","lightred","lightyellow","lightcyan","nushell","msvc","aarch","linemode","sxyazi","rsplit","ZELLIJ","bitflags","bitflags","USERPROFILE","Neovim","vergen","gitcl","Renderable","preloaders","prec","Upserting","prio","Ghostty","Catmull","Lanczos","cmds","unyank","scrolloff","headsup","unsub","uzers","scopeguard","SPDLOG","globset","filetime","magick","magick","prefetcher","Prework","prefetchers","PREWORKERS","conds","translit","rxvt","Urxvt","realpath","realname","REPARSE","hardlink","hardlinking","nlink","nlink","linemodes","SIGSTOP","sevenzip","rsplitn","replacen","DECSET","DECRQM","repeek","cwds","tcsi","Hyprland","Wayfire","SWAYSOCK","btime","nsec","codegen","gethostname","fchmod","fdfind","Rustc","rustc","ffprobe","vframes","luma","obase","outln","errln","tmtheme","twox","cfgs","fstype","objc","rdev","runloop","exfat","rclone","DECRQSS","DECSCUSR","libvterm","Uninit","lockin","rposition","resvg","foldhash","tilded","futs","chdir","hashbrown","JEMALLOC","RUSTFLAGS","RDONLY","GETPATH","fcntl","casefold","inodes","Splatable","casefied","thiserror","memchr","memmem","russh","deadpool","keepalive","nodelay","publickey","deadpool","initing","treelize","TOCTOU","fellback","watchee","Textlike","sstr","pointee","writef","wakeup","nonblocking","sigwinch","timespec","termios","tcgetattr","tcsetattr","tcgetwinsize","rustix","codepoint","codepoints","Raterm"],"version":"0.2","flagWords":[]}
\ No newline at end of file
+{"flagWords":[],"version":"0.2","language":"en","words":["Punct","KEYMAP","splitn","crossterm","YAZI","peekable","ratatui","syntect","pbpaste","pbcopy","oneshot","Posix","Lsar","XADDOS","zoxide","cands","Deque","precache","imageops","IFBLK","IFCHR","IFDIR","IFIFO","IFLNK","IFMT","IFSOCK","IRGRP","IROTH","IRUSR","ISGID","ISUID","ISVTX","IWGRP","IWOTH","IWUSR","IXGRP","IXOTH","IXUSR","libc","winsize","TIOCGWINSZ","xpixel","ypixel","ioerr","appender","Catppuccin","macchiato","gitmodules","Dotfiles","bashprofile","vimrc","flac","webp","exiftool","mediainfo","ripgrep","indexmap","indexmap","unwatch","canonicalize","serde","fsevent","Ueberzug","iterm","wezterm","sixel","chafa","ueberzugpp","Konsole","Überzug","pkgs","pdftoppm","poppler","singlefile","jpegopt","EXIF","rustfmt","mktemp","nanos","xclip","xsel","natord","Mintty","nixos","nixpkgs","SIGTSTP","SIGCONT","SIGCONT","mlua","nonstatic","userdata","metatable","natsort","backstack","luajit","Succ","Succ","cand","fileencoding","foldmethod","lightgreen","darkgray","lightred","lightyellow","lightcyan","nushell","msvc","aarch","linemode","sxyazi","rsplit","ZELLIJ","bitflags","bitflags","USERPROFILE","Neovim","vergen","gitcl","Renderable","preloaders","prec","Upserting","prio","Ghostty","Catmull","Lanczos","cmds","unyank","scrolloff","headsup","unsub","uzers","scopeguard","SPDLOG","globset","filetime","magick","magick","prefetcher","Prework","prefetchers","PREWORKERS","conds","translit","rxvt","Urxvt","realpath","realname","REPARSE","hardlink","hardlinking","nlink","nlink","linemodes","SIGSTOP","sevenzip","rsplitn","replacen","DECSET","DECRQM","repeek","cwds","tcsi","Hyprland","Wayfire","SWAYSOCK","btime","nsec","codegen","gethostname","fchmod","fdfind","Rustc","rustc","ffprobe","vframes","luma","obase","outln","errln","tmtheme","twox","cfgs","fstype","objc","rdev","runloop","exfat","rclone","DECRQSS","DECSCUSR","libvterm","Uninit","lockin","rposition","resvg","foldhash","tilded","futs","chdir","hashbrown","JEMALLOC","RUSTFLAGS","RDONLY","GETPATH","fcntl","casefold","inodes","Splatable","casefied","thiserror","memchr","memmem","russh","deadpool","keepalive","nodelay","publickey","deadpool","initing","treelize","TOCTOU","fellback","watchee","Textlike","sstr","pointee","writef","wakeup","nonblocking","sigwinch","timespec","termios","tcgetattr","tcsetattr","tcgetwinsize","rustix","codepoint","codepoints","Raterm","mimetypes","Mimelist","renderables","redrawer","Padable"]}
\ No newline at end of file
diff --git a/flake.lock b/flake.lock
index d485f39e..052f6d36 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1776329215,
-        "narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=",
+        "lastModified": 1779877693,
+        "narHash": "sha256-NOF9NAREhxr50bbBfVcVOq+ArCMSoe8dP79Pk2uyARk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b86751bc4085f48661017fa226dee99fab6c651b",
+        "rev": "4100e830e085863741bc69b156ec4ccd53ab5be0",
         "type": "github"
       },
       "original": {
@@ -48,11 +48,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776741231,
-        "narHash": "sha256-k9G98qzn+7npROUaks8VqCFm7cFtEG8ulQLBBo5lItg=",
+        "lastModified": 1779851998,
+        "narHash": "sha256-UkkMh3bX9QW4Luqkm98nUaOqKWrU6i65mUnph3WeSSw=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "02061303f7c4c964f7b4584dabd9e985b4cd442b",
+        "rev": "6cddd512fa2bf7231f098d3a2f92f6e4cff71e0a",
         "type": "github"
       },
       "original": {
diff --git a/nix/yazi-unwrapped.nix b/nix/yazi-unwrapped.nix
index 3601b485..2cae987c 100644
--- a/nix/yazi-unwrapped.nix
+++ b/nix/yazi-unwrapped.nix
@@ -28,9 +28,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoLock = {
     lockFile = "${src}/Cargo.lock";
-    #outputHashes = {
-    #  "mlua-0.10.0" = "sha256-Xg6/jc+UP8tbJJ6x1sbAgt8ZHt051xEBBcjmikQqYlw=";
-    #};
   };
 
   env = {
@@ -54,6 +51,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --fish ./yazi-boot/completions/yazi.fish \
       --zsh  ./yazi-boot/completions/_yazi
 
+    installShellCompletion --cmd ya \
+      --bash ./yazi-cli/completions/ya.bash \
+      --fish ./yazi-cli/completions/ya.fish \
+      --zsh  ./yazi-cli/completions/_ya
+
     # Resize logo
     for RES in 16 24 32 48 64 128 256; do
       mkdir -p $out/share/icons/hicolor/"$RES"x"$RES"/apps
@@ -75,7 +77,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       hash = "sha256-kEVXejDg4ChFoMNBvKlwdFEyUuTcY2VuK9j0PdafKus=";
     };
   };
-  
+
 
   meta = {
     description = "Blazing fast terminal file manager written in Rust, based on async I/O";
diff --git a/scripts/validate-form/main.js b/scripts/validate-form/main.js
index 925b4e16..bd3fddb8 100644
--- a/scripts/validate-form/main.js
+++ b/scripts/validate-form/main.js
@@ -13,7 +13,7 @@ function bugReportBody(creator, content, hash) {
 I noticed that you did not correctly follow the issue template. Please ensure that:
 
 - The bug can still be reproduced on the [newest nightly build](https://yazi-rs.github.io/docs/installation/#binaries).
-- The debug information (\`yazi --debug\`) is updated for the newest nightly.
+- The environment info (\`ya env\`) is updated for the newest nightly.
 - The non-optional items in the checklist are checked.
 
 Issues with \`${LABEL_NAME}\` will be marked ready once edited with the proper content, or closed after 2 days of inactivity.
@@ -32,7 +32,7 @@ function featureRequestBody(creator, content) {
 I noticed that you did not correctly follow the issue template. Please ensure that:
 
 - The requested feature does not exist in the [newest nightly build](https://yazi-rs.github.io/docs/installation/#binaries).
-- The debug information (\`yazi --debug\`) is updated for the newest nightly.
+- The environment info (\`ya env\`) is updated for the newest nightly.
 - The non-optional items in the checklist are checked.
 
 Issues with \`${LABEL_NAME}\` will be marked ready once edited with the proper content, or closed after 2 days of inactivity.
diff --git a/scripts/validate-form/package-lock.json b/scripts/validate-form/package-lock.json
index 6e873bca..87395153 100644
--- a/scripts/validate-form/package-lock.json
+++ b/scripts/validate-form/package-lock.json
@@ -238,9 +238,9 @@
 			}
 		},
 		"node_modules/undici": {
-			"version": "6.25.0",
-			"resolved": "https://registry.npmjs.org/undici/-/undici-6.25.0.tgz",
-			"integrity": "sha512-ZgpWDC5gmNiuY9CnLVXEH8rl50xhRCuLNA97fAUnKi8RRuV4E6KG31pDTsLVUKnohJE0I3XDrTeEydAXRw47xg==",
+			"version": "6.27.0",
+			"resolved": "https://registry.npmjs.org/undici/-/undici-6.27.0.tgz",
+			"integrity": "sha512-YmfV3YnEDzXRC5lZ2jWtWWHKGUm1zIt8AhesR1tens+HTNv+YZlN/dp6G727LOvMJ8xjP9Be7Y2Sdr96LDm+pg==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=18.17"
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 78abbfe2..91e5949f 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -133,9 +133,16 @@ parts:
       - --prefix=/usr
     build-attributes:
       - enable-patchelf
+    organize:
+      # `libgomp1` installs libgomp into the multiarch directory, but the
+      # `magick` binary's RPATH only searches `$ORIGIN/../lib` (i.e. usr/lib).
+      # Move it alongside the Magick libraries so the bundled binary can load
+      # it at runtime; otherwise magick fails with:
+      #   "libgomp.so.1: cannot open shared object file: No such file or directory"
+      usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libgomp.so*: usr/lib/
     prime:
       - usr/bin/magick
-      - usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libgomp.so.1
+      - usr/lib/libgomp.so*
       - usr/lib/libMagickCore-7.Q16HDRI.so*
       - usr/lib/libMagickWand-7.Q16HDRI.so*
 
diff --git a/yazi-actor/Cargo.toml b/yazi-actor/Cargo.toml
index c9b748d5..1015e74a 100644
--- a/yazi-actor/Cargo.toml
+++ b/yazi-actor/Cargo.toml
@@ -40,18 +40,18 @@ yazi-watcher   = { path = "../yazi-watcher", version = "26.5.6" }
 yazi-widgets   = { path = "../yazi-widgets", version = "26.5.6" }
 
 # External dependencies
-anyhow       = { workspace = true }
-either       = { workspace = true }
-futures      = { workspace = true }
-hashbrown    = { workspace = true }
-indexmap     = { workspace = true }
-mlua         = { workspace = true }
-paste        = { workspace = true }
-ratatui      = { workspace = true }
-scopeguard   = { workspace = true }
-tokio        = { workspace = true }
-tokio-stream = { workspace = true }
-tracing      = { workspace = true }
+anyhow          = { workspace = true }
+either          = { workspace = true }
+futures         = { workspace = true }
+hashbrown       = { workspace = true }
+indexmap        = { workspace = true }
+mlua            = { workspace = true }
+paste           = { workspace = true }
+ratatui-core    = { workspace = true }
+scopeguard      = { workspace = true }
+tokio           = { workspace = true }
+tokio-stream    = { workspace = true }
+tracing         = { workspace = true }
 
 [target."cfg(unix)".dependencies]
 libc = { workspace = true }
diff --git a/yazi-actor/src/app/accept_payload.rs b/yazi-actor/src/app/accept_payload.rs
index e9de9bed..151e83b6 100644
--- a/yazi-actor/src/app/accept_payload.rs
+++ b/yazi-actor/src/app/accept_payload.rs
@@ -29,7 +29,7 @@ impl Actor for AcceptPayload {
 		drop(lock);
 
 		let kind = kind.to_owned();
-		succ!(Lives::scope(cx.core, || {
+		succ!(Lives::scope(cx.core, |_| {
 			let body = payload.body.into_lua(&LUA)?;
 			for (id, cb) in handlers {
 				if let Err(e) = runtime_scope!(LUA, &id, cb.call::<()>(body.clone())) {
diff --git a/yazi-actor/src/app/dnd.rs b/yazi-actor/src/app/dnd.rs
new file mode 100644
index 00000000..576418d8
--- /dev/null
+++ b/yazi-actor/src/app/dnd.rs
@@ -0,0 +1,43 @@
+use anyhow::Result;
+use mlua::{ObjectLike, Table};
+use tracing::error;
+use yazi_actor::lives::Lives;
+use yazi_binding::runtime_scope;
+use yazi_macro::succ;
+use yazi_parser::app::DndForm;
+use yazi_plugin::LUA;
+use yazi_shared::data::Data;
+
+use crate::{Actor, Ctx};
+
+pub struct Dnd;
+
+impl Actor for Dnd {
+	type Form = DndForm;
+
+	const NAME: &str = "dnd";
+
+	fn act(cx: &mut Ctx, form: Self::Form) -> Result<Data> {
+		let Some(size) = cx.term.as_ref().and_then(|t| t.size().ok()) else { succ!() };
+		let area = yazi_binding::elements::Rect::from(size);
+
+		let result = Lives::scope(cx.core, move |_| {
+			runtime_scope!(LUA, "root", {
+				let root = LUA.globals().raw_get::<Table>("Root")?.call_method::<Table>("new", area)?;
+
+				if form.event.is_drag() {
+					root.call_method::<()>("drag", form.event)?;
+				} else {
+					root.call_method::<()>("drop", form.event)?;
+				}
+
+				Ok(())
+			})
+		});
+
+		if let Err(ref e) = result {
+			error!("{e}");
+		}
+		succ!(result?);
+	}
+}
diff --git a/yazi-actor/src/app/lua.rs b/yazi-actor/src/app/lua.rs
index 65a50abf..fedf031e 100644
--- a/yazi-actor/src/app/lua.rs
+++ b/yazi-actor/src/app/lua.rs
@@ -1,10 +1,9 @@
 use anyhow::Result;
 use yazi_binding::runtime_scope;
-use yazi_dds::Sendable;
 use yazi_macro::succ;
 use yazi_parser::app::LuaForm;
 use yazi_plugin::LUA;
-use yazi_shared::data::Data;
+use yazi_shared::data::{Data, Sendable};
 
 use crate::{Actor, Ctx, lives::Lives};
 
@@ -17,7 +16,7 @@ impl Actor for Lua {
 
 	fn act(cx: &mut Ctx, form: Self::Form) -> Result<Data> {
 		let chunk = LUA.load(&*form.code).set_name("anonymous");
-		let result = Lives::scope(cx.core, || {
+		let result = Lives::scope(cx.core, |_| {
 			runtime_scope!(LUA, "inline", Sendable::value_to_data(&LUA, chunk.eval()?))
 		});
 		succ!(result?);
diff --git a/yazi-actor/src/app/mod.rs b/yazi-actor/src/app/mod.rs
index 0b0a6086..b6c0bd1a 100644
--- a/yazi-actor/src/app/mod.rs
+++ b/yazi-actor/src/app/mod.rs
@@ -2,6 +2,7 @@ yazi_macro::mod_flat!(
 	accept_payload
 	bootstrap
 	deprecate
+	dnd
 	focus
 	lua
 	mouse
diff --git a/yazi-actor/src/app/mouse.rs b/yazi-actor/src/app/mouse.rs
index 7e121168..7eaecb61 100644
--- a/yazi-actor/src/app/mouse.rs
+++ b/yazi-actor/src/app/mouse.rs
@@ -19,31 +19,29 @@ impl Actor for Mouse {
 	const NAME: &str = "mouse";
 
 	fn act(cx: &mut Ctx, form: Self::Form) -> Result<Data> {
-		let event = yazi_binding::MouseEvent::from(form.event);
-
 		let Some(size) = cx.term.as_ref().and_then(|t| t.size().ok()) else { succ!() };
 		let area = yazi_binding::elements::Rect::from(size);
 
-		let result = Lives::scope(cx.core, move || {
-			let root = runtime_scope!(LUA, "root", {
-				LUA.globals().raw_get::<Table>("Root")?.call_method::<Table>("new", area)
-			})?;
+		let result = Lives::scope(cx.core, move |_| {
+			runtime_scope!(LUA, "root", {
+				let root = LUA.globals().raw_get::<Table>("Root")?.call_method::<Table>("new", area)?;
 
-			match event.kind {
-				MouseEventKind::Down(_) => root.call_method("click", (event, false))?,
-				MouseEventKind::Up(_) => root.call_method("click", (event, true))?,
+				match form.event.kind {
+					MouseEventKind::Down(_) => root.call_method("click", (form.event, false))?,
+					MouseEventKind::Up(_) => root.call_method("click", (form.event, true))?,
 
-				MouseEventKind::ScrollDown => root.call_method("scroll", (event, 1))?,
-				MouseEventKind::ScrollUp => root.call_method("scroll", (event, -1))?,
+					MouseEventKind::ScrollDown => root.call_method("scroll", (form.event, 1))?,
+					MouseEventKind::ScrollUp => root.call_method("scroll", (form.event, -1))?,
 
-				MouseEventKind::ScrollRight => root.call_method("touch", (event, 1))?,
-				MouseEventKind::ScrollLeft => root.call_method("touch", (event, -1))?,
+					MouseEventKind::ScrollRight => root.call_method("touch", (form.event, 1))?,
+					MouseEventKind::ScrollLeft => root.call_method("touch", (form.event, -1))?,
 
-				MouseEventKind::Moved => root.call_method("move", event)?,
-				MouseEventKind::Drag(_) => root.call_method("drag", event)?,
-			}
+					MouseEventKind::Moved => root.call_method("move", form.event)?,
+					MouseEventKind::Drag(_) => root.call_method("drag", form.event)?,
+				}
 
-			Ok(())
+				Ok(())
+			})
 		});
 
 		if let Err(ref e) = result {
diff --git a/yazi-actor/src/app/plugin_do.rs b/yazi-actor/src/app/plugin_do.rs
index c62a390a..dc647bab 100644
--- a/yazi-actor/src/app/plugin_do.rs
+++ b/yazi-actor/src/app/plugin_do.rs
@@ -43,7 +43,7 @@ impl Actor for PluginDo {
 		};
 		drop(loader);
 
-		let result = Lives::scope(cx.core, || {
+		let result = Lives::scope(cx.core, |_| {
 			if let Some(cb) = opt.callback {
 				cb(&LUA, plugin)
 			} else {
diff --git a/yazi-actor/src/app/reflow.rs b/yazi-actor/src/app/reflow.rs
index cd4390a1..cfb55e3b 100644
--- a/yazi-actor/src/app/reflow.rs
+++ b/yazi-actor/src/app/reflow.rs
@@ -1,6 +1,6 @@
 use anyhow::Result;
 use mlua::Value;
-use ratatui::layout::Position;
+use ratatui_core::layout::Position;
 use tracing::error;
 use yazi_actor::lives::Lives;
 use yazi_config::LAYOUT;
@@ -21,7 +21,7 @@ impl Actor for Reflow {
 		let Some(size) = cx.term.as_ref().and_then(|t| t.size().ok()) else { succ!() };
 		let mut layout = LAYOUT.get();
 
-		let result = Lives::scope(cx.core, || {
+		let result = Lives::scope(cx.core, |_| {
 			let comps = (form.reflow)((Position::ORIGIN, size).into())?;
 
 			for v in comps.sequence_values::<Value>() {
diff --git a/yazi-actor/src/app/title.rs b/yazi-actor/src/app/title.rs
index e6011789..7b19d9e2 100644
--- a/yazi-actor/src/app/title.rs
+++ b/yazi-actor/src/app/title.rs
@@ -3,8 +3,7 @@ use yazi_actor::Ctx;
 use yazi_macro::{succ, writef};
 use yazi_parser::{app::TitleForm, spark::SparkKind};
 use yazi_shared::{Source, data::Data};
-use yazi_term::sequence::SetTitle;
-use yazi_tty::TTY;
+use yazi_tty::{TTY, sequence::SetTitle};
 use yazi_tui::RatermState;
 
 use crate::Actor;
diff --git a/yazi-actor/src/cmp/trigger.rs b/yazi-actor/src/cmp/trigger.rs
index ce9a3468..964d715e 100644
--- a/yazi-actor/src/cmp/trigger.rs
+++ b/yazi-actor/src/cmp/trigger.rs
@@ -22,7 +22,7 @@ impl Actor for Trigger {
 		if form.ticket.is_some_and(|t| t != cx.cmp.ticket) {
 			succ!();
 		} else if form.ticket.is_none() {
-			cx.cmp.ticket = cx.input.ticket.current();
+			cx.cmp.ticket = cx.input.lock().map(|g| g.ticket.current()).unwrap_or_default();
 		}
 
 		cx.cmp.handle.take().map(|h| h.abort());
@@ -53,7 +53,7 @@ impl Actor for Trigger {
 
 			if !cache.is_empty() {
 				cache
-					.sort_unstable_by(|a, b| natsort(a.name.encoded_bytes(), b.name.encoded_bytes(), false));
+					.sort_unstable_by(|a, b| natsort(a.name.encoded_bytes(), b.name.encoded_bytes(), true));
 				CmpProxy::show(CmpOpt { cache, cache_name: parent, word, ticket });
 			}
 
diff --git a/yazi-actor/src/context.rs b/yazi-actor/src/context.rs
index 1ad02d79..fbdc2863 100644
--- a/yazi-actor/src/context.rs
+++ b/yazi-actor/src/context.rs
@@ -2,8 +2,8 @@ use std::ops::{Deref, DerefMut};
 
 use anyhow::{Result, anyhow};
 use yazi_core::{Core, mgr::Tabs, tab::{Folder, Tab}};
-use yazi_fs::File;
-use yazi_shared::{Id, Source, event::Action, url::UrlBuf};
+use yazi_fs::file::File;
+use yazi_shared::{Source, event::Action, id::Id, url::UrlBuf};
 use yazi_tui::Raterm;
 
 pub struct Ctx<'a> {
diff --git a/yazi-actor/src/core/preflight.rs b/yazi-actor/src/core/preflight.rs
index 56f6e4d0..92e8d0c9 100644
--- a/yazi-actor/src/core/preflight.rs
+++ b/yazi-actor/src/core/preflight.rs
@@ -16,7 +16,7 @@ impl Preflight {
 			return Ok(opt.1);
 		};
 
-		Ok(Lives::scope(cx.core, || {
+		Ok(Lives::scope(cx.core, |_| {
 			let mut body = opt.1.into_lua(&LUA)?;
 			for (id, cb) in handlers {
 				match runtime_scope!(LUA, &id, cb.call::<Value>(&body)) {
diff --git a/yazi-actor/src/input/close.rs b/yazi-actor/src/input/close.rs
index 0c0a8eb5..19ae12e7 100644
--- a/yazi-actor/src/input/close.rs
+++ b/yazi-actor/src/input/close.rs
@@ -1,7 +1,7 @@
 use anyhow::Result;
 use yazi_macro::{act, render, succ};
-use yazi_parser::input::CloseForm;
-use yazi_shared::data::Data;
+use yazi_parser::{input::CloseForm, spark::SparkKind};
+use yazi_shared::{Source, data::Data};
 use yazi_widgets::input::InputEvent;
 
 use crate::{Actor, Ctx};
@@ -14,16 +14,28 @@ impl Actor for Close {
 	const NAME: &str = "close";
 
 	fn act(cx: &mut Ctx, form: Self::Form) -> Result<Data> {
-		let input = &mut cx.input;
-		input.visible = false;
-		input.ticket.next();
+		let Some(mut guard) = cx.input.lock_mut() else {
+			succ!();
+		};
 
-		if let Some(tx) = input.tx.take() {
-			let value = input.snap().value.clone();
-			_ = tx.send(if form.submit { InputEvent::Submit(value) } else { InputEvent::Cancel(value) });
+		guard.ticket.next();
+		if let Some(cb) = guard.cb.take() {
+			let value = guard.snap().value.clone();
+			cb(if form.submit { InputEvent::Submit(value) } else { InputEvent::Cancel(value) });
 		}
 
+		drop(guard);
+		cx.input.main.visible = false;
+
 		act!(cmp:close, cx)?;
 		succ!(render!());
 	}
+
+	fn hook(cx: &Ctx, _form: &Self::Form) -> Option<SparkKind> {
+		match cx.source() {
+			Source::Key => Some(SparkKind::KeyInputClose),
+			Source::Ind => Some(SparkKind::IndInputClose),
+			_ => None,
+		}
+	}
 }
diff --git a/yazi-actor/src/input/complete.rs b/yazi-actor/src/input/complete.rs
index 5380618d..394c92c8 100644
--- a/yazi-actor/src/input/complete.rs
+++ b/yazi-actor/src/input/complete.rs
@@ -13,11 +13,14 @@ impl Actor for Complete {
 	const NAME: &str = "complete";
 
 	fn act(cx: &mut Ctx, form: Self::Form) -> Result<Data> {
-		let input = &mut cx.input;
-		if !input.visible || input.ticket.current() != form.ticket {
+		let Some(mut guard) = cx.input.lock_mut() else {
+			succ!();
+		};
+
+		if guard.ticket.current() != form.ticket {
 			succ!();
 		}
 
-		act!(complete, input, form)
+		act!(complete, guard, form)
 	}
 }
diff --git a/yazi-actor/src/input/escape.rs b/yazi-actor/src/input/escape.rs
index 495e0528..6977792c 100644
--- a/yazi-actor/src/input/escape.rs
+++ b/yazi-actor/src/input/escape.rs
@@ -15,16 +15,20 @@ impl Actor for Escape {
 
 	fn act(cx: &mut Ctx, _: Self::Form) -> Result<Data> {
 		use yazi_widgets::input::InputMode as M;
-		let input = &mut cx.input;
+		let Some(mut guard) = cx.input.lock_mut() else {
+			succ!();
+		};
 
-		let mode = input.snap().mode;
+		let (mode, op) = (guard.snap().mode, guard.snap().op);
+		act!(escape, guard)?;
+
+		drop(guard);
 		match mode {
-			M::Normal if input.snap_mut().op == InputOp::None => act!(input:close, cx),
+			M::Normal if op == InputOp::None => act!(input:close, cx),
 			M::Insert => act!(cmp:close, cx),
 			M::Normal | M::Replace => Ok(().into()),
 		}?;
 
-		act!(escape, cx.input)?;
 		succ!(render!());
 	}
 }
diff --git a/yazi-actor/src/input/show.rs b/yazi-actor/src/input/show.rs
index 9b3ee137..3c3272c3 100644
--- a/yazi-actor/src/input/show.rs
+++ b/yazi-actor/src/input/show.rs
@@ -1,27 +1,34 @@
 use std::ops::DerefMut;
 
 use anyhow::Result;
+use yazi_config::{THEME, YAZI};
 use yazi_macro::{act, render, succ};
+use yazi_parser::input::ShowForm;
 use yazi_shared::data::Data;
-use yazi_widgets::input::InputOpt;
+use yazi_shim::ratatui::Padable;
 
 use crate::{Actor, Ctx};
 
 pub struct Show;
 
 impl Actor for Show {
-	type Form = InputOpt;
+	type Form = ShowForm;
 
 	const NAME: &str = "show";
 
-	fn act(cx: &mut Ctx, form: Self::Form) -> Result<Data> {
+	fn act(cx: &mut Ctx, Self::Form { mut opt }: Self::Form) -> Result<Data> {
 		act!(input:close, cx)?;
 
+		let area = cx.mgr.area(opt.position).padding(cx.input.padding());
 		let input = &mut cx.input;
-		input.visible = true;
-		input.title = form.cfg.title.clone();
-		input.position = form.cfg.position;
-		*input.deref_mut() = yazi_widgets::input::Input::new(form)?;
+		input.main.visible = true;
+		input.main.title = opt.title.clone();
+		input.main.position = opt.position;
+
+		opt.styles = (&THEME.input).into();
+		opt.blinking = YAZI.input.cursor_blink;
+		*input.main.deref_mut() = yazi_widgets::input::Input::new(opt)?;
+		input.main.repos(area);
 
 		succ!(render!());
 	}
diff --git a/yazi-actor/src/lib.rs b/yazi-actor/src/lib.rs
index 6706a76c..15eb9f27 100644
--- a/yazi-actor/src/lib.rs
+++ b/yazi-actor/src/lib.rs
@@ -3,3 +3,5 @@ extern crate self as yazi_actor;
 yazi_macro::mod_pub!(app cmp confirm core help input lives mgr notify pick spot tasks which);
 
 yazi_macro::mod_flat!(actor context);
+
+pub fn init() { lives::init(); }
diff --git a/yazi-actor/src/lives/behavior.rs b/yazi-actor/src/lives/behavior.rs
new file mode 100644
index 00000000..c97f3c1e
--- /dev/null
+++ b/yazi-actor/src/lives/behavior.rs
@@ -0,0 +1,29 @@
+use std::ops::Deref;
+
+use mlua::{AnyUserData, UserData, UserDataMethods};
+
+use super::{Lives, PtrCell};
+
+pub(super) struct Behavior {
+	inner: PtrCell<yazi_scheduler::Behavior>,
+}
+
+impl Deref for Behavior {
+	type Target = yazi_scheduler::Behavior;
+
+	fn deref(&self) -> &Self::Target { &self.inner }
+}
+
+impl Behavior {
+	pub(super) fn make(inner: &yazi_scheduler::Behavior) -> mlua::Result<AnyUserData> {
+		let inner = PtrCell::from(inner);
+
+		Lives::scoped_userdata(Self { inner })
+	}
+}
+
+impl UserData for Behavior {
+	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
+		methods.add_method("reset", |_, me, ()| Ok(me.reset()));
+	}
+}
diff --git a/yazi-actor/src/lives/core.rs b/yazi-actor/src/lives/core.rs
index a32022c9..666a219b 100644
--- a/yazi-actor/src/lives/core.rs
+++ b/yazi-actor/src/lives/core.rs
@@ -1,10 +1,12 @@
 use std::ops::Deref;
 
-use mlua::{AnyUserData, IntoLua, MetaMethod, UserData, UserDataMethods, Value};
+use mlua::{AnyUserData, IntoLua, MetaMethod, UserData, UserDataMethods, UserDataRef, Value};
 use paste::paste;
 
 use super::{Lives, PtrCell};
 
+pub(super) type CoreRef = UserDataRef<Core>;
+
 pub(super) struct Core {
 	inner: PtrCell<yazi_core::Core>,
 
@@ -12,8 +14,9 @@ pub(super) struct Core {
 	c_tabs:   Option<Value>,
 	c_tasks:  Option<Value>,
 	c_yanked: Option<Value>,
-	c_layer:  Option<Value>,
+	c_input:  Option<Value>,
 	c_which:  Option<Value>,
+	c_layer:  Option<Value>,
 }
 
 impl Deref for Core {
@@ -31,8 +34,9 @@ impl Core {
 			c_tabs:   None,
 			c_tasks:  None,
 			c_yanked: None,
-			c_layer:  None,
+			c_input:  None,
 			c_which:  None,
+			c_layer:  None,
 		})
 	}
 }
@@ -57,10 +61,9 @@ impl UserData for Core {
 				b"tabs" => reuse!(tabs, super::Tabs::make(&me.mgr.tabs)),
 				b"tasks" => reuse!(tasks, super::Tasks::make(&me.tasks)),
 				b"yanked" => reuse!(yanked, super::Yanked::make(&me.mgr.yanked)),
-				b"layer" => {
-					reuse!(layer, Ok::<_, mlua::Error>(yazi_binding::Layer::from(me.layer())))
-				}
+				b"input" => reuse!(input, super::Input::make(&me.input)),
 				b"which" => reuse!(which, super::Which::make(&me.which)),
+				b"layer" => reuse!(layer, Ok::<_, mlua::Error>(me.layer())),
 				_ => Value::Nil,
 			})
 		});
diff --git a/yazi-actor/src/lives/file.rs b/yazi-actor/src/lives/file.rs
index 3f259675..adca9c5f 100644
--- a/yazi-actor/src/lives/file.rs
+++ b/yazi-actor/src/lives/file.rs
@@ -1,37 +1,27 @@
 use std::{ops::Deref, ptr};
 
-use mlua::{AnyUserData, IntoLua, UserData, UserDataFields, UserDataMethods, Value};
-use yazi_binding::{Range, Style, cached_field};
+use mlua::{AnyUserData, IntoLua, UserData, UserDataFields, UserDataMethods};
+use yazi_binding::{Range, style::Style};
 use yazi_config::THEME;
 use yazi_shared::{path::AsPath, url::UrlLike};
 
-use super::Lives;
-use crate::lives::PtrCell;
+use super::{FILE_CACHE, Lives};
+use crate::lives::{CoreRef, PtrCell};
 
 pub(super) struct File {
 	idx:    usize,
 	folder: PtrCell<yazi_core::tab::Folder>,
 	tab:    PtrCell<yazi_core::tab::Tab>,
-
-	v_cha:     Option<Value>,
-	v_url:     Option<Value>,
-	v_link_to: Option<Value>,
-
-	v_name:  Option<Value>,
-	v_path:  Option<Value>,
-	v_cache: Option<Value>,
-
-	v_bare: Option<Value>,
 }
 
 impl Deref for File {
-	type Target = yazi_fs::File;
+	type Target = yazi_fs::file::File;
 
 	fn deref(&self) -> &Self::Target { &self.folder.files[self.idx] }
 }
 
-impl AsRef<yazi_fs::File> for File {
-	fn as_ref(&self) -> &yazi_fs::File { self }
+impl AsRef<yazi_fs::file::File> for File {
+	fn as_ref(&self) -> &yazi_fs::file::File { self }
 }
 
 impl File {
@@ -42,24 +32,10 @@ impl File {
 	) -> mlua::Result<AnyUserData> {
 		use hashbrown::hash_map::Entry;
 
-		Ok(match super::FILE_CACHE.borrow_mut().entry(PtrCell(&folder.files[idx])) {
+		Ok(match unsafe { (*FILE_CACHE.get()).assume_init_mut() }.entry(PtrCell(&folder.files[idx])) {
 			Entry::Occupied(oe) => oe.into_mut().clone(),
 			Entry::Vacant(ve) => {
-				let ud = Lives::scoped_userdata(Self {
-					idx,
-					folder: folder.into(),
-					tab: tab.into(),
-
-					v_cha: None,
-					v_url: None,
-					v_link_to: None,
-
-					v_name: None,
-					v_path: None,
-					v_cache: None,
-
-					v_bare: None,
-				})?;
+				let ud = Lives::scoped_userdata(Self { idx, folder: folder.into(), tab: tab.into() })?;
 				ve.insert(ud.clone());
 				ud
 			}
@@ -73,7 +49,7 @@ impl File {
 impl UserData for File {
 	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
 		yazi_binding::impl_file_fields!(fields);
-		cached_field!(fields, bare, |_, me| Ok(yazi_binding::File::new(&**me)));
+		fields.add_cached_field("bare", |_, me| Ok(yazi_fs::file::File::from(&**me)));
 
 		fields.add_field_method_get("idx", |_, me| Ok(me.idx + 1));
 		fields.add_field_method_get("is_hovered", |_, me| Ok(me.is_hovered()));
@@ -87,17 +63,15 @@ impl UserData for File {
 		yazi_binding::impl_file_methods!(methods);
 
 		methods.add_method("icon", |_, me, ()| {
-			use yazi_binding::Icon;
 			// TODO: use a cache
-			Ok(yazi_config::THEME.icon.matches(me, me.is_hovered()).map(Icon::from))
+			Ok(yazi_config::THEME.icon.matches(me, me.is_hovered()))
 		});
 		methods.add_method("size", |_, me, ()| {
 			Ok(if me.is_dir() { me.folder.files.sizes.get(&me.urn()).copied() } else { Some(me.len) })
 		});
 		methods.add_method("mime", |lua, me, ()| {
-			lua.named_registry_value::<AnyUserData>("cx")?.borrow_scoped(|core: &yazi_core::Core| {
-				core.mgr.mimetype.get(&me.url).map(|s| lua.create_string(s)).transpose()
-			})?
+			let core: CoreRef = lua.named_registry_value("cx")?;
+			core.mgr.mimetype.get(&me.url).map(|s| lua.create_string(s)).transpose()
 		});
 		methods.add_method("prefix", |lua, me, ()| {
 			if !me.url.has_trail() {
@@ -109,20 +83,18 @@ impl UserData for File {
 			Some(lua.create_string(comp.as_path().encoded_bytes())).transpose()
 		});
 		methods.add_method("style", |lua, me, ()| {
-			lua.named_registry_value::<AnyUserData>("cx")?.borrow_scoped(|core: &yazi_core::Core| {
-				let mime = core.mgr.mimetype.get(&me.url).unwrap_or_default();
-				THEME.filetype.match_style(me, mime).map(Style::from)
-			})
+			let core: CoreRef = lua.named_registry_value("cx")?;
+			let mime = core.mgr.mimetype.get(&me.url).unwrap_or_default();
+			Ok(THEME.filetype.match_style(me, mime).map(Style::from))
 		});
 		methods.add_method("is_yanked", |lua, me, ()| {
-			lua.named_registry_value::<AnyUserData>("cx")?.borrow_scoped(|core: &yazi_core::Core| {
-				if !core.mgr.yanked.contains(&me.url) {
-					0u8
-				} else if core.mgr.yanked.cut {
-					2u8
-				} else {
-					1u8
-				}
+			let core: CoreRef = lua.named_registry_value("cx")?;
+			Ok(if !core.mgr.yanked.contains(&me.url) {
+				0u8
+			} else if core.mgr.yanked.cut {
+				2u8
+			} else {
+				1u8
 			})
 		});
 		methods.add_method("is_marked", |_, me, ()| {
@@ -139,31 +111,30 @@ impl UserData for File {
 		});
 		methods.add_method("is_selected", |_, me, ()| Ok(me.tab.selected.contains(&me.url)));
 		methods.add_method("found", |lua, me, ()| {
-			lua.named_registry_value::<AnyUserData>("cx")?.borrow_scoped(|core: &yazi_core::Core| {
-				let Some(finder) = &core.active().finder else {
-					return Ok(None);
-				};
+			let core: CoreRef = lua.named_registry_value("cx")?;
+			let Some(finder) = &core.active().finder else {
+				return Ok(None);
+			};
 
-				let Some(idx) = finder.matched_idx(&me.folder, me.urn()) else {
-					return Ok(None);
-				};
+			let Some(idx) = finder.matched_idx(&me.folder, me.urn()) else {
+				return Ok(None);
+			};
 
-				Some(lua.create_sequence_from([idx.into_lua(lua)?, finder.matched.len().into_lua(lua)?]))
-					.transpose()
-			})
+			lua.create_sequence_from([idx.into_lua(lua)?, finder.matched.len().into_lua(lua)?]).map(Some)
 		});
 		methods.add_method("highlights", |lua, me, ()| {
-			lua.named_registry_value::<AnyUserData>("cx")?.borrow_scoped(|core: &yazi_core::Core| {
-				let Some(finder) = &core.active().finder else {
-					return None;
-				};
-				if me.folder.url != me.tab.current.url {
-					return None;
-				}
+			let core: CoreRef = lua.named_registry_value("cx")?;
+			let Some(finder) = &core.active().finder else {
+				return Ok(None);
+			};
+			if me.folder.url != me.tab.current.url {
+				return Ok(None);
+			}
+			let Some(Some(h)) = me.url.name().map(|s| finder.filter.highlighted(s)) else {
+				return Ok(None);
+			};
 
-				let h = finder.filter.highlighted(me.url.name()?)?;
-				Some(h.into_iter().map(Range::from).collect::<Vec<_>>())
-			})
+			lua.create_sequence_from(h.into_iter().map(Range::from)).map(Some)
 		});
 	}
 }
diff --git a/yazi-actor/src/lives/files.rs b/yazi-actor/src/lives/files.rs
index 884f03dc..e67998ae 100644
--- a/yazi-actor/src/lives/files.rs
+++ b/yazi-actor/src/lives/files.rs
@@ -1,7 +1,7 @@
 use std::ops::{Deref, Range};
 
-use mlua::{AnyUserData, MetaMethod, UserData, UserDataFields, UserDataMethods, Value};
-use yazi_binding::cached_field;
+use mlua::{AnyUserData, MetaMethod, UserData, UserDataFields, UserDataMethods};
+use yazi_shim::mlua::UserDataFieldsExt;
 
 use super::{File, Filter, Lives, PtrCell};
 
@@ -9,8 +9,6 @@ pub(super) struct Files {
 	window: Range<usize>,
 	folder: PtrCell<yazi_core::tab::Folder>,
 	tab:    PtrCell<yazi_core::tab::Tab>,
-
-	v_filter: Option<Value>,
 }
 
 impl Deref for Files {
@@ -25,13 +23,13 @@ impl Files {
 		folder: &yazi_core::tab::Folder,
 		tab: &yazi_core::tab::Tab,
 	) -> mlua::Result<AnyUserData> {
-		Lives::scoped_userdata(Self { window, folder: folder.into(), tab: tab.into(), v_filter: None })
+		Lives::scoped_userdata(Self { window, folder: folder.into(), tab: tab.into() })
 	}
 }
 
 impl UserData for Files {
 	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
-		cached_field!(fields, filter, |_, me| me.filter().map(Filter::make).transpose());
+		fields.add_static_field("filter", |_, me| me.filter().map(Filter::make).transpose());
 	}
 
 	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
diff --git a/yazi-actor/src/lives/folder.rs b/yazi-actor/src/lives/folder.rs
index ab4ed872..e7fa3e38 100644
--- a/yazi-actor/src/lives/folder.rs
+++ b/yazi-actor/src/lives/folder.rs
@@ -1,8 +1,8 @@
 use std::ops::{Deref, Range};
 
-use mlua::{AnyUserData, UserData, UserDataFields, Value};
-use yazi_binding::{FolderStage, Url, cached_field};
+use mlua::{AnyUserData, UserData, UserDataFields};
 use yazi_config::LAYOUT;
+use yazi_shim::mlua::UserDataFieldsExt;
 
 use super::{File, Files, Lives, PtrCell};
 
@@ -10,12 +10,6 @@ pub(super) struct Folder {
 	window: Range<usize>,
 	inner:  PtrCell<yazi_core::tab::Folder>,
 	tab:    PtrCell<yazi_core::tab::Tab>,
-
-	v_cwd:     Option<Value>,
-	v_files:   Option<Value>,
-	v_stage:   Option<Value>,
-	v_window:  Option<Value>,
-	v_hovered: Option<Value>,
 }
 
 impl Deref for Folder {
@@ -38,30 +32,20 @@ impl Folder {
 			}
 		};
 
-		Lives::scoped_userdata(Self {
-			window,
-			inner: inner.into(),
-			tab: tab.into(),
-
-			v_cwd: None,
-			v_files: None,
-			v_stage: None,
-			v_window: None,
-			v_hovered: None,
-		})
+		Lives::scoped_userdata(Self { window, inner: inner.into(), tab: tab.into() })
 	}
 }
 
 impl UserData for Folder {
 	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
-		cached_field!(fields, cwd, |_, me| Ok(Url::new(&me.url)));
-		cached_field!(fields, files, |_, me| Files::make(0..me.files.len(), me, &me.tab));
-		cached_field!(fields, stage, |_, me| Ok(FolderStage::new(me.stage.clone())));
-		cached_field!(fields, window, |_, me| Files::make(me.window.clone(), me, &me.tab));
+		fields.add_cached_field("cwd", |_, me| Ok(me.url.clone()));
+		fields.add_static_field("files", |_, me| Files::make(0..me.files.len(), me, &me.tab));
+		fields.add_cached_field("stage", |_, me| Ok(me.stage.clone()));
+		fields.add_static_field("window", |_, me| Files::make(me.window.clone(), me, &me.tab));
 
 		fields.add_field_method_get("offset", |_, me| Ok(me.offset));
 		fields.add_field_method_get("cursor", |_, me| Ok(me.cursor));
-		cached_field!(fields, hovered, |_, me| {
+		fields.add_static_field("hovered", |_, me| {
 			me.hovered().map(|_| File::make(me.cursor, me, &me.tab)).transpose()
 		});
 	}
diff --git a/yazi-actor/src/lives/input.rs b/yazi-actor/src/lives/input.rs
new file mode 100644
index 00000000..6bb6f555
--- /dev/null
+++ b/yazi-actor/src/lives/input.rs
@@ -0,0 +1,29 @@
+use std::ops::Deref;
+
+use mlua::{AnyUserData, UserData, UserDataFields};
+use yazi_shim::mlua::UserDataFieldsExt;
+
+use super::{Lives, PtrCell};
+use crate::lives::InputAlt;
+
+pub(super) struct Input {
+	inner: PtrCell<yazi_core::input::Input>,
+}
+
+impl Deref for Input {
+	type Target = yazi_core::input::Input;
+
+	fn deref(&self) -> &Self::Target { &self.inner }
+}
+
+impl Input {
+	pub(super) fn make(inner: &yazi_core::input::Input) -> mlua::Result<AnyUserData> {
+		Lives::scoped_userdata(Self { inner: inner.into() })
+	}
+}
+
+impl UserData for Input {
+	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
+		fields.add_cached_field("alt", |_, me| me.alt.as_ref().map(InputAlt::make).transpose());
+	}
+}
diff --git a/yazi-actor/src/lives/input_alt.rs b/yazi-actor/src/lives/input_alt.rs
new file mode 100644
index 00000000..92c24208
--- /dev/null
+++ b/yazi-actor/src/lives/input_alt.rs
@@ -0,0 +1,26 @@
+use std::ops::Deref;
+
+use mlua::{AnyUserData, UserData, UserDataFields};
+use yazi_shim::mlua::UserDataFieldsExt;
+
+use super::{Lives, PtrCell};
+
+pub(super) struct InputAlt(PtrCell<yazi_core::input::InputAlt>);
+
+impl Deref for InputAlt {
+	type Target = yazi_core::input::InputAlt;
+
+	fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+impl InputAlt {
+	pub(super) fn make(inner: &yazi_core::input::InputAlt) -> mlua::Result<AnyUserData> {
+		Lives::scoped_userdata(Self(inner.into()))
+	}
+}
+
+impl UserData for InputAlt {
+	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
+		fields.add_cached_field("value", |lua, me| lua.create_string(me.lock().value()));
+	}
+}
diff --git a/yazi-actor/src/lives/lives.rs b/yazi-actor/src/lives/lives.rs
index 1b969cd4..64b8046f 100644
--- a/yazi-actor/src/lives/lives.rs
+++ b/yazi-actor/src/lives/lives.rs
@@ -1,39 +1,38 @@
-use std::cell::RefCell;
+use std::mem::MaybeUninit;
 
 use hashbrown::HashMap;
 use mlua::{AnyUserData, UserData};
 use scopeguard::defer;
 use tracing::error;
 use yazi_plugin::LUA;
-use yazi_shim::cell::RoCell;
 
 use super::{Core, PtrCell};
+use crate::lives::MutCell;
 
-static TO_DESTROY: RoCell<RefCell<Vec<AnyUserData>>> = RoCell::new_const(RefCell::new(Vec::new()));
-pub(super) static FILE_CACHE: RoCell<RefCell<HashMap<PtrCell<yazi_fs::File>, AnyUserData>>> =
-	RoCell::new();
+pub(super) static TO_DESTROY: MutCell<Vec<AnyUserData>> = MutCell::new(Vec::new());
+pub(super) static FILE_CACHE: MutCell<
+	MaybeUninit<HashMap<PtrCell<yazi_fs::file::File>, AnyUserData>>,
+> = MutCell::new(MaybeUninit::uninit());
 
 pub struct Lives;
 
 impl Lives {
-	pub fn scope<T, F>(core: &yazi_core::Core, f: F) -> mlua::Result<T>
+	pub fn scope<T, F>(core: &mut yazi_core::Core, f: F) -> mlua::Result<T>
 	where
-		F: FnOnce() -> mlua::Result<T>,
+		F: FnOnce(&mut yazi_core::Core) -> mlua::Result<T>,
 	{
-		FILE_CACHE.init(Default::default());
-		defer! { FILE_CACHE.drop(); }
-
-		let result = LUA.scope(|scope| {
-			scope.add_destructor(|| {
-				for ud in TO_DESTROY.borrow_mut().drain(..) {
+		defer! {
+			unsafe {
+				(*FILE_CACHE.get()).assume_init_mut().clear();
+				for ud in (*TO_DESTROY.get()).drain(..) {
 					ud.destroy().expect("failed to destruct scoped userdata");
 				}
-			});
+			}
+		}
 
-			LUA.set_named_registry_value("cx", scope.create_any_userdata_ref(core)?)?;
-			LUA.globals().raw_set("cx", Core::make(core)?)?;
-			f()
-		});
+		LUA.set_named_registry_value("cx", Core::make(core)?)?;
+		LUA.globals().raw_set("cx", Core::make(core)?)?;
+		let result = f(core);
 
 		if let Err(ref e) = result {
 			error!("{e}");
@@ -46,7 +45,7 @@ impl Lives {
 		T: UserData + 'static,
 	{
 		let ud = LUA.create_userdata(data)?;
-		TO_DESTROY.borrow_mut().push(ud.clone());
+		unsafe { &mut *TO_DESTROY.get() }.push(ud.clone());
 		Ok(ud)
 	}
 }
diff --git a/yazi-actor/src/lives/mod.rs b/yazi-actor/src/lives/mod.rs
index d6c82311..ea093ddb 100644
--- a/yazi-actor/src/lives/mod.rs
+++ b/yazi-actor/src/lives/mod.rs
@@ -1 +1,5 @@
-yazi_macro::mod_flat!(core file files filter finder folder lives mode preference preview ptr selected tab tabs task tasks which yanked);
+yazi_macro::mod_flat!(behavior core file files filter finder folder input input_alt lives mode mut_cell preference preview ptr selected tab tabs task tasks which yanked);
+
+pub(super) fn init() {
+	unsafe { FILE_CACHE.get().write(std::mem::MaybeUninit::new(<_>::default())) };
+}
diff --git a/yazi-actor/src/lives/mut_cell.rs b/yazi-actor/src/lives/mut_cell.rs
new file mode 100644
index 00000000..25b27c8d
--- /dev/null
+++ b/yazi-actor/src/lives/mut_cell.rs
@@ -0,0 +1,11 @@
+use std::cell::UnsafeCell;
+
+pub(super) struct MutCell<T>(UnsafeCell<T>);
+
+unsafe impl<T> Sync for MutCell<T> {}
+
+impl<T> MutCell<T> {
+	pub(super) const fn new(value: T) -> Self { Self(UnsafeCell::new(value)) }
+
+	pub(super) fn get(&self) -> *mut T { self.0.get() }
+}
diff --git a/yazi-actor/src/lives/preference.rs b/yazi-actor/src/lives/preference.rs
index 011a8c64..db772993 100644
--- a/yazi-actor/src/lives/preference.rs
+++ b/yazi-actor/src/lives/preference.rs
@@ -1,18 +1,12 @@
 use std::ops::Deref;
 
-use mlua::{AnyUserData, UserData, UserDataFields, Value};
-use yazi_binding::cached_field;
-use yazi_shim::strum::IntoStr;
+use mlua::{AnyUserData, UserData, UserDataFields};
+use yazi_shim::{mlua::UserDataFieldsExt, strum::IntoStr};
 
 use super::{Lives, PtrCell};
 
 pub(super) struct Preference {
 	inner: PtrCell<yazi_core::tab::Preference>,
-
-	v_name:     Option<Value>,
-	v_linemode: Option<Value>,
-
-	v_sort_by: Option<Value>,
 }
 
 impl Deref for Preference {
@@ -23,26 +17,19 @@ impl Deref for Preference {
 
 impl Preference {
 	pub(super) fn make(inner: &yazi_core::tab::Preference) -> mlua::Result<AnyUserData> {
-		Lives::scoped_userdata(Self {
-			inner: inner.into(),
-
-			v_name:     None,
-			v_linemode: None,
-
-			v_sort_by: None,
-		})
+		Lives::scoped_userdata(Self { inner: inner.into() })
 	}
 }
 
 impl UserData for Preference {
 	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
 		// Display
-		cached_field!(fields, name, |lua, me| lua.create_string(&me.name));
-		cached_field!(fields, linemode, |lua, me| lua.create_string(&*me.linemode));
+		fields.add_cached_field("name", |lua, me| lua.create_string(&me.name));
+		fields.add_cached_field("linemode", |lua, me| lua.create_string(&*me.linemode));
 		fields.add_field_method_get("show_hidden", |_, me| Ok(me.show_hidden));
 
 		// Sorting
-		cached_field!(fields, sort_by, |_, me| Ok(me.sort_by.into_str()));
+		fields.add_cached_field("sort_by", |_, me| Ok(me.sort_by.into_str()));
 		fields.add_field_method_get("sort_sensitive", |_, me| Ok(me.sort_sensitive));
 		fields.add_field_method_get("sort_reverse", |_, me| Ok(me.sort_reverse));
 		fields.add_field_method_get("sort_dir_first", |_, me| Ok(me.sort_dir_first));
diff --git a/yazi-actor/src/lives/preview.rs b/yazi-actor/src/lives/preview.rs
index 5390f48d..3cb58345 100644
--- a/yazi-actor/src/lives/preview.rs
+++ b/yazi-actor/src/lives/preview.rs
@@ -1,15 +1,13 @@
 use std::ops::Deref;
 
-use mlua::{AnyUserData, UserData, UserDataFields, Value};
-use yazi_binding::cached_field;
+use mlua::{AnyUserData, UserData, UserDataFields};
 use yazi_config::LAYOUT;
+use yazi_shim::mlua::UserDataFieldsExt;
 
 use super::{Folder, Lives, PtrCell};
 
 pub(super) struct Preview {
 	tab: PtrCell<yazi_core::tab::Tab>,
-
-	v_folder: Option<Value>,
 }
 
 impl Deref for Preview {
@@ -22,17 +20,16 @@ impl Deref for Preview {
 
 impl Preview {
 	pub(super) fn make(tab: &yazi_core::tab::Tab) -> mlua::Result<AnyUserData> {
-		Lives::scoped_userdata(Self { tab: tab.into(), v_folder: None })
+		Lives::scoped_userdata(Self { tab: tab.into() })
 	}
 }
 
 impl UserData for Preview {
 	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
 		fields.add_field_method_get("skip", |_, me| Ok(me.skip));
-		// TODO: Make sure we need this ?
 		fields.add_field_method_get("search_idx", |_, me| Ok(me.search_idx));
 
-		cached_field!(fields, folder, |_, me| {
+		fields.add_static_field("folder", |_, me| {
 			me.tab
 				.hovered_folder()
 				.map(|f| {
diff --git a/yazi-actor/src/lives/selected.rs b/yazi-actor/src/lives/selected.rs
index 2956dd37..68694257 100644
--- a/yazi-actor/src/lives/selected.rs
+++ b/yazi-actor/src/lives/selected.rs
@@ -1,4 +1,5 @@
 use mlua::AnyUserData;
+use yazi_shared::url::UrlBuf;
 
 use super::Lives;
 use crate::lives::PtrCell;
@@ -11,7 +12,7 @@ impl Selected {
 		let inner = PtrCell::from(inner);
 
 		Lives::scoped_userdata(yazi_binding::Iter::new(
-			inner.as_static().values().map(yazi_binding::Url::new),
+			inner.as_static().values().map(UrlBuf::from),
 			Some(inner.len()),
 		))
 	}
diff --git a/yazi-actor/src/lives/tab.rs b/yazi-actor/src/lives/tab.rs
index 69d5abb0..af7e8ba8 100644
--- a/yazi-actor/src/lives/tab.rs
+++ b/yazi-actor/src/lives/tab.rs
@@ -1,21 +1,13 @@
 use std::{borrow::Cow, ops::Deref};
 
-use mlua::{AnyUserData, UserData, UserDataFields, UserDataMethods, Value};
-use yazi_binding::{Id, UrlRef, cached_field};
+use mlua::{AnyUserData, UserData, UserDataFields, UserDataMethods};
+use yazi_shared::url::UrlRef;
+use yazi_shim::mlua::UserDataFieldsExt;
 
 use super::{Finder, Folder, Lives, Mode, Preference, Preview, PtrCell, Selected};
 
 pub(super) struct Tab {
 	inner: PtrCell<yazi_core::tab::Tab>,
-
-	v_name:     Option<Value>,
-	v_mode:     Option<Value>,
-	v_pref:     Option<Value>,
-	v_current:  Option<Value>,
-	v_parent:   Option<Value>,
-	v_selected: Option<Value>,
-	v_preview:  Option<Value>,
-	v_finder:   Option<Value>,
 }
 
 impl Deref for Tab {
@@ -26,42 +18,29 @@ impl Deref for Tab {
 
 impl Tab {
 	pub(super) fn make(inner: &yazi_core::tab::Tab) -> mlua::Result<AnyUserData> {
-		Lives::scoped_userdata(Self {
-			inner: inner.into(),
-
-			v_name:     None,
-			v_mode:     None,
-			v_pref:     None,
-			v_current:  None,
-			v_parent:   None,
-			v_selected: None,
-			v_preview:  None,
-			v_finder:   None,
-		})
+		Lives::scoped_userdata(Self { inner: inner.into() })
 	}
 }
 
 impl UserData for Tab {
 	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
-		fields.add_field_method_get("id", |_, me| Ok(Id(me.id)));
-		cached_field!(fields, name, |lua, me| {
-			match me.name() {
-				Cow::Borrowed(s) => lua.create_string(s),
-				Cow::Owned(s) => lua.create_external_string(s),
-			}
+		fields.add_field_method_get("id", |_, me| Ok(me.id));
+		fields.add_cached_field("name", |lua, me| match me.name() {
+			Cow::Borrowed(s) => lua.create_string(s),
+			Cow::Owned(s) => lua.create_external_string(s),
 		});
 
-		cached_field!(fields, mode, |_, me| Mode::make(&me.mode));
-		cached_field!(fields, pref, |_, me| Preference::make(&me.pref));
-		cached_field!(fields, current, |_, me| Folder::make(None, &me.current, me));
-		cached_field!(fields, parent, |_, me| {
+		fields.add_static_field("mode", |_, me| Mode::make(&me.mode));
+		fields.add_static_field("pref", |_, me| Preference::make(&me.pref));
+		fields.add_static_field("current", |_, me| Folder::make(None, &me.current, me));
+		fields.add_static_field("parent", |_, me| {
 			me.parent.as_ref().map(|f| Folder::make(None, f, me)).transpose()
 		});
 
-		cached_field!(fields, selected, |_, me| Selected::make(&me.selected));
+		fields.add_static_field("selected", |_, me| Selected::make(&me.selected));
 
-		cached_field!(fields, preview, |_, me| Preview::make(me));
-		cached_field!(fields, finder, |_, me| me.finder.as_ref().map(Finder::make).transpose());
+		fields.add_static_field("preview", |_, me| Preview::make(me));
+		fields.add_static_field("finder", |_, me| me.finder.as_ref().map(Finder::make).transpose());
 	}
 
 	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
diff --git a/yazi-actor/src/lives/task.rs b/yazi-actor/src/lives/task.rs
index 7deaae8e..964a2f63 100644
--- a/yazi-actor/src/lives/task.rs
+++ b/yazi-actor/src/lives/task.rs
@@ -1,16 +1,13 @@
 use std::ops::Deref;
 
-use mlua::{AnyUserData, LuaSerdeExt, UserData, UserDataFields, Value};
-use yazi_binding::{SER_OPT, cached_field};
+use mlua::{AnyUserData, LuaSerdeExt, UserData, UserDataFields};
 use yazi_scheduler::Progress;
+use yazi_shim::mlua::{SER_OPT, UserDataFieldsExt};
 
 use super::{Lives, PtrCell};
 
 pub(super) struct TaskSnap {
 	inner: PtrCell<yazi_scheduler::TaskSnap>,
-
-	v_title: Option<Value>,
-	v_prog:  Option<Value>,
 }
 
 impl Deref for TaskSnap {
@@ -21,14 +18,14 @@ impl Deref for TaskSnap {
 
 impl TaskSnap {
 	pub(super) fn make(inner: &yazi_scheduler::TaskSnap) -> mlua::Result<AnyUserData> {
-		Lives::scoped_userdata(Self { inner: inner.into(), v_title: None, v_prog: None })
+		Lives::scoped_userdata(Self { inner: inner.into() })
 	}
 }
 
 impl UserData for TaskSnap {
 	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
-		cached_field!(fields, title, |lua, me| lua.create_string(&me.title));
-		cached_field!(fields, prog, |lua, me| lua.to_value_with(&me.prog, SER_OPT));
+		fields.add_cached_field("title", |lua, me| lua.create_string(&me.title));
+		fields.add_cached_field("prog", |lua, me| lua.to_value_with(&me.prog, SER_OPT));
 
 		fields.add_field_method_get("running", |_, me| Ok(me.prog.running()));
 		fields.add_field_method_get("cooked", |_, me| Ok(me.prog.cooked()));
diff --git a/yazi-actor/src/lives/tasks.rs b/yazi-actor/src/lives/tasks.rs
index e547c138..b00cf715 100644
--- a/yazi-actor/src/lives/tasks.rs
+++ b/yazi-actor/src/lives/tasks.rs
@@ -1,16 +1,13 @@
 use std::ops::Deref;
 
-use mlua::{AnyUserData, LuaSerdeExt, UserData, UserDataFields, Value};
-use yazi_binding::{SER_OPT, cached_field};
+use mlua::{AnyUserData, LuaSerdeExt, UserData, UserDataFields};
+use yazi_shim::mlua::{SER_OPT, UserDataFieldsExt};
 
 use super::{Lives, PtrCell};
-use crate::lives::TaskSnap;
+use crate::lives::{Behavior, TaskSnap};
 
 pub(super) struct Tasks {
 	inner: PtrCell<yazi_core::tasks::Tasks>,
-
-	v_snaps:   Option<Value>,
-	v_summary: Option<Value>,
 }
 
 impl Deref for Tasks {
@@ -21,12 +18,7 @@ impl Deref for Tasks {
 
 impl Tasks {
 	pub(super) fn make(inner: &yazi_core::tasks::Tasks) -> mlua::Result<AnyUserData> {
-		Lives::scoped_userdata(Self {
-			inner: inner.into(),
-
-			v_snaps:   None,
-			v_summary: None,
-		})
+		Lives::scoped_userdata(Self { inner: inner.into() })
 	}
 }
 
@@ -34,7 +26,9 @@ impl UserData for Tasks {
 	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
 		fields.add_field_method_get("cursor", |_, me| Ok(me.cursor));
 
-		cached_field!(fields, snaps, |lua, me| {
+		fields.add_static_field("behavior", |_, me| Behavior::make(&me.scheduler.behavior));
+
+		fields.add_static_field("snaps", |lua, me| {
 			let tbl = lua.create_table_with_capacity(me.snaps.len(), 0)?;
 			for snap in &me.snaps {
 				tbl.raw_push(TaskSnap::make(snap)?)?;
@@ -42,6 +36,6 @@ impl UserData for Tasks {
 			Ok(tbl)
 		});
 
-		cached_field!(fields, summary, |lua, me| lua.to_value_with(&me.summary, SER_OPT));
+		fields.add_cached_field("summary", |lua, me| lua.to_value_with(&me.summary, SER_OPT));
 	}
 }
diff --git a/yazi-actor/src/lives/which.rs b/yazi-actor/src/lives/which.rs
index 66016cfd..3e80cb7f 100644
--- a/yazi-actor/src/lives/which.rs
+++ b/yazi-actor/src/lives/which.rs
@@ -1,15 +1,12 @@
 use std::ops::Deref;
 
-use mlua::{AnyUserData, UserData, UserDataFields, Value};
-use yazi_binding::cached_field;
+use mlua::{AnyUserData, UserData, UserDataFields};
+use yazi_shim::mlua::UserDataFieldsExt;
 
 use super::{Lives, PtrCell};
 
 pub(super) struct Which {
 	inner: PtrCell<yazi_core::which::Which>,
-
-	v_tx:    Option<Value>,
-	v_cands: Option<Value>,
 }
 
 impl Deref for Which {
@@ -20,16 +17,16 @@ impl Deref for Which {
 
 impl Which {
 	pub(super) fn make(inner: &yazi_core::which::Which) -> mlua::Result<AnyUserData> {
-		Lives::scoped_userdata(Self { inner: inner.into(), v_tx: None, v_cands: None })
+		Lives::scoped_userdata(Self { inner: inner.into() })
 	}
 }
 
 impl UserData for Which {
 	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
-		cached_field!(fields, tx, |_, me| Ok(me.tx.clone().map(yazi_binding::MpscUnboundedTx)));
+		fields.add_cached_field("tx", |_, me| Ok(me.tx.clone().map(yazi_binding::MpscUnboundedTx)));
 		fields.add_field_method_get("times", |_, me| Ok(me.inner.times));
-		cached_field!(fields, cands, |lua, me| {
-			lua.create_sequence_from(me.inner.cands.iter().cloned().map(yazi_binding::ChordCow))
+		fields.add_cached_field("cands", |lua, me| {
+			lua.create_sequence_from(me.inner.cands.iter().cloned())
 		});
 
 		fields.add_field_method_get("active", |_, me| Ok(me.inner.active));
diff --git a/yazi-actor/src/lives/yanked.rs b/yazi-actor/src/lives/yanked.rs
index d5b9ee92..1f30826c 100644
--- a/yazi-actor/src/lives/yanked.rs
+++ b/yazi-actor/src/lives/yanked.rs
@@ -1,7 +1,9 @@
 use std::ops::Deref;
 
 use mlua::{AnyUserData, MetaMethod, MultiValue, ObjectLike, UserData, UserDataFields, UserDataMethods};
-use yazi_binding::{Iter, get_metatable};
+use yazi_binding::Iter;
+use yazi_shared::url::UrlBuf;
+use yazi_shim::mlua::get_metatable;
 
 use super::{Lives, PtrCell};
 
@@ -23,7 +25,7 @@ impl Yanked {
 		Lives::scoped_userdata(Self {
 			inner,
 			iter: Lives::scoped_userdata(Iter::new(
-				inner.as_static().iter().map(yazi_binding::Url::new),
+				inner.as_static().iter().map(UrlBuf::from),
 				Some(inner.len()),
 			))?,
 		})
diff --git a/yazi-actor/src/mgr/bulk_create.rs b/yazi-actor/src/mgr/bulk_create.rs
index 1b6defa0..e96f59c3 100644
--- a/yazi-actor/src/mgr/bulk_create.rs
+++ b/yazi-actor/src/mgr/bulk_create.rs
@@ -1,18 +1,18 @@
-use std::{fmt::{self, Display}, io::{self, Read, Write}, path::{MAIN_SEPARATOR, Path}, sync::Arc};
+use std::{fmt::{self, Display}, io::{self, Read, Write}, path::{MAIN_SEPARATOR, Path}};
 
 use anyhow::{Result, anyhow};
 use scopeguard::defer;
 use yazi_binding::Permit;
-use yazi_config::{YAZI, opener::OpenerRule};
-use yazi_fs::{File, FilesOp, Splatter, provider::{Provider, local::Local}};
+use yazi_config::{YAZI, opener::OpenerRuleArc};
+use yazi_fs::{FilesOp, Splatter, file::File, provider::{Provider, local::Local}};
 use yazi_macro::{succ, writef};
 use yazi_parser::VoidForm;
 use yazi_proxy::TasksProxy;
 use yazi_scheduler::{AppProxy, NotifyProxy};
 use yazi_shared::{data::Data, strand::Strand, url::{AsUrl, UrlBuf, UrlCow, UrlLike}};
 use yazi_shim::path::CROSS_SEPARATOR;
-use yazi_term::{YIELD_TO_SUBPROCESS, sequence::EraseScreen};
-use yazi_tty::TTY;
+use yazi_term::YIELD_TO_SUBPROCESS;
+use yazi_tty::{TTY, sequence::EraseScreen};
 use yazi_vfs::{VfsFile, provider};
 use yazi_watcher::WATCHER;
 
@@ -106,7 +106,7 @@ impl BulkCreate {
 		Ok(())
 	}
 
-	fn opener() -> Option<Arc<OpenerRule>> {
+	fn opener() -> Option<OpenerRuleArc> {
 		YAZI
 			.open
 			.match_dummy(Path::new("bulk-create.txt"), "text/plain")
diff --git a/yazi-actor/src/mgr/bulk_rename.rs b/yazi-actor/src/mgr/bulk_rename.rs
index b472aa44..0bd71e9b 100644
--- a/yazi-actor/src/mgr/bulk_rename.rs
+++ b/yazi-actor/src/mgr/bulk_rename.rs
@@ -1,20 +1,20 @@
-use std::{hash::Hash, io::{Read, Write}, ops::Deref, path::Path, sync::Arc};
+use std::{hash::Hash, io::{Read, Write}, ops::Deref, path::Path};
 
 use anyhow::{Result, anyhow};
 use hashbrown::HashMap;
 use scopeguard::defer;
 use tokio::io::AsyncWriteExt;
 use yazi_binding::Permit;
-use yazi_config::{YAZI, opener::OpenerRule};
+use yazi_config::{YAZI, opener::OpenerRuleArc};
 use yazi_dds::Pubsub;
-use yazi_fs::{File, FilesOp, Splatter, max_common_root, path::skip_url, provider::{FileBuilder, Provider, local::{Gate, Local}}};
+use yazi_fs::{FilesOp, Splatter, file::File, max_common_root, path::skip_url, provider::{FileBuilder, Provider, local::{Gate, Local}}};
 use yazi_macro::{err, succ, writef};
 use yazi_parser::VoidForm;
 use yazi_proxy::TasksProxy;
 use yazi_scheduler::{AppProxy, NotifyProxy};
 use yazi_shared::{data::Data, path::PathDyn, strand::{AsStrand, AsStrandJoin, Strand, StrandBuf, StrandLike}, url::{AsUrl, UrlBuf, UrlCow, UrlLike}};
-use yazi_term::{YIELD_TO_SUBPROCESS, sequence::EraseScreen};
-use yazi_tty::TTY;
+use yazi_term::YIELD_TO_SUBPROCESS;
+use yazi_tty::{TTY, sequence::EraseScreen};
 use yazi_vfs::{VfsFile, maybe_exists, provider};
 use yazi_watcher::WATCHER;
 
@@ -152,7 +152,7 @@ impl BulkRename {
 		Ok(())
 	}
 
-	fn opener() -> Option<Arc<OpenerRule>> {
+	fn opener() -> Option<OpenerRuleArc> {
 		YAZI
 			.open
 			.match_dummy(Path::new("bulk-rename.txt"), "text/plain")
diff --git a/yazi-actor/src/mgr/cd.rs b/yazi-actor/src/mgr/cd.rs
index 7192af9b..11da268d 100644
--- a/yazi-actor/src/mgr/cd.rs
+++ b/yazi-actor/src/mgr/cd.rs
@@ -3,10 +3,10 @@ use std::{mem, time::Duration};
 use anyhow::Result;
 use tokio::pin;
 use tokio_stream::{StreamExt, wrappers::UnboundedReceiverStream};
-use yazi_config::popup::InputCfg;
+use yazi_config::YAZI;
 use yazi_core::mgr::CdSource;
 use yazi_dds::Pubsub;
-use yazi_fs::{File, FilesOp, path::{clean_url, expand_url}};
+use yazi_fs::{FilesOp, file::File, path::{clean_url, expand_url}};
 use yazi_macro::{act, err, input, render, succ};
 use yazi_parser::mgr::CdForm;
 use yazi_proxy::{CmpProxy, MgrProxy};
@@ -63,7 +63,7 @@ impl Actor for Cd {
 
 impl Cd {
 	fn cd_interactive(cx: &mut Ctx) -> Result<Data> {
-		let input = input!(cx, InputCfg::cd(cx.cwd().as_url()))?;
+		let input = input!(cx, YAZI.input.cd(cx.cwd().as_url()))?;
 
 		tokio::spawn(async move {
 			let rx = Debounce::new(UnboundedReceiverStream::new(input), Duration::from_millis(50));
diff --git a/yazi-actor/src/mgr/create.rs b/yazi-actor/src/mgr/create.rs
index f1c7d2f1..08c6b027 100644
--- a/yazi-actor/src/mgr/create.rs
+++ b/yazi-actor/src/mgr/create.rs
@@ -1,6 +1,6 @@
 use anyhow::{Result, bail};
-use yazi_config::popup::{ConfirmCfg, InputCfg};
-use yazi_fs::{File, FilesOp};
+use yazi_config::{YAZI, popup::ConfirmCfg};
+use yazi_fs::{FilesOp, file::File};
 use yazi_macro::{input, ok_or_not_found, succ};
 use yazi_parser::mgr::CreateForm;
 use yazi_proxy::{ConfirmProxy, MgrProxy};
@@ -20,7 +20,7 @@ impl Actor for Create {
 
 	fn act(cx: &mut Ctx, form: Self::Form) -> Result<Data> {
 		let cwd = cx.cwd().to_owned();
-		let mut input = input!(cx, InputCfg::create(form.dir))?;
+		let mut input = input!(cx, YAZI.input.create(form.dir))?;
 
 		tokio::spawn(async move {
 			let Some(InputEvent::Submit(name)) = input.recv().await else { return };
diff --git a/yazi-actor/src/mgr/download.rs b/yazi-actor/src/mgr/download.rs
index 8e9c174e..61b02d8a 100644
--- a/yazi-actor/src/mgr/download.rs
+++ b/yazi-actor/src/mgr/download.rs
@@ -4,7 +4,7 @@ use anyhow::Result;
 use futures::{StreamExt, stream::FuturesUnordered};
 use hashbrown::HashSet;
 use yazi_core::mgr::OpenOpt;
-use yazi_fs::{File, FsScheme, provider::{Provider, local::Local}};
+use yazi_fs::{FsScheme, file::File, provider::{Provider, local::Local}};
 use yazi_macro::succ;
 use yazi_parser::mgr::DownloadForm;
 use yazi_proxy::MgrProxy;
diff --git a/yazi-actor/src/mgr/filter.rs b/yazi-actor/src/mgr/filter.rs
index dd070369..ade4752f 100644
--- a/yazi-actor/src/mgr/filter.rs
+++ b/yazi-actor/src/mgr/filter.rs
@@ -3,7 +3,7 @@ use std::time::Duration;
 use anyhow::Result;
 use tokio::pin;
 use tokio_stream::{StreamExt, wrappers::UnboundedReceiverStream};
-use yazi_config::popup::InputCfg;
+use yazi_config::YAZI;
 use yazi_core::mgr::FilterOpt;
 use yazi_macro::{input, succ};
 use yazi_parser::mgr::FilterForm;
@@ -21,7 +21,7 @@ impl Actor for Filter {
 	const NAME: &str = "filter";
 
 	fn act(cx: &mut Ctx, Self::Form { opt }: Self::Form) -> Result<Data> {
-		let input = input!(cx, InputCfg::filter())?;
+		let input = input!(cx, YAZI.input.filter())?;
 
 		tokio::spawn(async move {
 			let rx = Debounce::new(UnboundedReceiverStream::new(input), Duration::from_millis(50));
diff --git a/yazi-actor/src/mgr/find.rs b/yazi-actor/src/mgr/find.rs
index 8d1bcaf9..262df048 100644
--- a/yazi-actor/src/mgr/find.rs
+++ b/yazi-actor/src/mgr/find.rs
@@ -3,7 +3,7 @@ use std::time::Duration;
 use anyhow::Result;
 use tokio::pin;
 use tokio_stream::{StreamExt, wrappers::UnboundedReceiverStream};
-use yazi_config::popup::InputCfg;
+use yazi_config::YAZI;
 use yazi_core::mgr::FindDoOpt;
 use yazi_macro::{input, succ};
 use yazi_parser::mgr::FindForm;
@@ -21,7 +21,7 @@ impl Actor for Find {
 	const NAME: &str = "find";
 
 	fn act(cx: &mut Ctx, form: Self::Form) -> Result<Data> {
-		let input = input!(cx, InputCfg::find(form.prev))?;
+		let input = input!(cx, YAZI.input.find(form.prev))?;
 
 		tokio::spawn(async move {
 			let rx = Debounce::new(UnboundedReceiverStream::new(input), Duration::from_millis(50));
diff --git a/yazi-actor/src/mgr/open.rs b/yazi-actor/src/mgr/open.rs
index 4a39468c..2d789ed0 100644
--- a/yazi-actor/src/mgr/open.rs
+++ b/yazi-actor/src/mgr/open.rs
@@ -3,7 +3,7 @@ use futures::StreamExt;
 use hashbrown::HashSet;
 use yazi_boot::ARGS;
 use yazi_core::mgr::OpenDoOpt;
-use yazi_fs::File;
+use yazi_fs::file::File;
 use yazi_macro::{act, succ};
 use yazi_parser::mgr::OpenForm;
 use yazi_proxy::MgrProxy;
diff --git a/yazi-actor/src/mgr/open_do.rs b/yazi-actor/src/mgr/open_do.rs
index defae85b..253151fb 100644
--- a/yazi-actor/src/mgr/open_do.rs
+++ b/yazi-actor/src/mgr/open_do.rs
@@ -1,7 +1,8 @@
 use anyhow::Result;
 use hashbrown::HashMap;
 use indexmap::IndexSet;
-use yazi_config::{YAZI, popup::PickCfg};
+use yazi_config::YAZI;
+use yazi_fs::file::File;
 use yazi_macro::succ;
 use yazi_parser::mgr::OpenDoForm;
 use yazi_proxy::{PickProxy, TasksProxy};
@@ -40,7 +41,7 @@ impl Actor for OpenDo {
 			succ!();
 		}
 
-		let pick = PickProxy::show(PickCfg::open(openers.iter().map(|o| o.desc()).collect()));
+		let pick = PickProxy::show(YAZI.pick.open(openers.iter().map(|o| o.desc()).collect()));
 		let urls: Vec<_> = [UrlCow::default()]
 			.into_iter()
 			.chain(targets.into_iter().map(|(file, _)| file.url.into()))
@@ -63,7 +64,7 @@ impl Actor for OpenDo {
 
 impl OpenDo {
 	// TODO: remove
-	fn match_and_open(cx: &Ctx, cwd: UrlBuf, targets: Vec<(yazi_fs::File, &str)>) {
+	fn match_and_open(cx: &Ctx, cwd: UrlBuf, targets: Vec<(File, &str)>) {
 		let mut openers = HashMap::new();
 		for (file, mime) in targets {
 			if let Some(open) = YAZI.open.matches(&file, mime)
diff --git a/yazi-actor/src/mgr/rename.rs b/yazi-actor/src/mgr/rename.rs
index 1d956406..22d54467 100644
--- a/yazi-actor/src/mgr/rename.rs
+++ b/yazi-actor/src/mgr/rename.rs
@@ -1,11 +1,11 @@
 use anyhow::Result;
-use yazi_config::popup::{ConfirmCfg, InputCfg};
+use yazi_config::{YAZI, popup::ConfirmCfg};
 use yazi_dds::Pubsub;
-use yazi_fs::{File, FilesOp};
+use yazi_fs::{FilesOp, file::File};
 use yazi_macro::{act, err, input, ok_or_not_found, succ};
 use yazi_parser::mgr::RenameForm;
 use yazi_proxy::{ConfirmProxy, MgrProxy};
-use yazi_shared::{Id, data::Data, url::{UrlBuf, UrlLike}};
+use yazi_shared::{data::Data, id::Id, url::{UrlBuf, UrlLike}};
 use yazi_vfs::{VfsFile, maybe_exists, provider};
 use yazi_watcher::WATCHER;
 use yazi_widgets::input::InputEvent;
@@ -42,7 +42,7 @@ impl Actor for Rename {
 		};
 
 		let (tab, old) = (cx.tab().id, hovered.url_owned());
-		let mut input = input!(cx, InputCfg::rename().with_value(name).with_cursor(cursor))?;
+		let mut input = input!(cx, YAZI.input.rename().with_value(name).with_cursor(cursor))?;
 
 		tokio::spawn(async move {
 			let Some(InputEvent::Submit(name)) = input.recv().await else { return };
diff --git a/yazi-actor/src/mgr/reveal.rs b/yazi-actor/src/mgr/reveal.rs
index bc83fdfd..e7133d06 100644
--- a/yazi-actor/src/mgr/reveal.rs
+++ b/yazi-actor/src/mgr/reveal.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use yazi_fs::{File, FilesOp};
+use yazi_fs::{FilesOp, file::File};
 use yazi_macro::{act, render, succ};
 use yazi_parser::mgr::RevealForm;
 use yazi_shared::{data::Data, url::UrlLike};
diff --git a/yazi-actor/src/mgr/search.rs b/yazi-actor/src/mgr/search.rs
index 9602490b..70b380a8 100644
--- a/yazi-actor/src/mgr/search.rs
+++ b/yazi-actor/src/mgr/search.rs
@@ -3,7 +3,7 @@ use std::{borrow::Cow, time::Duration};
 use anyhow::Result;
 use tokio::pin;
 use tokio_stream::{StreamExt, wrappers::UnboundedReceiverStream};
-use yazi_config::popup::InputCfg;
+use yazi_config::YAZI;
 use yazi_core::mgr::{CdSource, SearchVia};
 use yazi_fs::{FilesOp, cha::Cha};
 use yazi_macro::{act, input, succ};
@@ -28,7 +28,7 @@ impl Actor for Search {
 			handle.abort();
 		}
 
-		let mut input = input!(cx, InputCfg::search(opt.via.into()).with_value(&*opt.subject))?;
+		let mut input = input!(cx, YAZI.input.search(opt.via.into()).with_value(&*opt.subject))?;
 
 		tokio::spawn(async move {
 			if let Some(InputEvent::Submit(subject)) = input.recv().await {
diff --git a/yazi-actor/src/mgr/shell.rs b/yazi-actor/src/mgr/shell.rs
index f935b359..33fb79c3 100644
--- a/yazi-actor/src/mgr/shell.rs
+++ b/yazi-actor/src/mgr/shell.rs
@@ -1,7 +1,7 @@
 use std::borrow::Cow;
 
 use anyhow::Result;
-use yazi_config::popup::InputCfg;
+use yazi_config::YAZI;
 use yazi_macro::{act, input, succ};
 use yazi_parser::mgr::ShellForm;
 use yazi_proxy::TasksProxy;
@@ -25,7 +25,10 @@ impl Actor for Shell {
 		let selected: Vec<_> = cx.tab().hovered_and_selected().cloned().map(Into::into).collect();
 
 		let input = if form.interactive {
-			Some(input!(cx, InputCfg::shell(form.block).with_value(&*form.run).with_cursor(form.cursor))?)
+			Some(input!(
+				cx,
+				YAZI.input.shell(form.block).with_value(&*form.run).with_cursor(form.cursor)
+			)?)
 		} else {
 			None
 		};
diff --git a/yazi-actor/src/mgr/tab_rename.rs b/yazi-actor/src/mgr/tab_rename.rs
index 238c5067..7a037129 100644
--- a/yazi-actor/src/mgr/tab_rename.rs
+++ b/yazi-actor/src/mgr/tab_rename.rs
@@ -1,7 +1,7 @@
 use std::borrow::Cow;
 
 use anyhow::Result;
-use yazi_config::popup::InputCfg;
+use yazi_config::YAZI;
 use yazi_macro::{act, input, render, succ};
 use yazi_parser::mgr::TabRenameForm;
 use yazi_proxy::MgrProxy;
@@ -29,7 +29,7 @@ impl Actor for TabRename {
 
 		let mut input = input!(
 			cx,
-			InputCfg::tab_rename().with_value(form.name.unwrap_or(Cow::Borrowed(&pref.name)))
+			YAZI.input.tab_rename().with_value(form.name.unwrap_or(Cow::Borrowed(&pref.name)))
 		)?;
 
 		tokio::spawn(async move {
diff --git a/yazi-actor/src/notify/tick.rs b/yazi-actor/src/notify/tick.rs
index 1ee7b610..6cb9b256 100644
--- a/yazi-actor/src/notify/tick.rs
+++ b/yazi-actor/src/notify/tick.rs
@@ -1,7 +1,7 @@
 use std::time::Duration;
 
 use anyhow::Result;
-use ratatui::layout::Rect;
+use ratatui_core::layout::Rect;
 use yazi_core::notify::Notify;
 use yazi_macro::{render, render_partial, succ};
 use yazi_parser::notify::TickForm;
diff --git a/yazi-actor/src/tasks/inspect.rs b/yazi-actor/src/tasks/inspect.rs
index 22150212..e3606cd0 100644
--- a/yazi-actor/src/tasks/inspect.rs
+++ b/yazi-actor/src/tasks/inspect.rs
@@ -4,13 +4,12 @@ use anyhow::Result;
 use scopeguard::defer;
 use tokio::{io::{AsyncReadExt, stdin}, select, sync::mpsc, time};
 use yazi_binding::Permit;
-use yazi_term::TERM;
 use yazi_macro::{succ, writef};
 use yazi_parser::VoidForm;
 use yazi_scheduler::AppProxy;
 use yazi_shared::data::Data;
-use yazi_term::{YIELD_TO_SUBPROCESS, sequence::EraseScreen};
-use yazi_tty::TTY;
+use yazi_term::{TERM, YIELD_TO_SUBPROCESS};
+use yazi_tty::{TTY, sequence::EraseScreen};
 
 use crate::{Actor, Ctx};
 
diff --git a/yazi-actor/src/tasks/spawn.rs b/yazi-actor/src/tasks/spawn.rs
index 0928fe3c..efa4b535 100644
--- a/yazi-actor/src/tasks/spawn.rs
+++ b/yazi-actor/src/tasks/spawn.rs
@@ -15,6 +15,8 @@ impl Actor for Spawn {
 
 	fn act(cx: &mut Ctx, form: Self::Form) -> Result<Data> {
 		succ!(match form.opt {
+			TaskOpt::Cut(r#in) => cx.tasks.scheduler.file_cut(r#in),
+
 			TaskOpt::Plugin(r#in) => cx.tasks.scheduler.plugin_entry(r#in),
 		})
 	}
diff --git a/yazi-adapter/Cargo.toml b/yazi-adapter/Cargo.toml
index f3acea37..886c0128 100644
--- a/yazi-adapter/Cargo.toml
+++ b/yazi-adapter/Cargo.toml
@@ -19,18 +19,19 @@ yazi-fs       = { path = "../yazi-fs", version = "26.5.6" }
 yazi-macro    = { path = "../yazi-macro", version = "26.5.6" }
 yazi-shared   = { path = "../yazi-shared", version = "26.5.6" }
 yazi-shim     = { path = "../yazi-shim", version = "26.5.6" }
-yazi-term     = { path = "../yazi-term", version = "26.5.6" }
 yazi-tty      = { path = "../yazi-tty", version = "26.5.9" }
+yazi-widgets  = { path = "../yazi-widgets", version = "26.5.6" }
 
 # External dependencies
-ansi-to-tui = { workspace = true }
-anyhow      = { workspace = true }
-base64      = { workspace = true }
-image       = { version = "0.25.10", default-features = false, features = [ "avif", "bmp", "dds", "exr", "ff", "gif", "hdr", "ico", "jpeg", "png", "pnm", "qoi", "tga", "tiff", "webp" ] }
-moxcms      = "0.8.1"
-palette     = { version = "0.7.6", default-features = false }
-quantette   = { version = "0.6.0", default-features = false }
-ratatui     = { workspace = true }
-strum       = { workspace = true }
-tokio       = { workspace = true }
-tracing     = { workspace = true }
+ansi-to-tui  = { workspace = true }
+anyhow       = { workspace = true }
+base64       = { workspace = true }
+image        = { workspace = true }
+inventory    = { workspace = true }
+moxcms       = "0.8.1"
+palette      = { version = "0.7.6", default-features = false }
+quantette    = { version = "0.6.0", default-features = false }
+ratatui-core = { workspace = true }
+strum        = { workspace = true }
+tokio        = { workspace = true }
+tracing      = { workspace = true }
diff --git a/yazi-adapter/src/adapter.rs b/yazi-adapter/src/adapter.rs
index f3fc75b2..b44a6e9a 100644
--- a/yazi-adapter/src/adapter.rs
+++ b/yazi-adapter/src/adapter.rs
@@ -1,105 +1,56 @@
-use std::{env, path::PathBuf};
+use std::{fmt::{self, Debug}, ops::Deref};
 
 use anyhow::Result;
-use ratatui::layout::Rect;
-use strum::{Display, IntoStaticStr};
-use tracing::warn;
-use yazi_emulator::{Emulator, TMUX};
-use yazi_shared::env_exists;
+use ratatui_core::layout::Rect;
+use yazi_emulator::EMULATOR;
+use yazi_shim::cell::SyncCell;
+use yazi_widgets::clear::ClearInventory;
 
-use crate::{Adapters, SHOWN, drivers};
+use crate::{ADAPTOR, drivers::{Driver, Drivers}};
 
-#[derive(Clone, Copy, Debug, Display, Eq, IntoStaticStr, PartialEq)]
-#[strum(serialize_all = "kebab-case")]
-pub enum Adapter {
-	Kgp,
-	KgpOld,
-	Iip,
-	Sixel,
+pub struct Adapter {
+	driver:        Driver,
+	shown:         SyncCell<Option<Rect>>,
+	pub collision: SyncCell<bool>,
+}
 
-	// Supported by Überzug++
-	X11,
-	Wayland,
-	Chafa,
+impl Deref for Adapter {
+	type Target = Driver;
+
+	fn deref(&self) -> &Self::Target { &self.driver }
+}
+
+impl Debug for Adapter {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { self.driver.fmt(f) }
 }
 
 impl Adapter {
-	pub async fn image_show<P>(self, path: P, max: Rect) -> Result<Rect>
-	where
-		P: Into<PathBuf>,
-	{
-		if max.is_empty() {
-			return Ok(Rect::default());
-		}
-
-		let path = path.into();
-		match self {
-			Self::Kgp => drivers::Kgp::image_show(path, max).await,
-			Self::KgpOld => drivers::KgpOld::image_show(path, max).await,
-			Self::Iip => drivers::Iip::image_show(path, max).await,
-			Self::Sixel => drivers::Sixel::image_show(path, max).await,
-			Self::X11 | Self::Wayland => drivers::Ueberzug::image_show(path, max).await,
-			Self::Chafa => drivers::Chafa::image_show(path, max).await,
+	pub(super) fn new() -> Self {
+		Self {
+			driver:    Drivers::matches(&EMULATOR),
+			shown:     SyncCell::new(None),
+			collision: SyncCell::new(false),
 		}
 	}
 
-	pub fn image_hide(self) -> Result<()> {
-		if let Some(area) = SHOWN.replace(None) { self.image_erase(area) } else { Ok(()) }
+	pub fn image_hide(&self) -> Result<()> {
+		if let Some(area) = self.shown.replace(None) { self.driver.image_erase(area) } else { Ok(()) }
 	}
 
-	pub fn image_erase(self, area: Rect) -> Result<()> {
-		match self {
-			Self::Kgp => drivers::Kgp::image_erase(area),
-			Self::KgpOld => drivers::KgpOld::image_erase(area),
-			Self::Iip => drivers::Iip::image_erase(area),
-			Self::Sixel => drivers::Sixel::image_erase(area),
-			Self::X11 | Self::Wayland => drivers::Ueberzug::image_erase(area),
-			Self::Chafa => drivers::Chafa::image_erase(area),
-		}
-	}
-
-	#[inline]
-	pub fn shown_load(self) -> Option<Rect> { SHOWN.get() }
-
-	#[inline]
-	pub(super) fn shown_store(area: Rect) { SHOWN.set(Some(area)); }
-
-	pub(super) fn start(self) { drivers::Ueberzug::start(self); }
-
-	#[inline]
-	pub(super) fn needs_ueberzug(self) -> bool {
-		!matches!(self, Self::Kgp | Self::KgpOld | Self::Iip | Self::Sixel)
-	}
+	pub(super) fn shown_store(&self, area: Rect) { self.shown.set(Some(area)); }
 }
 
-impl Adapter {
-	pub fn matches(emulator: &Emulator) -> Self {
-		let mut adapters: Adapters = emulator.into();
-		if env_exists("ZELLIJ_SESSION_NAME") {
-			adapters.retain(|p| *p == Self::Sixel);
-		} else if TMUX.get() {
-			adapters.retain(|p| *p != Self::KgpOld);
-		}
-		if let Some(p) = adapters.first() {
-			return *p;
-		}
+inventory::submit! {
+	ClearInventory {
+		clear: |area| {
+			let overlap = area.intersection(ADAPTOR.shown.get()?);
+			if overlap.area() == 0 {
+				return None;
+			}
 
-		let supported_compositor = drivers::Ueberzug::supported_compositor();
-		match env::var("XDG_SESSION_TYPE").unwrap_or_default().as_str() {
-			"x11" => return Self::X11,
-			"wayland" if supported_compositor => return Self::Wayland,
-			"wayland" if !supported_compositor => return Self::Chafa,
-			_ => warn!("[Adapter] Could not identify XDG_SESSION_TYPE"),
-		}
-		if env_exists("WAYLAND_DISPLAY") {
-			return if supported_compositor { Self::Wayland } else { Self::Chafa };
-		}
-		match env::var("DISPLAY").unwrap_or_default().as_str() {
-			s if !s.is_empty() && !s.contains("/org.xquartz") => return Self::X11,
-			_ => {}
-		}
-
-		warn!("[Adapter] Falling back to chafa");
-		Self::Chafa
+			ADAPTOR.driver.image_erase(overlap).ok();
+			ADAPTOR.collision.set(true);
+			Some(overlap)
+		},
 	}
 }
diff --git a/yazi-adapter/src/adapters.rs b/yazi-adapter/src/adapters.rs
deleted file mode 100644
index 77912c41..00000000
--- a/yazi-adapter/src/adapters.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-use std::ops::{Deref, DerefMut};
-
-use crate::Adapter;
-
-pub(super) struct Adapters(Vec<Adapter>);
-
-impl Deref for Adapters {
-	type Target = Vec<Adapter>;
-
-	fn deref(&self) -> &Self::Target { &self.0 }
-}
-
-impl DerefMut for Adapters {
-	fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0 }
-}
-
-impl From<&yazi_emulator::Emulator> for Adapters {
-	fn from(value: &yazi_emulator::Emulator) -> Self { value.kind.either_into() }
-}
-
-impl From<yazi_emulator::Brand> for Adapters {
-	fn from(value: yazi_emulator::Brand) -> Self {
-		use yazi_emulator::Brand as B;
-
-		use crate::Adapter as A;
-
-		Self(match value {
-			B::Kitty => vec![A::Kgp],
-			B::Konsole => vec![A::KgpOld],
-			B::Iterm2 => vec![A::Iip, A::Sixel],
-			B::WezTerm => vec![A::Iip, A::Sixel],
-			B::Foot => vec![A::Sixel],
-			B::Ghostty => vec![A::Kgp],
-			B::Microsoft => vec![A::Sixel],
-			B::Warp => vec![A::Iip, A::KgpOld],
-			B::Rio => vec![A::Kgp],
-			B::BlackBox => vec![A::Sixel],
-			B::VSCode => vec![A::Iip, A::Sixel],
-			B::Tabby => vec![A::Iip, A::Sixel],
-			B::Hyper => vec![A::Iip, A::Sixel],
-			B::Mintty => vec![A::Iip],
-			B::Tmux => vec![],
-			B::VTerm => vec![],
-			B::Apple => vec![],
-			B::Urxvt => vec![],
-			B::Bobcat => vec![A::Iip, A::Sixel],
-		})
-	}
-}
-
-impl From<yazi_emulator::Unknown> for Adapters {
-	fn from(value: yazi_emulator::Unknown) -> Self {
-		use Adapter as A;
-
-		Self(match (value.kgp, value.sixel) {
-			(true, true) => vec![A::Sixel, A::KgpOld],
-			(true, false) => vec![A::KgpOld],
-			(false, true) => vec![A::Sixel],
-			(false, false) => vec![],
-		})
-	}
-}
diff --git a/yazi-adapter/src/drivers/chafa.rs b/yazi-adapter/src/drivers/chafa.rs
index 651eafc5..c326595a 100644
--- a/yazi-adapter/src/drivers/chafa.rs
+++ b/yazi-adapter/src/drivers/chafa.rs
@@ -2,17 +2,18 @@ use std::{io::Write, path::PathBuf, process::Stdio};
 
 use ansi_to_tui::IntoText;
 use anyhow::{Result, anyhow, bail};
-use ratatui::layout::Rect;
+use ratatui_core::layout::Rect;
 use tokio::process::Command;
+use yazi_config::THEME;
 use yazi_emulator::Emulator;
-use yazi_term::sequence::MoveTo;
+use yazi_tty::sequence::{MoveTo, ResetAttrs, SetBg};
 
-use crate::Adapter;
+use crate::ADAPTOR;
 
-pub(crate) struct Chafa;
+pub(super) struct Chafa;
 
 impl Chafa {
-	pub(crate) async fn image_show(path: PathBuf, max: Rect) -> Result<Rect> {
+	pub(super) async fn image_show(path: PathBuf, max: Rect) -> Result<Rect> {
 		let child = Command::new("chafa")
 			.args([
 				"-f",
@@ -57,8 +58,8 @@ impl Chafa {
 			height: lines.len() as u16,
 		};
 
-		Adapter::Chafa.image_hide()?;
-		Adapter::shown_store(area);
+		ADAPTOR.image_hide()?;
+		ADAPTOR.shown_store(area);
 		Emulator::move_lock((max.x, max.y), |w| {
 			for (i, line) in lines.into_iter().enumerate() {
 				w.write_all(line)?;
@@ -68,14 +69,17 @@ impl Chafa {
 		})
 	}
 
-	pub(crate) fn image_erase(area: Rect) -> Result<()> {
+	pub(super) fn image_erase(area: Rect) -> Result<()> {
 		let s = " ".repeat(area.width as usize);
 		Emulator::move_lock((0, 0), |w| {
+			if let Some(c) = THEME.app.overall.get().bg {
+				write!(w, "{}", SetBg(c))?;
+			}
 			for y in area.top()..area.bottom() {
 				write!(w, "{}", MoveTo(area.x, y))?;
 				write!(w, "{s}")?;
 			}
-			Ok(())
+			Ok(write!(w, "{ResetAttrs}")?)
 		})
 	}
 }
diff --git a/yazi-adapter/src/drivers/driver.rs b/yazi-adapter/src/drivers/driver.rs
new file mode 100644
index 00000000..e8660919
--- /dev/null
+++ b/yazi-adapter/src/drivers/driver.rs
@@ -0,0 +1,59 @@
+use std::path::PathBuf;
+
+use anyhow::Result;
+use ratatui_core::layout::Rect;
+use strum::{Display, IntoStaticStr};
+
+use crate::drivers::{Chafa, Iip, Kgp, KgpOld, Sixel, Ueberzug};
+
+#[derive(Clone, Copy, Debug, Display, Eq, IntoStaticStr, PartialEq)]
+#[strum(serialize_all = "kebab-case")]
+pub enum Driver {
+	Kgp,
+	KgpOld,
+	Iip,
+	Sixel,
+
+	// Supported by Überzug++
+	X11,
+	Wayland,
+	Chafa,
+}
+
+impl Driver {
+	pub async fn image_show<P>(self, path: P, max: Rect) -> Result<Rect>
+	where
+		P: Into<PathBuf>,
+	{
+		if max.is_empty() {
+			return Ok(Rect::default());
+		}
+
+		let path = path.into();
+		match self {
+			Self::Kgp => Kgp::image_show(path, max).await,
+			Self::KgpOld => KgpOld::image_show(path, max).await,
+			Self::Iip => Iip::image_show(path, max).await,
+			Self::Sixel => Sixel::image_show(path, max).await,
+			Self::X11 | Self::Wayland => Ueberzug::image_show(path, max).await,
+			Self::Chafa => Chafa::image_show(path, max).await,
+		}
+	}
+
+	pub fn image_erase(self, area: Rect) -> Result<()> {
+		match self {
+			Self::Kgp => Kgp::image_erase(area),
+			Self::KgpOld => KgpOld::image_erase(area),
+			Self::Iip => Iip::image_erase(area),
+			Self::Sixel => Sixel::image_erase(area),
+			Self::X11 | Self::Wayland => Ueberzug::image_erase(area),
+			Self::Chafa => Chafa::image_erase(area),
+		}
+	}
+
+	pub(crate) fn start(self) { Ueberzug::start(self); }
+
+	pub(crate) fn needs_ueberzug(self) -> bool {
+		!matches!(self, Self::Kgp | Self::KgpOld | Self::Iip | Self::Sixel)
+	}
+}
diff --git a/yazi-adapter/src/drivers/drivers.rs b/yazi-adapter/src/drivers/drivers.rs
new file mode 100644
index 00000000..ed442005
--- /dev/null
+++ b/yazi-adapter/src/drivers/drivers.rs
@@ -0,0 +1,94 @@
+use std::{env, ops::{Deref, DerefMut}};
+
+use tracing::warn;
+use yazi_emulator::{Emulator, TMUX};
+use yazi_shared::env_exists;
+
+use crate::drivers::{Driver as D, Ueberzug};
+
+pub(crate) struct Drivers(Vec<D>);
+
+impl Deref for Drivers {
+	type Target = Vec<D>;
+
+	fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+impl DerefMut for Drivers {
+	fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0 }
+}
+
+impl From<&yazi_emulator::Emulator> for Drivers {
+	fn from(value: &yazi_emulator::Emulator) -> Self { value.kind.either_into() }
+}
+
+impl From<yazi_emulator::Brand> for Drivers {
+	fn from(value: yazi_emulator::Brand) -> Self {
+		use yazi_emulator::Brand as B;
+
+		Self(match value {
+			B::Kitty => vec![D::Kgp],
+			B::Konsole => vec![D::KgpOld],
+			B::Iterm2 => vec![D::Iip, D::Sixel],
+			B::WezTerm => vec![D::Iip, D::Sixel],
+			B::Foot => vec![D::Sixel],
+			B::Ghostty => vec![D::Kgp],
+			B::Microsoft => vec![D::Sixel],
+			B::Warp => vec![D::Iip, D::KgpOld],
+			B::Rio => vec![D::Kgp],
+			B::BlackBox => vec![D::Sixel],
+			B::VSCode => vec![D::Iip, D::Sixel],
+			B::Tabby => vec![D::Iip, D::Sixel],
+			B::Hyper => vec![D::Iip, D::Sixel],
+			B::Mintty => vec![D::Iip],
+			B::Tmux => vec![],
+			B::VTerm => vec![],
+			B::Apple => vec![],
+			B::Urxvt => vec![],
+			B::Bobcat => vec![D::Iip, D::Sixel],
+		})
+	}
+}
+
+impl From<yazi_emulator::Unknown> for Drivers {
+	fn from(value: yazi_emulator::Unknown) -> Self {
+		Self(match (value.kgp, value.sixel) {
+			(true, true) => vec![D::Sixel, D::KgpOld],
+			(true, false) => vec![D::KgpOld],
+			(false, true) => vec![D::Sixel],
+			(false, false) => vec![],
+		})
+	}
+}
+
+impl Drivers {
+	pub fn matches(emulator: &Emulator) -> D {
+		let mut adapters: Self = emulator.into();
+		if env_exists("ZELLIJ_SESSION_NAME") {
+			adapters.retain(|p| *p == D::Sixel);
+		} else if TMUX.get() {
+			adapters.retain(|p| *p != D::KgpOld);
+		}
+		if let Some(p) = adapters.first() {
+			return *p;
+		}
+
+		let supported_compositor = Ueberzug::supported_compositor();
+		match env::var("XDG_SESSION_TYPE").unwrap_or_default().as_str() {
+			"x11" => return D::X11,
+			"wayland" if supported_compositor => return D::Wayland,
+			"wayland" if !supported_compositor => return D::Chafa,
+			_ => warn!("[Adapter] Could not identify XDG_SESSION_TYPE"),
+		}
+		if env_exists("WAYLAND_DISPLAY") {
+			return if supported_compositor { D::Wayland } else { D::Chafa };
+		}
+		match env::var("DISPLAY").unwrap_or_default().as_str() {
+			s if !s.is_empty() && !s.contains("/org.xquartz") => return D::X11,
+			_ => {}
+		}
+
+		warn!("[Adapter] Falling back to chafa");
+		D::Chafa
+	}
+}
diff --git a/yazi-adapter/src/drivers/iip.rs b/yazi-adapter/src/drivers/iip.rs
index 8859626b..8e03b5fa 100644
--- a/yazi-adapter/src/drivers/iip.rs
+++ b/yazi-adapter/src/drivers/iip.rs
@@ -1,39 +1,42 @@
-use std::{fmt::Write, io::Write as ioWrite, path::PathBuf};
+use std::{fmt::Write as _, io::Write as _, path::PathBuf};
 
 use anyhow::Result;
 use base64::{Engine, engine::{Config, general_purpose::STANDARD}};
 use image::{DynamicImage, ExtendedColorType, ImageEncoder, codecs::{jpeg::JpegEncoder, png::PngEncoder}};
-use ratatui::layout::Rect;
-use yazi_config::YAZI;
+use ratatui_core::layout::Rect;
+use yazi_config::{THEME, YAZI};
 use yazi_emulator::{CLOSE, Emulator, START};
-use yazi_term::sequence::MoveTo;
+use yazi_tty::sequence::{MoveTo, ResetAttrs, SetBg};
 
-use crate::{Image, adapter::Adapter};
+use crate::{ADAPTOR, Image};
 
-pub(crate) struct Iip;
+pub(super) struct Iip;
 
 impl Iip {
-	pub(crate) async fn image_show(path: PathBuf, max: Rect) -> Result<Rect> {
+	pub(super) async fn image_show(path: PathBuf, max: Rect) -> Result<Rect> {
 		let img = Image::downscale(path, max).await?;
 		let area = Image::pixel_area((img.width(), img.height()), max);
 		let b = Self::encode(img).await?;
 
-		Adapter::Iip.image_hide()?;
-		Adapter::shown_store(area);
+		ADAPTOR.image_hide()?;
+		ADAPTOR.shown_store(area);
 		Emulator::move_lock((max.x, max.y), |w| {
 			w.write_all(&b)?;
 			Ok(area)
 		})
 	}
 
-	pub(crate) fn image_erase(area: Rect) -> Result<()> {
+	pub(super) fn image_erase(area: Rect) -> Result<()> {
 		let s = " ".repeat(area.width as usize);
 		Emulator::move_lock((0, 0), |w| {
+			if let Some(c) = THEME.app.overall.get().bg {
+				write!(w, "{}", SetBg(c))?;
+			}
 			for y in area.top()..area.bottom() {
 				write!(w, "{}", MoveTo(area.x, y))?;
 				write!(w, "{s}")?;
 			}
-			Ok(())
+			Ok(write!(w, "{ResetAttrs}")?)
 		})
 	}
 
diff --git a/yazi-adapter/src/drivers/kgp.rs b/yazi-adapter/src/drivers/kgp.rs
index 9cb533f7..dfeedbc8 100644
--- a/yazi-adapter/src/drivers/kgp.rs
+++ b/yazi-adapter/src/drivers/kgp.rs
@@ -4,12 +4,13 @@ use std::{io::Write, path::PathBuf};
 use anyhow::Result;
 use base64::{Engine, engine::general_purpose};
 use image::DynamicImage;
-use ratatui::{layout::Rect, style::Color};
+use ratatui_core::{layout::Rect, style::Color};
+use yazi_config::THEME;
 use yazi_emulator::{CLOSE, ESCAPE, Emulator, START};
 use yazi_shim::cell::SyncCell;
-use yazi_term::sequence::{MoveTo, SetFg};
+use yazi_tty::sequence::{MoveTo, ResetAttrs, SetBg, SetFg};
 
-use crate::{adapter::Adapter, image::Image};
+use crate::{ADAPTOR, image::Image};
 
 static DIACRITICS: [char; 297] = [
 	'\u{0305}',
@@ -311,18 +312,18 @@ static DIACRITICS: [char; 297] = [
 	'\u{1D244}',
 ];
 
-pub(crate) struct Kgp;
+pub(super) struct Kgp;
 
 impl Kgp {
-	pub(crate) async fn image_show(path: PathBuf, max: Rect) -> Result<Rect> {
+	pub(super) async fn image_show(path: PathBuf, max: Rect) -> Result<Rect> {
 		let img = Image::downscale(path, max).await?;
 		let area = Image::pixel_area((img.width(), img.height()), max);
 
 		let b1 = Self::encode(img).await?;
 		let b2 = Self::place(&area)?;
 
-		Adapter::Kgp.image_hide()?;
-		Adapter::shown_store(area);
+		ADAPTOR.image_hide()?;
+		ADAPTOR.shown_store(area);
 		Emulator::move_lock((area.x, area.y), |w| {
 			w.write_all(&b1)?;
 			w.write_all(&b2)?;
@@ -330,15 +331,19 @@ impl Kgp {
 		})
 	}
 
-	pub(crate) fn image_erase(area: Rect) -> Result<()> {
+	pub(super) fn image_erase(area: Rect) -> Result<()> {
 		let s = " ".repeat(area.width as usize);
 		Emulator::move_lock((0, 0), |w| {
+			if let Some(c) = THEME.app.overall.get().bg {
+				write!(w, "{}", SetBg(c))?;
+			}
+
 			for y in area.top()..area.bottom() {
 				write!(w, "{}", MoveTo(area.x, y))?;
 				write!(w, "{s}")?;
 			}
 
-			write!(w, "{START}_Gq=2,a=d,d=A{ESCAPE}\\{CLOSE}")?;
+			write!(w, "{ResetAttrs}{START}_Gq=2,a=d,d=A{ESCAPE}\\{CLOSE}")?;
 			Ok(())
 		})
 	}
@@ -381,12 +386,16 @@ impl Kgp {
 	}
 
 	fn place(area: &Rect) -> Result<Vec<u8>> {
-		let mut buf = Vec::with_capacity(area.width as usize * area.height as usize * 3 + 50);
+		let mut buf = Vec::with_capacity(area.width as usize * area.height as usize * 3 + 500);
 
 		let id = Self::image_id();
 		let (r, g, b) = ((id >> 16) & 0xff, (id >> 8) & 0xff, id & 0xff);
 		write!(buf, "{}", SetFg(Color::Rgb(r as u8, g as u8, b as u8)))?;
 
+		if let Some(c) = THEME.app.overall.get().bg {
+			write!(buf, "{}", SetBg(c))?;
+		}
+
 		for y in 0..area.height {
 			write!(buf, "{}", MoveTo(area.x, area.y + y))?;
 			for x in 0..area.width {
@@ -395,6 +404,8 @@ impl Kgp {
 				write!(buf, "{}", *DIACRITICS.get(x as usize).unwrap_or(&DIACRITICS[0]))?;
 			}
 		}
+
+		write!(buf, "{ResetAttrs}")?;
 		Ok(buf)
 	}
 
diff --git a/yazi-adapter/src/drivers/kgp_old.rs b/yazi-adapter/src/drivers/kgp_old.rs
index bb78103b..1910703b 100644
--- a/yazi-adapter/src/drivers/kgp_old.rs
+++ b/yazi-adapter/src/drivers/kgp_old.rs
@@ -4,29 +4,29 @@ use std::{io::Write, path::PathBuf};
 use anyhow::Result;
 use base64::{Engine, engine::general_purpose};
 use image::DynamicImage;
-use ratatui::layout::Rect;
+use ratatui_core::layout::Rect;
 use yazi_emulator::{CLOSE, ESCAPE, Emulator, START};
 use yazi_tty::TTY;
 
-use crate::{Image, adapter::Adapter};
+use crate::{ADAPTOR, Image};
 
-pub(crate) struct KgpOld;
+pub(super) struct KgpOld;
 
 impl KgpOld {
-	pub(crate) async fn image_show(path: PathBuf, max: Rect) -> Result<Rect> {
+	pub(super) async fn image_show(path: PathBuf, max: Rect) -> Result<Rect> {
 		let img = Image::downscale(path, max).await?;
 		let area = Image::pixel_area((img.width(), img.height()), max);
 		let b = Self::encode(img).await?;
 
-		Adapter::KgpOld.image_hide()?;
-		Adapter::shown_store(area);
+		ADAPTOR.image_hide()?;
+		ADAPTOR.shown_store(area);
 		Emulator::move_lock((area.x, area.y), |w| {
 			w.write_all(&b)?;
 			Ok(area)
 		})
 	}
 
-	pub(crate) fn image_erase(_: Rect) -> Result<()> {
+	pub(super) fn image_erase(_: Rect) -> Result<()> {
 		let mut w = TTY.lockout();
 		write!(w, "{START}_Gq=2,a=d,d=A{ESCAPE}\\{CLOSE}")?;
 		w.flush()?;
diff --git a/yazi-adapter/src/drivers/mod.rs b/yazi-adapter/src/drivers/mod.rs
index 57eeaf4f..20e82086 100644
--- a/yazi-adapter/src/drivers/mod.rs
+++ b/yazi-adapter/src/drivers/mod.rs
@@ -1 +1 @@
-yazi_macro::mod_flat!(chafa iip kgp kgp_old sixel ueberzug);
+yazi_macro::mod_flat!(chafa driver drivers iip kgp kgp_old sixel ueberzug);
diff --git a/yazi-adapter/src/drivers/sixel.rs b/yazi-adapter/src/drivers/sixel.rs
index 1a39661e..e019bf36 100644
--- a/yazi-adapter/src/drivers/sixel.rs
+++ b/yazi-adapter/src/drivers/sixel.rs
@@ -4,13 +4,14 @@ use anyhow::{Result, bail};
 use image::{DynamicImage, GenericImageView, RgbImage};
 use palette::{Srgb, cast::ComponentsAs};
 use quantette::{PaletteSize, color_map::IndexedColorMap, wu::{BinnerU8x3, WuU8x3}};
-use ratatui::layout::Rect;
+use ratatui_core::layout::Rect;
+use yazi_config::THEME;
 use yazi_emulator::{CLOSE, ESCAPE, Emulator, START};
-use yazi_term::sequence::MoveTo;
+use yazi_tty::sequence::{MoveTo, ResetAttrs, SetBg};
 
-use crate::{Image, adapter::Adapter};
+use crate::{ADAPTOR, Image};
 
-pub(crate) struct Sixel;
+pub(super) struct Sixel;
 
 struct QuantizeOutput<T> {
 	indices: Vec<u8>,
@@ -18,27 +19,30 @@ struct QuantizeOutput<T> {
 }
 
 impl Sixel {
-	pub(crate) async fn image_show(path: PathBuf, max: Rect) -> Result<Rect> {
+	pub(super) async fn image_show(path: PathBuf, max: Rect) -> Result<Rect> {
 		let img = Image::downscale(path, max).await?;
 		let area = Image::pixel_area((img.width(), img.height()), max);
 		let b = Self::encode(img).await?;
 
-		Adapter::Sixel.image_hide()?;
-		Adapter::shown_store(area);
+		ADAPTOR.image_hide()?;
+		ADAPTOR.shown_store(area);
 		Emulator::move_lock((area.x, area.y), |w| {
 			w.write_all(&b)?;
 			Ok(area)
 		})
 	}
 
-	pub(crate) fn image_erase(area: Rect) -> Result<()> {
+	pub(super) fn image_erase(area: Rect) -> Result<()> {
 		let s = " ".repeat(area.width as usize);
 		Emulator::move_lock((0, 0), |w| {
+			if let Some(c) = THEME.app.overall.get().bg {
+				write!(w, "{}", SetBg(c))?;
+			}
 			for y in area.top()..area.bottom() {
 				write!(w, "{}", MoveTo(area.x, y))?;
 				write!(w, "{s}")?;
 			}
-			Ok(())
+			Ok(write!(w, "{ResetAttrs}")?)
 		})
 	}
 
diff --git a/yazi-adapter/src/drivers/ueberzug.rs b/yazi-adapter/src/drivers/ueberzug.rs
index 6ab4aabd..ba6f5009 100644
--- a/yazi-adapter/src/drivers/ueberzug.rs
+++ b/yazi-adapter/src/drivers/ueberzug.rs
@@ -2,7 +2,7 @@ use std::{path::PathBuf, process::Stdio};
 
 use anyhow::{Result, bail};
 use image::ImageReader;
-use ratatui::layout::Rect;
+use ratatui_core::layout::Rect;
 use tokio::{io::AsyncWriteExt, process::{Child, Command}, sync::mpsc::{self, UnboundedSender}};
 use tracing::{debug, warn};
 use yazi_config::YAZI;
@@ -10,21 +10,21 @@ use yazi_emulator::Dimension;
 use yazi_shared::{LOG_LEVEL, env_exists};
 use yazi_shim::{cell::RoCell, strum::IntoStr};
 
-use crate::Adapter;
+use crate::{ADAPTOR, drivers::Driver};
 
 type Cmd = Option<(PathBuf, Rect)>;
 
 static DEMON: RoCell<Option<UnboundedSender<Cmd>>> = RoCell::new();
 
-pub(crate) struct Ueberzug;
+pub(super) struct Ueberzug;
 
 impl Ueberzug {
-	pub(crate) fn start(adapter: Adapter) {
-		if !adapter.needs_ueberzug() {
+	pub(super) fn start(driver: Driver) {
+		if !driver.needs_ueberzug() {
 			return DEMON.init(None);
 		}
 
-		let mut child = Self::create_demon(adapter).ok();
+		let mut child = Self::create_demon(driver).ok();
 		let (tx, mut rx) = mpsc::unbounded_channel();
 
 		tokio::spawn(async move {
@@ -34,17 +34,17 @@ impl Ueberzug {
 					child = None;
 				}
 				if child.is_none() {
-					child = Self::create_demon(adapter).ok();
+					child = Self::create_demon(driver).ok();
 				}
 				if let Some(c) = &mut child {
-					Self::send_command(adapter, c, cmd).await.ok();
+					Self::send_command(driver, c, cmd).await.ok();
 				}
 			}
 		});
 		DEMON.init(Some(tx))
 	}
 
-	pub(crate) async fn image_show(path: PathBuf, max: Rect) -> Result<Rect> {
+	pub(super) async fn image_show(path: PathBuf, max: Rect) -> Result<Rect> {
 		let Some(tx) = &*DEMON else {
 			bail!("uninitialized ueberzugpp");
 		};
@@ -64,11 +64,11 @@ impl Ueberzug {
 			.unwrap_or(max);
 
 		tx.send(Some((path, area)))?;
-		Adapter::shown_store(area);
+		ADAPTOR.shown_store(area);
 		Ok(area)
 	}
 
-	pub(crate) fn image_erase(_: Rect) -> Result<()> {
+	pub(super) fn image_erase(_: Rect) -> Result<()> {
 		if let Some(tx) = &*DEMON {
 			Ok(tx.send(None)?)
 		} else {
@@ -79,16 +79,16 @@ impl Ueberzug {
 	// Currently Überzug++'s Wayland output only supports Niri, Sway, Hyprland and
 	// Wayfire as it requires information from specific compositor socket directly.
 	// These environment variables are from ueberzugpp src/canvas/wayland/config.cpp
-	pub(crate) fn supported_compositor() -> bool {
+	pub(super) fn supported_compositor() -> bool {
 		env_exists("NIRI_SOCKET")
 			|| env_exists("SWAYSOCK")
 			|| env_exists("HYPRLAND_INSTANCE_SIGNATURE")
 			|| env_exists("WAYFIRE_SOCKET")
 	}
 
-	fn create_demon(adapter: Adapter) -> Result<Child> {
+	fn create_demon(driver: Driver) -> Result<Child> {
 		let result = Command::new("ueberzugpp")
-			.args(["layer", "-so", adapter.into_str()])
+			.args(["layer", "-so", driver.into_str()])
 			.env("SPDLOG_LEVEL", if LOG_LEVEL.get().is_none() { "" } else { "debug" })
 			.kill_on_drop(true)
 			.stdin(Stdio::piped())
@@ -113,7 +113,7 @@ impl Ueberzug {
 		rect
 	}
 
-	async fn send_command(adapter: Adapter, child: &mut Child, cmd: Cmd) -> Result<()> {
+	async fn send_command(driver: Driver, child: &mut Child, cmd: Cmd) -> Result<()> {
 		let s = if let Some((path, rect)) = cmd {
 			debug!("ueberzugpp rect before adjustment: {:?}", rect);
 			let rect = Self::adjust_rect(rect);
@@ -132,7 +132,7 @@ impl Ueberzug {
 			format!(r#"{{"action":"remove","identifier":"yazi"}}{}"#, '\n')
 		};
 
-		debug!("`ueberzugpp layer -so {adapter}` command: {s}");
+		debug!("`ueberzugpp layer -so {driver}` command: {s}");
 		child.stdin.as_mut().unwrap().write_all(s.as_bytes()).await?;
 
 		Ok(())
diff --git a/yazi-adapter/src/icc.rs b/yazi-adapter/src/icc.rs
index 6b3f0541..cf97bdb8 100644
--- a/yazi-adapter/src/icc.rs
+++ b/yazi-adapter/src/icc.rs
@@ -3,6 +3,7 @@ use image::{ColorType, DynamicImage, GrayAlphaImage, GrayImage, ImageDecoder, Rg
 use moxcms::{CicpColorPrimaries, ColorProfile, DataColorSpace, Layout, TransferCharacteristics, TransformOptions};
 
 pub(super) struct Icc;
+
 impl Icc {
 	pub(super) fn transform(mut decoder: impl ImageDecoder) -> anyhow::Result<DynamicImage> {
 		if let Some(layout) = Self::color_type_to_layout(decoder.color_type())
diff --git a/yazi-adapter/src/image.rs b/yazi-adapter/src/image.rs
index 84355b19..5afeff56 100644
--- a/yazi-adapter/src/image.rs
+++ b/yazi-adapter/src/image.rs
@@ -2,7 +2,7 @@ use std::path::{Path, PathBuf};
 
 use anyhow::Result;
 use image::{DynamicImage, ImageDecoder, ImageError, ImageReader, Limits, codecs::{jpeg::JpegEncoder, png::PngEncoder}, imageops::FilterType, metadata::Orientation};
-use ratatui::layout::Rect;
+use ratatui_core::layout::Rect;
 use yazi_config::YAZI;
 use yazi_emulator::Dimension;
 use yazi_fs::provider::{Provider, local::Local};
diff --git a/yazi-adapter/src/info.rs b/yazi-adapter/src/info.rs
deleted file mode 100644
index 86d4052e..00000000
--- a/yazi-adapter/src/info.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-use std::path::PathBuf;
-
-use image::{ImageDecoder, ImageError};
-
-pub type ImageFormat = image::ImageFormat;
-pub type ImageColor = image::ColorType;
-pub type ImageOrientation = image::metadata::Orientation;
-
-#[derive(Clone, Copy)]
-pub struct ImageInfo {
-	pub format:      ImageFormat,
-	pub width:       u32,
-	pub height:      u32,
-	pub color:       ImageColor,
-	pub orientation: Option<ImageOrientation>,
-}
-
-impl ImageInfo {
-	pub async fn new(path: PathBuf) -> image::ImageResult<Self> {
-		tokio::task::spawn_blocking(move || {
-			let reader = image::ImageReader::open(path)?.with_guessed_format()?;
-
-			let Some(format) = reader.format() else {
-				return Err(ImageError::IoError(std::io::Error::new(
-					std::io::ErrorKind::InvalidData,
-					"unknown image format",
-				)));
-			};
-
-			let mut decoder = reader.into_decoder()?;
-			let (width, height) = decoder.dimensions();
-			Ok(Self {
-				format,
-				width,
-				height,
-				color: decoder.color_type(),
-				orientation: decoder.orientation().ok(),
-			})
-		})
-		.await
-		.map_err(|e| ImageError::IoError(e.into()))?
-	}
-}
diff --git a/yazi-adapter/src/lib.rs b/yazi-adapter/src/lib.rs
index 01080816..347bd4e0 100644
--- a/yazi-adapter/src/lib.rs
+++ b/yazi-adapter/src/lib.rs
@@ -1,15 +1,12 @@
 yazi_macro::mod_pub!(drivers);
 
-yazi_macro::mod_flat!(adapter adapters icc image info);
+yazi_macro::mod_flat!(adapter icc image);
 
 use yazi_emulator::{Brand, CLOSE, EMULATOR, ESCAPE, Emulator, Mux, START, TMUX};
 use yazi_shared::in_wsl;
-use yazi_shim::cell::SyncCell;
+use yazi_shim::cell::{RoCell, SyncCell};
 
-pub static ADAPTOR: SyncCell<Adapter> = SyncCell::new(Adapter::Chafa);
-
-// Image state
-static SHOWN: SyncCell<Option<ratatui::layout::Rect>> = SyncCell::new(None);
+pub static ADAPTOR: RoCell<Adapter> = RoCell::new();
 
 // WSL support
 pub static WSL: SyncCell<bool> = SyncCell::new(false);
@@ -34,7 +31,7 @@ pub fn init() -> anyhow::Result<()> {
 	EMULATOR.init(emulator);
 	yazi_config::init_flavor(EMULATOR.light)?;
 
-	ADAPTOR.set(Adapter::matches(&EMULATOR));
-	ADAPTOR.get().start();
+	ADAPTOR.init(Adapter::new());
+	ADAPTOR.start();
 	Ok(())
 }
diff --git a/yazi-binding/Cargo.toml b/yazi-binding/Cargo.toml
index 1eb4fcc1..77cdc3c5 100644
--- a/yazi-binding/Cargo.toml
+++ b/yazi-binding/Cargo.toml
@@ -17,30 +17,24 @@ default      = [ "vendored-lua" ]
 vendored-lua = [ "mlua/vendored" ]
 
 [dependencies]
-yazi-adapter = { path = "../yazi-adapter", version = "26.5.6" }
 yazi-codegen = { path = "../yazi-codegen", version = "26.5.6" }
-yazi-config  = { path = "../yazi-config", version = "26.5.6" }
-yazi-fs      = { path = "../yazi-fs", version = "26.5.6" }
 yazi-macro   = { path = "../yazi-macro", version = "26.5.6" }
-yazi-shared  = { path = "../yazi-shared", version = "26.5.6" }
 yazi-shim    = { path = "../yazi-shim", version = "26.5.6" }
-yazi-term    = { path = "../yazi-term", version = "26.5.6" }
-yazi-vfs     = { path = "../yazi-vfs", version = "26.5.6" }
-yazi-widgets = { path = "../yazi-widgets", version = "26.5.6" }
 
 # External dependencies
-ansi-to-tui   = { workspace = true }
-anyhow        = { workspace = true }
-futures       = { workspace = true }
-hashbrown     = { workspace = true }
-mlua          = { workspace = true }
-paste         = { workspace = true }
-ratatui       = { workspace = true }
-serde_json    = { workspace = true }
-tokio  	      = { workspace = true }
-tokio-stream  = { workspace = true }
-tracing       = { workspace = true }
-unicode-width = { workspace = true }
+ansi-to-tui     = { workspace = true }
+anyhow          = { workspace = true }
+futures         = { workspace = true }
+hashbrown       = { workspace = true }
+image           = { workspace = true }
+mlua            = { workspace = true }
+ratatui-core    = { workspace = true }
+ratatui-widgets = { workspace = true }
+serde           = { workspace = true }
+serde_json      = { workspace = true }
+strum           = { workspace = true }
+tokio    	      = { workspace = true }
+unicode-width   = { workspace = true }
 
 [target.'cfg(unix)'.dependencies]
 libc = { workspace = true }
diff --git a/yazi-binding/src/access.rs b/yazi-binding/src/access.rs
deleted file mode 100644
index 1134d982..00000000
--- a/yazi-binding/src/access.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-use mlua::{AnyUserData, IntoLuaMulti, UserData, UserDataMethods, Value};
-use yazi_fs::provider::FileBuilder;
-
-use crate::{Error, Fd, UrlRef};
-
-#[derive(Default)]
-pub struct Access(yazi_vfs::provider::Gate);
-
-impl UserData for Access {
-	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
-		methods.add_function("append", |_, (ud, append): (AnyUserData, bool)| {
-			ud.borrow_mut::<Self>()?.0.append(append);
-			Ok(ud)
-		});
-		methods.add_function("create", |_, (ud, create): (AnyUserData, bool)| {
-			ud.borrow_mut::<Self>()?.0.create(create);
-			Ok(ud)
-		});
-		methods.add_function("create_new", |_, (ud, create_new): (AnyUserData, bool)| {
-			ud.borrow_mut::<Self>()?.0.create_new(create_new);
-			Ok(ud)
-		});
-		methods.add_async_method("open", |lua, me, url: UrlRef| async move {
-			match me.0.open(&*url).await {
-				Ok(fd) => Fd(fd).into_lua_multi(&lua),
-				Err(e) => (Value::Nil, Error::Io(e)).into_lua_multi(&lua),
-			}
-		});
-		methods.add_function("read", |_, (ud, read): (AnyUserData, bool)| {
-			ud.borrow_mut::<Self>()?.0.read(read);
-			Ok(ud)
-		});
-		methods.add_function("truncate", |_, (ud, truncate): (AnyUserData, bool)| {
-			ud.borrow_mut::<Self>()?.0.truncate(truncate);
-			Ok(ud)
-		});
-		methods.add_function("write", |_, (ud, write): (AnyUserData, bool)| {
-			ud.borrow_mut::<Self>()?.0.write(write);
-			Ok(ud)
-		});
-	}
-}
diff --git a/yazi-binding/src/chord_cow.rs b/yazi-binding/src/chord_cow.rs
deleted file mode 100644
index dc5821db..00000000
--- a/yazi-binding/src/chord_cow.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use mlua::UserData;
-use yazi_codegen::FromLuaOwned;
-
-#[derive(Clone, FromLuaOwned)]
-pub struct ChordCow(pub yazi_config::keymap::ChordCow);
-
-impl From<yazi_config::keymap::ChordCow> for ChordCow {
-	fn from(value: yazi_config::keymap::ChordCow) -> Self { Self(value) }
-}
-
-impl From<ChordCow> for yazi_config::keymap::ChordCow {
-	fn from(value: ChordCow) -> Self { value.0 }
-}
-
-impl UserData for ChordCow {}
diff --git a/yazi-binding/src/composer.rs b/yazi-binding/src/composer.rs
index ebfc5bd2..e12d237f 100644
--- a/yazi-binding/src/composer.rs
+++ b/yazi-binding/src/composer.rs
@@ -5,10 +5,9 @@ pub type ComposerGet = fn(&Lua, &[u8]) -> mlua::Result<Value>;
 pub type ComposerSet = fn(&Lua, &[u8], Value) -> mlua::Result<Value>;
 
 pub struct Composer<G, S> {
-	get:    G,
-	set:    S,
-	parent: Option<(G, S)>,
-	cache:  HashMap<Vec<u8>, Value>,
+	get:   G,
+	set:   S,
+	cache: HashMap<Vec<u8>, Value>,
 }
 
 impl<G, S> Composer<G, S>
@@ -16,13 +15,7 @@ where
 	G: Fn(&Lua, &[u8]) -> mlua::Result<Value> + 'static,
 	S: Fn(&Lua, &[u8], Value) -> mlua::Result<Value> + 'static,
 {
-	#[inline]
-	pub fn new(get: G, set: S) -> Self { Self { get, set, parent: None, cache: Default::default() } }
-
-	#[inline]
-	pub fn with_parent(get: G, set: S, p_get: G, p_set: S) -> Self {
-		Self { get, set, parent: Some((p_get, p_set)), cache: Default::default() }
-	}
+	pub fn new(get: G, set: S) -> Self { Self { get, set, cache: Default::default() } }
 }
 
 impl<G, S> UserData for Composer<G, S>
@@ -37,14 +30,9 @@ where
 				return Ok(v.clone());
 			}
 
-			let mut value = (me.get)(lua, &key)?;
-			if value.is_nil()
-				&& let Some((p_get, _)) = &me.parent
-			{
-				value = p_get(lua, &key)?;
-			}
-
+			let value = (me.get)(lua, &key)?;
 			me.cache.insert(key.to_owned(), value.clone());
+
 			Ok(value)
 		});
 
@@ -56,11 +44,6 @@ where
 
 				if value.is_nil() {
 					me.cache.remove(key.as_ref());
-				} else if let Some((_, p_set)) = &me.parent {
-					match p_set(lua, key.as_ref(), value)? {
-						Value::Nil => me.cache.remove(key.as_ref()),
-						v => me.cache.insert(key.to_owned(), v),
-					};
 				} else {
 					me.cache.insert(key.to_owned(), value);
 				}
diff --git a/yazi-binding/src/config/fetcher.rs b/yazi-binding/src/config/fetcher.rs
deleted file mode 100644
index 00ab805e..00000000
--- a/yazi-binding/src/config/fetcher.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use std::{ops::Deref, sync::Arc};
-
-use mlua::{ExternalError, FromLua, IntoLua, Lua, Table, UserData, UserDataFields, Value};
-use yazi_config::YAZI;
-
-use crate::{FileRef, Id, Iter, cached_field};
-
-#[derive(Clone)]
-pub struct Fetcher {
-	inner: Arc<yazi_config::plugin::Fetcher>,
-
-	v_name: Option<Value>,
-}
-
-impl Deref for Fetcher {
-	type Target = yazi_config::plugin::Fetcher;
-
-	fn deref(&self) -> &Self::Target { &self.inner }
-}
-
-impl Fetcher {
-	pub fn new(inner: impl Into<Arc<yazi_config::plugin::Fetcher>>) -> Self {
-		Self { inner: inner.into(), v_name: None }
-	}
-}
-
-impl UserData for Fetcher {
-	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
-		fields.add_field_method_get("id", |_, me| Ok(Id(me.id)));
-
-		cached_field!(fields, name, |lua, me| lua.create_string(&*me.name));
-	}
-}
-
-// --- Matcher
-pub struct FetcherMatcher(yazi_config::plugin::FetcherMatcher<'static>);
-
-impl FetcherMatcher {
-	pub fn new(inner: impl Into<yazi_config::plugin::FetcherMatcher<'static>>) -> Self {
-		Self(inner.into())
-	}
-}
-
-impl TryFrom<Table> for FetcherMatcher {
-	type Error = mlua::Error;
-
-	fn try_from(value: Table) -> Result<Self, Self::Error> {
-		let id: Id = value.raw_get("id").unwrap_or_default();
-		let file: Option<FileRef> = value.raw_get("file")?;
-		let mime: Option<String> = value.raw_get("mime")?;
-
-		Ok(Self(yazi_config::plugin::FetcherMatcher {
-			fetchers: YAZI.plugin.fetchers.load_full(),
-			id: id.0,
-			file: file.map(|f| f.inner.clone().into()),
-			mime: mime.map(Into::into),
-			..Default::default()
-		}))
-	}
-}
-
-impl FromLua for FetcherMatcher {
-	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
-		match value {
-			Value::Table(t) => t.try_into(),
-			_ => Err("expected a table of FetcherMatcher".into_lua_err()),
-		}
-	}
-}
-
-impl IntoLua for FetcherMatcher {
-	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> {
-		Iter::new(self.0.map(Fetcher::new), None).into_lua(lua)
-	}
-}
diff --git a/yazi-binding/src/config/fetchers.rs b/yazi-binding/src/config/fetchers.rs
deleted file mode 100644
index 66bc3fdb..00000000
--- a/yazi-binding/src/config/fetchers.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use mlua::{IntoLua, MetaMethod, UserData, UserDataMethods};
-use yazi_config::YAZI;
-
-use crate::config::FetcherMatcher;
-
-pub struct Fetchers;
-
-impl UserData for Fetchers {
-	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
-		methods.add_method("match", |lua, _, matcher: Option<FetcherMatcher>| match matcher {
-			Some(matcher) => matcher.into_lua(lua),
-			None => FetcherMatcher::new(&YAZI.plugin.fetchers).into_lua(lua),
-		});
-
-		methods.add_meta_method(MetaMethod::Len, |_, _, ()| Ok(YAZI.plugin.fetchers.load().len()));
-	}
-}
diff --git a/yazi-binding/src/config/mod.rs b/yazi-binding/src/config/mod.rs
deleted file mode 100644
index 06de0823..00000000
--- a/yazi-binding/src/config/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-yazi_macro::mod_flat!(fetcher fetchers open_rule open_rules opener opener_rule opener_rules preloader preloaders previewer previewers spotter spotters);
diff --git a/yazi-binding/src/config/open_rule.rs b/yazi-binding/src/config/open_rule.rs
deleted file mode 100644
index 73acfaf7..00000000
--- a/yazi-binding/src/config/open_rule.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-use std::{ops::Deref, sync::Arc};
-
-use mlua::{ExternalError, FromLua, IntoLua, Lua, LuaSerdeExt, Table, UserData, UserDataFields, Value};
-use yazi_config::YAZI;
-
-use crate::{FileRef, Id, Iter, cached_field};
-
-pub struct OpenRule {
-	inner: Arc<yazi_config::open::OpenRule>,
-
-	v_use: Option<Value>,
-}
-
-impl Deref for OpenRule {
-	type Target = Arc<yazi_config::open::OpenRule>;
-
-	fn deref(&self) -> &Self::Target { &self.inner }
-}
-
-impl From<OpenRule> for Arc<yazi_config::open::OpenRule> {
-	fn from(value: OpenRule) -> Self { value.inner }
-}
-
-impl OpenRule {
-	pub fn new(inner: impl Into<Arc<yazi_config::open::OpenRule>>) -> Self {
-		Self { inner: inner.into(), v_use: None }
-	}
-}
-
-impl FromLua for OpenRule {
-	fn from_lua(value: Value, lua: &Lua) -> mlua::Result<Self> {
-		Ok(Self::new(lua.from_value::<yazi_config::open::OpenRule>(value)?))
-	}
-}
-
-impl UserData for OpenRule {
-	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
-		fields.add_field_method_get("id", |_, me| Ok(Id(me.id)));
-		cached_field!(fields, use, |lua, me| {
-			lua.create_sequence_from(me.r#use.iter().map(|s| s.as_str()))
-		});
-	}
-}
-
-// --- Matcher
-pub struct OpenRuleMatcher(pub(super) yazi_config::open::OpenRuleMatcher<'static>);
-
-impl OpenRuleMatcher {
-	pub fn new(inner: impl Into<yazi_config::open::OpenRuleMatcher<'static>>) -> Self {
-		Self(inner.into())
-	}
-}
-
-impl TryFrom<Table> for OpenRuleMatcher {
-	type Error = mlua::Error;
-
-	fn try_from(value: Table) -> Result<Self, Self::Error> {
-		let id: Id = value.raw_get("id").unwrap_or_default();
-		let file: Option<FileRef> = value.raw_get("file")?;
-		let mime: Option<String> = value.raw_get("mime")?;
-
-		Ok(Self(yazi_config::open::OpenRuleMatcher {
-			rules: YAZI.open.load_full(),
-			id: id.0,
-			file: file.map(|f| f.inner.clone().into()),
-			mime: mime.map(Into::into),
-			..Default::default()
-		}))
-	}
-}
-
-impl FromLua for OpenRuleMatcher {
-	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
-		match value {
-			Value::Table(t) => t.try_into(),
-			_ => Err("expected a table of OpenRuleMatcher".into_lua_err()),
-		}
-	}
-}
-
-impl IntoLua for OpenRuleMatcher {
-	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> {
-		Iter::new(self.0.map(OpenRule::new), None).into_lua(lua)
-	}
-}
diff --git a/yazi-binding/src/config/open_rules.rs b/yazi-binding/src/config/open_rules.rs
deleted file mode 100644
index 1f1f7689..00000000
--- a/yazi-binding/src/config/open_rules.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-use mlua::{ExternalError, ExternalResult, IntoLua, MetaMethod, Table, UserData, UserDataMethods};
-use yazi_config::YAZI;
-use yazi_shim::mlua::DeserializeOverLua;
-
-use crate::config::{OpenRule, OpenRuleMatcher};
-
-pub struct OpenRules;
-
-impl UserData for OpenRules {
-	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
-		methods.add_method("match", |lua, _, matcher: Option<OpenRuleMatcher>| match matcher {
-			Some(matcher) => matcher.into_lua(lua),
-			None => OpenRuleMatcher::new(&*YAZI.open).into_lua(lua),
-		});
-
-		methods.add_method("insert", |_, _, (index, rule): (isize, OpenRule)| {
-			let index = match index {
-				1.. => index - 1,
-				0 => return Err("index must be 1-based or negative".into_lua_err()),
-				_ => index,
-			};
-
-			YAZI.open.insert(index, rule.clone()).into_lua_err()?;
-			Ok(rule)
-		});
-
-		methods.add_method("remove", |_, _, matcher: OpenRuleMatcher| {
-			YAZI.open.remove(matcher.0);
-			Ok(())
-		});
-
-		methods.add_method("update", |_, _, (matcher, table): (OpenRuleMatcher, Table)| {
-			YAZI.open.update(matcher.0, |rule| rule.deserialize_over_lua(&table))?;
-			Ok(())
-		});
-
-		methods.add_meta_method(MetaMethod::Len, |_, _, ()| Ok(YAZI.open.load().len()));
-	}
-}
diff --git a/yazi-binding/src/config/opener.rs b/yazi-binding/src/config/opener.rs
deleted file mode 100644
index f3bbd76c..00000000
--- a/yazi-binding/src/config/opener.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use mlua::{ExternalError, FromLua, IntoLua, IntoLuaMulti, MetaMethod, UserData, UserDataMethods, Value};
-use yazi_config::{YAZI, opener::OpenerRulesMatcher};
-
-use crate::config::OpenerRules;
-
-pub struct Opener;
-
-impl UserData for Opener {
-	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
-		methods.add_meta_method(MetaMethod::Index, |lua, _, key: mlua::String| {
-			let key = key.to_str()?;
-			match YAZI.opener.load().get(&*key) {
-				Some(rules) => OpenerRules::new(rules.clone()).into_lua(lua),
-				None => Ok(Value::Nil),
-			}
-		});
-
-		methods.add_meta_method(MetaMethod::NewIndex, |lua, _, (key, value): (mlua::String, Value)| {
-			let key = key.to_str()?;
-			match value {
-				t @ Value::Table(_) => {
-					YAZI.opener.insert(&key, &*OpenerRules::from_lua(t, lua)?);
-				}
-				Value::Nil => {
-					YAZI.opener.remove(&key);
-				}
-				_ => return Err("expected a table or nil".into_lua_err()),
-			}
-			Ok(())
-		});
-
-		methods.add_meta_method(MetaMethod::Pairs, |lua, _, ()| {
-			let mut matcher = OpenerRulesMatcher::from(&YAZI.opener);
-			let iter = lua.create_function_mut(move |lua, ()| {
-				if let Some((name, rules)) = matcher.next() {
-					(name, OpenerRules::new(rules)).into_lua_multi(lua)
-				} else {
-					().into_lua_multi(lua)
-				}
-			})?;
-
-			Ok(iter)
-		});
-	}
-}
diff --git a/yazi-binding/src/config/opener_rule.rs b/yazi-binding/src/config/opener_rule.rs
deleted file mode 100644
index 0ce390f3..00000000
--- a/yazi-binding/src/config/opener_rule.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use std::{ops::Deref, sync::Arc};
-
-use mlua::{ExternalError, FromLua, IntoLua, Lua, LuaSerdeExt, Table, UserData, UserDataFields, Value};
-
-use crate::{Id, Iter, cached_field};
-
-pub struct OpenerRule {
-	inner: Arc<yazi_config::opener::OpenerRule>,
-
-	v_run:  Option<Value>,
-	v_desc: Option<Value>,
-}
-
-impl Deref for OpenerRule {
-	type Target = Arc<yazi_config::opener::OpenerRule>;
-
-	fn deref(&self) -> &Self::Target { &self.inner }
-}
-
-impl From<OpenerRule> for Arc<yazi_config::opener::OpenerRule> {
-	fn from(value: OpenerRule) -> Self { value.inner }
-}
-
-impl OpenerRule {
-	pub fn new(inner: impl Into<Arc<yazi_config::opener::OpenerRule>>) -> Self {
-		Self { inner: inner.into(), v_run: None, v_desc: None }
-	}
-}
-
-impl FromLua for OpenerRule {
-	fn from_lua(value: Value, lua: &Lua) -> mlua::Result<Self> {
-		let mut inner: yazi_config::opener::OpenerRule = lua.from_value(value)?;
-		inner.fill();
-
-		Ok(Self::new(inner))
-	}
-}
-
-impl UserData for OpenerRule {
-	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
-		fields.add_field_method_get("id", |_, me| Ok(Id(me.id)));
-		cached_field!(fields, run, |lua, me| lua.create_string(&*me.run));
-		fields.add_field_method_get("block", |_, me| Ok(me.block));
-		fields.add_field_method_get("orphan", |_, me| Ok(me.orphan));
-		cached_field!(fields, desc, |lua, me| lua.create_string(&*me.desc));
-	}
-}
-
-// --- Matcher
-pub struct OpenerRuleMatcher(pub(super) yazi_config::opener::OpenerRuleMatcher);
-
-impl OpenerRuleMatcher {
-	pub fn new(inner: impl Into<yazi_config::opener::OpenerRuleMatcher>) -> Self {
-		Self(inner.into())
-	}
-}
-
-impl TryFrom<Table> for OpenerRuleMatcher {
-	type Error = mlua::Error;
-
-	fn try_from(t: Table) -> Result<Self, Self::Error> {
-		let id: Id = t.raw_get("id").unwrap_or_default();
-
-		Ok(Self(yazi_config::opener::OpenerRuleMatcher { id: id.0, ..Default::default() }))
-	}
-}
-
-impl FromLua for OpenerRuleMatcher {
-	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
-		match value {
-			Value::Table(t) => t.try_into(),
-			_ => Err("expected a table of OpenerRuleMatcher".into_lua_err()),
-		}
-	}
-}
-
-impl IntoLua for OpenerRuleMatcher {
-	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> {
-		Iter::new(self.0.map(OpenerRule::new), None).into_lua(lua)
-	}
-}
diff --git a/yazi-binding/src/config/opener_rules.rs b/yazi-binding/src/config/opener_rules.rs
deleted file mode 100644
index d694bdec..00000000
--- a/yazi-binding/src/config/opener_rules.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-use std::{ops::Deref, sync::Arc};
-
-use mlua::{ExternalError, ExternalResult, FromLua, IntoLua, Lua, LuaSerdeExt, MetaMethod, UserData, UserDataMethods, Value};
-use yazi_shim::toml::DeserializeOverHook;
-
-use crate::config::{OpenerRule, OpenerRuleMatcher};
-
-pub struct OpenerRules {
-	inner: Arc<yazi_config::opener::OpenerRules>,
-}
-
-impl Deref for OpenerRules {
-	type Target = Arc<yazi_config::opener::OpenerRules>;
-
-	fn deref(&self) -> &Self::Target { &self.inner }
-}
-
-impl OpenerRules {
-	pub fn new(inner: impl Into<Arc<yazi_config::opener::OpenerRules>>) -> Self {
-		Self { inner: inner.into() }
-	}
-}
-
-impl FromLua for OpenerRules {
-	fn from_lua(value: Value, lua: &Lua) -> mlua::Result<Self> {
-		let inner: yazi_config::opener::OpenerRules = lua.from_value(value)?;
-
-		Ok(Self::new(inner.deserialize_over_hook().into_lua_err()?))
-	}
-}
-
-impl UserData for OpenerRules {
-	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
-		methods.add_method("match", |lua, me, matcher: Option<OpenerRuleMatcher>| match matcher {
-			Some(matcher) => matcher.into_lua(lua),
-			None => OpenerRuleMatcher::new(&*me.inner).into_lua(lua),
-		});
-
-		methods.add_method("insert", |_, me, (index, rule): (isize, OpenerRule)| {
-			let index = match index {
-				1.. => index - 1,
-				0 => return Err("index must be 1-based or negative".into_lua_err()),
-				_ => index,
-			};
-
-			me.inner.insert(index, rule.clone()).into_lua_err()?;
-			Ok(rule)
-		});
-
-		methods.add_method("remove", |_, me, matcher: OpenerRuleMatcher| {
-			me.inner.remove(matcher.0);
-			Ok(())
-		});
-
-		methods.add_meta_method(MetaMethod::Len, |_, me, ()| Ok(me.inner.load().len()));
-	}
-}
diff --git a/yazi-binding/src/config/preloader.rs b/yazi-binding/src/config/preloader.rs
deleted file mode 100644
index 1d81e0eb..00000000
--- a/yazi-binding/src/config/preloader.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use std::{ops::Deref, sync::Arc};
-
-use mlua::{ExternalError, FromLua, IntoLua, Lua, Table, UserData, UserDataFields, Value};
-use yazi_config::YAZI;
-
-use crate::{FileRef, Id, Iter, cached_field};
-
-#[derive(Clone)]
-pub struct Preloader {
-	inner: Arc<yazi_config::plugin::Preloader>,
-
-	v_name: Option<Value>,
-}
-
-impl Deref for Preloader {
-	type Target = yazi_config::plugin::Preloader;
-
-	fn deref(&self) -> &Self::Target { &self.inner }
-}
-
-impl Preloader {
-	pub fn new(inner: impl Into<Arc<yazi_config::plugin::Preloader>>) -> Self {
-		Self { inner: inner.into(), v_name: None }
-	}
-}
-
-impl UserData for Preloader {
-	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
-		fields.add_field_method_get("id", |_, me| Ok(Id(me.id)));
-
-		cached_field!(fields, name, |lua, me| lua.create_string(&*me.name));
-	}
-}
-
-// --- Matcher
-pub struct PreloaderMatcher(pub(super) yazi_config::plugin::PreloaderMatcher<'static>);
-
-impl PreloaderMatcher {
-	pub fn new(inner: impl Into<yazi_config::plugin::PreloaderMatcher<'static>>) -> Self {
-		Self(inner.into())
-	}
-}
-
-impl TryFrom<Table> for PreloaderMatcher {
-	type Error = mlua::Error;
-
-	fn try_from(value: Table) -> Result<Self, Self::Error> {
-		let id: Id = value.raw_get("id").unwrap_or_default();
-		let file: Option<FileRef> = value.raw_get("file")?;
-		let mime: Option<String> = value.raw_get("mime")?;
-
-		Ok(Self(yazi_config::plugin::PreloaderMatcher {
-			preloaders: YAZI.plugin.preloaders.load_full(),
-			id: id.0,
-			file: file.map(|f| f.inner.clone().into()),
-			mime: mime.map(Into::into),
-			..Default::default()
-		}))
-	}
-}
-
-impl FromLua for PreloaderMatcher {
-	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
-		match value {
-			Value::Table(t) => t.try_into(),
-			_ => Err("expected a table of PreloaderMatcher".into_lua_err()),
-		}
-	}
-}
-
-impl IntoLua for PreloaderMatcher {
-	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> {
-		Iter::new(self.0.map(Preloader::new), None).into_lua(lua)
-	}
-}
diff --git a/yazi-binding/src/config/preloaders.rs b/yazi-binding/src/config/preloaders.rs
deleted file mode 100644
index f1c13769..00000000
--- a/yazi-binding/src/config/preloaders.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use mlua::{IntoLua, MetaMethod, UserData, UserDataMethods};
-use yazi_config::YAZI;
-
-use crate::config::PreloaderMatcher;
-
-pub struct Preloaders;
-
-impl UserData for Preloaders {
-	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
-		methods.add_method("match", |lua, _, matcher: Option<PreloaderMatcher>| match matcher {
-			Some(matcher) => matcher.into_lua(lua),
-			None => PreloaderMatcher::new(&YAZI.plugin.preloaders).into_lua(lua),
-		});
-
-		methods.add_meta_method(MetaMethod::Len, |_, _, ()| Ok(YAZI.plugin.preloaders.load().len()));
-	}
-}
diff --git a/yazi-binding/src/config/previewer.rs b/yazi-binding/src/config/previewer.rs
deleted file mode 100644
index 4863a972..00000000
--- a/yazi-binding/src/config/previewer.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-use std::{ops::Deref, sync::Arc};
-
-use mlua::{ExternalError, FromLua, IntoLua, Lua, LuaSerdeExt, Table, UserData, UserDataFields, Value};
-use yazi_config::YAZI;
-
-use crate::{FileRef, Id, Iter, cached_field};
-
-#[derive(Clone)]
-pub struct Previewer {
-	inner: Arc<yazi_config::plugin::Previewer>,
-
-	v_name: Option<Value>,
-}
-
-impl Deref for Previewer {
-	type Target = yazi_config::plugin::Previewer;
-
-	fn deref(&self) -> &Self::Target { &self.inner }
-}
-
-impl From<Previewer> for Arc<yazi_config::plugin::Previewer> {
-	fn from(value: Previewer) -> Self { value.inner }
-}
-
-impl Previewer {
-	pub fn new(inner: impl Into<Arc<yazi_config::plugin::Previewer>>) -> Self {
-		Self { inner: inner.into(), v_name: None }
-	}
-}
-
-impl FromLua for Previewer {
-	fn from_lua(value: Value, lua: &Lua) -> mlua::Result<Self> {
-		Ok(Self::new(lua.from_value::<yazi_config::plugin::Previewer>(value)?))
-	}
-}
-
-impl UserData for Previewer {
-	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
-		fields.add_field_method_get("id", |_, me| Ok(Id(me.id)));
-
-		cached_field!(fields, name, |lua, me| lua.create_string(&*me.name));
-	}
-}
-
-// --- Matcher
-pub struct PreviewerMatcher(pub(super) yazi_config::plugin::PreviewerMatcher<'static>);
-
-impl PreviewerMatcher {
-	pub fn new(inner: impl Into<yazi_config::plugin::PreviewerMatcher<'static>>) -> Self {
-		Self(inner.into())
-	}
-}
-
-impl TryFrom<Table> for PreviewerMatcher {
-	type Error = mlua::Error;
-
-	fn try_from(value: Table) -> Result<Self, Self::Error> {
-		let id: Id = value.raw_get("id").unwrap_or_default();
-		let file: Option<FileRef> = value.raw_get("file")?;
-		let mime: Option<String> = value.raw_get("mime")?;
-
-		Ok(Self(yazi_config::plugin::PreviewerMatcher {
-			previewers: YAZI.plugin.previewers.load_full(),
-			id: id.0,
-			file: file.map(|f| f.inner.clone().into()),
-			mime: mime.map(Into::into),
-			..Default::default()
-		}))
-	}
-}
-
-impl FromLua for PreviewerMatcher {
-	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
-		match value {
-			Value::Table(t) => t.try_into(),
-			_ => Err("expected a table of PreviewerMatcher".into_lua_err()),
-		}
-	}
-}
-
-impl IntoLua for PreviewerMatcher {
-	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> {
-		Iter::new(self.0.map(Previewer::new), None).into_lua(lua)
-	}
-}
diff --git a/yazi-binding/src/config/previewers.rs b/yazi-binding/src/config/previewers.rs
deleted file mode 100644
index 66934839..00000000
--- a/yazi-binding/src/config/previewers.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-use mlua::{ExternalError, ExternalResult, IntoLua, MetaMethod, UserData, UserDataMethods};
-use yazi_config::YAZI;
-
-use crate::config::{Previewer, PreviewerMatcher};
-
-pub struct Previewers;
-
-impl UserData for Previewers {
-	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
-		methods.add_method("match", |lua, _, matcher: Option<PreviewerMatcher>| match matcher {
-			Some(matcher) => matcher.into_lua(lua),
-			None => PreviewerMatcher::new(&YAZI.plugin.previewers).into_lua(lua),
-		});
-
-		methods.add_method("insert", |_, _, (index, previewer): (isize, Previewer)| {
-			let index = match index {
-				1.. => index - 1,
-				0 => return Err("index must be 1-based or negative".into_lua_err()),
-				_ => index,
-			};
-
-			YAZI.plugin.previewers.insert(index, previewer.clone().into()).into_lua_err()?;
-			Ok(previewer)
-		});
-
-		methods.add_method("remove", |_, _, matcher: PreviewerMatcher| {
-			YAZI.plugin.previewers.remove(matcher.0);
-			Ok(())
-		});
-
-		methods.add_meta_method(MetaMethod::Len, |_, _, ()| Ok(YAZI.plugin.previewers.load().len()));
-	}
-}
diff --git a/yazi-binding/src/config/spotter.rs b/yazi-binding/src/config/spotter.rs
deleted file mode 100644
index 719331ff..00000000
--- a/yazi-binding/src/config/spotter.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use std::{ops::Deref, sync::Arc};
-
-use mlua::{ExternalError, FromLua, IntoLua, Lua, Table, UserData, UserDataFields, Value};
-use yazi_config::YAZI;
-
-use crate::{FileRef, Id, Iter, cached_field};
-
-#[derive(Clone)]
-pub struct Spotter {
-	inner: Arc<yazi_config::plugin::Spotter>,
-
-	v_name: Option<Value>,
-}
-
-impl Deref for Spotter {
-	type Target = yazi_config::plugin::Spotter;
-
-	fn deref(&self) -> &Self::Target { &self.inner }
-}
-
-impl Spotter {
-	pub fn new(inner: impl Into<Arc<yazi_config::plugin::Spotter>>) -> Self {
-		Self { inner: inner.into(), v_name: None }
-	}
-}
-
-impl UserData for Spotter {
-	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
-		fields.add_field_method_get("id", |_, me| Ok(Id(me.id)));
-
-		cached_field!(fields, name, |lua, me| lua.create_string(&*me.name));
-	}
-}
-
-// --- Matcher
-pub struct SpotterMatcher(pub(super) yazi_config::plugin::SpotterMatcher<'static>);
-
-impl SpotterMatcher {
-	pub fn new(inner: impl Into<yazi_config::plugin::SpotterMatcher<'static>>) -> Self {
-		Self(inner.into())
-	}
-}
-
-impl TryFrom<Table> for SpotterMatcher {
-	type Error = mlua::Error;
-
-	fn try_from(value: Table) -> Result<Self, Self::Error> {
-		let id: Id = value.raw_get("id").unwrap_or_default();
-		let file: Option<FileRef> = value.raw_get("file")?;
-		let mime: Option<String> = value.raw_get("mime")?;
-
-		Ok(Self(yazi_config::plugin::SpotterMatcher {
-			spotters: YAZI.plugin.spotters.load_full(),
-			id: id.0,
-			file: file.map(|f| f.inner.clone().into()),
-			mime: mime.map(Into::into),
-			..Default::default()
-		}))
-	}
-}
-
-impl FromLua for SpotterMatcher {
-	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
-		match value {
-			Value::Table(t) => t.try_into(),
-			_ => Err("expected a table of SpotterMatcher".into_lua_err()),
-		}
-	}
-}
-
-impl IntoLua for SpotterMatcher {
-	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> {
-		Iter::new(self.0.map(Spotter::new), None).into_lua(lua)
-	}
-}
diff --git a/yazi-binding/src/config/spotters.rs b/yazi-binding/src/config/spotters.rs
deleted file mode 100644
index 8afda780..00000000
--- a/yazi-binding/src/config/spotters.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use mlua::{IntoLua, MetaMethod, UserData, UserDataMethods};
-use yazi_config::YAZI;
-
-use crate::config::SpotterMatcher;
-
-pub struct Spotters;
-
-impl UserData for Spotters {
-	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
-		methods.add_method("match", |lua, _, matcher: Option<SpotterMatcher>| match matcher {
-			Some(matcher) => matcher.into_lua(lua),
-			None => SpotterMatcher::new(&YAZI.plugin.spotters).into_lua(lua),
-		});
-
-		methods.add_meta_method(MetaMethod::Len, |_, _, ()| Ok(YAZI.plugin.spotters.load().len()));
-	}
-}
diff --git a/yazi-binding/src/elements/align.rs b/yazi-binding/src/elements/align.rs
index 564cfa70..5d4a2a18 100644
--- a/yazi-binding/src/elements/align.rs
+++ b/yazi-binding/src/elements/align.rs
@@ -3,10 +3,10 @@ use std::ops::Deref;
 use mlua::{FromLua, IntoLua, Lua, Value};
 
 #[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
-pub struct Align(pub(super) ratatui::layout::Alignment);
+pub struct Align(pub(super) ratatui_core::layout::Alignment);
 
 impl Deref for Align {
-	type Target = ratatui::layout::Alignment;
+	type Target = ratatui_core::layout::Alignment;
 
 	fn deref(&self) -> &Self::Target { &self.0 }
 }
@@ -27,9 +27,9 @@ impl FromLua for Align {
 			});
 		};
 		Ok(Self(match n {
-			0 => ratatui::layout::Alignment::Left,
-			1 => ratatui::layout::Alignment::Center,
-			2 => ratatui::layout::Alignment::Right,
+			0 => ratatui_core::layout::Alignment::Left,
+			1 => ratatui_core::layout::Alignment::Center,
+			2 => ratatui_core::layout::Alignment::Right,
 			_ => Err(mlua::Error::FromLuaConversionError {
 				from:    value.type_name(),
 				to:      "Align".to_string(),
diff --git a/yazi-binding/src/elements/area.rs b/yazi-binding/src/elements/area.rs
index f2cf04cd..888f06e9 100644
--- a/yazi-binding/src/elements/area.rs
+++ b/yazi-binding/src/elements/area.rs
@@ -1,48 +1,63 @@
 use std::fmt::Debug;
 
 use mlua::{AnyUserData, ExternalError, FromLua, IntoLua, Lua, Value};
+use yazi_shim::ratatui::Padable;
 
-use super::{Pos, Rect};
+use super::Rect;
+use crate::position::Position;
 
 const EXPECTED: &str = "expected a Pos or Rect";
 
 #[derive(Clone, Copy)]
 pub enum Area {
-	Pos(Pos),
 	Rect(Rect),
+	Pos(Position),
 }
 
 impl Default for Area {
 	fn default() -> Self { Self::Rect(Default::default()) }
 }
 
-impl Area {
-	pub fn size(self) -> ratatui::layout::Size {
+impl Debug for Area {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		match self {
+			Self::Rect(rect) => write!(f, "{:?}", **rect),
+			Self::Pos(pos) => write!(f, "{:?}", **pos),
+		}
+	}
+}
+
+impl From<Area> for Position {
+	fn from(value: Area) -> Self {
+		match value {
+			Area::Rect(rect) => Self::from(*rect),
+			Area::Pos(pos) => pos,
+		}
+	}
+}
+
+impl Area {
+	pub fn size(self) -> ratatui_core::layout::Size {
 		match self {
-			Self::Pos(pos) => {
-				ratatui::layout::Size { width: pos.offset.width, height: pos.offset.height }
-			}
 			Self::Rect(rect) => (*rect).into(),
+			Self::Pos(pos) => ratatui_core::layout::Size { width: pos.width, height: pos.height },
 		}
 	}
 
-	pub fn inner(self, padding: ratatui::widgets::Padding) -> Self {
+	pub fn padding(self, padding: ratatui_widgets::block::Padding) -> Self {
 		match self {
-			Self::Pos(mut pos) => {
-				pos.pad += padding;
-				Self::Pos(pos)
-			}
-			Self::Rect(rect) => Self::Rect(rect.pad(padding.into())),
+			Self::Rect(rect) => Self::Rect(rect.padding(padding).into()),
+			Self::Pos(pos) => Self::Pos(pos.padding(padding)),
 		}
 	}
 
 	pub fn transform(
 		self,
-		f: impl FnOnce(yazi_config::popup::Position) -> ratatui::layout::Rect,
-	) -> ratatui::layout::Rect {
+		f: impl FnOnce(Position) -> ratatui_core::layout::Rect,
+	) -> ratatui_core::layout::Rect {
 		match self {
-			Self::Pos(pos) => *Rect(f(*pos)).pad(pos.pad),
 			Self::Rect(rect) => *rect,
+			Self::Pos(pos) => f(pos),
 		}
 	}
 }
@@ -51,17 +66,21 @@ impl From<Rect> for Area {
 	fn from(rect: Rect) -> Self { Self::Rect(rect) }
 }
 
-impl From<ratatui::layout::Rect> for Area {
-	fn from(rect: ratatui::layout::Rect) -> Self { Self::Rect(rect.into()) }
+impl From<ratatui_core::layout::Rect> for Area {
+	fn from(rect: ratatui_core::layout::Rect) -> Self { Self::Rect(rect.into()) }
 }
 
-impl TryFrom<AnyUserData> for Area {
+impl From<Position> for Area {
+	fn from(value: Position) -> Self { Self::Pos(value) }
+}
+
+impl TryFrom<&AnyUserData> for Area {
 	type Error = mlua::Error;
 
-	fn try_from(value: AnyUserData) -> Result<Self, Self::Error> {
+	fn try_from(value: &AnyUserData) -> Result<Self, Self::Error> {
 		Ok(if let Ok(rect) = value.borrow::<Rect>() {
 			Self::Rect(*rect)
-		} else if let Ok(pos) = value.borrow::<Pos>() {
+		} else if let Ok(pos) = value.borrow::<Position>() {
 			Self::Pos(*pos)
 		} else {
 			return Err(EXPECTED.into_lua_err());
@@ -72,7 +91,7 @@ impl TryFrom<AnyUserData> for Area {
 impl FromLua for Area {
 	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
 		match value {
-			Value::UserData(ud) => Self::try_from(ud),
+			Value::UserData(ud) => Self::try_from(&ud),
 			_ => Err(EXPECTED.into_lua_err()),
 		}
 	}
@@ -81,17 +100,8 @@ impl FromLua for Area {
 impl IntoLua for Area {
 	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> {
 		match self {
-			Self::Pos(pos) => pos.into_lua(lua),
 			Self::Rect(rect) => rect.into_lua(lua),
-		}
-	}
-}
-
-impl Debug for Area {
-	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-		match self {
-			Self::Pos(pos) => write!(f, "{:?}", **pos),
-			Self::Rect(rect) => write!(f, "{:?}", **rect),
+			Self::Pos(pos) => pos.into_lua(lua),
 		}
 	}
 }
diff --git a/yazi-binding/src/elements/bar.rs b/yazi-binding/src/elements/bar.rs
index eb94303b..e260747c 100644
--- a/yazi-binding/src/elements/bar.rs
+++ b/yazi-binding/src/elements/bar.rs
@@ -1,15 +1,17 @@
 use mlua::{AnyUserData, IntoLua, Lua, MetaMethod, Table, UserData, UserDataMethods, Value};
-use ratatui::widgets::{Borders, Widget};
+use ratatui_core::widgets::Widget;
+use ratatui_widgets::borders::Borders;
 
 use super::{Area, Edge};
+use crate::elements::Spatial;
 
 #[derive(Clone, Debug, Default)]
 pub struct Bar {
-	pub(super) area: Area,
+	area: Area,
 
 	edge:   Edge,
 	symbol: String,
-	style:  ratatui::style::Style,
+	style:  ratatui_core::style::Style,
 }
 
 impl Bar {
@@ -23,17 +25,20 @@ impl Bar {
 	}
 }
 
-impl Widget for Bar {
-	fn render(self, rect: ratatui::layout::Rect, buf: &mut ratatui::buffer::Buffer)
-	where
-		Self: Sized,
-	{
-		(&self).render(rect, buf);
-	}
+impl TryFrom<&AnyUserData> for Bar {
+	type Error = mlua::Error;
+
+	fn try_from(value: &AnyUserData) -> Result<Self, Self::Error> { value.take() }
+}
+
+impl Spatial for Bar {
+	fn area(&self) -> Area { self.area }
+
+	fn set_area(&mut self, area: Area) { self.area = area; }
 }
 
 impl Widget for &Bar {
-	fn render(self, rect: ratatui::layout::Rect, buf: &mut ratatui::buffer::Buffer)
+	fn render(self, rect: ratatui_core::layout::Rect, buf: &mut ratatui_core::buffer::Buffer)
 	where
 		Self: Sized,
 	{
diff --git a/yazi-binding/src/elements/border.rs b/yazi-binding/src/elements/border.rs
index a56ac58d..cbb76a2f 100644
--- a/yazi-binding/src/elements/border.rs
+++ b/yazi-binding/src/elements/border.rs
@@ -1,8 +1,9 @@
 use mlua::{AnyUserData, IntoLua, Lua, MetaMethod, Table, UserData, UserDataMethods, Value};
-use ratatui::widgets::{Borders, Widget};
+use ratatui_core::widgets::Widget;
+use ratatui_widgets::borders::Borders;
 
 use super::{Area, Edge};
-use crate::elements::Line;
+use crate::elements::{Line, Spatial};
 
 // Type
 const PLAIN: u8 = 0;
@@ -17,16 +18,17 @@ pub struct Border {
 	pub area: Area,
 
 	pub edge:   Edge,
-	pub r#type: ratatui::widgets::BorderType,
-	pub style:  ratatui::style::Style,
+	pub r#type: ratatui_widgets::borders::BorderType,
+	pub style:  ratatui_core::style::Style,
+	pub merge:  ratatui_core::symbols::merge::MergeStrategy,
 
-	pub titles: Vec<(ratatui::widgets::TitlePosition, ratatui::text::Line<'static>)>,
+	pub titles: Vec<(ratatui_widgets::block::TitlePosition, ratatui_core::text::Line<'static>)>,
 }
 
 impl Border {
 	pub fn compose(lua: &Lua) -> mlua::Result<Value> {
 		let new = lua.create_function(|_, (_, edge): (Table, Edge)| {
-			Ok(Self { edge, r#type: ratatui::widgets::BorderType::Rounded, ..Default::default() })
+			Ok(Self { edge, r#type: ratatui_widgets::borders::BorderType::Rounded, ..Default::default() })
 		})?;
 
 		let border = lua.create_table_from([
@@ -44,20 +46,33 @@ impl Border {
 	}
 }
 
+impl TryFrom<&AnyUserData> for Border {
+	type Error = mlua::Error;
+
+	fn try_from(value: &AnyUserData) -> Result<Self, Self::Error> { value.take() }
+}
+
+impl Spatial for Border {
+	fn area(&self) -> Area { self.area }
+
+	fn set_area(&mut self, area: Area) { self.area = area; }
+}
+
 impl Widget for Border {
-	fn render(self, rect: ratatui::layout::Rect, buf: &mut ratatui::buffer::Buffer)
+	fn render(self, rect: ratatui_core::layout::Rect, buf: &mut ratatui_core::buffer::Buffer)
 	where
 		Self: Sized,
 	{
-		let mut block = ratatui::widgets::Block::default()
+		let mut block = ratatui_widgets::block::Block::default()
 			.borders(self.edge.0)
 			.border_type(self.r#type)
-			.border_style(self.style);
+			.border_style(self.style)
+			.merge_borders(self.merge);
 
 		for title in self.titles {
 			block = match title {
-				(ratatui::widgets::TitlePosition::Top, line) => block.title_top(line),
-				(ratatui::widgets::TitlePosition::Bottom, line) => block.title_bottom(line),
+				(ratatui_widgets::block::TitlePosition::Top, line) => block.title_top(line),
+				(ratatui_widgets::block::TitlePosition::Bottom, line) => block.title_bottom(line),
 			};
 		}
 
@@ -66,7 +81,7 @@ impl Widget for Border {
 }
 
 impl Widget for &Border {
-	fn render(self, rect: ratatui::layout::Rect, buf: &mut ratatui::buffer::Buffer)
+	fn render(self, rect: ratatui_core::layout::Rect, buf: &mut ratatui_core::buffer::Buffer)
 	where
 		Self: Sized,
 	{
@@ -81,20 +96,20 @@ impl UserData for Border {
 
 		methods.add_function("type", |_, (ud, value): (AnyUserData, u8)| {
 			ud.borrow_mut::<Self>()?.r#type = match value {
-				ROUNDED => ratatui::widgets::BorderType::Rounded,
-				DOUBLE => ratatui::widgets::BorderType::Double,
-				THICK => ratatui::widgets::BorderType::Thick,
-				QUADRANT_INSIDE => ratatui::widgets::BorderType::QuadrantInside,
-				QUADRANT_OUTSIDE => ratatui::widgets::BorderType::QuadrantOutside,
-				_ => ratatui::widgets::BorderType::Plain,
+				ROUNDED => ratatui_widgets::borders::BorderType::Rounded,
+				DOUBLE => ratatui_widgets::borders::BorderType::Double,
+				THICK => ratatui_widgets::borders::BorderType::Thick,
+				QUADRANT_INSIDE => ratatui_widgets::borders::BorderType::QuadrantInside,
+				QUADRANT_OUTSIDE => ratatui_widgets::borders::BorderType::QuadrantOutside,
+				_ => ratatui_widgets::borders::BorderType::Plain,
 			};
 			Ok(ud)
 		});
 		methods.add_function("title", |_, (ud, line, position): (AnyUserData, Line, Option<u8>)| {
 			let position = if position == Some(Borders::BOTTOM.bits()) {
-				ratatui::widgets::TitlePosition::Bottom
+				ratatui_widgets::block::TitlePosition::Bottom
 			} else {
-				ratatui::widgets::TitlePosition::Top
+				ratatui_widgets::block::TitlePosition::Top
 			};
 
 			ud.borrow_mut::<Self>()?.titles.push((position, line.inner));
@@ -104,5 +119,13 @@ impl UserData for Border {
 			ud.borrow_mut::<Self>()?.edge = edge;
 			Ok(ud)
 		});
+		methods.add_function("merge", |_, (ud, exact): (AnyUserData, bool)| {
+			ud.borrow_mut::<Self>()?.merge = if exact {
+				ratatui_core::symbols::merge::MergeStrategy::Exact
+			} else {
+				ratatui_core::symbols::merge::MergeStrategy::Fuzzy
+			};
+			Ok(ud)
+		});
 	}
 }
diff --git a/yazi-binding/src/elements/cell.rs b/yazi-binding/src/elements/cell.rs
index 3b31b907..a75805ac 100644
--- a/yazi-binding/src/elements/cell.rs
+++ b/yazi-binding/src/elements/cell.rs
@@ -4,10 +4,10 @@ use super::Text;
 
 #[derive(Clone, Debug)]
 pub struct Cell {
-	pub(super) text: ratatui::text::Text<'static>,
+	pub(super) text: ratatui_core::text::Text<'static>,
 }
 
-impl From<Cell> for ratatui::widgets::Cell<'static> {
+impl From<Cell> for ratatui_widgets::table::Cell<'static> {
 	fn from(value: Cell) -> Self { Self::new(value.text) }
 }
 
diff --git a/yazi-binding/src/elements/clear.rs b/yazi-binding/src/elements/clear.rs
deleted file mode 100644
index 5bcf0c2b..00000000
--- a/yazi-binding/src/elements/clear.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use mlua::{IntoLua, Lua, MetaMethod, Table, UserData, UserDataMethods, Value};
-use ratatui::widgets::Widget;
-
-use super::Area;
-
-#[derive(Clone, Copy, Debug, Default)]
-pub struct Clear {
-	pub area: Area,
-}
-
-impl Clear {
-	pub fn compose(lua: &Lua) -> mlua::Result<Value> {
-		let new = lua.create_function(|_, (_, area): (Table, Area)| Ok(Self { area }))?;
-
-		let clear = lua.create_table()?;
-		clear.set_metatable(Some(lua.create_table_from([(MetaMethod::Call.name(), new)])?))?;
-
-		clear.into_lua(lua)
-	}
-}
-
-impl Widget for Clear {
-	fn render(self, rect: ratatui::layout::Rect, buf: &mut ratatui::buffer::Buffer)
-	where
-		Self: Sized,
-	{
-		(&self).render(rect, buf);
-	}
-}
-
-impl Widget for &Clear {
-	fn render(self, rect: ratatui::layout::Rect, buf: &mut ratatui::buffer::Buffer)
-	where
-		Self: Sized,
-	{
-		yazi_widgets::Clear.render(rect, buf);
-	}
-}
-
-impl UserData for Clear {
-	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
-		crate::impl_area_method!(methods);
-	}
-}
diff --git a/yazi-binding/src/elements/color.rs b/yazi-binding/src/elements/color.rs
index 503f6d5d..a7bf7926 100644
--- a/yazi-binding/src/elements/color.rs
+++ b/yazi-binding/src/elements/color.rs
@@ -1,9 +1,9 @@
 use std::str::FromStr;
 
-use mlua::{ExternalError, ExternalResult, FromLua, IntoLua, Lua, MetaMethod, Table, UserData, Value};
+use mlua::{AnyUserData, ExternalError, ExternalResult, FromLua, IntoLua, Lua, MetaMethod, Table, UserData, Value};
 
 #[derive(Clone, Copy, Default)]
-pub struct Color(pub ratatui::style::Color);
+pub struct Color(pub ratatui_core::style::Color);
 
 impl Color {
 	pub fn compose(lua: &Lua) -> mlua::Result<Value> {
@@ -16,12 +16,18 @@ impl Color {
 	}
 }
 
+impl TryFrom<&AnyUserData> for Color {
+	type Error = mlua::Error;
+
+	fn try_from(ud: &AnyUserData) -> Result<Self, Self::Error> { Ok(*ud.borrow()?) }
+}
+
 impl FromLua for Color {
 	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
 		Ok(Self(match value {
-			Value::Nil => ratatui::style::Color::Reset,
-			Value::String(s) => ratatui::style::Color::from_str(&s.to_str()?).into_lua_err()?,
-			Value::UserData(ud) => ud.borrow::<Self>()?.0,
+			Value::Nil => ratatui_core::style::Color::Reset,
+			Value::String(s) => ratatui_core::style::Color::from_str(&s.to_str()?).into_lua_err()?,
+			Value::UserData(ud) => return Self::try_from(&ud),
 			_ => Err("expected a Color".into_lua_err())?,
 		}))
 	}
diff --git a/yazi-binding/src/elements/constraint.rs b/yazi-binding/src/elements/constraint.rs
index c2ecad07..82fe300c 100644
--- a/yazi-binding/src/elements/constraint.rs
+++ b/yazi-binding/src/elements/constraint.rs
@@ -1,11 +1,11 @@
 use mlua::{FromLua, IntoLua, Lua, UserData, Value};
 
 #[derive(Clone, Copy, Default, FromLua)]
-pub struct Constraint(pub(super) ratatui::layout::Constraint);
+pub struct Constraint(pub(super) ratatui_core::layout::Constraint);
 
 impl Constraint {
 	pub fn compose(lua: &Lua) -> mlua::Result<Value> {
-		use ratatui::layout::Constraint as C;
+		use ratatui_core::layout::Constraint as C;
 
 		lua
 			.create_table_from([
@@ -20,7 +20,7 @@ impl Constraint {
 	}
 }
 
-impl From<Constraint> for ratatui::layout::Constraint {
+impl From<Constraint> for ratatui_core::layout::Constraint {
 	fn from(value: Constraint) -> Self { value.0 }
 }
 
diff --git a/yazi-binding/src/elements/edge.rs b/yazi-binding/src/elements/edge.rs
index a239ae60..f0b6bcf3 100644
--- a/yazi-binding/src/elements/edge.rs
+++ b/yazi-binding/src/elements/edge.rs
@@ -1,7 +1,7 @@
 use std::ops::Deref;
 
 use mlua::{FromLua, IntoLua, Lua, Value};
-use ratatui::widgets::Borders;
+use ratatui_widgets::borders::Borders;
 
 #[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
 pub struct Edge(pub Borders);
diff --git a/yazi-binding/src/elements/elements.rs b/yazi-binding/src/elements/elements.rs
deleted file mode 100644
index 45971550..00000000
--- a/yazi-binding/src/elements/elements.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-use mlua::{IntoLua, Lua, Value};
-use tracing::error;
-
-use super::Renderable;
-use crate::{Composer, ComposerGet, ComposerSet};
-
-pub fn compose(p_get: ComposerGet, p_set: ComposerSet) -> Composer<ComposerGet, ComposerSet> {
-	fn get(lua: &Lua, key: &[u8]) -> mlua::Result<Value> {
-		match key {
-			b"Align" => super::Align::compose(lua)?,
-			b"Bar" => super::Bar::compose(lua)?,
-			b"Border" => super::Border::compose(lua)?,
-			b"Clear" => super::Clear::compose(lua)?,
-			b"Color" => super::Color::compose(lua)?,
-			b"Constraint" => super::Constraint::compose(lua)?,
-			b"Edge" => super::Edge::compose(lua)?,
-			b"Gauge" => super::Gauge::compose(lua)?,
-			b"Layout" => super::Layout::compose(lua)?,
-			b"Line" => super::Line::compose(lua)?,
-			b"List" => super::List::compose(lua)?,
-			b"Pad" => super::Pad::compose(lua)?,
-			b"Pos" => super::Pos::compose(lua)?,
-			b"Rect" => super::Rect::compose(lua)?,
-			b"Row" => super::Row::compose(lua)?,
-			b"Span" => super::Span::compose(lua)?,
-			b"Style" => crate::Style::compose(lua)?,
-			b"Table" => super::Table::compose(lua)?,
-			b"Text" => super::Text::compose(lua)?,
-			b"Wrap" => super::Wrap::compose(lua)?,
-			_ => return Ok(Value::Nil),
-		}
-		.into_lua(lua)
-	}
-
-	fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> { Ok(value) }
-
-	Composer::with_parent(get, set, p_get, p_set)
-}
-
-pub fn render_once<F>(value: Value, buf: &mut ratatui::buffer::Buffer, trans: F)
-where
-	F: FnOnce(yazi_config::popup::Position) -> ratatui::layout::Rect + Copy,
-{
-	match value {
-		Value::Table(tbl) => {
-			for widget in tbl.sequence_values::<Renderable>() {
-				match widget {
-					Ok(w) => w.render_with(buf, trans),
-					Err(e) => error!("Failed to convert to renderable elements: {e}"),
-				}
-			}
-		}
-		Value::UserData(ud) => match Renderable::try_from(&ud) {
-			Ok(w) => w.render_with(buf, trans),
-			Err(e) => error!("Failed to convert to renderable element: {e}"),
-		},
-		_ => error!("Expected a renderable element, or a table of them, got: {value:?}"),
-	}
-}
diff --git a/yazi-binding/src/elements/fill.rs b/yazi-binding/src/elements/fill.rs
new file mode 100644
index 00000000..2ce66918
--- /dev/null
+++ b/yazi-binding/src/elements/fill.rs
@@ -0,0 +1,57 @@
+use mlua::{AnyUserData, IntoLua, Lua, MetaMethod, Table, UserData, UserDataMethods, Value};
+use ratatui_core::widgets::Widget;
+
+use super::Area;
+use crate::elements::Spatial;
+
+#[derive(Clone, Copy, Debug, Default)]
+pub struct Fill {
+	area: Area,
+
+	style: ratatui_core::style::Style,
+}
+
+impl Fill {
+	pub fn compose(lua: &Lua) -> mlua::Result<Value> {
+		let new =
+			lua.create_function(|_, (_, area): (Table, Area)| Ok(Self { area, ..Default::default() }))?;
+
+		let fill = lua.create_table()?;
+		fill.set_metatable(Some(lua.create_table_from([(MetaMethod::Call.name(), new)])?))?;
+
+		fill.into_lua(lua)
+	}
+}
+
+impl TryFrom<&AnyUserData> for Fill {
+	type Error = mlua::Error;
+
+	fn try_from(value: &AnyUserData) -> Result<Self, Self::Error> { Ok(*value.borrow()?) }
+}
+
+impl Spatial for Fill {
+	fn area(&self) -> Area { self.area }
+
+	fn set_area(&mut self, area: Area) { self.area = area; }
+}
+
+impl Widget for &Fill {
+	fn render(self, rect: ratatui_core::layout::Rect, buf: &mut ratatui_core::buffer::Buffer)
+	where
+		Self: Sized,
+	{
+		if self.style == Default::default() {
+			return;
+		}
+
+		for pos in rect.positions() {
+			buf[pos].set_style(self.style);
+		}
+	}
+}
+
+impl UserData for Fill {
+	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
+		crate::impl_style_method!(methods, style);
+	}
+}
diff --git a/yazi-binding/src/elements/gauge.rs b/yazi-binding/src/elements/gauge.rs
index d9eb611c..9c411748 100644
--- a/yazi-binding/src/elements/gauge.rs
+++ b/yazi-binding/src/elements/gauge.rs
@@ -1,17 +1,17 @@
 use mlua::{AnyUserData, ExternalError, IntoLua, Lua, MetaMethod, Table, UserData, UserDataMethods, Value};
-use ratatui::widgets::Widget;
+use ratatui_core::widgets::Widget;
 
 use super::{Area, Span};
-use crate::Style;
+use crate::{elements::Spatial, style::Style};
 
 #[derive(Clone, Debug, Default)]
 pub struct Gauge {
-	pub(super) area: Area,
+	area: Area,
 
 	ratio:       f64,
-	label:       Option<ratatui::text::Span<'static>>,
-	style:       ratatui::style::Style,
-	gauge_style: ratatui::style::Style,
+	label:       Option<ratatui_core::text::Span<'static>>,
+	style:       ratatui_core::style::Style,
+	gauge_style: ratatui_core::style::Style,
 }
 
 impl Gauge {
@@ -25,12 +25,24 @@ impl Gauge {
 	}
 }
 
+impl TryFrom<&AnyUserData> for Gauge {
+	type Error = mlua::Error;
+
+	fn try_from(value: &AnyUserData) -> Result<Self, Self::Error> { value.take() }
+}
+
+impl Spatial for Gauge {
+	fn area(&self) -> Area { self.area }
+
+	fn set_area(&mut self, area: Area) { self.area = area; }
+}
+
 impl Widget for Gauge {
-	fn render(self, rect: ratatui::layout::Rect, buf: &mut ratatui::buffer::Buffer)
+	fn render(self, rect: ratatui_core::layout::Rect, buf: &mut ratatui_core::buffer::Buffer)
 	where
 		Self: Sized,
 	{
-		let mut gauge = ratatui::widgets::Gauge::default()
+		let mut gauge = ratatui_widgets::gauge::Gauge::default()
 			.ratio(self.ratio)
 			.style(self.style)
 			.gauge_style(self.gauge_style);
@@ -44,7 +56,7 @@ impl Widget for Gauge {
 }
 
 impl Widget for &Gauge {
-	fn render(self, rect: ratatui::layout::Rect, buf: &mut ratatui::buffer::Buffer)
+	fn render(self, rect: ratatui_core::layout::Rect, buf: &mut ratatui_core::buffer::Buffer)
 	where
 		Self: Sized,
 	{
diff --git a/yazi-binding/src/elements/layout.rs b/yazi-binding/src/elements/layout.rs
index bf499894..eca8187c 100644
--- a/yazi-binding/src/elements/layout.rs
+++ b/yazi-binding/src/elements/layout.rs
@@ -8,8 +8,8 @@ const VERTICAL: bool = false;
 #[derive(Clone, Default)]
 pub struct Layout {
 	direction:   bool,
-	margin:      Option<ratatui::layout::Margin>,
-	constraints: Vec<ratatui::layout::Constraint>,
+	margin:      Option<ratatui_core::layout::Margin>,
+	constraints: Vec<ratatui_core::layout::Constraint>,
 }
 
 impl Layout {
@@ -30,7 +30,7 @@ impl UserData for Layout {
 			Ok(ud)
 		});
 		methods.add_function("margin", |_, (ud, value): (AnyUserData, u16)| {
-			ud.borrow_mut::<Self>()?.margin = Some(ratatui::layout::Margin::new(value, value));
+			ud.borrow_mut::<Self>()?.margin = Some(ratatui_core::layout::Margin::new(value, value));
 			Ok(ud)
 		});
 		methods.add_function("margin_h", |_, (ud, value): (AnyUserData, u16)| {
@@ -39,7 +39,7 @@ impl UserData for Layout {
 				if let Some(margin) = &mut me.margin {
 					margin.horizontal = value;
 				} else {
-					me.margin = Some(ratatui::layout::Margin::new(value, 0));
+					me.margin = Some(ratatui_core::layout::Margin::new(value, 0));
 				}
 			}
 			Ok(ud)
@@ -50,7 +50,7 @@ impl UserData for Layout {
 				if let Some(margin) = &mut me.margin {
 					margin.vertical = value;
 				} else {
-					me.margin = Some(ratatui::layout::Margin::new(0, value));
+					me.margin = Some(ratatui_core::layout::Margin::new(0, value));
 				}
 			}
 			Ok(ud)
@@ -60,11 +60,11 @@ impl UserData for Layout {
 			Ok(ud)
 		});
 		methods.add_method("split", |lua, me, value: Rect| {
-			let mut layout = ratatui::layout::Layout::new(
+			let mut layout = ratatui_core::layout::Layout::new(
 				if me.direction == VERTICAL {
-					ratatui::layout::Direction::Vertical
+					ratatui_core::layout::Direction::Vertical
 				} else {
-					ratatui::layout::Direction::Horizontal
+					ratatui_core::layout::Direction::Horizontal
 				},
 				&me.constraints,
 			);
diff --git a/yazi-binding/src/elements/line.rs b/yazi-binding/src/elements/line.rs
index 7a38dfcb..4bcc6048 100644
--- a/yazi-binding/src/elements/line.rs
+++ b/yazi-binding/src/elements/line.rs
@@ -1,24 +1,24 @@
 use std::{borrow::Cow, mem, ops::{Deref, DerefMut}};
 
 use ansi_to_tui::IntoText;
-use mlua::{AnyUserData, ExternalError, ExternalResult, FromLua, IntoLua, Lua, MetaMethod, Table, UserData, UserDataMethods, Value};
-use ratatui::widgets::Widget;
+use mlua::{AnyUserData, ExternalError, ExternalResult, FromLua, Function, IntoLua, Lua, MetaMethod, Table, UserData, UserDataMethods, Value};
+use ratatui_core::widgets::Widget;
 use unicode_width::UnicodeWidthChar;
 
 use super::{Area, Span};
-use crate::elements::Align;
+use crate::elements::{Align, Spatial};
 
 const EXPECTED: &str = "expected a string, Span, Line, or a table of them";
 
 #[derive(Clone, Debug, Default)]
 pub struct Line {
-	pub(super) area: Area,
+	area: Area,
 
-	pub(super) inner: ratatui::text::Line<'static>,
+	pub(super) inner: ratatui_core::text::Line<'static>,
 }
 
 impl Deref for Line {
-	type Target = ratatui::text::Line<'static>;
+	type Target = ratatui_core::text::Line<'static>;
 
 	fn deref(&self) -> &Self::Target { &self.inner }
 }
@@ -51,12 +51,26 @@ impl Line {
 	}
 }
 
-impl From<ratatui::text::Line<'static>> for Line {
-	fn from(value: ratatui::text::Line<'static>) -> Self {
+impl From<ratatui_core::text::Line<'static>> for Line {
+	fn from(value: ratatui_core::text::Line<'static>) -> Self {
 		Self { inner: value, ..Default::default() }
 	}
 }
 
+impl TryFrom<&AnyUserData> for Line {
+	type Error = mlua::Error;
+
+	fn try_from(value: &AnyUserData) -> Result<Self, Self::Error> {
+		Ok(if let Ok(line) = value.take() {
+			line
+		} else if let Ok(Span(span)) = value.take() {
+			Self { inner: span.into(), ..Default::default() }
+		} else {
+			Err(EXPECTED.into_lua_err())?
+		})
+	}
+}
+
 impl TryFrom<Table> for Line {
 	type Error = mlua::Error;
 
@@ -82,21 +96,18 @@ impl TryFrom<Table> for Line {
 	}
 }
 
-impl From<Line> for ratatui::text::Line<'static> {
+impl From<Line> for ratatui_core::text::Line<'static> {
 	fn from(value: Line) -> Self { value.inner }
 }
 
-impl Widget for Line {
-	fn render(self, rect: ratatui::layout::Rect, buf: &mut ratatui::buffer::Buffer)
-	where
-		Self: Sized,
-	{
-		(&self).render(rect, buf);
-	}
+impl Spatial for Line {
+	fn area(&self) -> Area { self.area }
+
+	fn set_area(&mut self, area: Area) { self.area = area; }
 }
 
 impl Widget for &Line {
-	fn render(self, rect: ratatui::layout::Rect, buf: &mut ratatui::buffer::Buffer)
+	fn render(self, rect: ratatui_core::layout::Rect, buf: &mut ratatui_core::buffer::Buffer)
 	where
 		Self: Sized,
 	{
@@ -106,22 +117,11 @@ impl Widget for &Line {
 
 impl FromLua for Line {
 	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
-		Ok(Self {
-			inner: match value {
-				Value::Table(tb) => return Self::try_from(tb),
-				Value::String(s) => s.to_string_lossy().into(),
-				Value::UserData(ud) => {
-					if let Ok(Span(span)) = ud.take() {
-						span.into()
-					} else if let Ok(line) = ud.take() {
-						return Ok(line);
-					} else {
-						Err(EXPECTED.into_lua_err())?
-					}
-				}
-				_ => Err(EXPECTED.into_lua_err())?,
-			},
-			..Default::default()
+		Ok(match value {
+			Value::Table(tb) => Self::try_from(tb)?,
+			Value::String(s) => Self { inner: s.to_string_lossy().into(), ..Default::default() },
+			Value::UserData(ud) => Self::try_from(&ud)?,
+			_ => Err(EXPECTED.into_lua_err())?,
 		})
 	}
 }
@@ -140,6 +140,13 @@ impl UserData for Line {
 		methods.add_method("visible", |_, me, ()| {
 			Ok(me.iter().flat_map(|s| s.content.chars()).any(|c| c.width().unwrap_or(0) > 0))
 		});
+		methods.add_function("map", |_, (ud, f): (AnyUserData, Function)| {
+			let mut me = ud.borrow_mut::<Self>()?;
+			for span in &mut me.spans {
+				*span = f.call::<Span>(Span(mem::take(span)))?.0;
+			}
+			Ok(ud)
+		});
 		methods.add_function("truncate", |lua, (ud, t): (AnyUserData, Table)| {
 			let mut me = ud.borrow_mut::<Self>()?;
 
@@ -150,7 +157,7 @@ impl UserData for Line {
 			}
 
 			let ellipsis = match t.raw_get::<Value>("ellipsis")? {
-				Value::Nil => (1, ratatui::text::Span::raw("…")),
+				Value::Nil => (1, ratatui_core::text::Span::raw("…")),
 				v => {
 					let mut span = Span::from_lua(v, lua)?;
 					(span.truncate(max), span.0)
diff --git a/yazi-binding/src/elements/list.rs b/yazi-binding/src/elements/list.rs
index 09f7b973..a4480d77 100644
--- a/yazi-binding/src/elements/list.rs
+++ b/yazi-binding/src/elements/list.rs
@@ -1,20 +1,21 @@
-use mlua::{IntoLua, Lua, MetaMethod, Table, UserData, UserDataMethods, Value};
-use ratatui::widgets::Widget;
+use mlua::{AnyUserData, IntoLua, Lua, MetaMethod, Table, UserData, UserDataMethods, Value};
+use ratatui_core::widgets::Widget;
 
 use super::{Area, Text};
+use crate::elements::Spatial;
 
 // --- List
 #[derive(Clone, Debug, Default)]
 pub struct List {
-	pub(super) area: Area,
+	area: Area,
 
-	inner: ratatui::widgets::List<'static>,
+	inner: ratatui_widgets::list::List<'static>,
 }
 
 impl List {
 	pub fn compose(lua: &Lua) -> mlua::Result<Value> {
 		let new = lua.create_function(|_, (_, items): (Table, Vec<Text>)| {
-			Ok(Self { inner: ratatui::widgets::List::new(items), ..Default::default() })
+			Ok(Self { inner: ratatui_widgets::list::List::new(items), ..Default::default() })
 		})?;
 
 		let list = lua.create_table()?;
@@ -24,17 +25,20 @@ impl List {
 	}
 }
 
-impl Widget for List {
-	fn render(self, rect: ratatui::layout::Rect, buf: &mut ratatui::buffer::Buffer)
-	where
-		Self: Sized,
-	{
-		(&self).render(rect, buf);
-	}
+impl TryFrom<&AnyUserData> for List {
+	type Error = mlua::Error;
+
+	fn try_from(value: &AnyUserData) -> Result<Self, Self::Error> { value.take() }
+}
+
+impl Spatial for List {
+	fn area(&self) -> Area { self.area }
+
+	fn set_area(&mut self, area: Area) { self.area = area; }
 }
 
 impl Widget for &List {
-	fn render(self, rect: ratatui::layout::Rect, buf: &mut ratatui::buffer::Buffer)
+	fn render(self, rect: ratatui_core::layout::Rect, buf: &mut ratatui_core::buffer::Buffer)
 	where
 		Self: Sized,
 	{
diff --git a/yazi-binding/src/elements/mod.rs b/yazi-binding/src/elements/mod.rs
index 6e1066f1..1cdbbe83 100644
--- a/yazi-binding/src/elements/mod.rs
+++ b/yazi-binding/src/elements/mod.rs
@@ -1 +1 @@
-yazi_macro::mod_flat!(align area bar border cell clear color constraint edge highlight elements gauge layout line list pad pos rect renderable row span table text wrap);
+yazi_macro::mod_flat!(align area bar border cell color constraint edge fill gauge highlight layout line list pad rect row span spatial table text wrap);
diff --git a/yazi-binding/src/elements/pad.rs b/yazi-binding/src/elements/pad.rs
index c7eb25b4..cd4b0376 100644
--- a/yazi-binding/src/elements/pad.rs
+++ b/yazi-binding/src/elements/pad.rs
@@ -3,46 +3,68 @@ use std::ops::{Add, AddAssign, Deref};
 use mlua::{FromLua, IntoLua, Lua, MetaMethod, Table, UserData, UserDataFields, Value};
 
 #[derive(Clone, Copy, Default, FromLua)]
-pub struct Pad(ratatui::widgets::Padding);
+pub struct Pad(ratatui_widgets::block::Padding);
 
 impl Deref for Pad {
-	type Target = ratatui::widgets::Padding;
+	type Target = ratatui_widgets::block::Padding;
 
 	fn deref(&self) -> &Self::Target { &self.0 }
 }
 
-impl From<ratatui::widgets::Padding> for Pad {
-	fn from(pad: ratatui::widgets::Padding) -> Self { Self(pad) }
+impl From<ratatui_widgets::block::Padding> for Pad {
+	fn from(value: ratatui_widgets::block::Padding) -> Self { Self(value) }
+}
+
+impl From<Pad> for ratatui_widgets::block::Padding {
+	fn from(value: Pad) -> Self { value.0 }
 }
 
 impl Pad {
 	pub fn compose(lua: &Lua) -> mlua::Result<Value> {
 		let new =
 			lua.create_function(|_, (_, top, right, bottom, left): (Table, u16, u16, u16, u16)| {
-				Ok(Self(ratatui::widgets::Padding::new(left, right, top, bottom)))
+				Ok(Self(ratatui_widgets::block::Padding::new(left, right, top, bottom)))
 			})?;
 
 		let pad = lua.create_table_from([
 			(
 				"left",
-				lua.create_function(|_, left: u16| Ok(Self(ratatui::widgets::Padding::left(left))))?,
+				lua
+					.create_function(|_, left: u16| Ok(Self(ratatui_widgets::block::Padding::left(left))))?,
 			),
 			(
 				"right",
-				lua.create_function(|_, right: u16| Ok(Self(ratatui::widgets::Padding::right(right))))?,
+				lua.create_function(|_, right: u16| {
+					Ok(Self(ratatui_widgets::block::Padding::right(right)))
+				})?,
+			),
+			(
+				"top",
+				lua.create_function(|_, top: u16| Ok(Self(ratatui_widgets::block::Padding::top(top))))?,
 			),
-			("top", lua.create_function(|_, top: u16| Ok(Self(ratatui::widgets::Padding::top(top))))?),
 			(
 				"bottom",
-				lua
-					.create_function(|_, bottom: u16| Ok(Self(ratatui::widgets::Padding::bottom(bottom))))?,
+				lua.create_function(|_, bottom: u16| {
+					Ok(Self(ratatui_widgets::block::Padding::bottom(bottom)))
+				})?,
+			),
+			(
+				"x",
+				lua.create_function(|_, x: u16| {
+					Ok(Self(ratatui_widgets::block::Padding::new(x, x, 0, 0)))
+				})?,
+			),
+			(
+				"y",
+				lua.create_function(|_, y: u16| {
+					Ok(Self(ratatui_widgets::block::Padding::new(0, 0, y, y)))
+				})?,
 			),
-			("x", lua.create_function(|_, x: u16| Ok(Self(ratatui::widgets::Padding::new(x, x, 0, 0))))?),
-			("y", lua.create_function(|_, y: u16| Ok(Self(ratatui::widgets::Padding::new(0, 0, y, y))))?),
 			(
 				"xy",
-				lua
-					.create_function(|_, xy: u16| Ok(Self(ratatui::widgets::Padding::new(xy, xy, xy, xy))))?,
+				lua.create_function(|_, xy: u16| {
+					Ok(Self(ratatui_widgets::block::Padding::new(xy, xy, xy, xy)))
+				})?,
 			),
 		])?;
 
@@ -60,11 +82,11 @@ impl UserData for Pad {
 	}
 }
 
-impl Add<ratatui::widgets::Padding> for Pad {
+impl Add<ratatui_widgets::block::Padding> for Pad {
 	type Output = Self;
 
-	fn add(self, rhs: ratatui::widgets::Padding) -> Self::Output {
-		Self(ratatui::widgets::Padding::new(
+	fn add(self, rhs: ratatui_widgets::block::Padding) -> Self::Output {
+		Self(ratatui_widgets::block::Padding::new(
 			self.left.saturating_add(rhs.left),
 			self.right.saturating_add(rhs.right),
 			self.top.saturating_add(rhs.top),
@@ -73,6 +95,6 @@ impl Add<ratatui::widgets::Padding> for Pad {
 	}
 }
 
-impl AddAssign<ratatui::widgets::Padding> for Pad {
-	fn add_assign(&mut self, rhs: ratatui::widgets::Padding) { *self = *self + rhs; }
+impl AddAssign<ratatui_widgets::block::Padding> for Pad {
+	fn add_assign(&mut self, rhs: ratatui_widgets::block::Padding) { *self = *self + rhs; }
 }
diff --git a/yazi-binding/src/elements/pos.rs b/yazi-binding/src/elements/pos.rs
deleted file mode 100644
index d509d945..00000000
--- a/yazi-binding/src/elements/pos.rs
+++ /dev/null
@@ -1,99 +0,0 @@
-use std::{ops::Deref, str::FromStr};
-
-use mlua::{AnyUserData, ExternalError, ExternalResult, FromLua, IntoLua, Lua, MetaMethod, Table, UserData, UserDataFields, UserDataMethods, Value};
-use yazi_shim::strum::IntoStr;
-
-use super::Pad;
-
-const EXPECTED: &str = "expected a Pos";
-
-#[derive(Clone, Copy, Default)]
-pub struct Pos {
-	inner: yazi_config::popup::Position,
-
-	pub(super) pad: Pad,
-}
-
-impl Deref for Pos {
-	type Target = yazi_config::popup::Position;
-
-	fn deref(&self) -> &Self::Target { &self.inner }
-}
-
-impl From<yazi_config::popup::Position> for Pos {
-	fn from(value: yazi_config::popup::Position) -> Self {
-		Self { inner: value, ..Default::default() }
-	}
-}
-
-impl From<Pos> for yazi_config::popup::Position {
-	fn from(value: Pos) -> Self { value.inner }
-}
-
-impl TryFrom<Table> for Pos {
-	type Error = mlua::Error;
-
-	fn try_from(t: Table) -> Result<Self, Self::Error> {
-		use yazi_config::popup::{Offset, Origin, Position};
-
-		Ok(Self::from(Position {
-			origin: Origin::from_str(&t.raw_get::<mlua::String>(1)?.to_str()?).into_lua_err()?,
-			offset: Offset {
-				x:      t.raw_get("x").unwrap_or_default(),
-				y:      t.raw_get("y").unwrap_or_default(),
-				width:  t.raw_get("w").unwrap_or_default(),
-				height: t.raw_get("h").unwrap_or_default(),
-			},
-		}))
-	}
-}
-
-impl FromLua for Pos {
-	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
-		Ok(match value {
-			Value::Table(tbl) => Self::try_from(tbl)?,
-			Value::UserData(ud) => {
-				if let Ok(pos) = ud.borrow() {
-					*pos
-				} else {
-					Err(EXPECTED.into_lua_err())?
-				}
-			}
-			_ => Err(EXPECTED.into_lua_err())?,
-		})
-	}
-}
-
-impl Pos {
-	pub fn compose(lua: &Lua) -> mlua::Result<Value> {
-		let new = lua.create_function(|_, (_, t): (Table, Table)| Self::try_from(t))?;
-
-		let position = lua.create_table()?;
-		position.set_metatable(Some(lua.create_table_from([(MetaMethod::Call.name(), new)])?))?;
-
-		position.into_lua(lua)
-	}
-
-	pub fn with_height(mut self, height: u16) -> Self {
-		self.inner.offset.height = height;
-		self
-	}
-}
-
-impl UserData for Pos {
-	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
-		// TODO: cache
-		fields.add_field_method_get("1", |_, me| Ok(me.origin.into_str()));
-		fields.add_field_method_get("x", |_, me| Ok(me.offset.x));
-		fields.add_field_method_get("y", |_, me| Ok(me.offset.y));
-		fields.add_field_method_get("w", |_, me| Ok(me.offset.width));
-		fields.add_field_method_get("h", |_, me| Ok(me.offset.height));
-	}
-
-	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
-		methods.add_function("pad", |_, (ud, pad): (AnyUserData, Pad)| {
-			ud.borrow_mut::<Self>()?.pad = pad;
-			Ok(ud)
-		});
-	}
-}
diff --git a/yazi-binding/src/elements/rect.rs b/yazi-binding/src/elements/rect.rs
index 6c21d678..c39015a0 100644
--- a/yazi-binding/src/elements/rect.rs
+++ b/yazi-binding/src/elements/rect.rs
@@ -1,32 +1,38 @@
 use std::ops::Deref;
 
 use mlua::{FromLua, IntoLua, Lua, MetaMethod, Table, UserData, UserDataFields, UserDataMethods, Value};
+use yazi_shim::ratatui::Padable;
 
 use super::Pad;
 
 #[derive(Clone, Copy, Debug, Default, FromLua)]
-pub struct Rect(pub ratatui::layout::Rect);
+pub struct Rect(pub ratatui_core::layout::Rect);
 
 impl Deref for Rect {
-	type Target = ratatui::layout::Rect;
+	type Target = ratatui_core::layout::Rect;
 
 	fn deref(&self) -> &Self::Target { &self.0 }
 }
 
-impl From<ratatui::layout::Rect> for Rect {
-	fn from(rect: ratatui::layout::Rect) -> Self { Self(rect) }
+impl From<ratatui_core::layout::Rect> for Rect {
+	fn from(rect: ratatui_core::layout::Rect) -> Self { Self(rect) }
 }
 
-impl From<ratatui::layout::Size> for Rect {
-	fn from(size: ratatui::layout::Size) -> Self {
-		Self(ratatui::layout::Rect { x: 0, y: 0, width: size.width, height: size.height })
+impl From<ratatui_core::layout::Size> for Rect {
+	fn from(size: ratatui_core::layout::Size) -> Self {
+		Self(ratatui_core::layout::Rect {
+			x:      0,
+			y:      0,
+			width:  size.width,
+			height: size.height,
+		})
 	}
 }
 
 impl Rect {
 	pub fn compose(lua: &Lua) -> mlua::Result<Value> {
 		let new = lua.create_function(|_, (_, args): (Table, Table)| {
-			Ok(Self(ratatui::layout::Rect {
+			Ok(Self(ratatui_core::layout::Rect {
 				x:      args.raw_get("x").unwrap_or_default(),
 				y:      args.raw_get("y").unwrap_or_default(),
 				width:  args.raw_get("w").unwrap_or_default(),
@@ -39,18 +45,8 @@ impl Rect {
 		rect.into_lua(lua)
 	}
 
-	pub(super) fn pad(self, pad: Pad) -> Self {
-		let mut r = *self;
-		r.x = r.x.saturating_add(pad.left);
-		r.y = r.y.saturating_add(pad.top);
-
-		r.width = r.width.saturating_sub(pad.left + pad.right);
-		r.height = r.height.saturating_sub(pad.top + pad.bottom);
-		Self(r)
-	}
-
 	fn patch(self, t: Table) -> mlua::Result<Self> {
-		Ok(Self(ratatui::layout::Rect {
+		Ok(Self(ratatui_core::layout::Rect {
 			x:      t.raw_get::<Option<_>>("x")?.unwrap_or(self.x),
 			y:      t.raw_get::<Option<_>>("y")?.unwrap_or(self.y),
 			width:  t.raw_get::<Option<_>>("w")?.unwrap_or(self.width),
@@ -78,7 +74,7 @@ impl UserData for Rect {
 	}
 
 	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
-		methods.add_method("pad", |_, me, pad: Pad| Ok(me.pad(pad)));
+		methods.add_method("pad", |_, me, pad: Pad| Ok(Self(me.padding(pad))));
 		methods.add_method("contains", |_, me, Self(rect)| Ok(me.contains(rect.into())));
 
 		methods.add_meta_method(MetaMethod::Call, |_, me, t: Table| me.patch(t));
diff --git a/yazi-binding/src/elements/renderable.rs b/yazi-binding/src/elements/renderable.rs
deleted file mode 100644
index 7730edf5..00000000
--- a/yazi-binding/src/elements/renderable.rs
+++ /dev/null
@@ -1,130 +0,0 @@
-use std::any::TypeId;
-
-use mlua::{AnyUserData, ExternalError, FromLua, Lua, Value};
-use ratatui::widgets::Widget;
-
-use super::{Bar, Border, Clear, Gauge, Line, List, Table, Text};
-use crate::{Error, elements::Area};
-
-#[derive(Clone, Debug)]
-pub enum Renderable {
-	Line(Line),
-	Text(Text),
-	List(Box<List>),
-	Bar(Bar),
-	Clear(Clear),
-	Border(Border),
-	Gauge(Box<Gauge>),
-	Table(Box<Table>),
-}
-
-impl Renderable {
-	pub fn area(&self) -> Area {
-		match self {
-			Self::Line(line) => line.area,
-			Self::Text(text) => text.area,
-			Self::List(list) => list.area,
-			Self::Bar(bar) => bar.area,
-			Self::Clear(clear) => clear.area,
-			Self::Border(border) => border.area,
-			Self::Gauge(gauge) => gauge.area,
-			Self::Table(table) => table.area,
-		}
-	}
-
-	pub fn with_area(mut self, area: impl Into<Area>) -> Self {
-		let area = area.into();
-		match &mut self {
-			Self::Line(line) => line.area = area,
-			Self::Text(text) => text.area = area,
-			Self::List(list) => list.area = area,
-			Self::Bar(bar) => bar.area = area,
-			Self::Clear(clear) => clear.area = area,
-			Self::Border(border) => border.area = area,
-			Self::Gauge(gauge) => gauge.area = area,
-			Self::Table(table) => table.area = area,
-		}
-		self
-	}
-
-	pub fn render_with<T>(self, buf: &mut ratatui::buffer::Buffer, trans: T)
-	where
-		T: FnOnce(yazi_config::popup::Position) -> ratatui::layout::Rect,
-	{
-		let rect = self.area().transform(trans);
-		self.render(rect, buf);
-	}
-}
-
-impl TryFrom<&AnyUserData> for Renderable {
-	type Error = mlua::Error;
-
-	fn try_from(ud: &AnyUserData) -> Result<Self, Self::Error> {
-		Ok(match ud.type_id() {
-			Some(t) if t == TypeId::of::<Line>() => Self::Line(ud.take()?),
-			Some(t) if t == TypeId::of::<Text>() => Self::Text(ud.take()?),
-			Some(t) if t == TypeId::of::<List>() => Self::List(Box::new(ud.take()?)),
-			Some(t) if t == TypeId::of::<Bar>() => Self::Bar(ud.take()?),
-			Some(t) if t == TypeId::of::<Clear>() => Self::Clear(ud.take()?),
-			Some(t) if t == TypeId::of::<Border>() => Self::Border(ud.take()?),
-			Some(t) if t == TypeId::of::<Gauge>() => Self::Gauge(Box::new(ud.take()?)),
-			Some(t) if t == TypeId::of::<Table>() => Self::Table(Box::new(ud.take()?)),
-			_ => Err(format!("expected a renderable userdata, not: {ud:#?}").into_lua_err())?,
-		})
-	}
-}
-
-impl From<Error> for Renderable {
-	fn from(error: Error) -> Self {
-		Self::Text(Text {
-			inner: error.into_string().into(),
-			wrap: ratatui::widgets::Wrap { trim: false }.into(),
-			..Default::default()
-		})
-	}
-}
-
-impl Widget for Renderable {
-	fn render(self, rect: ratatui::layout::Rect, buf: &mut ratatui::buffer::Buffer)
-	where
-		Self: Sized,
-	{
-		match self {
-			Self::Line(line) => line.render(rect, buf),
-			Self::Text(text) => text.render(rect, buf),
-			Self::List(list) => list.render(rect, buf),
-			Self::Bar(bar) => bar.render(rect, buf),
-			Self::Clear(clear) => clear.render(rect, buf),
-			Self::Border(border) => border.render(rect, buf),
-			Self::Gauge(gauge) => gauge.render(rect, buf),
-			Self::Table(table) => table.render(rect, buf),
-		}
-	}
-}
-
-impl Widget for &Renderable {
-	fn render(self, rect: ratatui::layout::Rect, buf: &mut ratatui::buffer::Buffer)
-	where
-		Self: Sized,
-	{
-		match self {
-			Renderable::Line(line) => line.render(rect, buf),
-			Renderable::Text(text) => text.render(rect, buf),
-			Renderable::List(list) => (&**list).render(rect, buf),
-			Renderable::Bar(bar) => bar.render(rect, buf),
-			Renderable::Clear(clear) => clear.render(rect, buf),
-			Renderable::Border(border) => border.render(rect, buf),
-			Renderable::Gauge(gauge) => (&**gauge).render(rect, buf),
-			Renderable::Table(table) => (&**table).render(rect, buf),
-		}
-	}
-}
-
-impl FromLua for Renderable {
-	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
-		match value {
-			Value::UserData(ud) => Self::try_from(&ud),
-			_ => Err(format!("expected a renderable userdata, not: {value:#?}").into_lua_err()),
-		}
-	}
-}
diff --git a/yazi-binding/src/elements/row.rs b/yazi-binding/src/elements/row.rs
index 969f81ef..0d433a94 100644
--- a/yazi-binding/src/elements/row.rs
+++ b/yazi-binding/src/elements/row.rs
@@ -10,7 +10,7 @@ pub struct Row {
 	height:           u16,
 	top_margin:       u16,
 	bottom_margin:    u16,
-	style:            ratatui::style::Style,
+	style:            ratatui_core::style::Style,
 }
 
 impl Row {
@@ -26,7 +26,7 @@ impl Row {
 	}
 }
 
-impl From<Row> for ratatui::widgets::Row<'static> {
+impl From<Row> for ratatui_widgets::table::Row<'static> {
 	fn from(value: Row) -> Self {
 		Self::new(value.cells)
 			.height(value.height.max(1))
@@ -36,18 +36,20 @@ impl From<Row> for ratatui::widgets::Row<'static> {
 	}
 }
 
+impl TryFrom<&AnyUserData> for Row {
+	type Error = mlua::Error;
+
+	fn try_from(value: &AnyUserData) -> Result<Self, Self::Error> {
+		if let Ok(row) = value.take() { Ok(row) } else { Err(EXPECTED.into_lua_err()) }
+	}
+}
+
 impl FromLua for Row {
 	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
-		Ok(match value {
-			Value::UserData(ud) => {
-				if let Ok(row) = ud.take() {
-					row
-				} else {
-					Err(EXPECTED.into_lua_err())?
-				}
-			}
-			_ => Err(EXPECTED.into_lua_err())?,
-		})
+		match value {
+			Value::UserData(ud) => Self::try_from(&ud),
+			_ => Err(EXPECTED.into_lua_err()),
+		}
 	}
 }
 
diff --git a/yazi-binding/src/elements/span.rs b/yazi-binding/src/elements/span.rs
index 717a0d73..4f57e6eb 100644
--- a/yazi-binding/src/elements/span.rs
+++ b/yazi-binding/src/elements/span.rs
@@ -5,10 +5,10 @@ use unicode_width::UnicodeWidthChar;
 
 const EXPECTED: &str = "expected a string or Span";
 
-pub struct Span(pub(super) ratatui::text::Span<'static>);
+pub struct Span(pub(super) ratatui_core::text::Span<'static>);
 
 impl Deref for Span {
-	type Target = ratatui::text::Span<'static>;
+	type Target = ratatui_core::text::Span<'static>;
 
 	fn deref(&self) -> &Self::Target { &self.0 }
 }
@@ -58,19 +58,21 @@ impl Span {
 	}
 }
 
+impl TryFrom<&AnyUserData> for Span {
+	type Error = mlua::Error;
+
+	fn try_from(value: &AnyUserData) -> Result<Self, Self::Error> {
+		if let Ok(span) = value.take() { Ok(span) } else { Err(EXPECTED.into_lua_err()) }
+	}
+}
+
 impl FromLua for Span {
 	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
-		Ok(Self(match value {
-			Value::String(s) => s.to_string_lossy().into(),
-			Value::UserData(ud) => {
-				if let Ok(Self(span)) = ud.take() {
-					span
-				} else {
-					Err(EXPECTED.into_lua_err())?
-				}
-			}
+		Ok(match value {
+			Value::String(s) => Self(s.to_string_lossy().into()),
+			Value::UserData(ud) => Self::try_from(&ud)?,
 			_ => Err(EXPECTED.into_lua_err())?,
-		}))
+		})
 	}
 }
 
diff --git a/yazi-binding/src/elements/spatial.rs b/yazi-binding/src/elements/spatial.rs
new file mode 100644
index 00000000..665e44d4
--- /dev/null
+++ b/yazi-binding/src/elements/spatial.rs
@@ -0,0 +1,7 @@
+use crate::elements::Area;
+
+pub trait Spatial {
+	fn area(&self) -> Area;
+
+	fn set_area(&mut self, area: Area);
+}
diff --git a/yazi-binding/src/elements/table.rs b/yazi-binding/src/elements/table.rs
index f7defacf..058259d5 100644
--- a/yazi-binding/src/elements/table.rs
+++ b/yazi-binding/src/elements/table.rs
@@ -1,32 +1,32 @@
 use mlua::{AnyUserData, IntoLua, Lua, MetaMethod, UserData, UserDataMethods, Value};
-use ratatui::widgets::{StatefulWidget, Widget};
+use ratatui_core::widgets::{StatefulWidget, Widget};
 
 use super::{Area, Row};
-use crate::{Style, elements::Constraint};
+use crate::{elements::{Constraint, Spatial}, style::Style};
 
 // --- Table
 #[derive(Clone, Debug, Default)]
 pub struct Table {
-	pub area: Area,
+	area: Area,
 
 	rows:           Vec<Row>,
-	header:         Option<ratatui::widgets::Row<'static>>,
-	footer:         Option<ratatui::widgets::Row<'static>>,
-	widths:         Vec<ratatui::layout::Constraint>,
+	header:         Option<ratatui_widgets::table::Row<'static>>,
+	footer:         Option<ratatui_widgets::table::Row<'static>>,
+	widths:         Vec<ratatui_core::layout::Constraint>,
 	column_spacing: u16,
-	block:          Option<ratatui::widgets::Block<'static>>, // TODO
+	block:          Option<ratatui_widgets::block::Block<'static>>, // TODO
 
-	style:                  ratatui::style::Style,
-	row_highlight_style:    ratatui::style::Style,
-	column_highlight_style: ratatui::style::Style,
-	cell_highlight_style:   ratatui::style::Style,
+	style:                  ratatui_core::style::Style,
+	row_highlight_style:    ratatui_core::style::Style,
+	column_highlight_style: ratatui_core::style::Style,
+	cell_highlight_style:   ratatui_core::style::Style,
 
-	highlight_symbol:  ratatui::text::Text<'static>, // TODO
-	highlight_spacing: ratatui::widgets::HighlightSpacing, // TODO
+	highlight_symbol:  ratatui_core::text::Text<'static>, // TODO
+	highlight_spacing: ratatui_widgets::table::HighlightSpacing, // TODO
 
-	flex: ratatui::layout::Flex,
+	flex: ratatui_core::layout::Flex,
 
-	state: ratatui::widgets::TableState,
+	state: ratatui_widgets::table::TableState,
 }
 
 impl Table {
@@ -41,7 +41,7 @@ impl Table {
 		table.into_lua(lua)
 	}
 
-	pub fn selected_cell(&self) -> Option<&ratatui::text::Text<'_>> {
+	pub fn selected_cell(&self) -> Option<&ratatui_core::text::Text<'_>> {
 		let row = &self.rows[self.selected()?];
 		let col = self.state.selected_column()?;
 		if row.cells.is_empty() { None } else { Some(&row.cells[col.min(row.cells.len() - 1)].text) }
@@ -60,18 +60,24 @@ impl Table {
 	}
 }
 
-impl TryFrom<AnyUserData> for Table {
+impl TryFrom<&AnyUserData> for Table {
 	type Error = mlua::Error;
 
-	fn try_from(value: AnyUserData) -> Result<Self, Self::Error> { value.take() }
+	fn try_from(value: &AnyUserData) -> Result<Self, Self::Error> { value.take() }
+}
+
+impl Spatial for Table {
+	fn area(&self) -> Area { self.area }
+
+	fn set_area(&mut self, area: Area) { self.area = area; }
 }
 
 impl Widget for Table {
-	fn render(mut self, rect: ratatui::layout::Rect, buf: &mut ratatui::buffer::Buffer)
+	fn render(mut self, rect: ratatui_core::layout::Rect, buf: &mut ratatui_core::buffer::Buffer)
 	where
 		Self: Sized,
 	{
-		let mut table = ratatui::widgets::Table::new(self.rows, self.widths)
+		let mut table = ratatui_widgets::table::Table::new(self.rows, self.widths)
 			.column_spacing(self.column_spacing)
 			.style(self.style)
 			.row_highlight_style(self.row_highlight_style)
@@ -96,7 +102,7 @@ impl Widget for Table {
 }
 
 impl Widget for &Table {
-	fn render(self, rect: ratatui::layout::Rect, buf: &mut ratatui::buffer::Buffer)
+	fn render(self, rect: ratatui_core::layout::Rect, buf: &mut ratatui_core::buffer::Buffer)
 	where
 		Self: Sized,
 	{
diff --git a/yazi-binding/src/elements/text.rs b/yazi-binding/src/elements/text.rs
index 64b0f8cf..fa511d2d 100644
--- a/yazi-binding/src/elements/text.rs
+++ b/yazi-binding/src/elements/text.rs
@@ -2,21 +2,22 @@ use std::{any::TypeId, mem};
 
 use ansi_to_tui::IntoText;
 use mlua::{AnyUserData, ExternalError, ExternalResult, FromLua, IntoLua, Lua, MetaMethod, Table, UserData, UserDataMethods, Value};
-use ratatui::widgets::Widget;
+use ratatui_core::widgets::Widget;
+use yazi_shim::SStr;
 
 use super::{Area, Line, Span, Wrap};
-use crate::{Error, elements::Align};
+use crate::{Error, elements::{Align, Spatial}};
 
 const EXPECTED: &str = "expected a string, Line, Span, or a table of them";
 
 #[derive(Clone, Debug, Default)]
 pub struct Text {
-	pub area: Area,
+	area: Area,
 
 	// TODO: block
-	pub inner:  ratatui::text::Text<'static>,
+	pub inner:  ratatui_core::text::Text<'static>,
 	pub wrap:   Wrap,
-	pub scroll: ratatui::layout::Position,
+	pub scroll: ratatui_core::layout::Position,
 }
 
 impl Text {
@@ -31,6 +32,19 @@ impl Text {
 		text.set_metatable(Some(lua.create_table_from([(MetaMethod::Call.name(), new)])?))?;
 		text.into_lua(lua)
 	}
+
+	pub fn wrap(mut self, wrap: impl Into<Wrap>) -> Self {
+		self.wrap = wrap.into();
+		self
+	}
+}
+
+impl From<ratatui_core::text::Text<'static>> for Text {
+	fn from(inner: ratatui_core::text::Text<'static>) -> Self { Self { inner, ..Default::default() } }
+}
+
+impl From<SStr> for Text {
+	fn from(value: SStr) -> Self { Self { inner: value.into(), ..Default::default() } }
 }
 
 impl TryFrom<Table> for Text {
@@ -54,16 +68,16 @@ impl TryFrom<Table> for Text {
 	}
 }
 
-impl From<Text> for ratatui::text::Text<'static> {
+impl From<Text> for ratatui_core::text::Text<'static> {
 	fn from(value: Text) -> Self { value.inner }
 }
 
-impl From<Text> for ratatui::widgets::Paragraph<'static> {
+impl From<Text> for ratatui_widgets::paragraph::Paragraph<'static> {
 	fn from(mut value: Text) -> Self {
 		let align = value.inner.alignment.take();
 		let style = mem::take(&mut value.inner.style);
 
-		let mut p = ratatui::widgets::Paragraph::new(value.inner).style(style);
+		let mut p = ratatui_widgets::paragraph::Paragraph::new(value.inner).style(style);
 		if let Some(align) = align {
 			p = p.alignment(align);
 		}
@@ -74,47 +88,62 @@ impl From<Text> for ratatui::widgets::Paragraph<'static> {
 	}
 }
 
+impl Spatial for Text {
+	fn area(&self) -> Area { self.area }
+
+	fn set_area(&mut self, area: Area) { self.area = area; }
+}
+
 impl Widget for Text {
-	fn render(self, rect: ratatui::layout::Rect, buf: &mut ratatui::buffer::Buffer)
+	fn render(self, rect: ratatui_core::layout::Rect, buf: &mut ratatui_core::buffer::Buffer)
 	where
 		Self: Sized,
 	{
 		if self.wrap.is_none() && self.scroll == Default::default() {
 			self.inner.render(rect, buf);
 		} else {
-			ratatui::widgets::Paragraph::from(self).render(rect, buf);
+			ratatui_widgets::paragraph::Paragraph::from(self).render(rect, buf);
 		}
 	}
 }
 
 impl Widget for &Text {
-	fn render(self, rect: ratatui::layout::Rect, buf: &mut ratatui::buffer::Buffer)
+	fn render(self, rect: ratatui_core::layout::Rect, buf: &mut ratatui_core::buffer::Buffer)
 	where
 		Self: Sized,
 	{
 		if self.wrap.is_none() && self.scroll == Default::default() {
 			(&self.inner).render(rect, buf);
 		} else {
-			ratatui::widgets::Paragraph::from(self.clone()).render(rect, buf);
+			ratatui_widgets::paragraph::Paragraph::from(self.clone()).render(rect, buf);
 		}
 	}
 }
 
+impl TryFrom<&AnyUserData> for Text {
+	type Error = mlua::Error;
+
+	fn try_from(value: &AnyUserData) -> Result<Self, Self::Error> {
+		let inner = match value.type_id() {
+			Some(t) if t == TypeId::of::<Self>() => return value.take(),
+			Some(t) if t == TypeId::of::<Line>() => value.take::<Line>()?.inner.into(),
+			Some(t) if t == TypeId::of::<Span>() => value.take::<Span>()?.0.into(),
+			Some(t) if t == TypeId::of::<Error>() => value.take::<Error>()?.into_string().into(),
+			_ => Err(EXPECTED.into_lua_err())?,
+		};
+
+		Ok(Self { inner, ..Default::default() })
+	}
+}
+
 impl FromLua for Text {
 	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
-		let inner = match value {
-			Value::Table(tb) => return Self::try_from(tb),
-			Value::String(s) => s.to_string_lossy().into(),
-			Value::UserData(ud) => match ud.type_id() {
-				Some(t) if t == TypeId::of::<Line>() => ud.take::<Line>()?.inner.into(),
-				Some(t) if t == TypeId::of::<Span>() => ud.take::<Span>()?.0.into(),
-				Some(t) if t == TypeId::of::<Self>() => return ud.take(),
-				Some(t) if t == TypeId::of::<Error>() => ud.take::<Error>()?.into_string().into(),
-				_ => Err(EXPECTED.into_lua_err())?,
-			},
+		Ok(match value {
+			Value::Table(tb) => Self::try_from(tb)?,
+			Value::String(s) => Self { inner: s.to_string_lossy().into(), ..Default::default() },
+			Value::UserData(ud) => Self::try_from(&ud)?,
 			_ => Err(EXPECTED.into_lua_err())?,
-		};
-		Ok(Self { inner, ..Default::default() })
+		})
 	}
 }
 
@@ -133,7 +162,7 @@ impl UserData for Text {
 			Ok(ud)
 		});
 		methods.add_function("scroll", |_, (ud, x, y): (AnyUserData, u16, u16)| {
-			ud.borrow_mut::<Self>()?.scroll = ratatui::layout::Position { x, y };
+			ud.borrow_mut::<Self>()?.scroll = ratatui_core::layout::Position { x, y };
 			Ok(ud)
 		});
 		methods.add_method("max_width", |_, me, ()| {
diff --git a/yazi-binding/src/elements/wrap.rs b/yazi-binding/src/elements/wrap.rs
index 85f205f8..88a8e639 100644
--- a/yazi-binding/src/elements/wrap.rs
+++ b/yazi-binding/src/elements/wrap.rs
@@ -1,13 +1,12 @@
 use std::ops::Deref;
 
 use mlua::{FromLua, IntoLua, Lua, Value};
-use yazi_config::preview::PreviewWrap;
 
 #[derive(Clone, Copy, Debug, Default)]
-pub struct Wrap(pub(super) Option<ratatui::widgets::Wrap>);
+pub struct Wrap(pub Option<ratatui_widgets::paragraph::Wrap>);
 
 impl Deref for Wrap {
-	type Target = Option<ratatui::widgets::Wrap>;
+	type Target = Option<ratatui_widgets::paragraph::Wrap>;
 
 	fn deref(&self) -> &Self::Target { &self.0 }
 }
@@ -18,21 +17,12 @@ impl Wrap {
 	}
 }
 
-impl From<Wrap> for Option<ratatui::widgets::Wrap> {
+impl From<Wrap> for Option<ratatui_widgets::paragraph::Wrap> {
 	fn from(value: Wrap) -> Self { value.0 }
 }
 
-impl From<ratatui::widgets::Wrap> for Wrap {
-	fn from(value: ratatui::widgets::Wrap) -> Self { Self(Some(value)) }
-}
-
-impl From<PreviewWrap> for Wrap {
-	fn from(value: PreviewWrap) -> Self {
-		Self(match value {
-			PreviewWrap::No => None,
-			PreviewWrap::Yes => Some(ratatui::widgets::Wrap { trim: false }),
-		})
-	}
+impl From<ratatui_widgets::paragraph::Wrap> for Wrap {
+	fn from(value: ratatui_widgets::paragraph::Wrap) -> Self { Self(Some(value)) }
 }
 
 impl FromLua for Wrap {
@@ -46,8 +36,8 @@ impl FromLua for Wrap {
 		};
 		Ok(Self(match n {
 			0 => None,
-			1 => Some(ratatui::widgets::Wrap { trim: false }),
-			2 => Some(ratatui::widgets::Wrap { trim: true }),
+			1 => Some(ratatui_widgets::paragraph::Wrap { trim: false }),
+			2 => Some(ratatui_widgets::paragraph::Wrap { trim: true }),
 			_ => Err(mlua::Error::FromLuaConversionError {
 				from:    value.type_name(),
 				to:      "Wrap".to_string(),
@@ -61,8 +51,8 @@ impl IntoLua for Wrap {
 	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> {
 		match self.0 {
 			None => 0.into_lua(lua),
-			Some(ratatui::widgets::Wrap { trim: false }) => 1.into_lua(lua),
-			Some(ratatui::widgets::Wrap { trim: true }) => 2.into_lua(lua),
+			Some(ratatui_widgets::paragraph::Wrap { trim: false }) => 1.into_lua(lua),
+			Some(ratatui_widgets::paragraph::Wrap { trim: true }) => 2.into_lua(lua),
 		}
 	}
 }
diff --git a/yazi-binding/src/error.rs b/yazi-binding/src/error.rs
index ff075c4b..ddf5e52b 100644
--- a/yazi-binding/src/error.rs
+++ b/yazi-binding/src/error.rs
@@ -2,12 +2,12 @@ use std::{borrow::Cow, fmt::Display};
 
 use mlua::{ExternalError, Lua, MetaMethod, UserData, UserDataFields, UserDataMethods, Value};
 use yazi_codegen::FromLuaOwned;
-use yazi_shared::SStr;
+use yazi_shim::SStr;
 
 #[derive(FromLuaOwned)]
 pub enum Error {
 	Io(std::io::Error),
-	Fs(yazi_fs::error::Error),
+	Fs(yazi_shim::fs::Error),
 	Serde(serde_json::Error),
 	Custom(SStr),
 }
@@ -18,7 +18,7 @@ impl Error {
 
 		let fs = lua.create_function(|_, value: Value| {
 			Ok(Self::Fs(match value {
-				Value::Table(t) => yazi_fs::error::Error::custom(
+				Value::Table(t) => yazi_shim::fs::Error::custom(
 					&t.raw_get::<mlua::String>("kind")?.to_str()?,
 					t.raw_get("code")?,
 					&t.raw_get::<mlua::String>("message")?.to_str()?,
@@ -64,7 +64,7 @@ impl UserData for Error {
 		});
 		fields.add_field_method_get("kind", |_, me| {
 			Ok(match me {
-				Self::Io(e) => Some(yazi_fs::error::Error::from(e.kind()).kind_str()),
+				Self::Io(e) => Some(yazi_shim::fs::Error::from(e.kind()).kind_str()),
 				Self::Fs(e) => Some(e.kind_str()),
 				_ => None,
 			})
diff --git a/yazi-binding/src/file.rs b/yazi-binding/src/file.rs
deleted file mode 100644
index 0ef0b640..00000000
--- a/yazi-binding/src/file.rs
+++ /dev/null
@@ -1,97 +0,0 @@
-use std::ops::Deref;
-
-use mlua::{AnyUserData, ExternalError, FromLua, Lua, ObjectLike, Table, UserData, UserDataFields, UserDataMethods, UserDataRef, Value};
-
-use crate::{Cha, Url, impl_file_fields, impl_file_methods};
-
-pub type FileRef = UserDataRef<File>;
-
-const EXPECTED: &str = "expected a table, File, or fs::File";
-
-#[derive(Clone)]
-pub struct File {
-	pub(crate) inner: yazi_fs::File,
-
-	v_cha:     Option<Value>,
-	v_url:     Option<Value>,
-	v_link_to: Option<Value>,
-
-	v_name:  Option<Value>,
-	v_path:  Option<Value>,
-	v_cache: Option<Value>,
-}
-
-impl Deref for File {
-	type Target = yazi_fs::File;
-
-	fn deref(&self) -> &Self::Target { &self.inner }
-}
-
-impl From<File> for yazi_fs::File {
-	fn from(value: File) -> Self { value.inner }
-}
-
-impl File {
-	pub fn new(inner: impl Into<yazi_fs::File>) -> Self {
-		Self {
-			inner:     inner.into(),
-			v_cha:     None,
-			v_url:     None,
-			v_link_to: None,
-
-			v_name:  None,
-			v_path:  None,
-			v_cache: None,
-		}
-	}
-
-	pub fn install(lua: &Lua) -> mlua::Result<()> {
-		lua.globals().raw_set("File", lua.create_function(|_, file: Self| Ok(file))?)
-	}
-}
-
-impl TryFrom<Table> for File {
-	type Error = mlua::Error;
-
-	fn try_from(value: Table) -> Result<Self, Self::Error> {
-		Ok(Self::new(yazi_fs::File {
-			url: value.raw_get::<Url>("url")?.into(),
-			cha: *value.raw_get::<Cha>("cha")?,
-			..Default::default()
-		}))
-	}
-}
-
-impl TryFrom<AnyUserData> for File {
-	type Error = mlua::Error;
-
-	fn try_from(value: AnyUserData) -> Result<Self, Self::Error> {
-		Ok(if let Ok(me) = value.take::<Self>() { me } else { value.get("bare")? })
-	}
-}
-
-impl FromLua for File {
-	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
-		match value {
-			Value::Table(tbl) => Self::try_from(tbl),
-			Value::UserData(ud) => Self::try_from(ud),
-			_ => Err(EXPECTED.into_lua_err())?,
-		}
-	}
-}
-
-impl UserData for File {
-	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
-		impl_file_fields!(fields);
-	}
-
-	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
-		impl_file_methods!(methods);
-
-		methods.add_method("icon", |_, me, ()| {
-			use crate::Icon;
-			// TODO: use a cache
-			Ok(yazi_config::THEME.icon.matches(me, false).map(Icon::from))
-		});
-	}
-}
diff --git a/yazi-binding/src/icon.rs b/yazi-binding/src/icon.rs
deleted file mode 100644
index c0ddbb53..00000000
--- a/yazi-binding/src/icon.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-use std::ops::Deref;
-
-use mlua::{IntoLua, Lua, Value};
-
-use crate::Style;
-
-pub struct Icon {
-	inner: yazi_config::Icon,
-}
-
-impl Deref for Icon {
-	type Target = yazi_config::Icon;
-
-	fn deref(&self) -> &Self::Target { &self.inner }
-}
-
-impl From<yazi_config::Icon> for Icon {
-	fn from(inner: yazi_config::Icon) -> Self { Self { inner } }
-}
-
-impl IntoLua for Icon {
-	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> {
-		lua
-			.create_table_from([
-				("text", self.inner.text.into_lua(lua)?),
-				("style", Style::from(self.inner.style).into_lua(lua)?),
-			])?
-			.into_lua(lua)
-	}
-}
diff --git a/yazi-binding/src/image.rs b/yazi-binding/src/image.rs
index 4a5bdfa9..24944ff7 100644
--- a/yazi-binding/src/image.rs
+++ b/yazi-binding/src/image.rs
@@ -1,17 +1,43 @@
-use std::ops::Deref;
+use std::path::PathBuf;
 
+use image::{ImageDecoder, ImageError};
 use mlua::{MetaMethod, UserData, UserDataFields, UserDataMethods};
 
-pub struct ImageInfo(yazi_adapter::ImageInfo);
-
-impl Deref for ImageInfo {
-	type Target = yazi_adapter::ImageInfo;
-
-	fn deref(&self) -> &Self::Target { &self.0 }
+// --- ImageInfo
+#[derive(Clone, Copy)]
+pub struct ImageInfo {
+	pub format:      image::ImageFormat,
+	pub width:       u32,
+	pub height:      u32,
+	pub color:       image::ColorType,
+	pub orientation: Option<image::metadata::Orientation>,
 }
 
-impl From<yazi_adapter::ImageInfo> for ImageInfo {
-	fn from(value: yazi_adapter::ImageInfo) -> Self { Self(value) }
+impl ImageInfo {
+	pub async fn new(path: PathBuf) -> image::ImageResult<Self> {
+		tokio::task::spawn_blocking(move || {
+			let reader = image::ImageReader::open(path)?.with_guessed_format()?;
+
+			let Some(format) = reader.format() else {
+				return Err(ImageError::IoError(std::io::Error::new(
+					std::io::ErrorKind::InvalidData,
+					"unknown image format",
+				)));
+			};
+
+			let mut decoder = reader.into_decoder()?;
+			let (width, height) = decoder.dimensions();
+			Ok(Self {
+				format,
+				width,
+				height,
+				color: decoder.color_type(),
+				orientation: decoder.orientation().ok(),
+			})
+		})
+		.await
+		.map_err(|e| ImageError::IoError(e.into()))?
+	}
 }
 
 impl UserData for ImageInfo {
@@ -25,12 +51,12 @@ impl UserData for ImageInfo {
 }
 
 // --- ImageFormat
-struct ImageFormat(yazi_adapter::ImageFormat);
+struct ImageFormat(image::ImageFormat);
 
 impl UserData for ImageFormat {
 	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
 		methods.add_meta_method(MetaMethod::ToString, |_, me, ()| {
-			use yazi_adapter::ImageFormat as F;
+			use image::ImageFormat as F;
 
 			Ok(match me.0 {
 				F::Png => "PNG",
@@ -55,12 +81,12 @@ impl UserData for ImageFormat {
 }
 
 // --- ImageColor
-struct ImageColor(yazi_adapter::ImageColor);
+struct ImageColor(image::ColorType);
 
 impl UserData for ImageColor {
 	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
 		methods.add_meta_method(MetaMethod::ToString, |_, me, ()| {
-			use yazi_adapter::ImageColor as C;
+			use image::ColorType as C;
 
 			Ok(match me.0 {
 				C::L8 => "L8",
diff --git a/yazi-binding/src/layer.rs b/yazi-binding/src/layer.rs
deleted file mode 100644
index 1e85aa92..00000000
--- a/yazi-binding/src/layer.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use mlua::{MetaMethod, UserData, UserDataMethods};
-use yazi_shim::strum::IntoStr;
-
-#[derive(Clone, Copy)]
-pub struct Layer(yazi_shared::Layer);
-
-impl From<yazi_shared::Layer> for Layer {
-	fn from(event: yazi_shared::Layer) -> Self { Self(event) }
-}
-
-impl UserData for Layer {
-	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
-		methods.add_meta_method(MetaMethod::ToString, |_, me, ()| Ok(me.0.into_str()));
-	}
-}
diff --git a/yazi-binding/src/lib.rs b/yazi-binding/src/lib.rs
index b1cfd06e..3e92c973 100644
--- a/yazi-binding/src/lib.rs
+++ b/yazi-binding/src/lib.rs
@@ -1,5 +1,5 @@
 mod macros;
 
-yazi_macro::mod_pub!(config elements process theme);
+yazi_macro::mod_pub!(elements position process style);
 
-yazi_macro::mod_flat!(access calculator cha chan chord_cow composer error fd file handle icon id image input iter layer mouse path permit range runtime scheme selector stage style url utils);
+yazi_macro::mod_flat!(chan composer error handle image iter permit range runtime);
diff --git a/yazi-binding/src/macros.rs b/yazi-binding/src/macros.rs
index 94f7c220..b2fd3ac1 100644
--- a/yazi-binding/src/macros.rs
+++ b/yazi-binding/src/macros.rs
@@ -43,48 +43,6 @@ macro_rules! deprecate {
 	}};
 }
 
-#[macro_export]
-macro_rules! cached_field {
-	($fields:ident, $key:ident, $value:expr) => {
-		$fields.add_field_function_get(stringify!($key), |lua, ud| {
-			use mlua::{Error::UserDataDestructed, IntoLua, Lua, Result, Value, Value::UserData};
-			ud.borrow_mut_scoped::<Self, Result<Value>>(|me| match paste::paste! { &me.[<v_ $key>] } {
-				Some(v) if !v.is_userdata() => Ok(v.clone()),
-				Some(v @ UserData(ud)) if !matches!(ud.borrow::<()>(), Err(UserDataDestructed)) => {
-					Ok(v.clone())
-				}
-				_ => {
-					let v = ($value as fn(&Lua, &Self) -> Result<_>)(lua, me)?.into_lua(lua)?;
-					paste::paste! { me.[<v_ $key>] = Some(v.clone()) };
-					Ok(v)
-				}
-			})?
-		});
-	};
-}
-
-#[macro_export]
-macro_rules! cached_field_mut {
-	($fields:ident, $key:ident, $value:expr) => {
-		$fields.add_field_function_get(stringify!($key), |lua, ud| {
-			use mlua::{Error::UserDataDestructed, IntoLua, Lua, Result, Value, Value::UserData};
-			ud.borrow_mut_scoped::<Self, Result<Value>>(|me| match paste::paste! { &me.[<v_ $key>] } {
-				Some(Ok(v)) if !v.is_userdata() => Ok(v.clone()),
-				Some(Ok(v @ UserData(ud))) if !matches!(ud.borrow::<()>(), Err(UserDataDestructed)) => {
-					Ok(v.clone())
-				}
-				Some(Err(e)) => Err(e.clone()),
-				_ => {
-					let v =
-						($value as fn(&Lua, &mut Self) -> Result<_>)(lua, me).and_then(|v| v.into_lua(lua));
-					paste::paste! { me.[<v_ $key>] = Some(v.clone()) };
-					v
-				}
-			})?
-		});
-	};
-}
-
 #[macro_export]
 macro_rules! impl_area_method {
 	($methods:ident) => {
@@ -92,11 +50,13 @@ macro_rules! impl_area_method {
 			"area",
 			|lua, (ud, area): (mlua::AnyUserData, Option<mlua::AnyUserData>)| {
 				use mlua::IntoLua;
+				use $crate::elements::Spatial;
+
 				if let Some(v) = area {
-					ud.borrow_mut::<Self>()?.area = $crate::elements::Area::try_from(v)?;
+					ud.borrow_mut::<Self>()?.set_area((&v).try_into()?);
 					ud.into_lua(lua)
 				} else {
-					ud.borrow::<Self>()?.area.into_lua(lua)
+					ud.borrow::<Self>()?.area().into_lua(lua)
 				}
 			},
 		);
@@ -106,7 +66,7 @@ macro_rules! impl_area_method {
 #[macro_export]
 macro_rules! impl_style_method {
 	($methods:ident, $($field:tt).+) => {
-		$methods.add_function("style", |_, (ud, style): (mlua::AnyUserData, $crate::Style)| {
+		$methods.add_function("style", |_, (ud, style): (mlua::AnyUserData, $crate::style::Style)| {
 			ud.borrow_mut::<Self>()?.$($field).+ = style.0;
 			Ok(ud)
 		});
@@ -119,7 +79,7 @@ macro_rules! impl_style_shorthands {
 		$methods.add_function("fg", |lua, (ud, value): (mlua::AnyUserData, mlua::Value)| {
 			use $crate::elements::Color;
 			use mlua::FromLua;
-			use ratatui::style::Modifier;
+			use ratatui_core::style::Modifier;
 
 			let me = &mut ud.borrow_mut::<Self>()?.$($field).+;
 			match value {
@@ -138,7 +98,7 @@ macro_rules! impl_style_shorthands {
 		$methods.add_function("bg", |lua, (ud, value): (mlua::AnyUserData, mlua::Value)| {
 			use $crate::elements::Color;
 			use mlua::FromLua;
-			use ratatui::style::Modifier;
+			use ratatui_core::style::Modifier;
 
 			let me = &mut ud.borrow_mut::<Self>()?.$($field).+;
 			match value {
@@ -157,86 +117,86 @@ macro_rules! impl_style_shorthands {
 		$methods.add_function("bold", |_, (ud, remove): (mlua::AnyUserData, bool)| {
 			let me = &mut ud.borrow_mut::<Self>()?.$($field).+;
 			if remove {
-				*me = me.remove_modifier(ratatui::style::Modifier::BOLD);
+				*me = me.remove_modifier(ratatui_core::style::Modifier::BOLD);
 			} else {
-				*me = me.add_modifier(ratatui::style::Modifier::BOLD);
+				*me = me.add_modifier(ratatui_core::style::Modifier::BOLD);
 			}
 			Ok(ud)
 		});
 		$methods.add_function("dim", |_, (ud, remove): (mlua::AnyUserData, bool)| {
 			let me = &mut ud.borrow_mut::<Self>()?.$($field).+;
 			if remove {
-				*me = me.remove_modifier(ratatui::style::Modifier::DIM);
+				*me = me.remove_modifier(ratatui_core::style::Modifier::DIM);
 			} else {
-				*me = me.add_modifier(ratatui::style::Modifier::DIM);
+				*me = me.add_modifier(ratatui_core::style::Modifier::DIM);
 			}
 			Ok(ud)
 		});
 		$methods.add_function("italic", |_, (ud, remove): (mlua::AnyUserData, bool)| {
 			let me = &mut ud.borrow_mut::<Self>()?.$($field).+;
 			if remove {
-				*me = me.remove_modifier(ratatui::style::Modifier::ITALIC);
+				*me = me.remove_modifier(ratatui_core::style::Modifier::ITALIC);
 			} else {
-				*me = me.add_modifier(ratatui::style::Modifier::ITALIC);
+				*me = me.add_modifier(ratatui_core::style::Modifier::ITALIC);
 			}
 			Ok(ud)
 		});
 		$methods.add_function("underline", |_, (ud, remove): (mlua::AnyUserData, bool)| {
 			let me = &mut ud.borrow_mut::<Self>()?.$($field).+;
 			if remove {
-				*me = me.remove_modifier(ratatui::style::Modifier::UNDERLINED);
+				*me = me.remove_modifier(ratatui_core::style::Modifier::UNDERLINED);
 			} else {
-				*me = me.add_modifier(ratatui::style::Modifier::UNDERLINED);
+				*me = me.add_modifier(ratatui_core::style::Modifier::UNDERLINED);
 			}
 			Ok(ud)
 		});
 		$methods.add_function("blink", |_, (ud, remove): (mlua::AnyUserData, bool)| {
 			let me = &mut ud.borrow_mut::<Self>()?.$($field).+;
 			if remove {
-				*me = me.remove_modifier(ratatui::style::Modifier::SLOW_BLINK);
+				*me = me.remove_modifier(ratatui_core::style::Modifier::SLOW_BLINK);
 			} else {
-				*me = me.add_modifier(ratatui::style::Modifier::SLOW_BLINK);
+				*me = me.add_modifier(ratatui_core::style::Modifier::SLOW_BLINK);
 			}
 			Ok(ud)
 		});
 		$methods.add_function("blink_rapid", |_, (ud, remove): (mlua::AnyUserData, bool)| {
 			let me = &mut ud.borrow_mut::<Self>()?.$($field).+;
 			if remove {
-				*me = me.remove_modifier(ratatui::style::Modifier::RAPID_BLINK);
+				*me = me.remove_modifier(ratatui_core::style::Modifier::RAPID_BLINK);
 			} else {
-				*me = me.add_modifier(ratatui::style::Modifier::RAPID_BLINK);
+				*me = me.add_modifier(ratatui_core::style::Modifier::RAPID_BLINK);
 			}
 			Ok(ud)
 		});
 		$methods.add_function("reverse", |_, (ud, remove): (mlua::AnyUserData, bool)| {
 			let me = &mut ud.borrow_mut::<Self>()?.$($field).+;
 			if remove {
-				*me = me.remove_modifier(ratatui::style::Modifier::REVERSED);
+				*me = me.remove_modifier(ratatui_core::style::Modifier::REVERSED);
 			} else {
-				*me = me.add_modifier(ratatui::style::Modifier::REVERSED);
+				*me = me.add_modifier(ratatui_core::style::Modifier::REVERSED);
 			}
 			Ok(ud)
 		});
 		$methods.add_function("hidden", |_, (ud, remove): (mlua::AnyUserData, bool)| {
 			let me = &mut ud.borrow_mut::<Self>()?.$($field).+;
 			if remove {
-				*me = me.remove_modifier(ratatui::style::Modifier::HIDDEN);
+				*me = me.remove_modifier(ratatui_core::style::Modifier::HIDDEN);
 			} else {
-				*me = me.add_modifier(ratatui::style::Modifier::HIDDEN);
+				*me = me.add_modifier(ratatui_core::style::Modifier::HIDDEN);
 			}
 			Ok(ud)
 		});
 		$methods.add_function("crossed", |_, (ud, remove): (mlua::AnyUserData, bool)| {
 			let me = &mut ud.borrow_mut::<Self>()?.$($field).+;
 			if remove {
-				*me = me.remove_modifier(ratatui::style::Modifier::CROSSED_OUT);
+				*me = me.remove_modifier(ratatui_core::style::Modifier::CROSSED_OUT);
 			} else {
-				*me = me.add_modifier(ratatui::style::Modifier::CROSSED_OUT);
+				*me = me.add_modifier(ratatui_core::style::Modifier::CROSSED_OUT);
 			}
 			Ok(ud)
 		});
 		$methods.add_function("reset", |_, ud: mlua::AnyUserData| {
-			ud.borrow_mut::<Self>()?.$($field).+ = ratatui::style::Style::reset();
+			ud.borrow_mut::<Self>()?.$($field).+ = ratatui_core::style::Style::reset();
 			Ok(ud)
 		});
 	};
@@ -245,21 +205,24 @@ macro_rules! impl_style_shorthands {
 #[macro_export]
 macro_rules! impl_file_fields {
 	($fields:ident) => {
-		$crate::cached_field!($fields, cha, |_, me| Ok($crate::Cha(me.cha)));
-		$crate::cached_field!($fields, url, |_, me| Ok($crate::Url::new(me.url_owned())));
-		$crate::cached_field!($fields, link_to, |_, me| Ok(me.link_to.as_ref().map($crate::Path::new)));
+		use yazi_shim::mlua::UserDataFieldsExt;
 
-		$crate::cached_field!($fields, name, |lua, me| {
+		$fields.add_cached_field("cha", |_, me| Ok(me.cha));
+		$fields.add_cached_field("url", |_, me| Ok(me.url_owned()));
+		$fields.add_cached_field("link_to", |_, me| Ok(me.link_to.clone()));
+
+		$fields.add_cached_field("name", |lua, me| {
 			me.name().map(|s| lua.create_string(s.encoded_bytes())).transpose()
 		});
-		$crate::cached_field!($fields, path, |_, me| {
+		$fields.add_cached_field("path", |_, me| {
 			use yazi_fs::FsUrl;
-			use yazi_shared::url::AsUrl;
-			Ok($crate::Path::new(me.url.as_url().unified_path()))
+			use yazi_shared::{path::PathBufDyn, url::AsUrl};
+			Ok(PathBufDyn::from(me.url.as_url().unified_path()))
 		});
-		$crate::cached_field!($fields, cache, |_, me| {
+		$fields.add_cached_field("cache", |_, me| {
 			use yazi_fs::FsUrl;
-			Ok(me.url.cache().map($crate::Path::new))
+			use yazi_shared::path::PathBufDyn;
+			Ok(me.url.cache().map(PathBufDyn::from))
 		});
 	};
 }
diff --git a/yazi-binding/src/mouse.rs b/yazi-binding/src/mouse.rs
deleted file mode 100644
index bc959bf5..00000000
--- a/yazi-binding/src/mouse.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use std::ops::Deref;
-
-use mlua::{UserData, UserDataFields};
-use yazi_term::event::{MouseButton, MouseEventKind};
-
-#[derive(Clone, Copy)]
-pub struct MouseEvent(yazi_term::event::MouseEvent);
-
-impl Deref for MouseEvent {
-	type Target = yazi_term::event::MouseEvent;
-
-	fn deref(&self) -> &Self::Target { &self.0 }
-}
-
-impl From<yazi_term::event::MouseEvent> for MouseEvent {
-	fn from(event: yazi_term::event::MouseEvent) -> Self { Self(event) }
-}
-
-impl UserData for MouseEvent {
-	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
-		fields.add_field_method_get("x", |_, me| Ok(me.column));
-		fields.add_field_method_get("y", |_, me| Ok(me.row));
-		fields.add_field_method_get("is_left", |_, me| {
-			use MouseEventKind as K;
-			Ok(matches!(me.kind, K::Down(b) | K::Up(b) | K::Drag(b) if b == MouseButton::Left))
-		});
-		fields.add_field_method_get("is_right", |_, me| {
-			use MouseEventKind as K;
-			Ok(matches!(me.kind, K::Down(b) | K::Up(b) | K::Drag(b) if b == MouseButton::Right))
-		});
-		fields.add_field_method_get("is_middle", |_, me| {
-			use MouseEventKind as K;
-			Ok(matches!(me.kind, K::Down(b) | K::Up(b) | K::Drag(b) if b == MouseButton::Middle))
-		});
-	}
-}
diff --git a/yazi-binding/src/position/lua.rs b/yazi-binding/src/position/lua.rs
new file mode 100644
index 00000000..c76ef309
--- /dev/null
+++ b/yazi-binding/src/position/lua.rs
@@ -0,0 +1,72 @@
+use std::str::FromStr;
+
+use mlua::{AnyUserData, ExternalError, ExternalResult, FromLua, IntoLua, Lua, MetaMethod, Table, UserData, UserDataFields, UserDataMethods, Value};
+use yazi_shim::strum::IntoStr;
+
+use crate::{elements::Pad, position::{Offset, Origin, Position}};
+
+const EXPECTED: &str = "expected a Pos";
+
+impl TryFrom<&AnyUserData> for Position {
+	type Error = mlua::Error;
+
+	fn try_from(ud: &AnyUserData) -> Result<Self, Self::Error> {
+		if let Ok(pos) = ud.borrow() { Ok(*pos) } else { Err(EXPECTED.into_lua_err()) }
+	}
+}
+
+impl TryFrom<Table> for Position {
+	type Error = mlua::Error;
+
+	fn try_from(t: Table) -> Result<Self, Self::Error> {
+		Ok(Self {
+			origin:  Origin::from_str(&t.raw_get::<mlua::String>(1)?.to_str()?).into_lua_err()?,
+			offset:  Offset {
+				x:      t.raw_get("x").unwrap_or_default(),
+				y:      t.raw_get("y").unwrap_or_default(),
+				width:  t.raw_get("w").unwrap_or_default(),
+				height: t.raw_get("h").unwrap_or_default(),
+			},
+			padding: Default::default(),
+		})
+	}
+}
+
+impl FromLua for Position {
+	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
+		match value {
+			Value::Table(tbl) => Self::try_from(tbl),
+			Value::UserData(ud) => Self::try_from(&ud),
+			_ => Err(EXPECTED.into_lua_err()),
+		}
+	}
+}
+
+impl Position {
+	pub fn compose(lua: &Lua) -> mlua::Result<Value> {
+		let new = lua.create_function(|_, (_, t): (Table, Table)| Self::try_from(t))?;
+
+		let pos = lua.create_table()?;
+		pos.set_metatable(Some(lua.create_table_from([(MetaMethod::Call.name(), new)])?))?;
+
+		pos.into_lua(lua)
+	}
+}
+
+impl UserData for Position {
+	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
+		// TODO: cache
+		fields.add_field_method_get("1", |_, me| Ok(me.origin.into_str()));
+		fields.add_field_method_get("x", |_, me| Ok(me.x));
+		fields.add_field_method_get("y", |_, me| Ok(me.y));
+		fields.add_field_method_get("w", |_, me| Ok(me.width));
+		fields.add_field_method_get("h", |_, me| Ok(me.height));
+	}
+
+	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
+		methods.add_function("pad", |_, (ud, pad): (AnyUserData, Pad)| {
+			ud.borrow_mut::<Self>()?.padding = pad.into();
+			Ok(ud)
+		});
+	}
+}
diff --git a/yazi-binding/src/position/mod.rs b/yazi-binding/src/position/mod.rs
new file mode 100644
index 00000000..75e14b31
--- /dev/null
+++ b/yazi-binding/src/position/mod.rs
@@ -0,0 +1 @@
+yazi_macro::mod_flat!(lua offset origin position);
diff --git a/yazi-config/src/popup/offset.rs b/yazi-binding/src/position/offset.rs
similarity index 77%
rename from yazi-config/src/popup/offset.rs
rename to yazi-binding/src/position/offset.rs
index 23c4be2c..4cea9d6b 100644
--- a/yazi-config/src/popup/offset.rs
+++ b/yazi-binding/src/position/offset.rs
@@ -10,6 +10,17 @@ pub struct Offset {
 	pub height: u16,
 }
 
+impl From<ratatui_core::layout::Rect> for Offset {
+	fn from(value: ratatui_core::layout::Rect) -> Self {
+		Self {
+			x:      value.x as i16,
+			y:      value.y as i16,
+			width:  value.width,
+			height: value.height,
+		}
+	}
+}
+
 impl TryFrom<[i16; 4]> for Offset {
 	type Error = anyhow::Error;
 
@@ -32,8 +43,3 @@ impl TryFrom<[i16; 4]> for Offset {
 		})
 	}
 }
-
-impl Offset {
-	#[inline]
-	pub fn line() -> Self { Self { x: 0, y: 0, width: u16::MAX, height: 1 } }
-}
diff --git a/yazi-config/src/popup/origin.rs b/yazi-binding/src/position/origin.rs
similarity index 100%
rename from yazi-config/src/popup/origin.rs
rename to yazi-binding/src/position/origin.rs
diff --git a/yazi-config/src/popup/position.rs b/yazi-binding/src/position/position.rs
similarity index 52%
rename from yazi-config/src/popup/position.rs
rename to yazi-binding/src/position/position.rs
index 3ea8bd89..2c649cce 100644
--- a/yazi-config/src/popup/position.rs
+++ b/yazi-binding/src/position/position.rs
@@ -1,18 +1,47 @@
-use ratatui::layout::Rect;
-use yazi_term::Dimension;
+use std::ops::{Deref, DerefMut};
+
+use ratatui_core::layout::Rect;
+use ratatui_widgets::block::Padding;
+use yazi_shim::ratatui::Padable;
 
 use super::{Offset, Origin};
 
 #[derive(Clone, Copy, Debug, Default)]
 pub struct Position {
-	pub origin: Origin,
-	pub offset: Offset,
+	pub origin:  Origin,
+	pub offset:  Offset,
+	pub padding: Padding,
+}
+
+impl Deref for Position {
+	type Target = Offset;
+
+	fn deref(&self) -> &Self::Target { &self.offset }
+}
+
+impl DerefMut for Position {
+	fn deref_mut(&mut self) -> &mut Self::Target { &mut self.offset }
+}
+
+impl From<Rect> for Position {
+	fn from(value: Rect) -> Self { Self::new(Origin::TopLeft, value.into()) }
 }
 
 impl Position {
-	pub const fn new(origin: Origin, offset: Offset) -> Self { Self { origin, offset } }
+	pub const fn new(origin: Origin, offset: Offset) -> Self {
+		Self { origin, offset, padding: Padding::ZERO }
+	}
 
-	pub fn rect(&self, Dimension { cols, rows, .. }: Dimension) -> Rect {
+	pub const fn hovered(offset: Offset) -> Self {
+		Self { origin: Origin::Hovered, offset, padding: Padding::ZERO }
+	}
+
+	pub fn with_height(mut self, height: u16) -> Self {
+		self.height = height;
+		self
+	}
+
+	pub fn rect(&self, (cols, rows): (u16, u16)) -> Rect {
 		use Origin::*;
 		let Offset { x, y, width, height } = self.offset;
 
@@ -40,10 +69,11 @@ impl Position {
 			width:  width.min(cols.saturating_sub(new_x)),
 			height: height.min(rows.saturating_sub(new_y)),
 		}
+		.padding(self.padding)
 	}
 
-	pub fn sticky(Dimension { cols, rows, .. }: Dimension, base: Rect, offset: Offset) -> Rect {
-		let Offset { x, y, width, height } = offset;
+	pub fn sticky(self, base: Rect, (cols, rows): (u16, u16)) -> Rect {
+		let Offset { x, y, width, height } = self.offset;
 
 		let above =
 			base.y.saturating_add(base.height).saturating_add(height).saturating_add_signed(y) > rows;
@@ -61,5 +91,15 @@ impl Position {
 			width:  width.min(cols.saturating_sub(new_x)),
 			height: height.min(rows.saturating_sub(new_y)),
 		}
+		.padding(self.padding)
+	}
+
+	pub fn padding(mut self, padding: impl Into<Padding>) -> Self {
+		let p = padding.into();
+		self.padding.left = self.padding.left.saturating_add(p.left);
+		self.padding.right = self.padding.right.saturating_add(p.right);
+		self.padding.top = self.padding.top.saturating_add(p.top);
+		self.padding.bottom = self.padding.bottom.saturating_add(p.bottom);
+		self
 	}
 }
diff --git a/yazi-binding/src/process/command.rs b/yazi-binding/src/process/command.rs
index 519c6189..4949b266 100644
--- a/yazi-binding/src/process/command.rs
+++ b/yazi-binding/src/process/command.rs
@@ -2,7 +2,7 @@ use std::{any::TypeId, ffi::OsStr, io, process::Stdio};
 
 use mlua::{AnyUserData, ExternalError, IntoLua, IntoLuaMulti, Lua, MetaMethod, Table, UserData, UserDataMethods, Value};
 use tokio::process::{ChildStderr, ChildStdin, ChildStdout};
-use yazi_shared::wtf8::FromWtf8;
+use yazi_shim::wtf8::FromWtf8;
 
 use super::{Child, output::Output};
 use crate::{Error, process::Status};
diff --git a/yazi-binding/src/process/output.rs b/yazi-binding/src/process/output.rs
index 97508849..7b0056cd 100644
--- a/yazi-binding/src/process/output.rs
+++ b/yazi-binding/src/process/output.rs
@@ -1,31 +1,25 @@
 use std::mem;
 
-use mlua::{UserData, UserDataFields, Value};
+use mlua::{UserData, UserDataFields};
+use yazi_shim::mlua::UserDataFieldsExt;
 
 use super::Status;
-use crate::{cached_field, cached_field_mut};
 
 pub struct Output {
 	inner: std::process::Output,
-
-	v_status: Option<Value>,
-	v_stdout: Option<mlua::Result<Value>>,
-	v_stderr: Option<mlua::Result<Value>>,
 }
 
 impl Output {
-	pub fn new(inner: std::process::Output) -> Self {
-		Self { inner, v_status: None, v_stdout: None, v_stderr: None }
-	}
+	pub fn new(inner: std::process::Output) -> Self { Self { inner } }
 }
 
 impl UserData for Output {
 	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
-		cached_field!(fields, status, |_, me| Ok(Status::new(me.inner.status)));
-		cached_field_mut!(fields, stdout, |lua, me| {
+		fields.add_cached_field("status", |_, me| Ok(Status::new(me.inner.status)));
+		fields.add_cached_field_mut("stdout", |lua, me| {
 			lua.create_external_string(mem::take(&mut me.inner.stdout))
 		});
-		cached_field_mut!(fields, stderr, |lua, me| {
+		fields.add_cached_field_mut("stderr", |lua, me| {
 			lua.create_external_string(mem::take(&mut me.inner.stderr))
 		});
 	}
diff --git a/yazi-binding/src/scheme.rs b/yazi-binding/src/scheme.rs
deleted file mode 100644
index 93bc9fd8..00000000
--- a/yazi-binding/src/scheme.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use std::ops::Deref;
-
-use mlua::{UserData, UserDataFields, Value};
-use yazi_fs::FsScheme;
-use yazi_shared::scheme::SchemeLike;
-use yazi_shim::strum::IntoStr;
-
-use crate::{Path, cached_field};
-
-pub struct Scheme {
-	inner: yazi_shared::scheme::Scheme,
-
-	v_kind:  Option<Value>,
-	v_cache: Option<Value>,
-}
-
-impl Deref for Scheme {
-	type Target = yazi_shared::scheme::Scheme;
-
-	fn deref(&self) -> &Self::Target { &self.inner }
-}
-
-impl Scheme {
-	pub fn new(scheme: impl Into<yazi_shared::scheme::Scheme>) -> Self {
-		Self { inner: scheme.into(), v_kind: None, v_cache: None }
-	}
-}
-
-impl UserData for Scheme {
-	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
-		cached_field!(fields, kind, |_, me| Ok(me.kind().into_str()));
-		cached_field!(fields, cache, |_, me| Ok(me.cache().map(Path::new)));
-
-		fields.add_field_method_get("is_virtual", |_, me| Ok(me.is_virtual()));
-	}
-}
diff --git a/yazi-binding/src/selector.rs b/yazi-binding/src/selector.rs
deleted file mode 100644
index d5d281ef..00000000
--- a/yazi-binding/src/selector.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-use std::ops::Deref;
-
-use mlua::{FromLua, Lua, LuaSerdeExt, UserData, Value};
-
-pub struct Selector(yazi_config::Selector);
-
-impl Deref for Selector {
-	type Target = yazi_config::Selector;
-
-	fn deref(&self) -> &Self::Target { &self.0 }
-}
-
-impl From<Selector> for yazi_config::Selector {
-	fn from(value: Selector) -> Self { value.0 }
-}
-
-impl FromLua for Selector {
-	fn from_lua(value: Value, lua: &Lua) -> mlua::Result<Self> { Ok(Self(lua.from_value(value)?)) }
-}
-
-impl UserData for Selector {}
diff --git a/yazi-binding/src/stage.rs b/yazi-binding/src/stage.rs
deleted file mode 100644
index 9678175c..00000000
--- a/yazi-binding/src/stage.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-use mlua::{IntoLuaMulti, MetaMethod, UserData, UserDataMethods};
-
-pub struct FolderStage(yazi_fs::FolderStage);
-
-impl FolderStage {
-	pub fn new(inner: yazi_fs::FolderStage) -> Self { Self(inner) }
-}
-
-impl UserData for FolderStage {
-	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
-		methods.add_meta_method(MetaMethod::Call, |lua, me, ()| {
-			use yazi_fs::FolderStage::*;
-
-			match &me.0 {
-				Loading => false.into_lua_multi(lua),
-				Loaded => true.into_lua_multi(lua),
-				Failed(e) => (true, crate::Error::Fs(e.clone())).into_lua_multi(lua),
-			}
-		});
-	}
-}
diff --git a/yazi-binding/src/style/mod.rs b/yazi-binding/src/style/mod.rs
new file mode 100644
index 00000000..11ea7d99
--- /dev/null
+++ b/yazi-binding/src/style/mod.rs
@@ -0,0 +1 @@
+yazi_macro::mod_flat!(style style_flat);
diff --git a/yazi-binding/src/style.rs b/yazi-binding/src/style/style.rs
similarity index 85%
rename from yazi-binding/src/style.rs
rename to yazi-binding/src/style/style.rs
index 45592ef2..efd87add 100644
--- a/yazi-binding/src/style.rs
+++ b/yazi-binding/src/style/style.rs
@@ -1,32 +1,32 @@
 use std::ops::Deref;
 
 use mlua::{ExternalError, FromLua, IntoLua, Lua, LuaSerdeExt, MetaMethod, Table, UserData, UserDataMethods, Value};
-use ratatui::style::Modifier;
-use yazi_shim::cell::SyncCell;
+use ratatui_core::style::Modifier;
+use yazi_shim::{cell::SyncCell, mlua::SER_OPT};
 
-use crate::{SER_OPT, elements::Color};
+use crate::{elements::Color, style::StyleFlat};
 
 #[derive(Clone, Copy, Default)]
-pub struct Style(pub ratatui::style::Style);
+pub struct Style(pub ratatui_core::style::Style);
 
 impl Deref for Style {
-	type Target = ratatui::style::Style;
+	type Target = ratatui_core::style::Style;
 
 	fn deref(&self) -> &Self::Target { &self.0 }
 }
 
-impl From<yazi_config::Style> for Style {
-	fn from(value: yazi_config::Style) -> Self { Self(value.into()) }
+impl From<StyleFlat> for Style {
+	fn from(value: StyleFlat) -> Self { Self(value.into()) }
 }
 
-impl From<Style> for ratatui::style::Style {
+impl From<&SyncCell<StyleFlat>> for Style {
+	fn from(value: &SyncCell<StyleFlat>) -> Self { value.get().into() }
+}
+
+impl From<Style> for ratatui_core::style::Style {
 	fn from(value: Style) -> Self { value.0 }
 }
 
-impl From<&SyncCell<yazi_config::Style>> for Style {
-	fn from(value: &SyncCell<yazi_config::Style>) -> Self { value.get().into() }
-}
-
 impl Style {
 	pub fn compose(lua: &Lua) -> mlua::Result<Value> {
 		let new = lua.create_function(|_, (_, style): (Table, Self)| Ok(style))?;
@@ -136,7 +136,6 @@ impl UserData for Style {
 
 		methods.add_method("patch", |_, me, other: Self| Ok(Self(me.patch(other))));
 
-		methods
-			.add_method("raw", |lua, me, ()| lua.to_value_with(&yazi_config::Style::from(me.0), SER_OPT));
+		methods.add_method("raw", |lua, me, ()| lua.to_value_with(&StyleFlat::from(me.0), SER_OPT));
 	}
 }
diff --git a/yazi-config/src/style.rs b/yazi-binding/src/style/style_flat.rs
similarity index 85%
rename from yazi-config/src/style.rs
rename to yazi-binding/src/style/style_flat.rs
index 5c2dd34a..8a63de21 100644
--- a/yazi-config/src/style.rs
+++ b/yazi-binding/src/style/style_flat.rs
@@ -1,8 +1,8 @@
-use ratatui::style::Color;
+use ratatui_core::style::Color;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Copy, Debug, Default, Deserialize, Serialize)]
-pub struct Style {
+pub struct StyleFlat {
 	pub fg:          Option<Color>,
 	pub bg:          Option<Color>,
 	pub bold:        Option<bool>,
@@ -16,10 +16,10 @@ pub struct Style {
 	pub crossed:     Option<bool>,
 }
 
-impl From<ratatui::style::Style> for Style {
+impl From<ratatui_core::style::Style> for StyleFlat {
 	#[rustfmt::skip]
-	fn from(value: ratatui::style::Style) -> Self {
-		use ratatui::style::Modifier as M;
+	fn from(value: ratatui_core::style::Style) -> Self {
+		use ratatui_core::style::Modifier as M;
 
 		let sub = value.sub_modifier;
 		let all = value.add_modifier - sub;
@@ -40,10 +40,10 @@ impl From<ratatui::style::Style> for Style {
 	}
 }
 
-impl From<Style> for ratatui::style::Style {
+impl From<StyleFlat> for ratatui_core::style::Style {
 	#[rustfmt::skip]
-	fn from(value: Style) -> Self {
-		use ratatui::style::Modifier as M;
+	fn from(value: StyleFlat) -> Self {
+		use ratatui_core::style::Modifier as M;
 
 		let (mut add, mut sub) = (M::empty(), M::empty());
 		if let Some(b) = value.bold {
@@ -84,8 +84,8 @@ impl From<Style> for ratatui::style::Style {
 	}
 }
 
-impl Style {
-	pub fn derive(self, other: ratatui::style::Style) -> ratatui::style::Style {
-		ratatui::style::Style::from(self).patch(other)
+impl StyleFlat {
+	pub fn derive(self, other: ratatui_core::style::Style) -> ratatui_core::style::Style {
+		ratatui_core::style::Style::from(self).patch(other)
 	}
 }
diff --git a/yazi-binding/src/theme/custom_field.rs b/yazi-binding/src/theme/custom_field.rs
deleted file mode 100644
index 760ad6b5..00000000
--- a/yazi-binding/src/theme/custom_field.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use mlua::IntoLua;
-
-use crate::Style;
-
-pub struct CustomField(yazi_config::theme::CustomField);
-
-impl CustomField {
-	pub fn new(inner: impl Into<yazi_config::theme::CustomField>) -> Self { Self(inner.into()) }
-}
-
-impl IntoLua for CustomField {
-	fn into_lua(self, lua: &mlua::Lua) -> mlua::Result<mlua::Value> {
-		match self.0 {
-			yazi_config::theme::CustomField::Style(style) => Style::from(style).into_lua(lua),
-			yazi_config::theme::CustomField::String(s) => s.into_lua(lua),
-		}
-	}
-}
diff --git a/yazi-binding/src/theme/custom_section.rs b/yazi-binding/src/theme/custom_section.rs
deleted file mode 100644
index 4404bec1..00000000
--- a/yazi-binding/src/theme/custom_section.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use std::sync::Arc;
-
-use hashbrown::HashMap;
-use mlua::{IntoLua, MetaMethod, UserData, UserDataMethods, Value};
-use yazi_shared::SnakeCasedString;
-
-use crate::theme::CustomField;
-
-pub struct CustomSection {
-	inner: Arc<HashMap<SnakeCasedString, yazi_config::theme::CustomField>>,
-}
-
-impl CustomSection {
-	pub fn new(inner: Arc<HashMap<SnakeCasedString, yazi_config::theme::CustomField>>) -> Self {
-		Self { inner }
-	}
-}
-
-impl UserData for CustomSection {
-	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
-		methods.add_meta_method(MetaMethod::Index, |lua, me, key: mlua::String| {
-			match me.inner.get(&*key.to_str()?) {
-				Some(value) => CustomField::new(value).into_lua(lua),
-				None => Ok(Value::Nil),
-			}
-		});
-	}
-}
diff --git a/yazi-binding/src/theme/mod.rs b/yazi-binding/src/theme/mod.rs
deleted file mode 100644
index ae58aae2..00000000
--- a/yazi-binding/src/theme/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-yazi_macro::mod_flat!(custom_field custom_section);
diff --git a/yazi-boot/Cargo.toml b/yazi-boot/Cargo.toml
index e226fade..4cc27b8e 100644
--- a/yazi-boot/Cargo.toml
+++ b/yazi-boot/Cargo.toml
@@ -13,21 +13,17 @@ rust-version.workspace = true
 workspace = true
 
 [dependencies]
-yazi-adapter  = { path = "../yazi-adapter", version = "26.5.6" }
-yazi-config   = { path = "../yazi-config", version = "26.5.6" }
-yazi-emulator = { path = "../yazi-emulator", version = "26.5.6" }
-yazi-fs       = { path = "../yazi-fs", version = "26.5.6" }
-yazi-macro    = { path = "../yazi-macro", version = "26.5.6" }
-yazi-shared   = { path = "../yazi-shared", version = "26.5.6" }
-yazi-shim     = { path = "../yazi-shim", version = "26.5.6" }
-yazi-term     = { path = "../yazi-term", version = "26.5.6" }
-yazi-vfs      = { path = "../yazi-vfs", version = "26.5.6" }
+yazi-fs      = { path = "../yazi-fs", version = "26.5.6" }
+yazi-macro   = { path = "../yazi-macro", version = "26.5.6" }
+yazi-shared  = { path = "../yazi-shared", version = "26.5.6" }
+yazi-shim    = { path = "../yazi-shim", version = "26.5.6" }
+yazi-version = { path = "../yazi-version", version = "26.5.6" }
+yazi-vfs     = { path = "../yazi-vfs", version = "26.5.6" }
 
 # External dependencies
 clap      = { workspace = true }
 futures   = { workspace = true }
 hashbrown = { workspace = true }
-regex     = { workspace = true }
 
 [build-dependencies]
 yazi-shared = { path = "../yazi-shared", version = "26.5.6" }
@@ -37,4 +33,3 @@ clap                  = { workspace = true }
 clap_complete         = "4.6.5"
 clap_complete_fig     = "4.5.2"
 clap_complete_nushell = "4.6.0"
-vergen-gitcl          = { version = "9.1.0", features = [ "build", "rustc" ] }
diff --git a/yazi-boot/build.rs b/yazi-boot/build.rs
index 93ea359e..597e6a00 100644
--- a/yazi-boot/build.rs
+++ b/yazi-boot/build.rs
@@ -5,27 +5,8 @@ use std::{env, error::Error};
 
 use clap::CommandFactory;
 use clap_complete::{Shell, generate_to};
-use vergen_gitcl::{BuildBuilder, Emitter, GitclBuilder, RustcBuilder};
 
 fn main() -> Result<(), Box<dyn Error>> {
-	Emitter::default()
-		.add_instructions(&BuildBuilder::default().build_date(true).build()?)?
-		.add_instructions(
-			&RustcBuilder::default()
-				.commit_date(true)
-				.commit_hash(true)
-				.host_triple(true)
-				.semver(true)
-				.build()?,
-		)?
-		.emit()?;
-
-	if env::var_os("YAZI_NO_GITCL").is_none() {
-		Emitter::default().add_instructions(&GitclBuilder::default().sha(true).build()?)?.emit()?;
-	} else {
-		println!("cargo:rustc-env=VERGEN_GIT_SHA=no-gitcl");
-	}
-
 	if env::var_os("YAZI_GEN_COMPLETIONS").is_none() {
 		return Ok(());
 	}
diff --git a/yazi-boot/src/actions/actions.rs b/yazi-boot/src/actions/actions.rs
index d4d120fa..1849be81 100644
--- a/yazi-boot/src/actions/actions.rs
+++ b/yazi-boot/src/actions/actions.rs
@@ -5,17 +5,17 @@ pub struct Actions;
 impl Actions {
 	pub(crate) fn act(args: &crate::Args) {
 		if args.debug {
-			println!("{}", Self::debug().unwrap());
-			process::exit(0);
-		}
-
-		if args.version {
-			println!("Yazi {}", Self::version());
+			println!("`yazi --debug` has been deprecated, use `ya env` instead.");
 			process::exit(0);
 		}
 
 		if args.clear_cache {
-			Self::clear_cache();
+			println!("`yazi --clear-cache` has been deprecated, use `ya cache clear` instead.");
+			process::exit(0);
+		}
+
+		if args.version {
+			println!("Yazi\n{}", yazi_version::version_full());
 			process::exit(0);
 		}
 	}
diff --git a/yazi-boot/src/actions/mod.rs b/yazi-boot/src/actions/mod.rs
index 651f0ab6..239b7755 100644
--- a/yazi-boot/src/actions/mod.rs
+++ b/yazi-boot/src/actions/mod.rs
@@ -1 +1 @@
-yazi_macro::mod_flat!(actions clear_cache debug rustc triple version);
+yazi_macro::mod_flat!(actions);
diff --git a/yazi-boot/src/actions/rustc.rs b/yazi-boot/src/actions/rustc.rs
deleted file mode 100644
index 834ba6e5..00000000
--- a/yazi-boot/src/actions/rustc.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use super::Actions;
-
-impl Actions {
-	pub(super) fn rustc() -> String {
-		format!(
-			"{} ({} {})",
-			env!("VERGEN_RUSTC_SEMVER"),
-			&env!("VERGEN_RUSTC_COMMIT_HASH")[..8],
-			env!("VERGEN_RUSTC_COMMIT_DATE")
-		)
-	}
-}
diff --git a/yazi-boot/src/actions/triple.rs b/yazi-boot/src/actions/triple.rs
deleted file mode 100644
index 04dafcfc..00000000
--- a/yazi-boot/src/actions/triple.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use super::Actions;
-
-impl Actions {
-	pub(super) fn triple() -> String {
-		format!(
-			"{} ({}-{})",
-			env!("VERGEN_RUSTC_HOST_TRIPLE"),
-			std::env::consts::OS,
-			std::env::consts::ARCH
-		)
-	}
-}
diff --git a/yazi-boot/src/actions/version.rs b/yazi-boot/src/actions/version.rs
deleted file mode 100644
index 84906dac..00000000
--- a/yazi-boot/src/actions/version.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-use super::Actions;
-
-impl Actions {
-	pub fn version() -> &'static str {
-		concat!(
-			env!("CARGO_PKG_VERSION"),
-			" (",
-			env!("VERGEN_GIT_SHA"),
-			" ",
-			env!("VERGEN_BUILD_DATE"),
-			")"
-		)
-	}
-}
diff --git a/yazi-boot/src/args.rs b/yazi-boot/src/args.rs
index 76c50936..b46b139e 100644
--- a/yazi-boot/src/args.rs
+++ b/yazi-boot/src/args.rs
@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use clap::Parser;
-use yazi_shared::{Id, url::UrlBuf};
+use yazi_shared::{id::Id, url::UrlBuf};
 
 #[derive(Debug, Default, Parser)]
 #[command(name = "yazi")]
@@ -18,9 +18,9 @@ pub struct Args {
 	#[arg(long)]
 	pub chooser_file: Option<PathBuf>,
 
-	/// Clear the cache directory
+	/// Clear the cache directory (deprecated, use `ya cache clear`)
 	#[arg(long)]
-	pub clear_cache: bool,
+	pub clear_cache: bool, // TODO: remove
 
 	/// Use the specified client ID, must be a globally unique number
 	#[arg(long)]
@@ -32,9 +32,9 @@ pub struct Args {
 	#[arg(long)]
 	pub remote_events: Option<String>,
 
-	/// Print debug information
+	/// Print debug information (deprecated, use `ya env`)
 	#[arg(long)]
-	pub debug: bool,
+	pub debug: bool, // TODO: remove
 
 	/// Print version
 	#[arg(short = 'V', long)]
diff --git a/yazi-cli/Cargo.toml b/yazi-cli/Cargo.toml
index 8c628d0f..09e86f9b 100644
--- a/yazi-cli/Cargo.toml
+++ b/yazi-cli/Cargo.toml
@@ -13,17 +13,23 @@ rust-version.workspace = true
 workspace = true
 
 [dependencies]
-yazi-boot   = { path = "../yazi-boot", version = "26.5.6" }
-yazi-dds    = { path = "../yazi-dds", version = "26.5.6" }
-yazi-fs     = { path = "../yazi-fs", version = "26.5.6" }
-yazi-macro  = { path = "../yazi-macro", version = "26.5.6" }
-yazi-shared = { path = "../yazi-shared", version = "26.5.6" }
-yazi-term   = { path = "../yazi-term", version = "26.5.6" }
+yazi-adapter  = { path = "../yazi-adapter", version = "26.5.6" }
+yazi-boot     = { path = "../yazi-boot", version = "26.5.6" }
+yazi-config   = { path = "../yazi-config", version = "26.5.6" }
+yazi-dds      = { path = "../yazi-dds", version = "26.5.6" }
+yazi-emulator = { path = "../yazi-emulator", version = "26.5.6" }
+yazi-fs       = { path = "../yazi-fs", version = "26.5.6" }
+yazi-macro    = { path = "../yazi-macro", version = "26.5.6" }
+yazi-shared   = { path = "../yazi-shared", version = "26.5.6" }
+yazi-term     = { path = "../yazi-term", version = "26.5.6" }
+yazi-tty      = { path = "../yazi-tty", version = "26.5.6" }
+yazi-version  = { path = "../yazi-version", version = "26.5.6" }
 
 # External dependencies
 anyhow     = { workspace = true }
 clap       = { workspace = true }
 hashbrown  = { workspace = true }
+regex      = { workspace = true }
 serde      = { workspace = true }
 serde_json = { workspace = true }
 tokio      = { workspace = true }
@@ -41,7 +47,6 @@ clap_complete_fig     = "4.5.2"
 clap_complete_nushell = "4.6.0"
 serde                 = { workspace = true }
 serde_json            = { workspace = true }
-vergen-gitcl          = { version = "9.1.0", features = [ "build" ] }
 
 [[bin]]
 name = "ya"
diff --git a/yazi-cli/build.rs b/yazi-cli/build.rs
index 8d596f34..7c5edb0f 100644
--- a/yazi-cli/build.rs
+++ b/yazi-cli/build.rs
@@ -5,7 +5,6 @@ use std::{env, error::Error};
 
 use clap::CommandFactory;
 use clap_complete::{Shell, generate_to};
-use vergen_gitcl::{BuildBuilder, Emitter, GitclBuilder};
 
 fn main() -> Result<(), Box<dyn Error>> {
 	let manifest = env::var_os("CARGO_MANIFEST_DIR").unwrap().to_string_lossy().replace(r"\", "/");
@@ -21,16 +20,6 @@ fn main() -> Result<(), Box<dyn Error>> {
 }
 
 fn generate() -> Result<(), Box<dyn Error>> {
-	Emitter::default()
-		.add_instructions(&BuildBuilder::default().build_date(true).build()?)?
-		.emit()?;
-
-	if env::var_os("YAZI_NO_GITCL").is_none() {
-		Emitter::default().add_instructions(&GitclBuilder::default().sha(true).build()?)?.emit()?;
-	} else {
-		println!("cargo:rustc-env=VERGEN_GIT_SHA=no-gitcl");
-	}
-
 	if env::var_os("YAZI_GEN_COMPLETIONS").is_none() {
 		return Ok(());
 	}
diff --git a/yazi-cli/src/args.rs b/yazi-cli/src/args.rs
index 17b75040..8457abc5 100644
--- a/yazi-cli/src/args.rs
+++ b/yazi-cli/src/args.rs
@@ -2,7 +2,7 @@ use std::{borrow::Cow, ffi::OsString};
 
 use anyhow::{Result, bail};
 use clap::{Parser, Subcommand};
-use yazi_shared::Id;
+use yazi_shared::id::Id;
 
 #[derive(Parser)]
 #[command(name = "Ya", about, long_about = None)]
@@ -32,6 +32,11 @@ pub(super) enum Command {
 	PubTo(CommandPubTo),
 	/// Subscribe to messages from all remote instances.
 	Sub(CommandSub),
+	/// Manage the cache.
+	#[command(subcommand)]
+	Cache(CommandCache),
+	/// Print environment and configuration information.
+	Env,
 }
 
 #[derive(clap::Args)]
@@ -154,6 +159,12 @@ pub(super) struct CommandSub {
 	pub(super) kinds: String,
 }
 
+#[derive(Subcommand)]
+pub(super) enum CommandCache {
+	/// Clear the cache directory.
+	Clear,
+}
+
 // --- Macros
 macro_rules! impl_emit_body {
 	($name:ident) => {
diff --git a/yazi-boot/src/actions/clear_cache.rs b/yazi-cli/src/cache/clear.rs
similarity index 69%
rename from yazi-boot/src/actions/clear_cache.rs
rename to yazi-cli/src/cache/clear.rs
index b2c2d488..68348834 100644
--- a/yazi-boot/src/actions/clear_cache.rs
+++ b/yazi-cli/src/cache/clear.rs
@@ -1,18 +1,20 @@
 use yazi_config::YAZI;
 use yazi_fs::Xdg;
 
-use super::Actions;
+use crate::cache::Cache;
 
-impl Actions {
-	pub(super) fn clear_cache() {
+impl Cache {
+	pub(crate) fn clear() -> anyhow::Result<()> {
 		if YAZI.preview.cache_dir == *Xdg::temp_dir() {
 			println!("Clearing cache directory: \n{:?}", YAZI.preview.cache_dir);
-			std::fs::remove_dir_all(&YAZI.preview.cache_dir).unwrap();
+			std::fs::remove_dir_all(&YAZI.preview.cache_dir)?;
 		} else {
 			println!(
 				"You've changed the default cache directory, for your data's safety, please clear it manually: \n{:?}",
 				YAZI.preview.cache_dir
 			);
 		}
+
+		Ok(())
 	}
 }
diff --git a/yazi-cli/src/cache/mod.rs b/yazi-cli/src/cache/mod.rs
new file mode 100644
index 00000000..77e6daec
--- /dev/null
+++ b/yazi-cli/src/cache/mod.rs
@@ -0,0 +1,3 @@
+yazi_macro::mod_flat!(clear);
+
+pub(crate) struct Cache;
diff --git a/yazi-cli/src/dds/exec.rs b/yazi-cli/src/dds/exec.rs
index a5d2a660..bce520ca 100644
--- a/yazi-cli/src/dds/exec.rs
+++ b/yazi-cli/src/dds/exec.rs
@@ -5,7 +5,7 @@ use serde::Deserialize;
 use tokio::io::AsyncWriteExt;
 use yazi_dds::{ID, Payload, Stream, ember::{Ember, EmberHi}};
 use yazi_macro::try_format;
-use yazi_shared::{Id, data::Data};
+use yazi_shared::{data::Data, id::Id};
 
 use crate::{CommandExec, CommandPub, dds::Dds};
 
diff --git a/yazi-cli/src/dds/shot.rs b/yazi-cli/src/dds/shot.rs
index ed039ed0..1b082176 100644
--- a/yazi-cli/src/dds/shot.rs
+++ b/yazi-cli/src/dds/shot.rs
@@ -5,7 +5,7 @@ use hashbrown::HashMap;
 use tokio::io::AsyncWriteExt;
 use yazi_dds::{ID, Payload, Peer, Stream, ember::{Ember, EmberBye, EmberHi}};
 use yazi_macro::try_format;
-use yazi_shared::Id;
+use yazi_shared::id::Id;
 
 use crate::dds::Dds;
 
@@ -44,10 +44,10 @@ impl Dds {
 	}
 
 	pub(super) fn ensure_version(version: Option<&str>) -> Result<()> {
-		if version != Some(EmberHi::version()) {
+		if version != Some(yazi_version::version()) {
 			bail!(
-				"Incompatible version (Ya {}, Yazi {}). Restart all `ya` and `yazi` processes if you upgrade either one.",
-				EmberHi::version(),
+				"Incompatible version (Ya {}, Yazi {}). Restart all `ya` and `yazi` processes if you upgraded either.",
+				yazi_version::version(),
 				version.unwrap_or("Unknown")
 			);
 		}
diff --git a/yazi-boot/src/actions/debug.rs b/yazi-cli/src/env/env.rs
similarity index 64%
rename from yazi-boot/src/actions/debug.rs
rename to yazi-cli/src/env/env.rs
index 26228335..1cc8e981 100644
--- a/yazi-boot/src/actions/debug.rs
+++ b/yazi-cli/src/env/env.rs
@@ -1,4 +1,4 @@
-use std::{env, ffi::OsStr, fmt::Write, path::Path};
+use std::{env, ffi::OsStr, fmt::Write, path::Path, process::Command};
 
 use regex::Regex;
 use yazi_config::{THEME, YAZI};
@@ -7,22 +7,17 @@ use yazi_fs::Xdg;
 use yazi_shared::timestamp_us;
 use yazi_term::TERM;
 
-use super::Actions;
+use crate::env::Env;
 
-impl Actions {
-	pub(super) fn debug() -> Result<String, std::fmt::Error> {
+impl Env {
+	pub(crate) fn print() -> Result<String, std::fmt::Error> {
 		let mut s = String::new();
-		writeln!(s, "\nYazi")?;
-		writeln!(s, "    Version  : {}", Self::version())?;
-		writeln!(s, "    Debug    : {}", cfg!(debug_assertions))?;
-		writeln!(s, "    Triple   : {}", Self::triple())?;
-		writeln!(s, "    Rustc    : {}", Self::rustc())?;
+		writeln!(s, "Yazi\n{}", Self::yazi_version())?;
 		writeln!(s, "    Backtrace: {:?}", env::var_os("RUST_BACKTRACE"))?;
 
-		writeln!(s, "\nYa")?;
-		writeln!(s, "    Version: {}", Self::process_output("ya", "--version"))?;
+		writeln!(s, "\nYa\n{}", yazi_version::version_full())?;
 
-		writeln!(s, "\nConfig")?;
+		writeln!(s, "Config")?;
 		writeln!(s, "    Init             : {}", Self::config_state("init.lua"))?;
 		writeln!(s, "    Yazi             : {}", Self::config_state("yazi.toml"))?;
 		writeln!(s, "    Keymap           : {}", Self::config_state("keymap.toml"))?;
@@ -39,7 +34,7 @@ impl Actions {
 		writeln!(s, "    Emulator.detect     : {:?}", *yazi_emulator::EMULATOR)?;
 
 		writeln!(s, "\nAdapter")?;
-		writeln!(s, "    Adapter.matches    : {:?}", yazi_adapter::ADAPTOR)?;
+		writeln!(s, "    Adapter.matches    : {:?}", *yazi_adapter::ADAPTOR)?;
 		writeln!(s, "    Dimension.available: {:?}", TERM.dimension())?;
 
 		writeln!(s, "\nDesktop")?;
@@ -88,47 +83,55 @@ impl Actions {
 
 		writeln!(s, "\nMultiplexers")?;
 		writeln!(s, "    TMUX               : {}", yazi_emulator::TMUX)?;
-		writeln!(s, "    tmux version       : {}", Self::process_output("tmux", "-V"))?;
+		writeln!(s, "    tmux version       : {}", Self::dep_version("tmux", "-V"))?;
 		writeln!(s, "    tmux build flags   : enable-sixel={}", Mux::tmux_sixel_flag())?;
 		writeln!(s, "    ZELLIJ_SESSION_NAME: {:?}", env::var_os("ZELLIJ_SESSION_NAME"))?;
-		writeln!(s, "    Zellij version     : {}", Self::process_output("zellij", "--version"))?;
+		writeln!(s, "    Zellij version     : {}", Self::dep_version("zellij", "--version"))?;
 
 		writeln!(s, "\nDependencies")?;
 		#[rustfmt::skip]
-		writeln!(s, "    file          : {}", Self::process_output(env::var_os("YAZI_FILE_ONE").unwrap_or("file".into()), "--version"))?;
-		writeln!(s, "    ueberzugpp    : {}", Self::process_output("ueberzugpp", "--version"))?;
+		writeln!(s, "    file          : {}", Self::dep_version(env::var_os("YAZI_FILE_ONE").unwrap_or("file".into()), "--version"))?;
+		writeln!(s, "    ueberzugpp    : {}", Self::dep_version("ueberzugpp", "--version"))?;
 		#[rustfmt::skip]
-		writeln!(s, "    ffmpeg/ffprobe: {} / {}", Self::process_output("ffmpeg", "-version"), Self::process_output("ffprobe", "-version"))?;
-		writeln!(s, "    pdftoppm      : {}", Self::process_output("pdftoppm", "--help"))?;
-		writeln!(s, "    magick        : {}", Self::process_output("magick", "--version"))?;
-		writeln!(s, "    fzf           : {}", Self::process_output("fzf", "--version"))?;
+		writeln!(s, "    ffmpeg/ffprobe: {} / {}", Self::dep_version("ffmpeg", "-version"), Self::dep_version("ffprobe", "-version"))?;
+		writeln!(s, "    pdftoppm      : {}", Self::dep_version("pdftoppm", "--help"))?;
+		writeln!(s, "    magick        : {}", Self::dep_version("magick", "--version"))?;
+		writeln!(s, "    fzf           : {}", Self::dep_version("fzf", "--version"))?;
 		#[rustfmt::skip]
-		writeln!(s, "    fd/fdfind     : {} / {}", Self::process_output("fd", "--version"), Self::process_output("fdfind", "--version"))?;
-		writeln!(s, "    rg            : {}", Self::process_output("rg", "--version"))?;
-		writeln!(s, "    chafa         : {}", Self::process_output("chafa", "--version"))?;
-		writeln!(s, "    zoxide        : {}", Self::process_output("zoxide", "--version"))?;
+		writeln!(s, "    fd/fdfind     : {} / {}", Self::dep_version("fd", "--version"), Self::dep_version("fdfind", "--version"))?;
+		writeln!(s, "    rg            : {}", Self::dep_version("rg", "--version"))?;
+		writeln!(s, "    chafa         : {}", Self::dep_version("chafa", "--version"))?;
+		writeln!(s, "    zoxide        : {}", Self::dep_version("zoxide", "--version"))?;
 		#[rustfmt::skip]
-		writeln!(s, "    7zz/7z        : {} / {}", Self::process_output("7zz", "i"), Self::process_output("7z", "i"))?;
-		writeln!(s, "    resvg         : {}", Self::process_output("resvg", "--version"))?;
-		writeln!(s, "    jq            : {}", Self::process_output("jq", "--version"))?;
+		writeln!(s, "    7zz/7z        : {} / {}", Self::dep_version("7zz", "i"), Self::dep_version("7z", "i"))?;
+		writeln!(s, "    resvg         : {}", Self::dep_version("resvg", "--version"))?;
+		writeln!(s, "    jq            : {}", Self::dep_version("jq", "--version"))?;
 
 		writeln!(s, "\nClipboard")?;
 		#[rustfmt::skip]
-		writeln!(s, "    wl-copy/paste: {} / {}", Self::process_output("wl-copy", "--version"), Self::process_output("wl-paste", "--version"))?;
-		writeln!(s, "    xclip        : {}", Self::process_output("xclip", "-version"))?;
-		writeln!(s, "    xsel         : {}", Self::process_output("xsel", "--version"))?;
+		writeln!(s, "    wl-copy/paste: {} / {}", Self::dep_version("wl-copy", "--version"), Self::dep_version("wl-paste", "--version"))?;
+		writeln!(s, "    xclip        : {}", Self::dep_version("xclip", "-version"))?;
+		writeln!(s, "    xsel         : {}", Self::dep_version("xsel", "--version"))?;
 
 		writeln!(s, "\nRoutine")?;
 		writeln!(s, "    `file -bL --mime-type`: {}", Self::file1_output())?;
 
-		writeln!(
-			s,
-			"\n\nSee https://yazi-rs.github.io/docs/plugins/overview#debugging on how to enable logging or debug runtime errors."
-		)?;
-
 		Ok(s)
 	}
 
+	fn yazi_version() -> String {
+		match Command::new("yazi").arg("--version").output() {
+			Ok(out) if out.status.success() => {
+				let s = if out.stdout.is_empty() { out.stderr } else { out.stdout };
+				let s = String::from_utf8_lossy(&s);
+				let s = s.trim();
+				s.strip_prefix("Yazi\n").unwrap_or(s).to_owned()
+			}
+			Ok(out) => format!("{:?}, {:?}", out.status, String::from_utf8_lossy(&out.stderr)),
+			Err(e) => format!("{e}"),
+		}
+	}
+
 	fn config_state(name: &str) -> String {
 		let p = Xdg::config_dir().join(name);
 		match std::fs::read_to_string(&p) {
@@ -139,8 +142,8 @@ impl Actions {
 		}
 	}
 
-	fn process_output(name: impl AsRef<OsStr>, arg: impl AsRef<OsStr>) -> String {
-		match std::process::Command::new(&name).arg(arg).output() {
+	fn dep_version(name: impl AsRef<OsStr>, arg: &str) -> String {
+		match Command::new(&name).arg(arg).output() {
 			Ok(out) if out.status.success() => {
 				let line =
 					String::from_utf8_lossy(&if out.stdout.is_empty() { out.stderr } else { out.stdout })
@@ -149,15 +152,12 @@ impl Actions {
 						.next()
 						.unwrap_or_default()
 						.to_owned();
-				if name.as_ref() == "ya" {
-					line.trim_start_matches("Ya ").to_owned()
-				} else {
-					Regex::new(r"\d+\.\d+(\.\d+-\d+|\.\d+|\b)")
-						.unwrap()
-						.find(&line)
-						.map(|m| m.as_str().to_owned())
-						.unwrap_or(line)
-				}
+
+				Regex::new(r"\d+\.\d+(\.\d+-\d+|\.\d+|\b)")
+					.unwrap()
+					.find(&line)
+					.map(|m| m.as_str().to_owned())
+					.unwrap_or(line)
 			}
 			Ok(out) => format!("{:?}, {:?}", out.status, String::from_utf8_lossy(&out.stderr)),
 			Err(e) => format!("{e}"),
@@ -171,7 +171,7 @@ impl Actions {
 		std::fs::File::create_new(&p).map(|mut f| f.write_all(b"Hello, World!")).ok();
 
 		let program = env::var_os("YAZI_FILE_ONE").unwrap_or("file".into());
-		match std::process::Command::new(program).args(["-bL", "--mime-type"]).arg(&p).output() {
+		match Command::new(program).args(["-bL", "--mime-type"]).arg(&p).output() {
 			Ok(out) => {
 				String::from_utf8_lossy(&out.stdout).trim().lines().next().unwrap_or_default().to_owned()
 			}
diff --git a/yazi-cli/src/env/mod.rs b/yazi-cli/src/env/mod.rs
new file mode 100644
index 00000000..055b1aa4
--- /dev/null
+++ b/yazi-cli/src/env/mod.rs
@@ -0,0 +1,3 @@
+yazi_macro::mod_flat!(env);
+
+pub(crate) struct Env;
diff --git a/yazi-cli/src/main.rs b/yazi-cli/src/main.rs
index b971ab9f..df189d6b 100644
--- a/yazi-cli/src/main.rs
+++ b/yazi-cli/src/main.rs
@@ -1,4 +1,4 @@
-yazi_macro::mod_pub!(dds package shared);
+yazi_macro::mod_pub!(cache dds env package shared);
 
 yazi_macro::mod_flat!(args);
 
@@ -31,12 +31,7 @@ async fn main() -> ExitCode {
 
 async fn run() -> anyhow::Result<()> {
 	if std::env::args_os().nth(1).is_some_and(|s| s == "-V" || s == "--version") {
-		outln!(
-			"Ya {} ({} {})",
-			env!("CARGO_PKG_VERSION"),
-			env!("VERGEN_GIT_SHA"),
-			env!("VERGEN_BUILD_DATE")
-		)?;
+		outln!("Ya\n{}", yazi_version::version_full())?;
 		return Ok(());
 	}
 
@@ -110,6 +105,25 @@ async fn run() -> anyhow::Result<()> {
 
 			tokio::signal::ctrl_c().await?;
 		}
+
+		Command::Cache(cmd) => {
+			yazi_tty::init();
+			yazi_config::init()?;
+
+			match cmd {
+				CommandCache::Clear => {
+					cache::Cache::clear()?;
+				}
+			}
+		}
+
+		Command::Env => {
+			yazi_tty::init();
+			yazi_term::init()?;
+			yazi_config::init()?;
+			yazi_adapter::init()?;
+			outln!("{}", env::Env::print()?)?;
+		}
 	}
 
 	Ok(())
diff --git a/yazi-cli/src/package/dependency.rs b/yazi-cli/src/package/dependency.rs
index ff5927ce..6de5755d 100644
--- a/yazi-cli/src/package/dependency.rs
+++ b/yazi-cli/src/package/dependency.rs
@@ -49,7 +49,7 @@ impl Dependency {
 		use std::io::IsTerminal;
 
 		use yazi_macro::writef;
-		use yazi_term::sequence::{If, SetSgr};
+		use yazi_tty::sequence::{If, SetSgr};
 
 		let ansi = env::var_os("YA_FORCE_ANSI").is_some_and(|v| v == "1") || io::stdout().is_terminal();
 		writef!(
diff --git a/yazi-cli/src/package/git.rs b/yazi-cli/src/package/git.rs
index 3d1e85df..506b54d5 100644
--- a/yazi-cli/src/package/git.rs
+++ b/yazi-cli/src/package/git.rs
@@ -45,11 +45,15 @@ impl Git {
 	async fn exec(f: impl FnOnce(&mut Command) -> &mut Command) -> Result<()> {
 		let status = f(Command::new("git").args([
 			"-c",
-			"advice.detachedHead=false",
+			"core.eol=lf",
+			"-c",
+			"core.autocrlf=false",
+			"-c",
+			"clone.defaultRemoteName=origin",
 			"-c",
 			"checkout.defaultRemote=origin",
 			"-c",
-			"clone.defaultRemoteName=origin",
+			"advice.detachedHead=false",
 		]))
 		.status()
 		.await
diff --git a/yazi-codegen/Cargo.toml b/yazi-codegen/Cargo.toml
index 01cb062f..77427710 100644
--- a/yazi-codegen/Cargo.toml
+++ b/yazi-codegen/Cargo.toml
@@ -19,4 +19,4 @@ proc-macro = true
 # External dependencies
 proc-macro2 = "1"
 quote       = "1.0.45"
-syn         = { version = "2.0.117", features = [ "full" ] }
+syn         = { version = "2.0.118", features = [ "full" ] }
diff --git a/yazi-config/Cargo.toml b/yazi-config/Cargo.toml
index ea98433b..d50defa4 100644
--- a/yazi-config/Cargo.toml
+++ b/yazi-config/Cargo.toml
@@ -13,6 +13,7 @@ rust-version.workspace = true
 workspace = true
 
 [dependencies]
+yazi-binding = { path = "../yazi-binding", version = "26.5.6" }
 yazi-codegen = { path = "../yazi-codegen", version = "26.5.6" }
 yazi-fs      = { path = "../yazi-fs", version = "26.5.6" }
 yazi-macro   = { path = "../yazi-macro", version = "26.5.6" }
@@ -20,19 +21,21 @@ yazi-shared  = { path = "../yazi-shared", version = "26.5.6" }
 yazi-shim    = { path = "../yazi-shim", version = "26.5.6" }
 yazi-term    = { path = "../yazi-term", version = "26.5.6" }
 yazi-tty     = { path = "../yazi-tty", version = "26.5.9" }
+yazi-widgets = { path = "../yazi-widgets", version = "26.5.6" }
 
 # External dependencies
-anyhow     = { workspace = true }
-arc-swap   = { workspace = true }
-bitflags   = { workspace = true }
-globset    = { workspace = true }
-hashbrown  = { workspace = true }
-indexmap   = { workspace = true }
-ratatui    = { workspace = true }
-regex      = { workspace = true }
-serde      = { workspace = true }
-serde_with = { workspace = true }
-strum      = { workspace = true }
-tokio      = { workspace = true }
-toml       = { workspace = true }
-tracing    = { workspace = true }
+anyhow          = { workspace = true }
+arc-swap        = { workspace = true }
+bitflags        = { workspace = true }
+globset         = { workspace = true }
+hashbrown       = { workspace = true }
+indexmap        = { workspace = true }
+inventory       = { workspace = true }
+mlua            = { workspace = true }
+ratatui-core    = { workspace = true }
+ratatui-widgets = { workspace = true }
+regex           = { workspace = true }
+serde           = { workspace = true }
+serde_with      = { workspace = true }
+toml            = { workspace = true }
+tracing         = { workspace = true }
diff --git a/yazi-config/preset/keymap-default.toml b/yazi-config/preset/keymap-default.toml
index 7d621ec0..900cf806 100644
--- a/yazi-config/preset/keymap-default.toml
+++ b/yazi-config/preset/keymap-default.toml
@@ -257,16 +257,16 @@ keymap = [
 	{ on = "<C-f>",   run = "move 1",  desc = "Move forward a character" },
 
 	# Word-wise movement
-	{ on = "b",         run = "backward",                    desc = "Move back to the start of the current or previous word" },
-	{ on = "B",         run = "backward --far",              desc = "Move back to the start of the current or previous WORD" },
-	{ on = "w",         run = "forward",                     desc = "Move forward to the start of the next word" },
-	{ on = "W",         run = "forward --far",               desc = "Move forward to the start of the next WORD" },
-	{ on = "e",         run = "forward --end-of-word",       desc = "Move forward to the end of the current or next word" },
-	{ on = "E",         run = "forward --far --end-of-word", desc = "Move forward to the end of the current or next WORD" },
-	{ on = "<A-b>",     run = "backward",                    desc = "Move back to the start of the current or previous word" },
-	{ on = "<A-f>",     run = "forward --end-of-word",       desc = "Move forward to the end of the current or next word" },
-	{ on = "<C-Left>",  run = "backward",                    desc = "Move back to the start of the current or previous word" },
-	{ on = "<C-Right>", run = "forward --end-of-word",       desc = "Move forward to the end of the current or next word" },
+	{ on = "b",         run = "backward",                   desc = "Move back to the start of the current or previous word" },
+	{ on = "B",         run = "backward wide",              desc = "Move back to the start of the current or previous WORD" },
+	{ on = "w",         run = "forward",                    desc = "Move forward to the start of the next word" },
+	{ on = "W",         run = "forward wide",               desc = "Move forward to the start of the next WORD" },
+	{ on = "e",         run = "forward --end-of-word",      desc = "Move forward to the end of the current or next word" },
+	{ on = "E",         run = "forward wide --end-of-word", desc = "Move forward to the end of the current or next WORD" },
+	{ on = "<A-b>",     run = "backward lean",              desc = "Move back to the start of the current or previous word" },
+	{ on = "<A-f>",     run = "forward lean --end-of-word", desc = "Move forward to the end of the current or next word" },
+	{ on = "<C-Left>",  run = "backward lean",              desc = "Move back to the start of the current or previous word" },
+	{ on = "<C-Right>", run = "forward lean --end-of-word", desc = "Move forward to the end of the current or next word" },
 
 	# Line-wise movement
 	{ on = "0",      run = "move bol",        desc = "Move to the BOL" },
diff --git a/yazi-config/src/icon.rs b/yazi-config/src/icon.rs
index b2064036..38c0d52a 100644
--- a/yazi-config/src/icon.rs
+++ b/yazi-config/src/icon.rs
@@ -1,10 +1,21 @@
+use mlua::{IntoLua, Lua, Value};
 use serde::Deserialize;
-
-use crate::Style;
+use yazi_binding::style::{Style, StyleFlat};
 
 #[derive(Clone, Debug, Deserialize)]
 pub struct Icon {
 	pub text:  String,
 	#[serde(flatten)]
-	pub style: Style,
+	pub style: StyleFlat,
+}
+
+impl IntoLua for Icon {
+	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> {
+		lua
+			.create_table_from([
+				("text", self.text.into_lua(lua)?),
+				("style", Style::from(self.style).into_lua(lua)?),
+			])?
+			.into_lua(lua)
+	}
 }
diff --git a/yazi-config/src/inject.rs b/yazi-config/src/inject.rs
new file mode 100644
index 00000000..7039e902
--- /dev/null
+++ b/yazi-config/src/inject.rs
@@ -0,0 +1,15 @@
+use mlua::UserDataMethods;
+use yazi_fs::file::FileInventory;
+
+use crate::THEME;
+
+inventory::submit! {
+	FileInventory {
+		register: |registry| {
+			registry.add_method("icon", |_, me, ()| {
+				// TODO: use a cache
+				Ok(THEME.icon.matches(me, false))
+			});
+		}
+	}
+}
diff --git a/yazi-config/src/keymap/chord.rs b/yazi-config/src/keymap/chord.rs
index d99ee567..44c21135 100644
--- a/yazi-config/src/keymap/chord.rs
+++ b/yazi-config/src/keymap/chord.rs
@@ -1,27 +1,44 @@
-use std::{borrow::Cow, hash::{Hash, Hasher}, sync::OnceLock};
+use std::{borrow::Cow, hash::{Hash, Hasher}, sync::{Arc, OnceLock}};
 
+use mlua::{ExternalError, FromLua, IntoLua, Lua, Table, Value};
 use regex::Regex;
 use serde::{Deserialize, Deserializer, de};
 use serde_with::{DeserializeAs, DisplayFromStr, OneOrMany};
-use yazi_shared::{Layer, Source, event::Action};
+use yazi_binding::Iter;
+use yazi_codegen::DeserializeOver2;
+use yazi_shared::{Layer, event::{Actions, deserialize_actions}, id::Id};
 
-use super::Key;
-use crate::{Mixable, Platform};
+use super::{Key, ids::chord_id};
+use crate::{Mixable, Platform, keymap::{ChordArc, Chords}};
 
 static RE: OnceLock<Regex> = OnceLock::new();
 
-#[derive(Clone, Debug, Default, Deserialize)]
-pub struct Chord<const L: u8 = { Layer::App as u8 }> {
+#[derive(Debug, Default, Deserialize, DeserializeOver2)]
+pub struct Chord<const L: u8 = { Layer::Null as u8 }> {
+	#[serde(skip, default = "chord_id")]
+	pub id:    Id,
 	#[serde(deserialize_with = "deserialize_on")]
 	pub on:    Vec<Key>,
-	#[serde(deserialize_with = "deserialize_run::<L, _>")]
-	pub run:   Vec<Action>,
+	#[serde(deserialize_with = "deserialize_actions::<L, _>")]
+	pub run:   Actions,
 	#[serde(default)]
 	pub desc:  String,
 	#[serde(default)]
 	pub r#for: Platform,
 }
 
+impl<const L: u8> Clone for Chord<L> {
+	fn clone(&self) -> Self {
+		Self {
+			id:    chord_id(),
+			on:    self.on.clone(),
+			run:   self.run.clone(),
+			desc:  self.desc.clone(),
+			r#for: self.r#for,
+		}
+	}
+}
+
 impl<const L: u8> PartialEq for Chord<L> {
 	fn eq(&self, other: &Self) -> bool { self.on == other.on }
 }
@@ -77,22 +94,76 @@ where
 	Ok(keys)
 }
 
-fn deserialize_run<'de, const L: u8, D>(deserializer: D) -> Result<Vec<Action>, D::Error>
-where
-	D: Deserializer<'de>,
-{
-	let mut actions: Vec<Action> = OneOrMany::<DisplayFromStr>::deserialize_as(deserializer)?;
+// --- Matcher
+#[derive(Default)]
+pub struct ChordMatcher {
+	pub id:  Id,
+	pub all: bool,
+}
 
-	let Some(layer) = Layer::from_repr(L) else {
-		return Err(de::Error::custom(format!("invalid keymap layer const: {L}")));
-	};
-
-	for action in &mut actions {
-		action.source = Source::Key;
-		if action.layer == Layer::Null {
-			action.layer = layer;
+impl ChordMatcher {
+	pub fn matches(&self, chord: &Chord) -> bool {
+		if self.all {
+			true
+		} else if self.id != Id::ZERO {
+			chord.id == self.id
+		} else {
+			false
 		}
 	}
-
-	Ok(actions)
+}
+
+impl TryFrom<Table> for ChordMatcher {
+	type Error = mlua::Error;
+
+	fn try_from(value: Table) -> Result<Self, Self::Error> {
+		let id: Id = value.raw_get("id").unwrap_or_default();
+
+		Ok(Self { id, ..Default::default() })
+	}
+}
+
+impl FromLua for ChordMatcher {
+	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
+		match value {
+			Value::Table(t) => t.try_into(),
+			_ => Err("expected a table of ChordMatcher".into_lua_err()),
+		}
+	}
+}
+
+// --- Iter
+#[derive(Default)]
+pub struct ChordIter {
+	pub chords:  Arc<Vec<ChordArc>>,
+	pub matcher: ChordMatcher,
+	pub offset:  usize,
+}
+
+impl From<&Chords> for ChordIter {
+	fn from(chords: &Chords) -> Self {
+		Self {
+			chords: chords.load_full(),
+			matcher: ChordMatcher { all: true, ..Default::default() },
+			..Default::default()
+		}
+	}
+}
+
+impl Iterator for ChordIter {
+	type Item = ChordArc;
+
+	fn next(&mut self) -> Option<Self::Item> {
+		while let Some(chord) = self.chords.get(self.offset) {
+			self.offset += 1;
+			if self.matcher.matches(chord) {
+				return Some(chord.clone());
+			}
+		}
+		None
+	}
+}
+
+impl IntoLua for ChordIter {
+	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> { Iter::new(self, None).into_lua(lua) }
 }
diff --git a/yazi-config/src/keymap/chord_arc.rs b/yazi-config/src/keymap/chord_arc.rs
new file mode 100644
index 00000000..2dd3f7e4
--- /dev/null
+++ b/yazi-config/src/keymap/chord_arc.rs
@@ -0,0 +1,106 @@
+use std::{ops::{Deref, DerefMut}, sync::Arc};
+
+use mlua::{UserData, UserDataFields, Value};
+use serde::Deserialize;
+use yazi_codegen::FromLuaOwned;
+use yazi_shared::{Layer, event::ActionCow};
+use yazi_shim::mlua::UserDataFieldsExt;
+
+use crate::{Mixable, keymap::Chord};
+
+#[repr(transparent)]
+#[derive(Clone, Debug, Default, Deserialize, FromLuaOwned)]
+pub struct ChordArc<const L: u8 = { Layer::Null as u8 }>(Arc<Chord<L>>);
+
+impl<const L: u8> Deref for ChordArc<L> {
+	type Target = Arc<Chord<L>>;
+
+	fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+impl<const L: u8> DerefMut for ChordArc<L> {
+	fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0 }
+}
+
+impl<const L: u8> From<&Self> for ChordArc<L> {
+	fn from(value: &Self) -> Self { value.clone() }
+}
+
+impl<const L: u8, const M: u8> From<Chord<L>> for ChordArc<M> {
+	fn from(value: Chord<L>) -> Self { ChordArc(Arc::new(value)).into_erased() }
+}
+
+impl<const L: u8> From<ChordArc<L>> for Chord<L> {
+	fn from(value: ChordArc<L>) -> Self {
+		match Arc::try_unwrap(value.0) {
+			Ok(c) => c,
+			Err(arc) => Self::clone(&arc),
+		}
+	}
+}
+
+impl<const L: u8> From<&ChordArc<L>> for Chord<L> {
+	fn from(value: &ChordArc<L>) -> Self { Self::clone(value) }
+}
+
+impl TryFrom<(Value, Layer)> for ChordArc {
+	type Error = mlua::Error;
+
+	fn try_from((value, layer): (Value, Layer)) -> Result<Self, Self::Error> {
+		use Chord as C;
+		use Layer as L;
+
+		let de = mlua::serde::Deserializer::new(value);
+		Ok(match layer {
+			L::Null => C::<{ L::Null as u8 }>::deserialize(de)?.into(),
+			L::App => C::<{ L::App as u8 }>::deserialize(de)?.into(),
+			L::Mgr => C::<{ L::Mgr as u8 }>::deserialize(de)?.into(),
+			L::Tasks => C::<{ L::Tasks as u8 }>::deserialize(de)?.into(),
+			L::Spot => C::<{ L::Spot as u8 }>::deserialize(de)?.into(),
+			L::Pick => C::<{ L::Pick as u8 }>::deserialize(de)?.into(),
+			L::Input => C::<{ L::Input as u8 }>::deserialize(de)?.into(),
+			L::Confirm => C::<{ L::Confirm as u8 }>::deserialize(de)?.into(),
+			L::Help => C::<{ L::Help as u8 }>::deserialize(de)?.into(),
+			L::Cmp => C::<{ L::Cmp as u8 }>::deserialize(de)?.into(),
+			L::Which => C::<{ L::Which as u8 }>::deserialize(de)?.into(),
+			L::Notify => C::<{ L::Notify as u8 }>::deserialize(de)?.into(),
+		})
+	}
+}
+
+impl<const L: u8> ChordArc<L> {
+	pub fn as_erased<const M: u8>(&self) -> &ChordArc<M> {
+		unsafe { &*(self as *const Self as *const ChordArc<M>) }
+	}
+
+	pub fn into_erased<const M: u8>(self) -> ChordArc<M> {
+		ChordArc(unsafe { Arc::from_raw(Arc::into_raw(self.0) as *const Chord<M>) })
+	}
+
+	pub fn to_seq(&self) -> Vec<ActionCow> {
+		self.run.iter().rev().cloned().map(Into::into).collect()
+	}
+
+	pub fn into_seq(self) -> Vec<ActionCow> {
+		match Arc::try_unwrap(self.0) {
+			Ok(c) => c.run.into_iter().rev().map(Into::into).collect(),
+			Err(arc) => Self(arc).to_seq(),
+		}
+	}
+}
+
+impl<const L: u8> Mixable for ChordArc<L> {
+	fn filter(&self) -> bool { self.0.filter() }
+}
+
+impl UserData for ChordArc {
+	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
+		fields.add_field_method_get("id", |_, me| Ok(me.id));
+
+		fields.add_cached_field("on", |lua, me| lua.create_sequence_from(me.on.iter().copied()));
+
+		fields.add_cached_field("run", |_, me| Ok(me.run.clone()));
+
+		fields.add_cached_field("desc", |lua, me| lua.create_string(&me.desc));
+	}
+}
diff --git a/yazi-config/src/keymap/chords.rs b/yazi-config/src/keymap/chords.rs
new file mode 100644
index 00000000..56bf096a
--- /dev/null
+++ b/yazi-config/src/keymap/chords.rs
@@ -0,0 +1,137 @@
+use std::{ops::Deref, sync::Arc};
+
+use arc_swap::ArcSwap;
+use mlua::{ExternalError, ExternalResult, MetaMethod, Table, UserData, UserDataMethods, Value};
+use serde::Deserialize;
+use yazi_shared::{Layer, event::Actions};
+use yazi_shim::{arc_swap::{ArcSwapExt, IntoPointee}, mlua::DeserializeOverLua, vec::{IndexAtError, VecExt}};
+
+use crate::keymap::{Chord, ChordArc, ChordIter, ChordMatcher};
+
+#[derive(Debug, Deserialize)]
+#[serde(transparent)]
+pub struct Chords<const L: u8 = { Layer::Null as u8 }> {
+	pub chords: ArcSwap<Vec<ChordArc<L>>>,
+	#[serde(skip, default = "layer_default::<L>")]
+	pub layer:  Layer,
+}
+
+impl<const L: u8> Default for Chords<L> {
+	fn default() -> Self {
+		Self { chords: ArcSwap::default(), layer: Layer::from_repr(L).unwrap_or_default() }
+	}
+}
+
+impl<const L: u8> Deref for Chords<L> {
+	type Target = ArcSwap<Vec<ChordArc<L>>>;
+
+	fn deref(&self) -> &Self::Target { &self.chords }
+}
+
+impl<const L: u8> From<Vec<ChordArc<L>>> for Chords<L> {
+	fn from(inner: Vec<ChordArc<L>>) -> Self {
+		Self { chords: inner.into_pointee(), layer: Layer::from_repr(L).unwrap_or_default() }
+	}
+}
+
+impl<const L: u8> Chords<L> {
+	pub fn as_erased<const M: u8>(&self) -> Arc<Vec<ChordArc<M>>> {
+		let chords = self.chords.load_full();
+		unsafe { Arc::from_raw(Arc::into_raw(chords) as *const Vec<ChordArc<M>>) }
+	}
+
+	pub fn insert(&self, index: isize, rule: ChordArc) -> Result<(), IndexAtError> {
+		self.chords.try_rcu(|rules| {
+			let (before, after) = rules.split_at(rules.index_at(index)?);
+			Ok(
+				before
+					.iter()
+					.cloned()
+					.chain([rule.as_erased().clone()])
+					.chain(after.iter().cloned())
+					.collect::<Vec<_>>(),
+			)
+		})?;
+
+		Ok(())
+	}
+
+	pub fn remove(&self, matcher: ChordMatcher) {
+		self.chords.rcu(|chords| {
+			let mut next = Vec::clone(chords);
+			next.retain(|arc| !matcher.matches(arc.as_erased()));
+			next
+		});
+	}
+
+	pub fn update<E>(
+		&self,
+		matcher: ChordMatcher,
+		f: impl Fn(Chord) -> Result<Chord, E>,
+	) -> Result<(), E> {
+		self.chords.try_rcu(|rules| {
+			let mut next = Vec::clone(rules);
+			for arc in &mut next {
+				if matcher.matches(arc.as_erased()) {
+					*arc = f(Chord::clone(arc.as_erased()))?.into();
+				}
+			}
+			Ok(Arc::new(next))
+		})?;
+
+		Ok(())
+	}
+
+	pub(crate) fn unwrap_unchecked(self) -> Vec<ChordArc<L>> {
+		Arc::try_unwrap(self.chords.into_inner()).expect("unique chords arc")
+	}
+}
+
+impl UserData for &Chords {
+	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
+		methods.add_method("match", |_, &me, matcher: Option<ChordMatcher>| {
+			Ok(match matcher {
+				Some(matcher) => ChordIter { chords: me.as_erased(), matcher, ..Default::default() },
+				None => me.into(),
+			})
+		});
+
+		methods.add_method("insert", |_, me, (index, value): (isize, Value)| {
+			let index = match index {
+				1.. => index - 1,
+				0 => return Err("index must be 1-based or negative".into_lua_err()),
+				_ => index,
+			};
+
+			let chord = ChordArc::try_from((value, me.layer))?;
+			me.insert(index, chord.clone()).into_lua_err()?;
+
+			Ok(chord)
+		});
+
+		methods.add_method("remove", |_, me, matcher: ChordMatcher| {
+			me.remove(matcher);
+			Ok(())
+		});
+
+		methods.add_method("update", |_, me, (matcher, table): (ChordMatcher, Table)| {
+			let mut run: Option<Actions> = table.raw_get("run")?;
+			if let Some(run) = &mut run {
+				table.raw_remove("run")?;
+				run.set(me.layer, yazi_shared::Source::Key);
+			}
+
+			me.update(matcher, |mut chord| {
+				chord = chord.deserialize_over_lua(&table)?;
+				if let Some(run) = &run {
+					chord.run = run.clone();
+				}
+				Ok(chord)
+			})
+		});
+
+		methods.add_meta_method(MetaMethod::Len, |_, me, ()| Ok(me.load().len()));
+	}
+}
+
+pub(super) fn layer_default<const L: u8>() -> Layer { Layer::from_repr(L).unwrap_or_default() }
diff --git a/yazi-config/src/keymap/cow.rs b/yazi-config/src/keymap/cow.rs
deleted file mode 100644
index 472405d7..00000000
--- a/yazi-config/src/keymap/cow.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-use std::ops::Deref;
-
-use yazi_shared::{Layer, event::ActionCow};
-
-use super::Chord;
-
-#[derive(Clone, Debug)]
-pub enum ChordCow<const L: u8 = { Layer::App as u8 }> {
-	Owned(Chord<L>),
-	Borrowed(&'static Chord<L>),
-}
-
-impl<const L: u8> From<Chord<L>> for ChordCow<L> {
-	fn from(c: Chord<L>) -> Self { Self::Owned(c) }
-}
-
-impl<const L: u8> From<&'static Chord<L>> for ChordCow<L> {
-	fn from(c: &'static Chord<L>) -> Self { Self::Borrowed(c) }
-}
-
-impl<const L: u8> Deref for ChordCow<L> {
-	type Target = Chord<L>;
-
-	fn deref(&self) -> &Self::Target {
-		match self {
-			Self::Owned(c) => c,
-			Self::Borrowed(c) => c,
-		}
-	}
-}
-
-impl<const L: u8> Default for ChordCow<L> {
-	fn default() -> Self { Self::Owned(Chord::default()) }
-}
-
-impl<const L: u8> ChordCow<L> {
-	pub fn into_seq(self) -> Vec<ActionCow> {
-		match self {
-			Self::Owned(c) => c.run.into_iter().rev().map(Into::into).collect(),
-			Self::Borrowed(c) => c.run.iter().rev().map(Into::into).collect(),
-		}
-	}
-}
diff --git a/yazi-config/src/keymap/ids.rs b/yazi-config/src/keymap/ids.rs
new file mode 100644
index 00000000..b1f42867
--- /dev/null
+++ b/yazi-config/src/keymap/ids.rs
@@ -0,0 +1,6 @@
+use yazi_shared::id::{Id, Ids};
+
+pub fn chord_id() -> Id {
+	static IDS: Ids = Ids::new();
+	IDS.next()
+}
diff --git a/yazi-config/src/keymap/key.rs b/yazi-config/src/keymap/key.rs
index 4cd39b47..a93f318c 100644
--- a/yazi-config/src/keymap/key.rs
+++ b/yazi-config/src/keymap/key.rs
@@ -1,19 +1,23 @@
 use std::{fmt::{Display, Write}, str::FromStr};
 
 use anyhow::bail;
+use mlua::{IntoLua, Lua, LuaSerdeExt, Value};
+use serde::{Deserialize, Serialize};
+use yazi_shim::mlua::SER_OPT;
 use yazi_term::event::{KeyCode, KeyEvent, Modifiers};
 
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+#[derive(Clone, Copy, Debug, Default, Deserialize, Eq, Hash, PartialEq, Serialize)]
 pub struct Key {
+	#[serde(flatten)]
 	pub code:   KeyCode,
 	pub shift:  bool,
 	pub ctrl:   bool,
 	pub alt:    bool,
+	#[serde(rename = "super")]
 	pub super_: bool,
 }
 
 impl Key {
-	#[inline]
 	pub fn plain(&self) -> Option<char> {
 		match self.code {
 			KeyCode::Char(c) if !self.ctrl && !self.alt && !self.super_ => Some(c),
@@ -22,12 +26,6 @@ impl Key {
 	}
 }
 
-impl Default for Key {
-	fn default() -> Self {
-		Self { code: KeyCode::Null, shift: false, ctrl: false, alt: false, super_: false }
-	}
-}
-
 impl From<KeyEvent> for Key {
 	fn from(value: KeyEvent) -> Self {
 		Self {
@@ -182,3 +180,7 @@ impl Display for Key {
 		write!(f, "{code}>")
 	}
 }
+
+impl IntoLua for Key {
+	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> { lua.to_value_with(&self, SER_OPT) }
+}
diff --git a/yazi-config/src/keymap/keymap.rs b/yazi-config/src/keymap/keymap.rs
index 98bdca94..5fc87882 100644
--- a/yazi-config/src/keymap/keymap.rs
+++ b/yazi-config/src/keymap/keymap.rs
@@ -1,39 +1,51 @@
+use std::{ops::Deref, sync::Arc};
+
 use anyhow::{Context, Result};
 use serde::Deserialize;
 use yazi_codegen::{DeserializeOver, DeserializeOver1};
 use yazi_fs::{Xdg, ok_or_not_found};
 use yazi_shared::Layer;
 
-use super::{Chord, KeymapRules};
+use super::KeymapSection;
+use crate::keymap::ChordArc;
 
 #[derive(Deserialize, DeserializeOver, DeserializeOver1)]
 pub struct Keymap {
-	pub mgr:     KeymapRules<{ Layer::Mgr as u8 }>,
-	pub tasks:   KeymapRules<{ Layer::Tasks as u8 }>,
-	pub spot:    KeymapRules<{ Layer::Spot as u8 }>,
-	pub pick:    KeymapRules<{ Layer::Pick as u8 }>,
-	pub input:   KeymapRules<{ Layer::Input as u8 }>,
-	pub confirm: KeymapRules<{ Layer::Confirm as u8 }>,
-	pub help:    KeymapRules<{ Layer::Help as u8 }>,
-	pub cmp:     KeymapRules<{ Layer::Cmp as u8 }>,
+	pub mgr:     KeymapSection<{ Layer::Mgr as u8 }>,
+	pub tasks:   KeymapSection<{ Layer::Tasks as u8 }>,
+	pub spot:    KeymapSection<{ Layer::Spot as u8 }>,
+	pub pick:    KeymapSection<{ Layer::Pick as u8 }>,
+	pub input:   KeymapSection<{ Layer::Input as u8 }>,
+	pub confirm: KeymapSection<{ Layer::Confirm as u8 }>,
+	pub help:    KeymapSection<{ Layer::Help as u8 }>,
+	pub cmp:     KeymapSection<{ Layer::Cmp as u8 }>,
 }
 
 impl Keymap {
-	pub fn get(&self, layer: Layer) -> &[Chord] {
-		match layer {
-			Layer::Null | Layer::App => &[],
-			Layer::Mgr => self.mgr.as_erased_slice(),
-			Layer::Tasks => self.tasks.as_erased_slice(),
-			Layer::Spot => self.spot.as_erased_slice(),
-			Layer::Pick => self.pick.as_erased_slice(),
-			Layer::Input => self.input.as_erased_slice(),
-			Layer::Confirm => self.confirm.as_erased_slice(),
-			Layer::Help => self.help.as_erased_slice(),
-			Layer::Cmp => self.cmp.as_erased_slice(),
-			Layer::Which => &[],
-			Layer::Notify => &[],
+	pub fn chords(&self, layer: Layer) -> Arc<Vec<ChordArc>> {
+		match self.section(layer) {
+			Some(s) => s.deref().as_erased(),
+			None => Arc::new(Vec::new()),
 		}
 	}
+
+	pub fn section(&self, layer: Layer) -> Option<&KeymapSection> {
+		use Layer as L;
+
+		Some(match layer {
+			L::Null | L::App => None?,
+			L::Mgr => self.mgr.as_erased(),
+			L::Tasks => self.tasks.as_erased(),
+			L::Spot => self.spot.as_erased(),
+			L::Pick => self.pick.as_erased(),
+			L::Input => self.input.as_erased(),
+			L::Confirm => self.confirm.as_erased(),
+			L::Help => self.help.as_erased(),
+			L::Cmp => self.cmp.as_erased(),
+			L::Which => None?,
+			L::Notify => None?,
+		})
+	}
 }
 
 impl Keymap {
diff --git a/yazi-config/src/keymap/mod.rs b/yazi-config/src/keymap/mod.rs
index ddc3039a..eda8e777 100644
--- a/yazi-config/src/keymap/mod.rs
+++ b/yazi-config/src/keymap/mod.rs
@@ -1 +1 @@
-yazi_macro::mod_flat!(chord cow key keymap rules);
+yazi_macro::mod_flat!(chord chord_arc chords ids key keymap section);
diff --git a/yazi-config/src/keymap/rules.rs b/yazi-config/src/keymap/rules.rs
deleted file mode 100644
index b3276bf1..00000000
--- a/yazi-config/src/keymap/rules.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use std::ops::Deref;
-
-use hashbrown::HashSet;
-use serde::Deserialize;
-use yazi_codegen::DeserializeOver2;
-use yazi_shim::toml::DeserializeOverHook;
-
-use super::{Chord, Key};
-use crate::mix;
-
-#[derive(Default, Deserialize, DeserializeOver2)]
-pub struct KeymapRules<const L: u8> {
-	keymap:         Vec<Chord<L>>,
-	#[serde(default)]
-	prepend_keymap: Vec<Chord<L>>,
-	#[serde(default)]
-	append_keymap:  Vec<Chord<L>>,
-}
-
-impl<const L: u8> Deref for KeymapRules<L> {
-	type Target = [Chord];
-
-	fn deref(&self) -> &Self::Target { self.as_erased_slice() }
-}
-
-impl<const L: u8> KeymapRules<L> {
-	pub(super) fn as_erased_slice(&self) -> &[Chord] {
-		// Safety: `Chord<L>` only changes deserialization behavior; the const parameter
-		// does not participate in layout, so a shared slice can be reinterpreted as
-		// the default `Chord` view.
-		unsafe { &*(self.keymap.as_slice() as *const [Chord<L>] as *const [Chord]) }
-	}
-}
-
-impl<const L: u8> DeserializeOverHook for KeymapRules<L> {
-	fn deserialize_over_hook(self) -> Result<Self, toml::de::Error> {
-		#[inline]
-		fn on<const L: u8>(Chord { on, .. }: &Chord<L>) -> [Key; 2] {
-			[on.first().copied().unwrap_or_default(), on.get(1).copied().unwrap_or_default()]
-		}
-
-		let a_seen: HashSet<_> = self.prepend_keymap.iter().map(on).collect();
-		let b_seen: HashSet<_> = self.keymap.iter().map(on).collect();
-
-		let keymap = mix(
-			self.prepend_keymap,
-			self.keymap.into_iter().filter(|v| !a_seen.contains(&on(v))),
-			self.append_keymap.into_iter().filter(|v| !b_seen.contains(&on(v))),
-		);
-
-		Ok(Self { keymap, ..Default::default() })
-	}
-}
diff --git a/yazi-config/src/keymap/section.rs b/yazi-config/src/keymap/section.rs
new file mode 100644
index 00000000..583cb566
--- /dev/null
+++ b/yazi-config/src/keymap/section.rs
@@ -0,0 +1,61 @@
+use std::ops::Deref;
+
+use hashbrown::HashSet;
+use mlua::{UserData, UserDataFields};
+use serde::Deserialize;
+use yazi_codegen::DeserializeOver2;
+use yazi_shared::Layer;
+use yazi_shim::{mlua::UserDataFieldsExt, toml::DeserializeOverHook};
+
+use super::{Key, Chord, Chords, chords::layer_default};
+use crate::{keymap::ChordArc, mix};
+
+#[derive(Default, Deserialize, DeserializeOver2)]
+pub struct KeymapSection<const L: u8 = { Layer::Null as u8 }> {
+	keymap:         Chords<L>,
+	#[serde(default)]
+	prepend_keymap: Vec<Chord<L>>,
+	#[serde(default)]
+	append_keymap:  Vec<Chord<L>>,
+	#[serde(default = "layer_default::<L>")]
+	layer:          Layer,
+}
+
+impl<const L: u8> Deref for KeymapSection<L> {
+	type Target = Chords<L>;
+
+	fn deref(&self) -> &Self::Target { &self.keymap }
+}
+
+impl<const L: u8> KeymapSection<L> {
+	pub fn as_erased<const M: u8>(&self) -> &KeymapSection<M> {
+		unsafe { &*(self as *const Self as *const KeymapSection<M>) }
+	}
+}
+
+impl<const L: u8> DeserializeOverHook for KeymapSection<L> {
+	fn deserialize_over_hook(self) -> Result<Self, toml::de::Error> {
+		#[inline]
+		fn on<const L: u8>(Chord { on, .. }: &Chord<L>) -> [Key; 2] {
+			[on.first().copied().unwrap_or_default(), on.get(1).copied().unwrap_or_default()]
+		}
+
+		let keymap = self.keymap.unwrap_unchecked();
+		let a_seen: HashSet<_> = self.prepend_keymap.iter().map(on).collect();
+		let b_seen: HashSet<_> = keymap.iter().map(|c| on(c)).collect();
+
+		let keymap: Vec<ChordArc<L>> = mix(
+			self.prepend_keymap,
+			keymap.into_iter().filter(|v| !a_seen.contains(&on(v))),
+			self.append_keymap.into_iter().filter(|v| !b_seen.contains(&on(v))),
+		);
+
+		Ok(Self { keymap: keymap.into(), layer: self.layer, ..Default::default() })
+	}
+}
+
+impl UserData for &'static KeymapSection {
+	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
+		fields.add_cached_field("rules", |_, me| Ok(&me.keymap));
+	}
+}
diff --git a/yazi-config/src/layout.rs b/yazi-config/src/layout.rs
index b25d44a0..27bd4e0b 100644
--- a/yazi-config/src/layout.rs
+++ b/yazi-config/src/layout.rs
@@ -1,4 +1,4 @@
-use ratatui::layout::Rect;
+use ratatui_core::layout::Rect;
 
 #[derive(Clone, Copy, Default, Eq, PartialEq)]
 pub struct Layout {
diff --git a/yazi-config/src/lib.rs b/yazi-config/src/lib.rs
index 0ee60811..1dab24a7 100644
--- a/yazi-config/src/lib.rs
+++ b/yazi-config/src/lib.rs
@@ -1,12 +1,11 @@
-yazi_macro::mod_pub!(keymap mgr open opener plugin popup preview tasks theme which vfs);
+yazi_macro::mod_pub!(keymap mgr open opener plugin popup preview tasks theme which);
 
-yazi_macro::mod_flat!(icon layout mixing pattern platform preset priority selectable selector style utils yazi);
+yazi_macro::mod_flat!(icon inject layout mixing pattern platform preset priority selectable selector yazi);
 
 use std::io::{Read, Write};
 
 use yazi_shim::{cell::{RoCell, SyncCell}, toml::{DeserializeOver, DeserializeOverWith}};
-use yazi_term::sequence::SetSgr;
-use yazi_tty::TTY;
+use yazi_tty::{TTY, sequence::SetSgr};
 
 pub static YAZI: RoCell<yazi::Yazi> = RoCell::new();
 pub static KEYMAP: RoCell<keymap::Keymap> = RoCell::new();
diff --git a/yazi-config/src/open/mod.rs b/yazi-config/src/open/mod.rs
index 5008c64b..747ee88c 100644
--- a/yazi-config/src/open/mod.rs
+++ b/yazi-config/src/open/mod.rs
@@ -1 +1 @@
-yazi_macro::mod_flat!(open rule rules);
+yazi_macro::mod_flat!(open open_rule open_rule_arc open_rule_matcher open_rules);
diff --git a/yazi-config/src/open/open.rs b/yazi-config/src/open/open.rs
index 33ef791e..1ad98434 100644
--- a/yazi-config/src/open/open.rs
+++ b/yazi-config/src/open/open.rs
@@ -1,14 +1,14 @@
-use std::{ops::Deref, sync::Arc};
+use std::ops::Deref;
 
 use anyhow::Result;
 use indexmap::IndexMap;
 use serde::Deserialize;
 use yazi_codegen::DeserializeOver2;
-use yazi_fs::{File, cha::ChaType};
+use yazi_fs::{cha::ChaType, file::File};
 use yazi_shared::url::AsUrl;
 use yazi_shim::toml::DeserializeOverHook;
 
-use crate::{mix, open::{OpenRule, OpenRules}};
+use crate::{mix, open::{OpenRule, OpenRuleArc, OpenRules}};
 
 #[derive(Default, Deserialize, DeserializeOver2)]
 pub struct Open {
@@ -26,7 +26,7 @@ impl Deref for Open {
 }
 
 impl Open {
-	pub fn match_dummy<U, M>(&self, url: U, mime: M) -> Option<Arc<OpenRule>>
+	pub fn match_dummy<U, M>(&self, url: U, mime: M) -> Option<OpenRuleArc>
 	where
 		U: AsUrl,
 		M: AsRef<str>,
@@ -40,8 +40,8 @@ impl Open {
 		self.matches(&file, mime)
 	}
 
-	pub fn match_common(&self, targets: &[(File, &str)]) -> impl Iterator<Item = Arc<OpenRule>> {
-		let mut seen: IndexMap<Arc<OpenRule>, usize> = IndexMap::new();
+	pub fn match_common(&self, targets: &[(File, &str)]) -> impl Iterator<Item = OpenRuleArc> {
+		let mut seen: IndexMap<OpenRuleArc, usize> = IndexMap::new();
 		for (file, mime) in targets {
 			if let Some(rule) = self.matches(file, mime) {
 				*seen.entry(rule).or_default() += 1;
@@ -54,7 +54,7 @@ impl Open {
 
 impl DeserializeOverHook for Open {
 	fn deserialize_over_hook(self) -> Result<Self, toml::de::Error> {
-		let rules: Vec<Arc<OpenRule>> =
+		let rules: Vec<OpenRuleArc> =
 			mix(self.prepend_rules, self.rules.unwrap_unchecked(), self.append_rules);
 
 		Ok(Self { rules: rules.into(), ..Default::default() })
diff --git a/yazi-config/src/open/rule.rs b/yazi-config/src/open/open_rule.rs
similarity index 97%
rename from yazi-config/src/open/rule.rs
rename to yazi-config/src/open/open_rule.rs
index afe44831..3a28c258 100644
--- a/yazi-config/src/open/rule.rs
+++ b/yazi-config/src/open/open_rule.rs
@@ -3,7 +3,7 @@ use std::hash::{Hash, Hasher};
 use serde::Deserialize;
 use serde_with::{OneOrMany, formats::PreferOne, serde_as};
 use yazi_codegen::DeserializeOver2;
-use yazi_shared::Id;
+use yazi_shared::id::Id;
 
 use crate::{Mixable, Pattern, Selectable, Selector, plugin::open_rule_id};
 
diff --git a/yazi-config/src/open/open_rule_arc.rs b/yazi-config/src/open/open_rule_arc.rs
new file mode 100644
index 00000000..5ba9aaf8
--- /dev/null
+++ b/yazi-config/src/open/open_rule_arc.rs
@@ -0,0 +1,43 @@
+use std::{ops::{Deref, DerefMut}, sync::Arc};
+
+use mlua::{FromLua, Lua, LuaSerdeExt, UserData, UserDataFields, Value};
+use serde::Deserialize;
+use yazi_shim::mlua::UserDataFieldsExt;
+
+use crate::{Mixable, open::OpenRule};
+
+#[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq)]
+pub struct OpenRuleArc(Arc<OpenRule>);
+
+impl Deref for OpenRuleArc {
+	type Target = Arc<OpenRule>;
+
+	fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+impl DerefMut for OpenRuleArc {
+	fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0 }
+}
+
+impl From<OpenRule> for OpenRuleArc {
+	fn from(value: OpenRule) -> Self { Self(value.into()) }
+}
+
+impl Mixable for OpenRuleArc {
+	fn any_file(&self) -> bool { self.0.any_file() }
+
+	fn any_dir(&self) -> bool { self.0.any_dir() }
+}
+
+impl FromLua for OpenRuleArc {
+	fn from_lua(value: Value, lua: &Lua) -> mlua::Result<Self> { lua.from_value(value) }
+}
+
+impl UserData for OpenRuleArc {
+	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
+		fields.add_field_method_get("id", |_, me| Ok(me.id));
+		fields.add_cached_field("use", |lua, me| {
+			lua.create_sequence_from(me.r#use.iter().map(|s| s.as_str()))
+		});
+	}
+}
diff --git a/yazi-config/src/open/open_rule_matcher.rs b/yazi-config/src/open/open_rule_matcher.rs
new file mode 100644
index 00000000..78882c0a
--- /dev/null
+++ b/yazi-config/src/open/open_rule_matcher.rs
@@ -0,0 +1,81 @@
+use std::{borrow::Cow, sync::Arc};
+
+use mlua::{ExternalError, FromLua, IntoLua, Lua, Table, Value};
+use yazi_binding::Iter;
+use yazi_fs::file::{File, FileRef};
+use yazi_shared::id::Id;
+
+use crate::{Selectable, YAZI, open::{OpenRule, OpenRuleArc, OpenRules}};
+
+#[derive(Default)]
+pub struct OpenRuleMatcher<'a> {
+	pub rules:  Arc<Vec<OpenRuleArc>>,
+	pub id:     Id,
+	pub file:   Option<Cow<'a, File>>,
+	pub mime:   Option<Cow<'a, str>>,
+	pub all:    bool,
+	pub offset: usize,
+}
+
+impl From<&OpenRules> for OpenRuleMatcher<'_> {
+	fn from(rules: &OpenRules) -> Self {
+		Self { rules: rules.load_full(), all: true, ..Default::default() }
+	}
+}
+
+impl OpenRuleMatcher<'_> {
+	pub fn matches(&self, rule: &OpenRule) -> bool {
+		if self.all {
+			true
+		} else if self.id != Id::ZERO {
+			rule.id == self.id
+		} else {
+			rule.match_with(self.file.as_deref(), self.mime.as_deref())
+		}
+	}
+}
+
+impl Iterator for OpenRuleMatcher<'_> {
+	type Item = OpenRuleArc;
+
+	fn next(&mut self) -> Option<Self::Item> {
+		while let Some(rule) = self.rules.get(self.offset) {
+			self.offset += 1;
+			if self.matches(rule) {
+				return Some(rule.clone());
+			}
+		}
+		None
+	}
+}
+
+impl TryFrom<Table> for OpenRuleMatcher<'static> {
+	type Error = mlua::Error;
+
+	fn try_from(value: Table) -> Result<Self, Self::Error> {
+		let id: Id = value.raw_get("id").unwrap_or_default();
+		let file: Option<FileRef> = value.raw_get("file")?;
+		let mime: Option<String> = value.raw_get("mime")?;
+
+		Ok(Self {
+			rules: YAZI.open.load_full(),
+			id,
+			file: file.map(|f| f.clone().into()),
+			mime: mime.map(Into::into),
+			..Default::default()
+		})
+	}
+}
+
+impl FromLua for OpenRuleMatcher<'static> {
+	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
+		match value {
+			Value::Table(t) => t.try_into(),
+			_ => Err("expected a table of OpenRuleMatcher".into_lua_err()),
+		}
+	}
+}
+
+impl IntoLua for OpenRuleMatcher<'static> {
+	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> { Iter::new(self, None).into_lua(lua) }
+}
diff --git a/yazi-config/src/open/open_rules.rs b/yazi-config/src/open/open_rules.rs
new file mode 100644
index 00000000..3aa355a5
--- /dev/null
+++ b/yazi-config/src/open/open_rules.rs
@@ -0,0 +1,124 @@
+use std::{borrow::Cow, ops::Deref, sync::Arc};
+
+use arc_swap::ArcSwap;
+use mlua::{ExternalError, ExternalResult, MetaMethod, Table, UserData, UserDataMethods};
+use serde::Deserialize;
+use yazi_fs::file::File;
+use yazi_shim::{arc_swap::{ArcSwapExt, IntoPointee}, mlua::DeserializeOverLua, vec::{IndexAtError, VecExt}};
+
+use super::OpenRule;
+use crate::{mix, open::{OpenRuleArc, OpenRuleMatcher}};
+
+#[derive(Debug, Default, Deserialize)]
+pub struct OpenRules(ArcSwap<Vec<OpenRuleArc>>);
+
+impl Deref for OpenRules {
+	type Target = ArcSwap<Vec<OpenRuleArc>>;
+
+	fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+impl From<Vec<OpenRuleArc>> for OpenRules {
+	fn from(inner: Vec<OpenRuleArc>) -> Self { Self(inner.into_pointee()) }
+}
+
+impl OpenRules {
+	pub fn matches(&self, file: &File, mime: &str) -> Option<OpenRuleArc> {
+		self.matcher(Some(file), Some(mime)).next()
+	}
+
+	pub fn matcher<'a, F, M>(&self, file: Option<F>, mime: Option<M>) -> OpenRuleMatcher<'a>
+	where
+		F: Into<Cow<'a, File>>,
+		M: Into<Cow<'a, str>>,
+	{
+		OpenRuleMatcher {
+			rules: self.0.load_full(),
+			file: file.map(Into::into),
+			mime: mime.map(Into::into),
+			..Default::default()
+		}
+	}
+
+	pub fn insert(&self, index: isize, rule: OpenRuleArc) -> Result<(), IndexAtError> {
+		self.0.try_rcu(|rules| {
+			let i = rules.index_at(index)?;
+			Ok(if i == rules.len() {
+				mix(Vec::<OpenRule>::new(), rules.iter().cloned(), [rule.clone()])
+			} else {
+				let (before, after) = rules.split_at(i);
+				mix(
+					Vec::<OpenRule>::new(),
+					before.iter().cloned().chain([rule.clone()]).chain(after.iter().cloned()),
+					Vec::<OpenRule>::new(),
+				)
+			})
+		})?;
+
+		Ok(())
+	}
+
+	pub fn remove(&self, matcher: OpenRuleMatcher) {
+		self.0.rcu(|rules| {
+			let mut next = Vec::clone(rules);
+			next.retain(|rule| !matcher.matches(rule));
+			next
+		});
+	}
+
+	pub fn update<E>(
+		&self,
+		matcher: OpenRuleMatcher,
+		f: impl Fn(OpenRule) -> Result<OpenRule, E>,
+	) -> Result<(), E> {
+		self.0.try_rcu(|rules| {
+			let mut next = Vec::clone(rules);
+			for rule in &mut next {
+				if matcher.matches(rule) {
+					*rule = f(OpenRule::clone(rule))?.into();
+				}
+			}
+			Ok(Arc::new(next))
+		})?;
+
+		Ok(())
+	}
+
+	pub(crate) fn unwrap_unchecked(self) -> Vec<OpenRuleArc> {
+		Arc::try_unwrap(self.0.into_inner()).expect("unique open rules arc")
+	}
+}
+
+impl UserData for &'static OpenRules {
+	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
+		methods.add_method("match", |_, &me, matcher: Option<OpenRuleMatcher>| {
+			Ok(match matcher {
+				Some(matcher) => matcher,
+				None => me.into(),
+			})
+		});
+
+		methods.add_method("insert", |_, &me, (index, rule): (isize, OpenRuleArc)| {
+			let index = match index {
+				1.. => index - 1,
+				0 => return Err("index must be 1-based or negative".into_lua_err()),
+				_ => index,
+			};
+
+			me.insert(index, rule.clone()).into_lua_err()?;
+			Ok(rule)
+		});
+
+		methods.add_method("remove", |_, &me, matcher: OpenRuleMatcher| {
+			me.remove(matcher);
+			Ok(())
+		});
+
+		methods.add_method("update", |_, &me, (matcher, table): (OpenRuleMatcher, Table)| {
+			me.update(matcher, |rule| rule.deserialize_over_lua(&table))?;
+			Ok(())
+		});
+
+		methods.add_meta_method(MetaMethod::Len, |_, &me, ()| Ok(me.load().len()));
+	}
+}
diff --git a/yazi-config/src/open/rules.rs b/yazi-config/src/open/rules.rs
deleted file mode 100644
index 753a524d..00000000
--- a/yazi-config/src/open/rules.rs
+++ /dev/null
@@ -1,133 +0,0 @@
-use std::{borrow::Cow, ops::Deref, sync::Arc};
-
-use arc_swap::ArcSwap;
-use serde::Deserialize;
-use yazi_fs::File;
-use yazi_shared::Id;
-use yazi_shim::{arc_swap::{ArcSwapExt, IntoPointee}, vec::{IndexAtError, VecExt}};
-
-use super::OpenRule;
-use crate::{Selectable, mix};
-
-#[derive(Debug, Default, Deserialize)]
-pub struct OpenRules(ArcSwap<Vec<Arc<OpenRule>>>);
-
-impl Deref for OpenRules {
-	type Target = ArcSwap<Vec<Arc<OpenRule>>>;
-
-	fn deref(&self) -> &Self::Target { &self.0 }
-}
-
-impl From<Vec<Arc<OpenRule>>> for OpenRules {
-	fn from(inner: Vec<Arc<OpenRule>>) -> Self { Self(inner.into_pointee()) }
-}
-
-impl OpenRules {
-	pub fn matches(&self, file: &File, mime: &str) -> Option<Arc<OpenRule>> {
-		self.matcher(Some(file), Some(mime)).next()
-	}
-
-	pub fn matcher<'a, F, M>(&self, file: Option<F>, mime: Option<M>) -> OpenRuleMatcher<'a>
-	where
-		F: Into<Cow<'a, File>>,
-		M: Into<Cow<'a, str>>,
-	{
-		OpenRuleMatcher {
-			rules: self.0.load_full(),
-			file: file.map(Into::into),
-			mime: mime.map(Into::into),
-			..Default::default()
-		}
-	}
-
-	pub fn insert(&self, index: isize, rule: Arc<OpenRule>) -> Result<(), IndexAtError> {
-		self.0.try_rcu(|rules| {
-			let i = rules.index_at(index)?;
-			Ok(if i == rules.len() {
-				mix(Vec::<OpenRule>::new(), rules.iter().cloned(), [rule.clone()])
-			} else {
-				let (before, after) = rules.split_at(i);
-				mix(
-					Vec::<OpenRule>::new(),
-					before.iter().cloned().chain([rule.clone()]).chain(after.iter().cloned()),
-					Vec::<OpenRule>::new(),
-				)
-			})
-		})?;
-
-		Ok(())
-	}
-
-	pub fn remove(&self, matcher: OpenRuleMatcher) {
-		self.0.rcu(|rules| {
-			let mut next = Vec::clone(rules);
-			next.retain(|rule| !matcher.matches(rule));
-			next
-		});
-	}
-
-	pub fn update<E>(
-		&self,
-		matcher: OpenRuleMatcher,
-		f: impl Fn(OpenRule) -> Result<OpenRule, E>,
-	) -> Result<(), E> {
-		self.0.try_rcu(|rules| {
-			let mut next = Vec::clone(rules);
-			for rule in &mut next {
-				if matcher.matches(rule) {
-					*rule = f(OpenRule::clone(rule))?.into();
-				}
-			}
-			Ok(Arc::new(next))
-		})?;
-
-		Ok(())
-	}
-
-	pub(crate) fn unwrap_unchecked(self) -> Vec<Arc<OpenRule>> {
-		Arc::try_unwrap(self.0.into_inner()).expect("unique open rules arc")
-	}
-}
-
-// --- Matcher
-#[derive(Default)]
-pub struct OpenRuleMatcher<'a> {
-	pub rules:  Arc<Vec<Arc<OpenRule>>>,
-	pub id:     Id,
-	pub file:   Option<Cow<'a, File>>,
-	pub mime:   Option<Cow<'a, str>>,
-	pub all:    bool,
-	pub offset: usize,
-}
-
-impl From<&OpenRules> for OpenRuleMatcher<'_> {
-	fn from(rules: &OpenRules) -> Self {
-		Self { rules: rules.load_full(), all: true, ..Default::default() }
-	}
-}
-
-impl OpenRuleMatcher<'_> {
-	pub fn matches(&self, rule: &OpenRule) -> bool {
-		if self.all {
-			true
-		} else if self.id != Id::ZERO {
-			rule.id == self.id
-		} else {
-			rule.match_with(self.file.as_deref(), self.mime.as_deref())
-		}
-	}
-}
-
-impl Iterator for OpenRuleMatcher<'_> {
-	type Item = Arc<OpenRule>;
-
-	fn next(&mut self) -> Option<Self::Item> {
-		while let Some(rule) = self.rules.get(self.offset) {
-			self.offset += 1;
-			if self.matches(rule) {
-				return Some(rule.clone());
-			}
-		}
-		None
-	}
-}
diff --git a/yazi-config/src/opener/mod.rs b/yazi-config/src/opener/mod.rs
index d8c2dd4b..ad0c507f 100644
--- a/yazi-config/src/opener/mod.rs
+++ b/yazi-config/src/opener/mod.rs
@@ -1 +1 @@
-yazi_macro::mod_flat!(opener rule rules);
+yazi_macro::mod_flat!(opener opener_rule opener_rule_arc opener_rule_matcher opener_rules opener_rules_arc opener_rules_matcher);
diff --git a/yazi-config/src/opener/opener.rs b/yazi-config/src/opener/opener.rs
index de60388f..b175ea5d 100644
--- a/yazi-config/src/opener/opener.rs
+++ b/yazi-config/src/opener/opener.rs
@@ -2,30 +2,30 @@ use std::{mem, ops::Deref, sync::Arc};
 
 use arc_swap::ArcSwap;
 use hashbrown::HashMap;
+use mlua::{ExternalError, FromLua, IntoLua, IntoLuaMulti, MetaMethod, UserData, UserDataMethods, Value};
 use serde::{Deserialize, Deserializer};
 use yazi_shim::{arc_swap::IntoPointee, toml::{DeserializeOverHook, DeserializeOverWith}};
 
-use super::{OpenerRule, OpenerRules};
-use crate::{open::OpenRule, opener::OpenerRuleMatcher};
+use crate::{open::{OpenRule, OpenRuleArc}, opener::{OpenerRuleArc, OpenerRuleMatcher, OpenerRulesArc, OpenerRulesMatcher}};
 
 #[derive(Debug, Deserialize)]
-pub struct Opener(ArcSwap<HashMap<String, Arc<OpenerRules>>>);
+pub struct Opener(ArcSwap<HashMap<String, OpenerRulesArc>>);
 
 impl Deref for Opener {
-	type Target = ArcSwap<HashMap<String, Arc<OpenerRules>>>;
+	type Target = ArcSwap<HashMap<String, OpenerRulesArc>>;
 
 	fn deref(&self) -> &Self::Target { &self.0 }
 }
 
 impl Opener {
-	pub fn all(&self, open: Arc<OpenRule>) -> impl Iterator<Item = Arc<OpenerRule>> + use<> {
+	pub fn all(&self, open: OpenRuleArc) -> impl Iterator<Item = OpenerRuleArc> + use<> {
 		let inner = self.0.load_full();
 		(0..open.r#use.len())
 			.filter_map(move |i| inner.get(&open.r#use[i]).cloned())
-			.flat_map(|rules| OpenerRuleMatcher::from(&*rules))
+			.flat_map(|rules| OpenerRuleMatcher::from(&rules))
 	}
 
-	pub fn first(&self, open: &OpenRule) -> Option<Arc<OpenerRule>> {
+	pub fn first(&self, open: &OpenRule) -> Option<OpenerRuleArc> {
 		let inner = self.0.load();
 		open
 			.r#use
@@ -34,7 +34,7 @@ impl Opener {
 			.find_map(|rules| rules.load().first().cloned())
 	}
 
-	pub fn block(&self, open: &OpenRule) -> Option<Arc<OpenerRule>> {
+	pub fn block(&self, open: &OpenRule) -> Option<OpenerRuleArc> {
 		let inner = self.0.load();
 		open
 			.r#use
@@ -43,7 +43,7 @@ impl Opener {
 			.find_map(|rules| rules.load().iter().find(|r| r.block).cloned())
 	}
 
-	pub fn insert(&self, name: &str, rules: &Arc<OpenerRules>) {
+	pub fn insert(&self, name: &str, rules: &OpenerRulesArc) {
 		self.0.rcu(|inner| {
 			let mut next = HashMap::clone(inner);
 			next.insert(name.to_owned(), rules.clone());
@@ -59,7 +59,7 @@ impl Opener {
 		});
 	}
 
-	pub(crate) fn unwrap_unchecked(self) -> HashMap<String, Arc<OpenerRules>> {
+	pub(crate) fn unwrap_unchecked(self) -> HashMap<String, OpenerRulesArc> {
 		Arc::try_unwrap(self.0.into_inner()).expect("unique opener arc")
 	}
 }
@@ -83,3 +83,45 @@ impl DeserializeOverWith for Opener {
 		Ok(Self(self.0.deserialize_over_with(de)?))
 	}
 }
+
+impl UserData for &'static Opener {
+	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
+		methods.add_meta_method(MetaMethod::Index, |lua, &me, key: mlua::String| {
+			let key = key.to_str()?;
+			match me.load().get(&*key) {
+				Some(rules) => rules.clone().into_lua(lua),
+				None => Ok(Value::Nil),
+			}
+		});
+
+		methods.add_meta_method(
+			MetaMethod::NewIndex,
+			|lua, &me, (key, value): (mlua::String, Value)| {
+				let key = key.to_str()?;
+				match value {
+					t @ Value::Table(_) => {
+						me.insert(&key, &OpenerRulesArc::from_lua(t, lua)?);
+					}
+					Value::Nil => {
+						me.remove(&key);
+					}
+					_ => return Err("expected a table or nil".into_lua_err()),
+				}
+				Ok(())
+			},
+		);
+
+		methods.add_meta_method(MetaMethod::Pairs, |lua, &me, ()| {
+			let mut matcher = OpenerRulesMatcher::from(me);
+			let iter = lua.create_function_mut(move |lua, ()| {
+				if let Some((name, rules)) = matcher.next() {
+					(name, rules).into_lua_multi(lua)
+				} else {
+					().into_lua_multi(lua)
+				}
+			})?;
+
+			Ok(iter)
+		});
+	}
+}
diff --git a/yazi-config/src/opener/rule.rs b/yazi-config/src/opener/opener_rule.rs
similarity index 50%
rename from yazi-config/src/opener/rule.rs
rename to yazi-config/src/opener/opener_rule.rs
index a38570fa..71347026 100644
--- a/yazi-config/src/opener/rule.rs
+++ b/yazi-config/src/opener/opener_rule.rs
@@ -1,10 +1,8 @@
-use std::sync::Arc;
-
 use serde::Deserialize;
 use yazi_fs::Splatter;
-use yazi_shared::{Id, NonEmptyString};
+use yazi_shared::{NonEmptyString, id::Id};
 
-use crate::{Platform, opener::OpenerRules, plugin::opener_rule_id};
+use crate::{Platform, plugin::opener_rule_id};
 
 #[derive(Clone, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub struct OpenerRule {
@@ -46,44 +44,3 @@ impl OpenerRule {
 		}
 	}
 }
-
-// --- Matcher
-#[derive(Default)]
-pub struct OpenerRuleMatcher {
-	pub rules:  Arc<Vec<Arc<OpenerRule>>>,
-	pub id:     Id,
-	pub all:    bool,
-	pub offset: usize,
-}
-
-impl From<&OpenerRules> for OpenerRuleMatcher {
-	fn from(rules: &OpenerRules) -> Self {
-		Self { rules: rules.load_full(), all: true, ..Default::default() }
-	}
-}
-
-impl OpenerRuleMatcher {
-	pub fn matches(&self, rule: &OpenerRule) -> bool {
-		if self.all {
-			true
-		} else if self.id != Id::ZERO {
-			rule.id == self.id
-		} else {
-			false
-		}
-	}
-}
-
-impl Iterator for OpenerRuleMatcher {
-	type Item = Arc<OpenerRule>;
-
-	fn next(&mut self) -> Option<Self::Item> {
-		while let Some(rule) = self.rules.get(self.offset) {
-			self.offset += 1;
-			if self.matches(rule) {
-				return Some(rule.clone());
-			}
-		}
-		None
-	}
-}
diff --git a/yazi-config/src/opener/opener_rule_arc.rs b/yazi-config/src/opener/opener_rule_arc.rs
new file mode 100644
index 00000000..c640d613
--- /dev/null
+++ b/yazi-config/src/opener/opener_rule_arc.rs
@@ -0,0 +1,43 @@
+use std::{ops::{Deref, DerefMut}, sync::Arc};
+
+use mlua::{FromLua, Lua, LuaSerdeExt, UserData, UserDataFields, Value};
+use serde::Deserialize;
+use yazi_shim::mlua::UserDataFieldsExt;
+
+use crate::opener::OpenerRule;
+
+#[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq)]
+pub struct OpenerRuleArc(Arc<OpenerRule>);
+
+impl Deref for OpenerRuleArc {
+	type Target = Arc<OpenerRule>;
+
+	fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+impl DerefMut for OpenerRuleArc {
+	fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0 }
+}
+
+impl From<OpenerRule> for OpenerRuleArc {
+	fn from(value: OpenerRule) -> Self { Self(value.into()) }
+}
+
+impl FromLua for OpenerRuleArc {
+	fn from_lua(value: Value, lua: &Lua) -> mlua::Result<Self> {
+		let mut inner: OpenerRule = lua.from_value(value)?;
+		inner.fill();
+
+		Ok(inner.into())
+	}
+}
+
+impl UserData for OpenerRuleArc {
+	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
+		fields.add_field_method_get("id", |_, me| Ok(me.id));
+		fields.add_cached_field("run", |lua, me| lua.create_string(&*me.run));
+		fields.add_field_method_get("block", |_, me| Ok(me.block));
+		fields.add_field_method_get("orphan", |_, me| Ok(me.orphan));
+		fields.add_cached_field("desc", |lua, me| lua.create_string(&*me.desc));
+	}
+}
diff --git a/yazi-config/src/opener/opener_rule_matcher.rs b/yazi-config/src/opener/opener_rule_matcher.rs
new file mode 100644
index 00000000..9d56f057
--- /dev/null
+++ b/yazi-config/src/opener/opener_rule_matcher.rs
@@ -0,0 +1,70 @@
+use std::sync::Arc;
+
+use mlua::{ExternalError, FromLua, IntoLua, Lua, Table, Value};
+use yazi_binding::Iter;
+use yazi_shared::id::Id;
+
+use crate::opener::{OpenerRule, OpenerRuleArc, OpenerRulesArc};
+
+#[derive(Default)]
+pub struct OpenerRuleMatcher {
+	pub rules:  Arc<Vec<OpenerRuleArc>>,
+	pub id:     Id,
+	pub all:    bool,
+	pub offset: usize,
+}
+
+impl From<&OpenerRulesArc> for OpenerRuleMatcher {
+	fn from(rules: &OpenerRulesArc) -> Self {
+		Self { rules: rules.load_full(), all: true, ..Default::default() }
+	}
+}
+
+impl OpenerRuleMatcher {
+	pub fn matches(&self, rule: &OpenerRule) -> bool {
+		if self.all {
+			true
+		} else if self.id != Id::ZERO {
+			rule.id == self.id
+		} else {
+			false
+		}
+	}
+}
+
+impl Iterator for OpenerRuleMatcher {
+	type Item = OpenerRuleArc;
+
+	fn next(&mut self) -> Option<Self::Item> {
+		while let Some(rule) = self.rules.get(self.offset) {
+			self.offset += 1;
+			if self.matches(rule) {
+				return Some(rule.clone());
+			}
+		}
+		None
+	}
+}
+
+impl TryFrom<Table> for OpenerRuleMatcher {
+	type Error = mlua::Error;
+
+	fn try_from(t: Table) -> Result<Self, Self::Error> {
+		let id: Id = t.raw_get("id").unwrap_or_default();
+
+		Ok(Self { id, ..Default::default() })
+	}
+}
+
+impl FromLua for OpenerRuleMatcher {
+	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
+		match value {
+			Value::Table(t) => t.try_into(),
+			_ => Err("expected a table of OpenerRuleMatcher".into_lua_err()),
+		}
+	}
+}
+
+impl IntoLua for OpenerRuleMatcher {
+	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> { Iter::new(self, None).into_lua(lua) }
+}
diff --git a/yazi-config/src/opener/opener_rules.rs b/yazi-config/src/opener/opener_rules.rs
new file mode 100644
index 00000000..3fe4bedf
--- /dev/null
+++ b/yazi-config/src/opener/opener_rules.rs
@@ -0,0 +1,61 @@
+use std::{ops::Deref, sync::Arc};
+
+use arc_swap::ArcSwap;
+use serde::Deserialize;
+use yazi_shim::{arc_swap::{ArcSwapExt, IntoPointee}, toml::DeserializeOverHook, vec::{IndexAtError, VecExt}};
+
+use crate::opener::{OpenerRuleArc, OpenerRuleMatcher};
+
+#[derive(Debug, Default, Deserialize)]
+pub struct OpenerRules(ArcSwap<Vec<OpenerRuleArc>>);
+
+impl Deref for OpenerRules {
+	type Target = ArcSwap<Vec<OpenerRuleArc>>;
+
+	fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+impl From<Vec<OpenerRuleArc>> for OpenerRules {
+	fn from(inner: Vec<OpenerRuleArc>) -> Self { Self(inner.into_pointee()) }
+}
+
+impl OpenerRules {
+	pub fn insert(&self, index: isize, rule: OpenerRuleArc) -> Result<(), IndexAtError> {
+		self.0.try_rcu(|rules| {
+			let (before, after) = rules.split_at(rules.index_at(index)?);
+			Ok(
+				before
+					.iter()
+					.cloned()
+					.chain([rule.clone()])
+					.chain(after.iter().cloned())
+					.collect::<Vec<_>>(),
+			)
+		})?;
+
+		Ok(())
+	}
+
+	pub fn remove(&self, matcher: OpenerRuleMatcher) {
+		self.0.rcu(|rules| {
+			let mut next = Vec::clone(rules);
+			next.retain(|rule| !matcher.matches(rule));
+			next
+		});
+	}
+
+	pub(crate) fn unwrap_unchecked(self) -> Vec<OpenerRuleArc> {
+		Arc::try_unwrap(self.0.into_inner()).expect("unique opener rules arc")
+	}
+}
+
+impl DeserializeOverHook for OpenerRules {
+	fn deserialize_over_hook(self) -> Result<Self, toml::de::Error> {
+		let mut inner = self.unwrap_unchecked();
+
+		inner.retain(|r| r.r#for.matches());
+		inner.iter_mut().for_each(|r| Arc::get_mut(r).expect("unique opener rule arc").fill());
+
+		Ok(Self(inner.into_pointee()))
+	}
+}
diff --git a/yazi-config/src/opener/opener_rules_arc.rs b/yazi-config/src/opener/opener_rules_arc.rs
new file mode 100644
index 00000000..80f3f17a
--- /dev/null
+++ b/yazi-config/src/opener/opener_rules_arc.rs
@@ -0,0 +1,61 @@
+use std::{ops::{Deref, DerefMut}, sync::Arc};
+
+use mlua::{ExternalError, ExternalResult, FromLua, Lua, LuaSerdeExt, MetaMethod, UserData, UserDataMethods, Value};
+use serde::Deserialize;
+use yazi_shim::toml::DeserializeOverHook;
+
+use crate::opener::{OpenerRuleArc, OpenerRuleMatcher, OpenerRules};
+
+#[derive(Clone, Debug, Deserialize)]
+pub struct OpenerRulesArc(Arc<OpenerRules>);
+
+impl Deref for OpenerRulesArc {
+	type Target = Arc<OpenerRules>;
+
+	fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+impl DerefMut for OpenerRulesArc {
+	fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0 }
+}
+
+impl From<OpenerRules> for OpenerRulesArc {
+	fn from(value: OpenerRules) -> Self { Self(value.into()) }
+}
+
+impl FromLua for OpenerRulesArc {
+	fn from_lua(value: Value, lua: &Lua) -> mlua::Result<Self> {
+		let inner: OpenerRules = lua.from_value(value)?;
+
+		Ok(inner.deserialize_over_hook().into_lua_err()?.into())
+	}
+}
+
+impl UserData for OpenerRulesArc {
+	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
+		methods.add_method("match", |_, me, matcher: Option<OpenerRuleMatcher>| {
+			Ok(match matcher {
+				Some(matcher) => matcher,
+				None => me.into(),
+			})
+		});
+
+		methods.add_method("insert", |_, me, (index, rule): (isize, OpenerRuleArc)| {
+			let index = match index {
+				1.. => index - 1,
+				0 => return Err("index must be 1-based or negative".into_lua_err()),
+				_ => index,
+			};
+
+			me.insert(index, rule.clone()).into_lua_err()?;
+			Ok(rule)
+		});
+
+		methods.add_method("remove", |_, me, matcher: OpenerRuleMatcher| {
+			me.remove(matcher);
+			Ok(())
+		});
+
+		methods.add_meta_method(MetaMethod::Len, |_, me, ()| Ok(me.load().len()));
+	}
+}
diff --git a/yazi-config/src/opener/opener_rules_matcher.rs b/yazi-config/src/opener/opener_rules_matcher.rs
new file mode 100644
index 00000000..1a2c8aa6
--- /dev/null
+++ b/yazi-config/src/opener/opener_rules_matcher.rs
@@ -0,0 +1,33 @@
+use std::{mem, sync::Arc};
+
+use hashbrown::{HashMap, hash_map};
+
+use crate::opener::{Opener, OpenerRulesArc};
+
+pub struct OpenerRulesMatcher {
+	iter:    hash_map::Iter<'static, String, OpenerRulesArc>,
+	_opener: Arc<HashMap<String, OpenerRulesArc>>,
+}
+
+impl From<&Opener> for OpenerRulesMatcher {
+	fn from(opener: &Opener) -> Self {
+		let opener = opener.load_full();
+
+		let iter = unsafe {
+			mem::transmute::<
+				hash_map::Iter<'_, String, OpenerRulesArc>,
+				hash_map::Iter<'static, String, OpenerRulesArc>,
+			>(opener.iter())
+		};
+
+		Self { iter, _opener: opener }
+	}
+}
+
+impl Iterator for OpenerRulesMatcher {
+	type Item = (String, OpenerRulesArc);
+
+	fn next(&mut self) -> Option<Self::Item> {
+		self.iter.next().map(|(name, rules)| (name.clone(), rules.clone()))
+	}
+}
diff --git a/yazi-config/src/opener/rules.rs b/yazi-config/src/opener/rules.rs
deleted file mode 100644
index f1221d3f..00000000
--- a/yazi-config/src/opener/rules.rs
+++ /dev/null
@@ -1,92 +0,0 @@
-use std::{mem, ops::Deref, sync::Arc};
-
-use arc_swap::ArcSwap;
-use hashbrown::{HashMap, hash_map};
-use serde::Deserialize;
-use yazi_shim::{arc_swap::{ArcSwapExt, IntoPointee}, toml::DeserializeOverHook, vec::{IndexAtError, VecExt}};
-
-use super::OpenerRule;
-use crate::opener::{Opener, OpenerRuleMatcher};
-
-#[derive(Debug, Default, Deserialize)]
-pub struct OpenerRules(ArcSwap<Vec<Arc<OpenerRule>>>);
-
-impl Deref for OpenerRules {
-	type Target = ArcSwap<Vec<Arc<OpenerRule>>>;
-
-	fn deref(&self) -> &Self::Target { &self.0 }
-}
-
-impl From<Vec<Arc<OpenerRule>>> for OpenerRules {
-	fn from(inner: Vec<Arc<OpenerRule>>) -> Self { Self(inner.into_pointee()) }
-}
-
-impl OpenerRules {
-	pub fn insert(&self, index: isize, rule: Arc<OpenerRule>) -> Result<(), IndexAtError> {
-		self.0.try_rcu(|rules| {
-			let (before, after) = rules.split_at(rules.index_at(index)?);
-			Ok(
-				before
-					.iter()
-					.cloned()
-					.chain([rule.clone()])
-					.chain(after.iter().cloned())
-					.collect::<Vec<_>>(),
-			)
-		})?;
-
-		Ok(())
-	}
-
-	pub fn remove(&self, matcher: OpenerRuleMatcher) {
-		self.0.rcu(|rules| {
-			let mut next = Vec::clone(rules);
-			next.retain(|rule| !matcher.matches(rule));
-			next
-		});
-	}
-
-	pub(crate) fn unwrap_unchecked(self) -> Vec<Arc<OpenerRule>> {
-		Arc::try_unwrap(self.0.into_inner()).expect("unique opener rules arc")
-	}
-}
-
-impl DeserializeOverHook for OpenerRules {
-	fn deserialize_over_hook(self) -> Result<Self, toml::de::Error> {
-		let mut inner = self.unwrap_unchecked();
-
-		inner.retain(|r| r.r#for.matches());
-		inner.iter_mut().for_each(|r| Arc::get_mut(r).expect("unique opener rule arc").fill());
-
-		Ok(Self(inner.into_pointee()))
-	}
-}
-
-// --- Matcher
-pub struct OpenerRulesMatcher {
-	iter:    hash_map::Iter<'static, String, Arc<OpenerRules>>,
-	_opener: Arc<HashMap<String, Arc<OpenerRules>>>,
-}
-
-impl From<&Opener> for OpenerRulesMatcher {
-	fn from(opener: &Opener) -> Self {
-		let opener = opener.load_full();
-
-		let iter = unsafe {
-			mem::transmute::<
-				hash_map::Iter<'_, String, Arc<OpenerRules>>,
-				hash_map::Iter<'static, String, Arc<OpenerRules>>,
-			>(opener.iter())
-		};
-
-		Self { iter, _opener: opener }
-	}
-}
-
-impl Iterator for OpenerRulesMatcher {
-	type Item = (String, Arc<OpenerRules>);
-
-	fn next(&mut self) -> Option<Self::Item> {
-		self.iter.next().map(|(name, rules)| (name.clone(), rules.clone()))
-	}
-}
diff --git a/yazi-config/src/plugin/fetcher.rs b/yazi-config/src/plugin/fetcher.rs
index 4b08bb79..8b5085bc 100644
--- a/yazi-config/src/plugin/fetcher.rs
+++ b/yazi-config/src/plugin/fetcher.rs
@@ -1,11 +1,13 @@
 use std::{borrow::Cow, ops::Deref, sync::Arc};
 
 use hashbrown::HashSet;
+use mlua::{ExternalError, FromLua, IntoLua, Lua, Table, Value};
 use serde::Deserialize;
-use yazi_fs::File;
-use yazi_shared::{Id, event::Cmd};
+use yazi_binding::Iter;
+use yazi_fs::file::{File, FileRef};
+use yazi_shared::{event::Cmd, id::Id};
 
-use crate::{Mixable, Pattern, Priority, Selectable, Selector, plugin::{Fetchers, fetcher_id}};
+use crate::{Mixable, Pattern, Priority, Selectable, Selector, YAZI, plugin::{FetcherArc, Fetchers, fetcher_id}};
 
 #[derive(Debug, Deserialize)]
 pub struct Fetcher {
@@ -38,7 +40,7 @@ impl Mixable for Fetcher {}
 // --- Matcher
 #[derive(Default)]
 pub struct FetcherMatcher<'a> {
-	pub fetchers: Arc<Vec<Arc<Fetcher>>>,
+	pub fetchers: Arc<Vec<FetcherArc>>,
 	pub id:       Id,
 	pub file:     Option<Cow<'a, File>>,
 	pub mime:     Option<Cow<'a, str>>,
@@ -66,7 +68,7 @@ impl FetcherMatcher<'_> {
 }
 
 impl Iterator for FetcherMatcher<'_> {
-	type Item = Arc<Fetcher>;
+	type Item = FetcherArc;
 
 	fn next(&mut self) -> Option<Self::Item> {
 		while let Some(fetcher) = self.fetchers.get(self.offset) {
@@ -81,3 +83,34 @@ impl Iterator for FetcherMatcher<'_> {
 		None
 	}
 }
+
+impl TryFrom<Table> for FetcherMatcher<'static> {
+	type Error = mlua::Error;
+
+	fn try_from(value: Table) -> Result<Self, Self::Error> {
+		let id: Id = value.raw_get("id").unwrap_or_default();
+		let file: Option<FileRef> = value.raw_get("file")?;
+		let mime: Option<String> = value.raw_get("mime")?;
+
+		Ok(Self {
+			fetchers: YAZI.plugin.fetchers.load_full(),
+			id,
+			file: file.map(|f| f.clone().into()),
+			mime: mime.map(Into::into),
+			..Default::default()
+		})
+	}
+}
+
+impl FromLua for FetcherMatcher<'static> {
+	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
+		match value {
+			Value::Table(t) => t.try_into(),
+			_ => Err("expected a table of FetcherMatcher".into_lua_err()),
+		}
+	}
+}
+
+impl IntoLua for FetcherMatcher<'static> {
+	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> { Iter::new(self, None).into_lua(lua) }
+}
diff --git a/yazi-config/src/plugin/fetcher_arc.rs b/yazi-config/src/plugin/fetcher_arc.rs
new file mode 100644
index 00000000..ff2a59c9
--- /dev/null
+++ b/yazi-config/src/plugin/fetcher_arc.rs
@@ -0,0 +1,34 @@
+use std::{ops::{Deref, DerefMut}, sync::Arc};
+
+use mlua::{UserData, UserDataFields};
+use serde::Deserialize;
+use yazi_shim::mlua::UserDataFieldsExt;
+
+use crate::{Mixable, plugin::Fetcher};
+
+#[derive(Clone, Debug, Deserialize)]
+pub struct FetcherArc(Arc<Fetcher>);
+
+impl Deref for FetcherArc {
+	type Target = Arc<Fetcher>;
+
+	fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+impl DerefMut for FetcherArc {
+	fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0 }
+}
+
+impl From<Fetcher> for FetcherArc {
+	fn from(value: Fetcher) -> Self { Self(value.into()) }
+}
+
+impl Mixable for FetcherArc {}
+
+impl UserData for FetcherArc {
+	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
+		fields.add_field_method_get("id", |_, me| Ok(me.id));
+
+		fields.add_cached_field("name", |lua, me| lua.create_string(&*me.name));
+	}
+}
diff --git a/yazi-config/src/plugin/fetchers.rs b/yazi-config/src/plugin/fetchers.rs
index cab71a4b..5f5cd0ed 100644
--- a/yazi-config/src/plugin/fetchers.rs
+++ b/yazi-config/src/plugin/fetchers.rs
@@ -1,29 +1,30 @@
 use std::{borrow::Cow, ops::Deref, sync::Arc};
 
 use arc_swap::ArcSwap;
+use mlua::{MetaMethod, UserData, UserDataMethods};
 use serde::Deserialize;
 use tracing::warn;
-use yazi_fs::File;
+use yazi_fs::file::File;
 use yazi_shim::arc_swap::IntoPointee;
 
-use super::{Fetcher, MAX_FETCHERS};
-use crate::plugin::FetcherMatcher;
+use super::MAX_FETCHERS;
+use crate::plugin::{FetcherArc, FetcherMatcher};
 
 #[derive(Debug, Default, Deserialize)]
-pub struct Fetchers(ArcSwap<Vec<Arc<Fetcher>>>);
+pub struct Fetchers(ArcSwap<Vec<FetcherArc>>);
 
 impl Deref for Fetchers {
-	type Target = ArcSwap<Vec<Arc<Fetcher>>>;
+	type Target = ArcSwap<Vec<FetcherArc>>;
 
 	fn deref(&self) -> &Self::Target { &self.0 }
 }
 
-impl From<Vec<Arc<Fetcher>>> for Fetchers {
-	fn from(inner: Vec<Arc<Fetcher>>) -> Self { Self(inner.into_pointee()) }
+impl From<Vec<FetcherArc>> for Fetchers {
+	fn from(inner: Vec<FetcherArc>) -> Self { Self(inner.into_pointee()) }
 }
 
-impl From<Arc<Vec<Arc<Fetcher>>>> for Fetchers {
-	fn from(inner: Arc<Vec<Arc<Fetcher>>>) -> Self { Self(inner.into()) }
+impl From<Arc<Vec<FetcherArc>>> for Fetchers {
+	fn from(inner: Arc<Vec<FetcherArc>>) -> Self { Self(inner.into()) }
 }
 
 impl Fetchers {
@@ -44,7 +45,7 @@ impl Fetchers {
 		}
 	}
 
-	pub fn mime(&self, files: Vec<File>) -> impl Iterator<Item = (Arc<Fetcher>, Vec<File>)> {
+	pub fn mime(&self, files: Vec<File>) -> impl Iterator<Item = (FetcherArc, Vec<File>)> {
 		let mut tasks: [Vec<_>; MAX_FETCHERS as usize] = Default::default();
 
 		for file in files {
@@ -62,7 +63,20 @@ impl Fetchers {
 		})
 	}
 
-	pub(crate) fn unwrap_unchecked(self) -> Vec<Arc<Fetcher>> {
+	pub(crate) fn unwrap_unchecked(self) -> Vec<FetcherArc> {
 		Arc::try_unwrap(self.0.into_inner()).expect("unique fetchers arc")
 	}
 }
+
+impl UserData for &'static Fetchers {
+	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
+		methods.add_method("match", |_, &me, matcher: Option<FetcherMatcher>| {
+			Ok(match matcher {
+				Some(matcher) => matcher,
+				None => me.into(),
+			})
+		});
+
+		methods.add_meta_method(MetaMethod::Len, |_, me, ()| Ok(me.load().len()));
+	}
+}
diff --git a/yazi-config/src/plugin/ids.rs b/yazi-config/src/plugin/ids.rs
index 64ae9912..414e8a73 100644
--- a/yazi-config/src/plugin/ids.rs
+++ b/yazi-config/src/plugin/ids.rs
@@ -1,4 +1,4 @@
-use yazi_shared::{Id, Ids};
+use yazi_shared::id::{Id, Ids};
 
 pub fn fetcher_id() -> Id {
 	static IDS: Ids = Ids::new();
diff --git a/yazi-config/src/plugin/mod.rs b/yazi-config/src/plugin/mod.rs
index 1abb88bf..9ac9dba9 100644
--- a/yazi-config/src/plugin/mod.rs
+++ b/yazi-config/src/plugin/mod.rs
@@ -1,4 +1,4 @@
-yazi_macro::mod_flat!(fetcher fetchers ids plugin preloader preloaders previewer previewers spotter spotters);
+yazi_macro::mod_flat!(fetcher fetcher_arc fetchers ids plugin preloader preloader_arc preloaders previewer previewer_arc previewers spotter spotter_arc spotters);
 
 pub const MAX_FETCHERS: u8 = 16;
 pub const MAX_PRELOADERS: u8 = 16;
diff --git a/yazi-config/src/plugin/plugin.rs b/yazi-config/src/plugin/plugin.rs
index 8d38870f..9faeead8 100644
--- a/yazi-config/src/plugin/plugin.rs
+++ b/yazi-config/src/plugin/plugin.rs
@@ -6,7 +6,7 @@ use yazi_codegen::DeserializeOver2;
 use yazi_shim::toml::DeserializeOverHook;
 
 use super::{Fetcher, Fetchers, Preloader, Preloaders, Previewer, Previewers, Spotter, Spotters};
-use crate::{mix, plugin::{MAX_FETCHERS, MAX_PRELOADERS}};
+use crate::{mix, plugin::{FetcherArc, MAX_FETCHERS, MAX_PRELOADERS, PreloaderArc, PreviewerArc, SpotterArc}};
 
 #[derive(Default, Deserialize, DeserializeOver2)]
 pub struct Plugin {
@@ -37,13 +37,13 @@ pub struct Plugin {
 
 impl DeserializeOverHook for Plugin {
 	fn deserialize_over_hook(self) -> Result<Self, toml::de::Error> {
-		let mut fetchers: Vec<Arc<Fetcher>> =
+		let mut fetchers: Vec<FetcherArc> =
 			mix(self.prepend_fetchers, self.fetchers.unwrap_unchecked(), self.append_fetchers);
-		let spotters: Vec<Arc<Spotter>> =
+		let spotters: Vec<SpotterArc> =
 			mix(self.prepend_spotters, self.spotters.unwrap_unchecked(), self.append_spotters);
-		let mut preloaders: Vec<Arc<Preloader>> =
+		let mut preloaders: Vec<PreloaderArc> =
 			mix(self.prepend_preloaders, self.preloaders.unwrap_unchecked(), self.append_preloaders);
-		let previewers: Vec<Arc<Previewer>> =
+		let previewers: Vec<PreviewerArc> =
 			mix(self.prepend_previewers, self.previewers.unwrap_unchecked(), self.append_previewers);
 
 		if fetchers.len() > MAX_FETCHERS as usize {
diff --git a/yazi-config/src/plugin/preloader.rs b/yazi-config/src/plugin/preloader.rs
index 0e6e9c65..e546af01 100644
--- a/yazi-config/src/plugin/preloader.rs
+++ b/yazi-config/src/plugin/preloader.rs
@@ -1,10 +1,12 @@
 use std::{borrow::Cow, ops::Deref, sync::Arc};
 
+use mlua::{ExternalError, FromLua, IntoLua, Lua, Table, Value};
 use serde::Deserialize;
-use yazi_fs::File;
-use yazi_shared::{Id, event::Cmd};
+use yazi_binding::Iter;
+use yazi_fs::file::{File, FileRef};
+use yazi_shared::{event::Cmd, id::Id};
 
-use crate::{Mixable, Pattern, Priority, Selectable, Selector, plugin::{Preloaders, preloader_id}};
+use crate::{Mixable, Pattern, Priority, Selectable, Selector, YAZI, plugin::{PreloaderArc, Preloaders, preloader_id}};
 
 #[derive(Debug, Deserialize)]
 pub struct Preloader {
@@ -38,7 +40,7 @@ impl Mixable for Preloader {}
 // --- Matcher
 #[derive(Default)]
 pub struct PreloaderMatcher<'a> {
-	pub preloaders: Arc<Vec<Arc<Preloader>>>,
+	pub preloaders: Arc<Vec<PreloaderArc>>,
 	pub id:         Id,
 	pub file:       Option<Cow<'a, File>>,
 	pub mime:       Option<Cow<'a, str>>,
@@ -66,7 +68,7 @@ impl PreloaderMatcher<'_> {
 }
 
 impl Iterator for PreloaderMatcher<'_> {
-	type Item = Arc<Preloader>;
+	type Item = PreloaderArc;
 
 	fn next(&mut self) -> Option<Self::Item> {
 		if self.stop && !self.all {
@@ -83,3 +85,34 @@ impl Iterator for PreloaderMatcher<'_> {
 		None
 	}
 }
+
+impl TryFrom<Table> for PreloaderMatcher<'static> {
+	type Error = mlua::Error;
+
+	fn try_from(value: Table) -> Result<Self, Self::Error> {
+		let id: Id = value.raw_get("id").unwrap_or_default();
+		let file: Option<FileRef> = value.raw_get("file")?;
+		let mime: Option<String> = value.raw_get("mime")?;
+
+		Ok(Self {
+			preloaders: YAZI.plugin.preloaders.load_full(),
+			id,
+			file: file.map(|f| f.clone().into()),
+			mime: mime.map(Into::into),
+			..Default::default()
+		})
+	}
+}
+
+impl FromLua for PreloaderMatcher<'static> {
+	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
+		match value {
+			Value::Table(t) => t.try_into(),
+			_ => Err("expected a table of PreloaderMatcher".into_lua_err()),
+		}
+	}
+}
+
+impl IntoLua for PreloaderMatcher<'static> {
+	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> { Iter::new(self, None).into_lua(lua) }
+}
diff --git a/yazi-config/src/plugin/preloader_arc.rs b/yazi-config/src/plugin/preloader_arc.rs
new file mode 100644
index 00000000..2d01f9b0
--- /dev/null
+++ b/yazi-config/src/plugin/preloader_arc.rs
@@ -0,0 +1,34 @@
+use std::{ops::{Deref, DerefMut}, sync::Arc};
+
+use mlua::{UserData, UserDataFields};
+use serde::Deserialize;
+use yazi_shim::mlua::UserDataFieldsExt;
+
+use crate::{Mixable, plugin::Preloader};
+
+#[derive(Clone, Debug, Deserialize)]
+pub struct PreloaderArc(Arc<Preloader>);
+
+impl Deref for PreloaderArc {
+	type Target = Arc<Preloader>;
+
+	fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+impl DerefMut for PreloaderArc {
+	fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0 }
+}
+
+impl From<Preloader> for PreloaderArc {
+	fn from(value: Preloader) -> Self { Self(value.into()) }
+}
+
+impl Mixable for PreloaderArc {}
+
+impl UserData for PreloaderArc {
+	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
+		fields.add_field_method_get("id", |_, me| Ok(me.id));
+
+		fields.add_cached_field("name", |lua, me| lua.create_string(&*me.name));
+	}
+}
diff --git a/yazi-config/src/plugin/preloaders.rs b/yazi-config/src/plugin/preloaders.rs
index 5e57163f..843b90a8 100644
--- a/yazi-config/src/plugin/preloaders.rs
+++ b/yazi-config/src/plugin/preloaders.rs
@@ -1,28 +1,28 @@
 use std::{borrow::Cow, ops::Deref, sync::Arc};
 
 use arc_swap::ArcSwap;
+use mlua::{MetaMethod, UserData, UserDataMethods};
 use serde::Deserialize;
-use yazi_fs::File;
+use yazi_fs::file::File;
 use yazi_shim::arc_swap::IntoPointee;
 
-use super::Preloader;
-use crate::plugin::PreloaderMatcher;
+use crate::plugin::{PreloaderArc, PreloaderMatcher};
 
 #[derive(Debug, Default, Deserialize)]
-pub struct Preloaders(ArcSwap<Vec<Arc<Preloader>>>);
+pub struct Preloaders(ArcSwap<Vec<PreloaderArc>>);
 
 impl Deref for Preloaders {
-	type Target = ArcSwap<Vec<Arc<Preloader>>>;
+	type Target = ArcSwap<Vec<PreloaderArc>>;
 
 	fn deref(&self) -> &Self::Target { &self.0 }
 }
 
-impl From<Vec<Arc<Preloader>>> for Preloaders {
-	fn from(inner: Vec<Arc<Preloader>>) -> Self { Self(inner.into_pointee()) }
+impl From<Vec<PreloaderArc>> for Preloaders {
+	fn from(inner: Vec<PreloaderArc>) -> Self { Self(inner.into_pointee()) }
 }
 
-impl From<Arc<Vec<Arc<Preloader>>>> for Preloaders {
-	fn from(inner: Arc<Vec<Arc<Preloader>>>) -> Self { Self(inner.into()) }
+impl From<Arc<Vec<PreloaderArc>>> for Preloaders {
+	fn from(inner: Arc<Vec<PreloaderArc>>) -> Self { Self(inner.into()) }
 }
 
 impl Preloaders {
@@ -43,7 +43,20 @@ impl Preloaders {
 		}
 	}
 
-	pub(crate) fn unwrap_unchecked(self) -> Vec<Arc<Preloader>> {
+	pub(crate) fn unwrap_unchecked(self) -> Vec<PreloaderArc> {
 		Arc::try_unwrap(self.0.into_inner()).expect("unique preloaders arc")
 	}
 }
+
+impl UserData for &'static Preloaders {
+	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
+		methods.add_method("match", |_, &me, matcher: Option<PreloaderMatcher>| {
+			Ok(match matcher {
+				Some(matcher) => matcher,
+				None => me.into(),
+			})
+		});
+
+		methods.add_meta_method(MetaMethod::Len, |_, me, ()| Ok(me.load().len()));
+	}
+}
diff --git a/yazi-config/src/plugin/previewer.rs b/yazi-config/src/plugin/previewer.rs
index 8d570a8d..6a0a2ebb 100644
--- a/yazi-config/src/plugin/previewer.rs
+++ b/yazi-config/src/plugin/previewer.rs
@@ -1,10 +1,12 @@
 use std::{borrow::Cow, ops::Deref, sync::Arc};
 
+use mlua::{ExternalError, FromLua, IntoLua, Lua, Table, Value};
 use serde::Deserialize;
-use yazi_fs::File;
-use yazi_shared::{Id, event::Cmd};
+use yazi_binding::Iter;
+use yazi_fs::file::{File, FileRef};
+use yazi_shared::{event::Cmd, id::Id};
 
-use crate::{Mixable, Pattern, Selectable, Selector, plugin::{Previewers, previewer_id}};
+use crate::{Mixable, Pattern, Selectable, Selector, YAZI, plugin::{PreviewerArc, Previewers, previewer_id}};
 
 #[derive(Debug, Deserialize)]
 pub struct Previewer {
@@ -37,7 +39,7 @@ impl Mixable for Previewer {
 // --- Matcher
 #[derive(Default)]
 pub struct PreviewerMatcher<'a> {
-	pub previewers: Arc<Vec<Arc<Previewer>>>,
+	pub previewers: Arc<Vec<PreviewerArc>>,
 	pub id:         Id,
 	pub file:       Option<Cow<'a, File>>,
 	pub mime:       Option<Cow<'a, str>>,
@@ -64,7 +66,7 @@ impl PreviewerMatcher<'_> {
 }
 
 impl Iterator for PreviewerMatcher<'_> {
-	type Item = Arc<Previewer>;
+	type Item = PreviewerArc;
 
 	fn next(&mut self) -> Option<Self::Item> {
 		while let Some(previewer) = self.previewers.get(self.offset) {
@@ -76,3 +78,34 @@ impl Iterator for PreviewerMatcher<'_> {
 		None
 	}
 }
+
+impl TryFrom<Table> for PreviewerMatcher<'static> {
+	type Error = mlua::Error;
+
+	fn try_from(value: Table) -> Result<Self, Self::Error> {
+		let id: Id = value.raw_get("id").unwrap_or_default();
+		let file: Option<FileRef> = value.raw_get("file")?;
+		let mime: Option<String> = value.raw_get("mime")?;
+
+		Ok(Self {
+			previewers: YAZI.plugin.previewers.load_full(),
+			id,
+			file: file.map(|f| f.clone().into()),
+			mime: mime.map(Into::into),
+			..Default::default()
+		})
+	}
+}
+
+impl FromLua for PreviewerMatcher<'static> {
+	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
+		match value {
+			Value::Table(t) => t.try_into(),
+			_ => Err("expected a table of PreviewerMatcher".into_lua_err()),
+		}
+	}
+}
+
+impl IntoLua for PreviewerMatcher<'static> {
+	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> { Iter::new(self, None).into_lua(lua) }
+}
diff --git a/yazi-config/src/plugin/previewer_arc.rs b/yazi-config/src/plugin/previewer_arc.rs
new file mode 100644
index 00000000..059d60a6
--- /dev/null
+++ b/yazi-config/src/plugin/previewer_arc.rs
@@ -0,0 +1,40 @@
+use std::{ops::{Deref, DerefMut}, sync::Arc};
+
+use mlua::{FromLua, Lua, LuaSerdeExt, UserData, UserDataFields, Value};
+use serde::Deserialize;
+use yazi_shim::mlua::UserDataFieldsExt;
+
+use crate::{Mixable, plugin::Previewer};
+
+#[derive(Clone, Debug, Deserialize)]
+pub struct PreviewerArc(Arc<Previewer>);
+
+impl Deref for PreviewerArc {
+	type Target = Arc<Previewer>;
+
+	fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+impl DerefMut for PreviewerArc {
+	fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0 }
+}
+
+impl From<Previewer> for PreviewerArc {
+	fn from(value: Previewer) -> Self { Self(value.into()) }
+}
+
+impl Mixable for PreviewerArc {}
+
+impl FromLua for PreviewerArc {
+	fn from_lua(value: Value, lua: &Lua) -> mlua::Result<Self> {
+		Ok(lua.from_value::<Previewer>(value)?.into())
+	}
+}
+
+impl UserData for PreviewerArc {
+	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
+		fields.add_field_method_get("id", |_, me| Ok(me.id));
+
+		fields.add_cached_field("name", |lua, me| lua.create_string(&*me.name));
+	}
+}
diff --git a/yazi-config/src/plugin/previewers.rs b/yazi-config/src/plugin/previewers.rs
index d02a47e5..f61b5434 100644
--- a/yazi-config/src/plugin/previewers.rs
+++ b/yazi-config/src/plugin/previewers.rs
@@ -1,28 +1,29 @@
 use std::{borrow::Cow, ops::Deref, sync::Arc};
 
 use arc_swap::ArcSwap;
+use mlua::{ExternalError, ExternalResult, MetaMethod, UserData, UserDataMethods};
 use serde::Deserialize;
-use yazi_fs::File;
+use yazi_fs::file::File;
 use yazi_shim::{arc_swap::{ArcSwapExt, IntoPointee}, vec::{IndexAtError, VecExt}};
 
 use super::Previewer;
-use crate::{mix, plugin::PreviewerMatcher};
+use crate::{mix, plugin::{PreviewerArc, PreviewerMatcher}};
 
 #[derive(Debug, Default, Deserialize)]
-pub struct Previewers(ArcSwap<Vec<Arc<Previewer>>>);
+pub struct Previewers(ArcSwap<Vec<PreviewerArc>>);
 
 impl Deref for Previewers {
-	type Target = ArcSwap<Vec<Arc<Previewer>>>;
+	type Target = ArcSwap<Vec<PreviewerArc>>;
 
 	fn deref(&self) -> &Self::Target { &self.0 }
 }
 
-impl From<Vec<Arc<Previewer>>> for Previewers {
-	fn from(inner: Vec<Arc<Previewer>>) -> Self { Self(inner.into_pointee()) }
+impl From<Vec<PreviewerArc>> for Previewers {
+	fn from(inner: Vec<PreviewerArc>) -> Self { Self(inner.into_pointee()) }
 }
 
 impl Previewers {
-	pub fn matches(&self, file: &File, mime: &str) -> Option<Arc<Previewer>> {
+	pub fn matches(&self, file: &File, mime: &str) -> Option<PreviewerArc> {
 		self.matcher(Some(file), Some(mime)).next()
 	}
 
@@ -39,7 +40,7 @@ impl Previewers {
 		}
 	}
 
-	pub fn insert(&self, index: isize, previewer: Arc<Previewer>) -> Result<(), IndexAtError> {
+	pub fn insert(&self, index: isize, previewer: PreviewerArc) -> Result<(), IndexAtError> {
 		self.0.try_rcu(|previewers| {
 			let i = previewers.index_at(index)?;
 			if i == previewers.len() {
@@ -65,7 +66,36 @@ impl Previewers {
 		});
 	}
 
-	pub(crate) fn unwrap_unchecked(self) -> Vec<Arc<Previewer>> {
+	pub(crate) fn unwrap_unchecked(self) -> Vec<PreviewerArc> {
 		Arc::try_unwrap(self.0.into_inner()).expect("unique previewers arc")
 	}
 }
+
+impl UserData for &'static Previewers {
+	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
+		methods.add_method("match", |_, &me, matcher: Option<PreviewerMatcher>| {
+			Ok(match matcher {
+				Some(matcher) => matcher,
+				None => me.into(),
+			})
+		});
+
+		methods.add_method("insert", |_, &me, (index, previewer): (isize, PreviewerArc)| {
+			let index = match index {
+				1.. => index - 1,
+				0 => return Err("index must be 1-based or negative".into_lua_err()),
+				_ => index,
+			};
+
+			me.insert(index, previewer.clone()).into_lua_err()?;
+			Ok(previewer)
+		});
+
+		methods.add_method("remove", |_, &me, matcher: PreviewerMatcher| {
+			me.remove(matcher);
+			Ok(())
+		});
+
+		methods.add_meta_method(MetaMethod::Len, |_, &me, ()| Ok(me.load().len()));
+	}
+}
diff --git a/yazi-config/src/plugin/spotter.rs b/yazi-config/src/plugin/spotter.rs
index 60aafbe3..f52a64a7 100644
--- a/yazi-config/src/plugin/spotter.rs
+++ b/yazi-config/src/plugin/spotter.rs
@@ -1,10 +1,12 @@
 use std::{borrow::Cow, ops::Deref, sync::Arc};
 
+use mlua::{ExternalError, FromLua, IntoLua, Lua, Table, Value};
 use serde::Deserialize;
-use yazi_fs::File;
-use yazi_shared::{Id, event::Cmd};
+use yazi_binding::Iter;
+use yazi_fs::file::{File, FileRef};
+use yazi_shared::{event::Cmd, id::Id};
 
-use crate::{Mixable, Pattern, Selectable, Selector, plugin::{Spotters, spotter_id}};
+use crate::{Mixable, Pattern, Selectable, Selector, YAZI, plugin::{SpotterArc, Spotters, spotter_id}};
 
 #[derive(Debug, Deserialize)]
 pub struct Spotter {
@@ -37,7 +39,7 @@ impl Mixable for Spotter {
 // --- Matcher
 #[derive(Default)]
 pub struct SpotterMatcher<'a> {
-	pub spotters: Arc<Vec<Arc<Spotter>>>,
+	pub spotters: Arc<Vec<SpotterArc>>,
 	pub id:       Id,
 	pub file:     Option<Cow<'a, File>>,
 	pub mime:     Option<Cow<'a, str>>,
@@ -64,7 +66,7 @@ impl SpotterMatcher<'_> {
 }
 
 impl Iterator for SpotterMatcher<'_> {
-	type Item = Arc<Spotter>;
+	type Item = SpotterArc;
 
 	fn next(&mut self) -> Option<Self::Item> {
 		while let Some(spotter) = self.spotters.get(self.offset) {
@@ -76,3 +78,34 @@ impl Iterator for SpotterMatcher<'_> {
 		None
 	}
 }
+
+impl TryFrom<Table> for SpotterMatcher<'static> {
+	type Error = mlua::Error;
+
+	fn try_from(value: Table) -> Result<Self, Self::Error> {
+		let id: Id = value.raw_get("id").unwrap_or_default();
+		let file: Option<FileRef> = value.raw_get("file")?;
+		let mime: Option<String> = value.raw_get("mime")?;
+
+		Ok(Self {
+			spotters: YAZI.plugin.spotters.load_full(),
+			id,
+			file: file.map(|f| f.clone().into()),
+			mime: mime.map(Into::into),
+			..Default::default()
+		})
+	}
+}
+
+impl FromLua for SpotterMatcher<'static> {
+	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
+		match value {
+			Value::Table(t) => t.try_into(),
+			_ => Err("expected a table of SpotterMatcher".into_lua_err()),
+		}
+	}
+}
+
+impl IntoLua for SpotterMatcher<'static> {
+	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> { Iter::new(self, None).into_lua(lua) }
+}
diff --git a/yazi-config/src/plugin/spotter_arc.rs b/yazi-config/src/plugin/spotter_arc.rs
new file mode 100644
index 00000000..983db941
--- /dev/null
+++ b/yazi-config/src/plugin/spotter_arc.rs
@@ -0,0 +1,34 @@
+use std::{ops::{Deref, DerefMut}, sync::Arc};
+
+use mlua::{UserData, UserDataFields};
+use serde::Deserialize;
+use yazi_shim::mlua::UserDataFieldsExt;
+
+use crate::{Mixable, plugin::Spotter};
+
+#[derive(Clone, Debug, Deserialize)]
+pub struct SpotterArc(Arc<Spotter>);
+
+impl Deref for SpotterArc {
+	type Target = Arc<Spotter>;
+
+	fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+impl DerefMut for SpotterArc {
+	fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0 }
+}
+
+impl From<Spotter> for SpotterArc {
+	fn from(value: Spotter) -> Self { Self(value.into()) }
+}
+
+impl Mixable for SpotterArc {}
+
+impl UserData for SpotterArc {
+	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
+		fields.add_field_method_get("id", |_, me| Ok(me.id));
+
+		fields.add_cached_field("name", |lua, me| lua.create_string(&*me.name));
+	}
+}
diff --git a/yazi-config/src/plugin/spotters.rs b/yazi-config/src/plugin/spotters.rs
index 4c092ffa..ef26aa0c 100644
--- a/yazi-config/src/plugin/spotters.rs
+++ b/yazi-config/src/plugin/spotters.rs
@@ -1,29 +1,29 @@
 use std::{borrow::Cow, ops::Deref, sync::Arc};
 
 use arc_swap::ArcSwap;
+use mlua::{MetaMethod, UserData, UserDataMethods};
 use serde::Deserialize;
-use yazi_fs::File;
-use yazi_shared::Id;
+use yazi_fs::file::File;
+use yazi_shared::id::Id;
 use yazi_shim::arc_swap::IntoPointee;
 
-use super::Spotter;
-use crate::plugin::SpotterMatcher;
+use crate::plugin::{SpotterArc, SpotterMatcher};
 
 #[derive(Debug, Default, Deserialize)]
-pub struct Spotters(ArcSwap<Vec<Arc<Spotter>>>);
+pub struct Spotters(ArcSwap<Vec<SpotterArc>>);
 
 impl Deref for Spotters {
-	type Target = ArcSwap<Vec<Arc<Spotter>>>;
+	type Target = ArcSwap<Vec<SpotterArc>>;
 
 	fn deref(&self) -> &Self::Target { &self.0 }
 }
 
-impl From<Vec<Arc<Spotter>>> for Spotters {
-	fn from(inner: Vec<Arc<Spotter>>) -> Self { Self(inner.into_pointee()) }
+impl From<Vec<SpotterArc>> for Spotters {
+	fn from(inner: Vec<SpotterArc>) -> Self { Self(inner.into_pointee()) }
 }
 
 impl Spotters {
-	pub fn matches(&self, file: &File, mime: &str) -> Option<Arc<Spotter>> {
+	pub fn matches(&self, file: &File, mime: &str) -> Option<SpotterArc> {
 		self.matcher(Some(file), Some(mime)).next()
 	}
 
@@ -41,7 +41,20 @@ impl Spotters {
 		}
 	}
 
-	pub(crate) fn unwrap_unchecked(self) -> Vec<Arc<Spotter>> {
+	pub(crate) fn unwrap_unchecked(self) -> Vec<SpotterArc> {
 		Arc::try_unwrap(self.0.into_inner()).expect("unique spotters arc")
 	}
 }
+
+impl UserData for &'static Spotters {
+	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
+		methods.add_method("match", |_, &me, matcher: Option<SpotterMatcher>| {
+			Ok(match matcher {
+				Some(matcher) => matcher,
+				None => me.into(),
+			})
+		});
+
+		methods.add_meta_method(MetaMethod::Len, |_, me, ()| Ok(me.load().len()));
+	}
+}
diff --git a/yazi-config/src/popup/confirm.rs b/yazi-config/src/popup/confirm.rs
index 89941f0c..3cd8a989 100644
--- a/yazi-config/src/popup/confirm.rs
+++ b/yazi-config/src/popup/confirm.rs
@@ -1,9 +1,7 @@
 use serde::Deserialize;
+use yazi_binding::position::{Offset, Origin, Position};
 use yazi_codegen::{DeserializeOver, DeserializeOver2};
 
-use super::{Offset, Origin};
-use crate::popup::Position;
-
 #[derive(Deserialize, DeserializeOver, DeserializeOver2)]
 pub struct Confirm {
 	// trash
diff --git a/yazi-config/src/popup/input.rs b/yazi-config/src/popup/input.rs
index 55e335d7..e28608ac 100644
--- a/yazi-config/src/popup/input.rs
+++ b/yazi-config/src/popup/input.rs
@@ -1,7 +1,8 @@
 use serde::Deserialize;
+use yazi_binding::position::{Offset, Origin, Position};
 use yazi_codegen::{DeserializeOver, DeserializeOver2};
-
-use super::{Offset, Origin};
+use yazi_shared::{scheme::Encode as EncodeScheme, url::Url};
+use yazi_widgets::input::InputOpt;
 
 #[derive(Deserialize, DeserializeOver, DeserializeOver2)]
 pub struct Input {
@@ -44,5 +45,76 @@ pub struct Input {
 }
 
 impl Input {
-	pub const fn border(&self) -> u16 { 2 }
+	pub fn cd(&self, cwd: Url) -> InputOpt {
+		InputOpt {
+			title: self.cd_title.clone(),
+			value: if cwd.kind().is_local() { String::new() } else { EncodeScheme(cwd).to_string() },
+			position: Position::new(self.cd_origin, self.cd_offset),
+			completion: true,
+			..Default::default()
+		}
+	}
+
+	pub fn create(&self, dir: bool) -> InputOpt {
+		InputOpt {
+			title: self.create_title[dir as usize].clone(),
+			position: Position::new(self.create_origin, self.create_offset),
+			..Default::default()
+		}
+	}
+
+	pub fn rename(&self) -> InputOpt {
+		InputOpt {
+			title: self.rename_title.clone(),
+			position: Position::new(self.rename_origin, self.rename_offset),
+			..Default::default()
+		}
+	}
+
+	pub fn filter(&self) -> InputOpt {
+		InputOpt {
+			title: self.filter_title.clone(),
+			position: Position::new(self.filter_origin, self.filter_offset),
+			realtime: true,
+			..Default::default()
+		}
+	}
+
+	pub fn find(&self, prev: bool) -> InputOpt {
+		InputOpt {
+			title: self.find_title[prev as usize].clone(),
+			position: Position::new(self.find_origin, self.find_offset),
+			realtime: true,
+			..Default::default()
+		}
+	}
+
+	pub fn search(&self, name: &str) -> InputOpt {
+		InputOpt {
+			title: self.search_title.replace("{n}", name),
+			position: Position::new(self.search_origin, self.search_offset),
+			..Default::default()
+		}
+	}
+
+	pub fn shell(&self, block: bool) -> InputOpt {
+		InputOpt {
+			title: self.shell_title[block as usize].clone(),
+			position: Position::new(self.shell_origin, self.shell_offset),
+			..Default::default()
+		}
+	}
+
+	pub fn tab_rename(&self) -> InputOpt {
+		InputOpt {
+			title: "Rename tab:".to_owned(),
+			position: Position::new(Origin::TopCenter, Offset {
+				x:      0,
+				y:      2,
+				width:  50,
+				height: 3,
+			}),
+			..Default::default()
+		}
+	}
 }
diff --git a/yazi-config/src/popup/mod.rs b/yazi-config/src/popup/mod.rs
index 520d083a..a723fb30 100644
--- a/yazi-config/src/popup/mod.rs
+++ b/yazi-config/src/popup/mod.rs
@@ -1 +1 @@
-yazi_macro::mod_flat!(confirm input offset options origin pick position);
+yazi_macro::mod_flat!(confirm input options pick);
diff --git a/yazi-config/src/popup/options.rs b/yazi-config/src/popup/options.rs
index 6170bfd9..e9906020 100644
--- a/yazi-config/src/popup/options.rs
+++ b/yazi-config/src/popup/options.rs
@@ -1,20 +1,12 @@
-use ratatui::{text::{Line, Text}, widgets::{Paragraph, Wrap}};
-use yazi_shared::{scheme::Encode as EncodeScheme, strand::ToStrand, url::{Url, UrlBuf}};
+use ratatui_core::text::{Line, Text};
+use ratatui_widgets::paragraph::{Paragraph, Wrap};
+use yazi_binding::position::Position;
+use yazi_macro::impl_data_any;
+use yazi_shared::{strand::ToStrand, url::UrlBuf};
 
-use super::{Offset, Position};
-use crate::{YAZI, popup::Origin};
-
-#[derive(Clone, Debug, Default)]
-pub struct InputCfg {
-	pub title:      String,
-	pub value:      String,
-	pub cursor:     Option<usize>,
-	pub obscure:    bool,
-	pub position:   Position,
-	pub realtime:   bool,
-	pub completion: bool,
-}
+use crate::YAZI;
 
+// --- PickCfg
 #[derive(Clone, Debug, Default)]
 pub struct PickCfg {
 	pub title:    String,
@@ -22,6 +14,9 @@ pub struct PickCfg {
 	pub position: Position,
 }
 
+impl_data_any!(PickCfg);
+
+// --- ConfirmCfg
 #[derive(Clone, Debug, Default)]
 pub struct ConfirmCfg {
 	pub position: Position,
@@ -30,92 +25,7 @@ pub struct ConfirmCfg {
 	pub list:     Paragraph<'static>,
 }
 
-impl InputCfg {
-	pub fn cd(cwd: Url) -> Self {
-		Self {
-			title: YAZI.input.cd_title.clone(),
-			value: if cwd.kind().is_local() { String::new() } else { EncodeScheme(cwd).to_string() },
-			position: Position::new(YAZI.input.cd_origin, YAZI.input.cd_offset),
-			completion: true,
-			..Default::default()
-		}
-	}
-
-	pub fn create(dir: bool) -> Self {
-		Self {
-			title: YAZI.input.create_title[dir as usize].clone(),
-			position: Position::new(YAZI.input.create_origin, YAZI.input.create_offset),
-			..Default::default()
-		}
-	}
-
-	pub fn rename() -> Self {
-		Self {
-			title: YAZI.input.rename_title.clone(),
-			position: Position::new(YAZI.input.rename_origin, YAZI.input.rename_offset),
-			..Default::default()
-		}
-	}
-
-	pub fn filter() -> Self {
-		Self {
-			title: YAZI.input.filter_title.clone(),
-			position: Position::new(YAZI.input.filter_origin, YAZI.input.filter_offset),
-			realtime: true,
-			..Default::default()
-		}
-	}
-
-	pub fn find(prev: bool) -> Self {
-		Self {
-			title: YAZI.input.find_title[prev as usize].clone(),
-			position: Position::new(YAZI.input.find_origin, YAZI.input.find_offset),
-			realtime: true,
-			..Default::default()
-		}
-	}
-
-	pub fn search(name: &str) -> Self {
-		Self {
-			title: YAZI.input.search_title.replace("{n}", name),
-			position: Position::new(YAZI.input.search_origin, YAZI.input.search_offset),
-			..Default::default()
-		}
-	}
-
-	pub fn shell(block: bool) -> Self {
-		Self {
-			title: YAZI.input.shell_title[block as usize].clone(),
-			position: Position::new(YAZI.input.shell_origin, YAZI.input.shell_offset),
-			..Default::default()
-		}
-	}
-
-	pub fn tab_rename() -> Self {
-		Self {
-			title: "Rename tab:".to_owned(),
-			position: Position::new(Origin::TopCenter, Offset {
-				x:      0,
-				y:      2,
-				width:  50,
-				height: 3,
-			}),
-			..Default::default()
-		}
-	}
-
-	#[inline]
-	pub fn with_value(mut self, value: impl Into<String>) -> Self {
-		self.value = value.into();
-		self
-	}
-
-	#[inline]
-	pub fn with_cursor(mut self, cursor: Option<usize>) -> Self {
-		self.cursor = cursor;
-		self
-	}
-}
+impl_data_any!(ConfirmCfg);
 
 impl ConfirmCfg {
 	fn new(
@@ -188,21 +98,3 @@ impl ConfirmCfg {
 		Some(Text::from_iter(lines))
 	}
 }
-
-impl PickCfg {
-	fn max_height(len: usize) -> u16 {
-		YAZI.pick.open_offset.height.min(YAZI.pick.border().saturating_add(len as u16))
-	}
-
-	pub fn open(items: Vec<String>) -> Self {
-		let max_height = Self::max_height(items.len());
-		Self {
-			title: YAZI.pick.open_title.clone(),
-			items,
-			position: Position::new(YAZI.pick.open_origin, Offset {
-				height: max_height,
-				..YAZI.pick.open_offset
-			}),
-		}
-	}
-}
diff --git a/yazi-config/src/popup/pick.rs b/yazi-config/src/popup/pick.rs
index b723f1ba..2a04139e 100644
--- a/yazi-config/src/popup/pick.rs
+++ b/yazi-config/src/popup/pick.rs
@@ -1,7 +1,8 @@
 use serde::Deserialize;
+use yazi_binding::position::{Offset, Origin, Position};
 use yazi_codegen::{DeserializeOver, DeserializeOver2};
 
-use super::{Offset, Origin};
+use crate::popup::PickCfg;
 
 #[derive(Deserialize, DeserializeOver, DeserializeOver2)]
 pub struct Pick {
@@ -12,5 +13,18 @@ pub struct Pick {
 }
 
 impl Pick {
-	pub const fn border(&self) -> u16 { 2 }
+	pub const BORDER: u16 = 2;
+
+	fn max_height(&self, len: usize) -> u16 {
+		self.open_offset.height.min(Self::BORDER.saturating_add(len as u16))
+	}
+
+	pub fn open(&self, items: Vec<String>) -> PickCfg {
+		let max_height = self.max_height(items.len());
+		PickCfg {
+			title: self.open_title.clone(),
+			items,
+			position: Position::new(self.open_origin, Offset { height: max_height, ..self.open_offset }),
+		}
+	}
 }
diff --git a/yazi-config/src/preset.rs b/yazi-config/src/preset.rs
index 2ab67ec6..06cc992f 100644
--- a/yazi-config/src/preset.rs
+++ b/yazi-config/src/preset.rs
@@ -1,4 +1,4 @@
-use crate::{Yazi, keymap::Keymap, theme::Theme, vfs::Vfs};
+use crate::{Yazi, keymap::Keymap, theme::Theme};
 
 pub(crate) struct Preset;
 
@@ -18,8 +18,4 @@ impl Preset {
 			yazi_macro::theme_preset!("dark")
 		})
 	}
-
-	pub(super) fn vfs() -> Result<Vfs, toml::de::Error> {
-		toml::from_str(&yazi_macro::config_preset!("vfs"))
-	}
 }
diff --git a/yazi-config/src/preview/preview.rs b/yazi-config/src/preview/preview.rs
index 4556a110..f285dcd1 100644
--- a/yazi-config/src/preview/preview.rs
+++ b/yazi-config/src/preview/preview.rs
@@ -1,16 +1,13 @@
-#[cfg(unix)]
-use std::os::unix::fs::DirBuilderExt;
-use std::{fs::DirBuilder, path::PathBuf};
+use std::path::PathBuf;
 
 use anyhow::{Context, Result};
 use serde::{Deserialize, Deserializer, Serialize};
 use yazi_codegen::DeserializeOver2;
-use yazi_fs::Xdg;
-use yazi_shared::{SStr, timestamp_us};
-use yazi_shim::toml::DeserializeOverHook;
+use yazi_fs::{Xdg, create_owned_dir_blocking, path::sanitize_path};
+use yazi_shared::timestamp_us;
+use yazi_shim::{SStr, toml::DeserializeOverHook};
 
 use super::PreviewWrap;
-use crate::normalize_path;
 
 #[derive(Debug, Deserialize, DeserializeOver2, Serialize)]
 pub struct Preview {
@@ -51,12 +48,7 @@ impl Preview {
 
 impl DeserializeOverHook for Preview {
 	fn deserialize_over_hook(self) -> Result<Self, toml::de::Error> {
-		#[cfg(unix)]
-		let result = DirBuilder::new().mode(0o700).recursive(true).create(&self.cache_dir);
-		#[cfg(not(unix))]
-		let result = DirBuilder::new().recursive(true).create(&self.cache_dir);
-
-		result
+		create_owned_dir_blocking(&self.cache_dir)
 			.context(format!("Failed to create cache directory: {}", self.cache_dir.display()))
 			.map_err(serde::de::Error::custom)?;
 
@@ -72,7 +64,7 @@ where
 	if path.as_os_str().is_empty() {
 		Ok(Xdg::temp_dir().to_owned())
 	} else {
-		normalize_path(path).ok_or_else(|| {
+		sanitize_path(path).ok_or_else(|| {
 			serde::de::Error::custom("cache_dir must be either empty or an absolute path.")
 		})
 	}
diff --git a/yazi-config/src/preview/wrap.rs b/yazi-config/src/preview/wrap.rs
index ca9a42bf..d37d12c1 100644
--- a/yazi-config/src/preview/wrap.rs
+++ b/yazi-config/src/preview/wrap.rs
@@ -7,11 +7,20 @@ pub enum PreviewWrap {
 	Yes,
 }
 
-impl From<PreviewWrap> for Option<ratatui::widgets::Wrap> {
+impl From<PreviewWrap> for Option<ratatui_widgets::paragraph::Wrap> {
 	fn from(wrap: PreviewWrap) -> Self {
 		match wrap {
 			PreviewWrap::No => None,
-			PreviewWrap::Yes => Some(ratatui::widgets::Wrap { trim: false }),
+			PreviewWrap::Yes => Some(ratatui_widgets::paragraph::Wrap { trim: false }),
 		}
 	}
 }
+
+impl From<PreviewWrap> for yazi_binding::elements::Wrap {
+	fn from(value: PreviewWrap) -> Self {
+		Self(match value {
+			PreviewWrap::No => None,
+			PreviewWrap::Yes => Some(ratatui_widgets::paragraph::Wrap { trim: false }),
+		})
+	}
+}
diff --git a/yazi-config/src/selectable.rs b/yazi-config/src/selectable.rs
index e3f07d35..0cac571d 100644
--- a/yazi-config/src/selectable.rs
+++ b/yazi-config/src/selectable.rs
@@ -1,4 +1,4 @@
-use yazi_fs::File;
+use yazi_fs::file::File;
 
 use crate::Pattern;
 
diff --git a/yazi-config/src/theme/custom_field.rs b/yazi-config/src/theme/custom_field.rs
index 2e6f55c7..74a2d04e 100644
--- a/yazi-config/src/theme/custom_field.rs
+++ b/yazi-config/src/theme/custom_field.rs
@@ -1,12 +1,19 @@
+use mlua::{IntoLua, Lua, Value};
 use serde::Deserialize;
+use yazi_binding::style::{Style, StyleFlat};
 
 #[derive(Clone, Debug, Deserialize)]
 #[serde(untagged)]
 pub enum CustomField {
-	Style(crate::Style),
+	Style(StyleFlat),
 	String(String),
 }
 
-impl From<&Self> for CustomField {
-	fn from(value: &Self) -> Self { value.clone() }
+impl IntoLua for CustomField {
+	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> {
+		match self {
+			Self::Style(style) => Style::from(style).into_lua(lua),
+			Self::String(s) => s.into_lua(lua),
+		}
+	}
 }
diff --git a/yazi-config/src/theme/custom_section_arc.rs b/yazi-config/src/theme/custom_section_arc.rs
new file mode 100644
index 00000000..fa26dadc
--- /dev/null
+++ b/yazi-config/src/theme/custom_section_arc.rs
@@ -0,0 +1,27 @@
+use std::{ops::Deref, sync::Arc};
+
+use hashbrown::HashMap;
+use mlua::{MetaMethod, UserData, UserDataMethods};
+use yazi_shared::SnakeCasedString;
+
+use crate::theme::{CustomField, CustomSection};
+
+pub struct CustomSectionArc(Arc<HashMap<SnakeCasedString, CustomField>>);
+
+impl Deref for CustomSectionArc {
+	type Target = Arc<HashMap<SnakeCasedString, CustomField>>;
+
+	fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+impl From<&CustomSection> for CustomSectionArc {
+	fn from(value: &CustomSection) -> Self { Self(value.load_full()) }
+}
+
+impl UserData for CustomSectionArc {
+	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
+		methods.add_meta_method(MetaMethod::Index, |_, me, key: mlua::String| {
+			Ok(me.get(&*key.to_str()?).cloned())
+		});
+	}
+}
diff --git a/yazi-config/src/theme/filetype.rs b/yazi-config/src/theme/filetype.rs
index 96515b64..095640b6 100644
--- a/yazi-config/src/theme/filetype.rs
+++ b/yazi-config/src/theme/filetype.rs
@@ -1,9 +1,10 @@
 use serde::Deserialize;
+use yazi_binding::style::StyleFlat;
 use yazi_codegen::{DeserializeOver, DeserializeOver2, Overlay};
-use yazi_fs::File;
+use yazi_fs::file::File;
 
 use super::FiletypeRules;
-use crate::{Selectable, Style};
+use crate::Selectable;
 
 #[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
 pub struct Filetype {
@@ -11,7 +12,7 @@ pub struct Filetype {
 }
 
 impl Filetype {
-	pub fn match_style(&self, file: &File, mime: &str) -> Option<Style> {
+	pub fn match_style(&self, file: &File, mime: &str) -> Option<StyleFlat> {
 		self.rules.load().iter().find(|rule| rule.matches(file, mime)).map(|rule| rule.style)
 	}
 }
diff --git a/yazi-config/src/theme/filetype_rule.rs b/yazi-config/src/theme/filetype_rule.rs
index 5bccee00..75eb0088 100644
--- a/yazi-config/src/theme/filetype_rule.rs
+++ b/yazi-config/src/theme/filetype_rule.rs
@@ -1,4 +1,6 @@
 use serde::Deserialize;
+use yazi_binding::style::StyleFlat;
+use yazi_fs::file::File;
 
 use crate::{Pattern, Selectable};
 
@@ -9,7 +11,7 @@ pub struct FiletypeRule {
 	#[serde(flatten)]
 	selector:  crate::Selector,
 	#[serde(flatten)]
-	pub style: crate::Style,
+	pub style: StyleFlat,
 }
 
 impl Selectable for FiletypeRule {
@@ -17,7 +19,7 @@ impl Selectable for FiletypeRule {
 
 	fn mime_pat(&self) -> Option<&Pattern> { self.selector.mime_pat() }
 
-	fn match_with(&self, file: Option<&yazi_fs::File>, mime: Option<&str>) -> bool {
+	fn match_with(&self, file: Option<&File>, mime: Option<&str>) -> bool {
 		match (self.is.enabled(), file) {
 			(Some(is), Some(f)) if !is.check(&f.cha) => false,
 			(Some(_), None) => false,
diff --git a/yazi-config/src/theme/icon.rs b/yazi-config/src/theme/icon.rs
index b5e6abe4..d8f6622b 100644
--- a/yazi-config/src/theme/icon.rs
+++ b/yazi-config/src/theme/icon.rs
@@ -2,7 +2,7 @@ use anyhow::Result;
 use hashbrown::HashMap;
 use serde::Deserialize;
 use yazi_codegen::{DeserializeOver2, Overlay};
-use yazi_fs::File;
+use yazi_fs::file::File;
 use yazi_shared::{NonEmptyString, url::UrlLike};
 use yazi_shim::toml::DeserializeOverHook;
 
diff --git a/yazi-config/src/theme/icon_cond.rs b/yazi-config/src/theme/icon_cond.rs
index 82e182c2..3e336916 100644
--- a/yazi-config/src/theme/icon_cond.rs
+++ b/yazi-config/src/theme/icon_cond.rs
@@ -1,5 +1,5 @@
 use serde::Deserialize;
-use yazi_fs::File;
+use yazi_fs::file::File;
 use yazi_shared::Condition;
 
 use crate::{Icon, Mixable};
diff --git a/yazi-config/src/theme/icon_conds.rs b/yazi-config/src/theme/icon_conds.rs
index 0f86964a..b025c838 100644
--- a/yazi-config/src/theme/icon_conds.rs
+++ b/yazi-config/src/theme/icon_conds.rs
@@ -3,7 +3,7 @@ use std::{ops::Deref, sync::Arc};
 use arc_swap::ArcSwap;
 use serde::Deserialize;
 use yazi_codegen::Overlay;
-use yazi_fs::File;
+use yazi_fs::file::File;
 use yazi_shim::arc_swap::IntoPointee;
 
 use crate::{Icon, theme::IconCond};
diff --git a/yazi-config/src/theme/icon_globs.rs b/yazi-config/src/theme/icon_globs.rs
index 840b4f00..4272b74e 100644
--- a/yazi-config/src/theme/icon_globs.rs
+++ b/yazi-config/src/theme/icon_globs.rs
@@ -3,7 +3,7 @@ use std::{ops::Deref, sync::Arc};
 use arc_swap::ArcSwap;
 use serde::Deserialize;
 use yazi_codegen::Overlay;
-use yazi_fs::File;
+use yazi_fs::file::File;
 use yazi_shim::arc_swap::IntoPointee;
 
 use crate::{Icon, Selectable, theme::IconGlob};
diff --git a/yazi-config/src/theme/mod.rs b/yazi-config/src/theme/mod.rs
index 4637adfd..2817aff5 100644
--- a/yazi-config/src/theme/mod.rs
+++ b/yazi-config/src/theme/mod.rs
@@ -1 +1 @@
-yazi_macro::mod_flat!(custom custom_field custom_section filetype filetype_rule filetype_rules flavor icon icon_cond icon_conds icon_glob icon_globs icon_names is theme);
+yazi_macro::mod_flat!(custom custom_field custom_section custom_section_arc filetype filetype_rule filetype_rules flavor icon icon_cond icon_conds icon_glob icon_globs icon_names is theme);
diff --git a/yazi-config/src/theme/theme.rs b/yazi-config/src/theme/theme.rs
index 6f551911..5f507347 100644
--- a/yazi-config/src/theme/theme.rs
+++ b/yazi-config/src/theme/theme.rs
@@ -3,12 +3,12 @@ use std::path::PathBuf;
 use anyhow::{Context, Result};
 use arc_swap::ArcSwap;
 use serde::{Deserialize, Deserializer, de};
+use yazi_binding::style::StyleFlat;
 use yazi_codegen::{DeserializeOver, DeserializeOver1, DeserializeOver2, Overlay};
-use yazi_fs::{Xdg, ok_or_not_found};
+use yazi_fs::{Xdg, ok_or_not_found, path::sanitize_path};
 use yazi_shim::{arc_swap::IntoPointee, cell::SyncCell};
 
 use super::{Custom, Filetype, Flavor, Icon};
-use crate::{Style, normalize_path};
 
 #[derive(Deserialize, DeserializeOver, DeserializeOver1, Overlay)]
 pub struct Theme {
@@ -38,197 +38,6 @@ pub struct Theme {
 	pub custom: Custom,
 }
 
-#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
-pub struct App {
-	pub overall: SyncCell<Style>,
-}
-
-#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
-pub struct Mgr {
-	pub cwd: SyncCell<Style>,
-
-	// Find
-	pub find_keyword:  SyncCell<Style>,
-	pub find_position: SyncCell<Style>,
-
-	// Symlink
-	pub symlink_target: SyncCell<Style>,
-
-	// Marker
-	pub marker_copied:   SyncCell<Style>,
-	pub marker_cut:      SyncCell<Style>,
-	pub marker_marked:   SyncCell<Style>,
-	pub marker_selected: SyncCell<Style>,
-	pub marker_symbol:   ArcSwap<String>,
-
-	// Count
-	pub count_copied:   SyncCell<Style>,
-	pub count_cut:      SyncCell<Style>,
-	pub count_selected: SyncCell<Style>,
-
-	// Border
-	pub border_symbol: ArcSwap<String>,
-	pub border_style:  SyncCell<Style>,
-
-	// Highlighting
-	#[serde(deserialize_with = "deserialize_syntect_theme")]
-	pub syntect_theme: ArcSwap<PathBuf>,
-}
-
-#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
-pub struct Tabs {
-	pub active:   SyncCell<Style>,
-	pub inactive: SyncCell<Style>,
-
-	pub sep_inner: ArcSwap<TabsSep>,
-	pub sep_outer: ArcSwap<TabsSep>,
-}
-
-#[derive(Deserialize)]
-pub struct TabsSep {
-	pub open:  String,
-	pub close: String,
-}
-
-#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
-pub struct Mode {
-	pub normal_main: SyncCell<Style>,
-	pub normal_alt:  SyncCell<Style>,
-
-	pub select_main: SyncCell<Style>,
-	pub select_alt:  SyncCell<Style>,
-
-	pub unset_main: SyncCell<Style>,
-	pub unset_alt:  SyncCell<Style>,
-}
-
-#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
-pub struct Indicator {
-	pub parent:  SyncCell<Style>,
-	pub current: SyncCell<Style>,
-	pub preview: SyncCell<Style>,
-	pub padding: ArcSwap<IndicatorPadding>,
-}
-
-#[derive(Deserialize)]
-pub struct IndicatorPadding {
-	pub open:  String,
-	pub close: String,
-}
-
-#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
-pub struct Status {
-	pub overall:   SyncCell<Style>,
-	pub sep_left:  ArcSwap<StatusSep>,
-	pub sep_right: ArcSwap<StatusSep>,
-
-	// Permissions
-	pub perm_sep:   SyncCell<Style>,
-	pub perm_type:  SyncCell<Style>,
-	pub perm_read:  SyncCell<Style>,
-	pub perm_write: SyncCell<Style>,
-	pub perm_exec:  SyncCell<Style>,
-
-	// Progress
-	pub progress_label:  SyncCell<Style>,
-	pub progress_normal: SyncCell<Style>,
-	pub progress_error:  SyncCell<Style>,
-}
-
-#[derive(Deserialize)]
-pub struct StatusSep {
-	pub open:  String,
-	pub close: String,
-}
-
-#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
-pub struct Which {
-	#[serde(deserialize_with = "deserialize_which_cols")]
-	pub cols: SyncCell<u8>,
-	pub mask: SyncCell<Style>,
-	pub cand: SyncCell<Style>,
-	pub rest: SyncCell<Style>,
-	pub desc: SyncCell<Style>,
-
-	pub separator:       ArcSwap<String>,
-	pub separator_style: SyncCell<Style>,
-}
-
-#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
-pub struct Confirm {
-	pub border: SyncCell<Style>,
-	pub title:  SyncCell<Style>,
-	pub body:   SyncCell<Style>,
-	pub list:   SyncCell<Style>,
-
-	pub btn_yes:    SyncCell<Style>,
-	pub btn_no:     SyncCell<Style>,
-	pub btn_labels: ArcSwap<[String; 2]>,
-}
-
-#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
-pub struct Spot {
-	pub border: SyncCell<Style>,
-	pub title:  SyncCell<Style>,
-
-	pub tbl_col:  SyncCell<Style>,
-	pub tbl_cell: SyncCell<Style>,
-}
-
-#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
-pub struct Notify {
-	pub title_info:  SyncCell<Style>,
-	pub title_warn:  SyncCell<Style>,
-	pub title_error: SyncCell<Style>,
-
-	pub icon_info:  ArcSwap<String>,
-	pub icon_warn:  ArcSwap<String>,
-	pub icon_error: ArcSwap<String>,
-}
-
-#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
-pub struct Pick {
-	pub border:   SyncCell<Style>,
-	pub active:   SyncCell<Style>,
-	pub inactive: SyncCell<Style>,
-}
-
-#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
-pub struct Input {
-	pub border:   SyncCell<Style>,
-	pub title:    SyncCell<Style>,
-	pub value:    SyncCell<Style>,
-	pub selected: SyncCell<Style>,
-}
-
-#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
-pub struct Cmp {
-	pub border:   SyncCell<Style>,
-	pub active:   SyncCell<Style>,
-	pub inactive: SyncCell<Style>,
-
-	pub icon_file:    ArcSwap<String>,
-	pub icon_folder:  ArcSwap<String>,
-	pub icon_command: ArcSwap<String>,
-}
-
-#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
-pub struct Tasks {
-	pub border:  SyncCell<Style>,
-	pub title:   SyncCell<Style>,
-	pub hovered: SyncCell<Style>,
-}
-
-#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
-pub struct Help {
-	pub on:   SyncCell<Style>,
-	pub run:  SyncCell<Style>,
-	pub desc: SyncCell<Style>,
-
-	pub hovered: SyncCell<Style>,
-	pub footer:  SyncCell<Style>,
-}
-
 impl Theme {
 	pub(crate) fn read() -> Result<String> {
 		let p = Xdg::config_dir().join("theme.toml");
@@ -246,19 +55,225 @@ impl Theme {
 	}
 }
 
-impl App {
-	pub fn bg_color(&self) -> String {
-		self.overall.get().bg.map(|c| c.to_string()).unwrap_or_default()
+// --- App
+#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
+pub struct App {
+	pub overall: SyncCell<StyleFlat>,
+}
+
+// --- Mgr
+#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
+pub struct Mgr {
+	pub cwd: SyncCell<StyleFlat>,
+
+	// Find
+	pub find_keyword:  SyncCell<StyleFlat>,
+	pub find_position: SyncCell<StyleFlat>,
+
+	// Symlink
+	pub symlink_target: SyncCell<StyleFlat>,
+
+	// Marker
+	pub marker_copied:   SyncCell<StyleFlat>,
+	pub marker_cut:      SyncCell<StyleFlat>,
+	pub marker_marked:   SyncCell<StyleFlat>,
+	pub marker_selected: SyncCell<StyleFlat>,
+	pub marker_symbol:   ArcSwap<String>,
+
+	// Count
+	pub count_copied:   SyncCell<StyleFlat>,
+	pub count_cut:      SyncCell<StyleFlat>,
+	pub count_selected: SyncCell<StyleFlat>,
+
+	// Border
+	pub border_symbol: ArcSwap<String>,
+	pub border_style:  SyncCell<StyleFlat>,
+
+	// Highlighting
+	#[serde(deserialize_with = "deserialize_syntect_theme")]
+	pub syntect_theme: ArcSwap<PathBuf>,
+}
+
+// --- Tabs
+#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
+pub struct Tabs {
+	pub active:   SyncCell<StyleFlat>,
+	pub inactive: SyncCell<StyleFlat>,
+
+	pub sep_inner: ArcSwap<TabsSep>,
+	pub sep_outer: ArcSwap<TabsSep>,
+}
+
+#[derive(Deserialize)]
+pub struct TabsSep {
+	pub open:  String,
+	pub close: String,
+}
+
+// --- Mode
+#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
+pub struct Mode {
+	pub normal_main: SyncCell<StyleFlat>,
+	pub normal_alt:  SyncCell<StyleFlat>,
+
+	pub select_main: SyncCell<StyleFlat>,
+	pub select_alt:  SyncCell<StyleFlat>,
+
+	pub unset_main: SyncCell<StyleFlat>,
+	pub unset_alt:  SyncCell<StyleFlat>,
+}
+
+// --- Indicator
+#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
+pub struct Indicator {
+	pub parent:  SyncCell<StyleFlat>,
+	pub current: SyncCell<StyleFlat>,
+	pub preview: SyncCell<StyleFlat>,
+	pub padding: ArcSwap<IndicatorPadding>,
+}
+
+#[derive(Deserialize)]
+pub struct IndicatorPadding {
+	pub open:  String,
+	pub close: String,
+}
+
+// --- Status
+#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
+pub struct Status {
+	pub overall:   SyncCell<StyleFlat>,
+	pub sep_left:  ArcSwap<StatusSep>,
+	pub sep_right: ArcSwap<StatusSep>,
+
+	// Permissions
+	pub perm_sep:   SyncCell<StyleFlat>,
+	pub perm_type:  SyncCell<StyleFlat>,
+	pub perm_read:  SyncCell<StyleFlat>,
+	pub perm_write: SyncCell<StyleFlat>,
+	pub perm_exec:  SyncCell<StyleFlat>,
+
+	// Progress
+	pub progress_label:  SyncCell<StyleFlat>,
+	pub progress_normal: SyncCell<StyleFlat>,
+	pub progress_error:  SyncCell<StyleFlat>,
+}
+
+#[derive(Deserialize)]
+pub struct StatusSep {
+	pub open:  String,
+	pub close: String,
+}
+
+// --- Which
+#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
+pub struct Which {
+	#[serde(deserialize_with = "deserialize_which_cols")]
+	pub cols: SyncCell<u8>,
+	pub mask: SyncCell<StyleFlat>,
+	pub cand: SyncCell<StyleFlat>,
+	pub rest: SyncCell<StyleFlat>,
+	pub desc: SyncCell<StyleFlat>,
+
+	pub separator:       ArcSwap<String>,
+	pub separator_style: SyncCell<StyleFlat>,
+}
+
+// --- Confirm
+#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
+pub struct Confirm {
+	pub border: SyncCell<StyleFlat>,
+	pub title:  SyncCell<StyleFlat>,
+	pub body:   SyncCell<StyleFlat>,
+	pub list:   SyncCell<StyleFlat>,
+
+	pub btn_yes:    SyncCell<StyleFlat>,
+	pub btn_no:     SyncCell<StyleFlat>,
+	pub btn_labels: ArcSwap<[String; 2]>,
+}
+
+// --- Spot
+#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
+pub struct Spot {
+	pub border: SyncCell<StyleFlat>,
+	pub title:  SyncCell<StyleFlat>,
+
+	pub tbl_col:  SyncCell<StyleFlat>,
+	pub tbl_cell: SyncCell<StyleFlat>,
+}
+
+// --- Notify
+#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
+pub struct Notify {
+	pub title_info:  SyncCell<StyleFlat>,
+	pub title_warn:  SyncCell<StyleFlat>,
+	pub title_error: SyncCell<StyleFlat>,
+
+	pub icon_info:  ArcSwap<String>,
+	pub icon_warn:  ArcSwap<String>,
+	pub icon_error: ArcSwap<String>,
+}
+
+// --- Pick
+#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
+pub struct Pick {
+	pub border:   SyncCell<StyleFlat>,
+	pub active:   SyncCell<StyleFlat>,
+	pub inactive: SyncCell<StyleFlat>,
+}
+
+// --- Input
+#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
+pub struct Input {
+	pub border:   SyncCell<StyleFlat>,
+	pub title:    SyncCell<StyleFlat>,
+	pub value:    SyncCell<StyleFlat>,
+	pub selected: SyncCell<StyleFlat>,
+}
+
+impl From<&Input> for yazi_widgets::input::InputStyles {
+	fn from(input: &Input) -> Self {
+		Self { normal: Some(input.value.get().into()), selected: Some(input.selected.get().into()) }
 	}
 }
 
+// --- Cmp
+#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
+pub struct Cmp {
+	pub border:   SyncCell<StyleFlat>,
+	pub active:   SyncCell<StyleFlat>,
+	pub inactive: SyncCell<StyleFlat>,
+
+	pub icon_file:    ArcSwap<String>,
+	pub icon_folder:  ArcSwap<String>,
+	pub icon_command: ArcSwap<String>,
+}
+
+// --- Tasks
+#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
+pub struct Tasks {
+	pub border:  SyncCell<StyleFlat>,
+	pub title:   SyncCell<StyleFlat>,
+	pub hovered: SyncCell<StyleFlat>,
+}
+
+// --- Help
+#[derive(Deserialize, DeserializeOver, DeserializeOver2, Overlay)]
+pub struct Help {
+	pub on:   SyncCell<StyleFlat>,
+	pub run:  SyncCell<StyleFlat>,
+	pub desc: SyncCell<StyleFlat>,
+
+	pub hovered: SyncCell<StyleFlat>,
+	pub footer:  SyncCell<StyleFlat>,
+}
+
 fn deserialize_syntect_theme<'de, D>(deserializer: D) -> Result<ArcSwap<PathBuf>, D::Error>
 where
 	D: Deserializer<'de>,
 {
 	let mut path = PathBuf::deserialize(deserializer)?;
 	if !path.as_os_str().is_empty() {
-		path = normalize_path(path).ok_or_else(|| {
+		path = sanitize_path(path).ok_or_else(|| {
 			de::Error::custom("syntect_theme must be either empty or an absolute path.")
 		})?;
 	}
diff --git a/yazi-core/Cargo.toml b/yazi-core/Cargo.toml
index 137c448b..7a83006c 100644
--- a/yazi-core/Cargo.toml
+++ b/yazi-core/Cargo.toml
@@ -28,25 +28,27 @@ yazi-scheduler = { path = "../yazi-scheduler", version = "26.5.6" }
 yazi-shared    = { path = "../yazi-shared", version = "26.5.6" }
 yazi-shim      = { path = "../yazi-shim", version = "26.5.6" }
 yazi-term      = { path = "../yazi-term", version = "26.5.6" }
+yazi-tty       = { path = "../yazi-tty", version = "26.5.6" }
 yazi-vfs       = { path = "../yazi-vfs", version = "26.5.6" }
 yazi-watcher   = { path = "../yazi-watcher", version = "26.5.6" }
 yazi-widgets   = { path = "../yazi-widgets", version = "26.5.6" }
 
 # External dependencies
-anyhow        = { workspace = true }
-dyn-clone     = { workspace = true }
-hashbrown     = { workspace = true }
-indexmap      = { workspace = true }
-mlua          = { workspace = true }
-parking_lot   = { workspace = true }
-ratatui       = { workspace = true }
-serde         = { workspace = true }
-serde_with    = { workspace = true }
-strum         = { workspace = true }
-syntect       = { workspace = true }
-tokio         = { workspace = true }
-tokio-stream  = { workspace = true }
-tokio-util    = { workspace = true }
-tracing       = { workspace = true }
-unicode-width = { workspace = true }
-yazi-prebuilt = "0.1.0"
+anyhow          = { workspace = true }
+dyn-clone       = { workspace = true }
+hashbrown       = { workspace = true }
+indexmap        = { workspace = true }
+mlua            = { workspace = true }
+parking_lot     = { workspace = true }
+ratatui-core    = { workspace = true }
+ratatui-widgets = { workspace = true }
+serde           = { workspace = true }
+serde_with      = { workspace = true }
+strum           = { workspace = true }
+syntect         = { workspace = true }
+tokio           = { workspace = true }
+tokio-stream    = { workspace = true }
+tokio-util      = { workspace = true }
+tracing         = { workspace = true }
+unicode-width   = { workspace = true }
+yazi-prebuilt   = "0.1.0"
diff --git a/yazi-core/src/app/plugin.rs b/yazi-core/src/app/plugin.rs
index 3677cec4..6b045e5f 100644
--- a/yazi-core/src/app/plugin.rs
+++ b/yazi-core/src/app/plugin.rs
@@ -6,8 +6,10 @@ use hashbrown::HashMap;
 use mlua::{Lua, Table};
 use serde::Deserialize;
 use strum::EnumString;
+use yazi_macro::impl_data_any;
 use yazi_scheduler::plugin::PluginInEntry;
-use yazi_shared::{SStr, data::{Data, DataKey}, event::{ActionCow, Cmd}};
+use yazi_shared::{data::{Data, DataKey}, event::{ActionCow, Cmd}};
+use yazi_shim::SStr;
 
 #[derive(Clone, Debug, Default)]
 pub struct PluginOpt {
@@ -17,6 +19,8 @@ pub struct PluginOpt {
 	pub callback: Option<Box<dyn PluginCallback>>,
 }
 
+impl_data_any!(PluginOpt);
+
 impl TryFrom<ActionCow> for PluginOpt {
 	type Error = anyhow::Error;
 
diff --git a/yazi-core/src/app/quit.rs b/yazi-core/src/app/quit.rs
index 3d79209b..0949ae9d 100644
--- a/yazi-core/src/app/quit.rs
+++ b/yazi-core/src/app/quit.rs
@@ -1,7 +1,8 @@
 use mlua::{FromLua, IntoLua, Lua, LuaSerdeExt, Value};
 use serde::{Deserialize, Serialize};
-use yazi_binding::SER_OPT;
+use yazi_macro::impl_data_any;
 use yazi_shared::{event::ActionCow, strand::StrandBuf};
+use yazi_shim::mlua::SER_OPT;
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct QuitOpt {
@@ -13,6 +14,8 @@ pub struct QuitOpt {
 	pub no_cwd_file: bool,
 }
 
+impl_data_any!(QuitOpt);
+
 impl TryFrom<ActionCow> for QuitOpt {
 	type Error = anyhow::Error;
 
diff --git a/yazi-core/src/cmp/cmp.rs b/yazi-core/src/cmp/cmp.rs
index 00c78268..a884321f 100644
--- a/yazi-core/src/cmp/cmp.rs
+++ b/yazi-core/src/cmp/cmp.rs
@@ -2,7 +2,7 @@ use std::io;
 
 use hashbrown::HashMap;
 use tokio::task::JoinHandle;
-use yazi_shared::{Id, url::UrlBuf};
+use yazi_shared::{id::Id, url::UrlBuf};
 use yazi_widgets::Scrollable;
 
 use crate::cmp::CmpItem;
diff --git a/yazi-core/src/cmp/option.rs b/yazi-core/src/cmp/option.rs
index 9e1543c2..7621b47e 100644
--- a/yazi-core/src/cmp/option.rs
+++ b/yazi-core/src/cmp/option.rs
@@ -1,4 +1,5 @@
-use yazi_shared::{Id, path::PathBufDyn, url::UrlBuf};
+use yazi_macro::impl_data_any;
+use yazi_shared::{id::Id, path::PathBufDyn, url::UrlBuf};
 
 use crate::cmp::CmpItem;
 
@@ -9,3 +10,5 @@ pub struct CmpOpt {
 	pub word:       PathBufDyn,
 	pub ticket:     Id,
 }
+
+impl_data_any!(CmpOpt);
diff --git a/yazi-core/src/confirm/confirm.rs b/yazi-core/src/confirm/confirm.rs
index a0d24343..aec6faa3 100644
--- a/yazi-core/src/confirm/confirm.rs
+++ b/yazi-core/src/confirm/confirm.rs
@@ -1,5 +1,6 @@
-use ratatui::{text::Line, widgets::Paragraph};
-use yazi_config::popup::Position;
+use ratatui_core::text::Line;
+use ratatui_widgets::paragraph::Paragraph;
+use yazi_binding::position::Position;
 use yazi_shared::CompletionToken;
 
 #[derive(Default)]
diff --git a/yazi-core/src/core.rs b/yazi-core/src/core.rs
index fcb940cd..ad6ca18c 100644
--- a/yazi-core/src/core.rs
+++ b/yazi-core/src/core.rs
@@ -1,8 +1,9 @@
-use ratatui::layout::{Position, Rect};
+use ratatui_core::layout::{Position, Rect};
 use yazi_shared::Layer;
-use yazi_term::CursorStyle;
+use yazi_shim::ratatui::Padable;
+use yazi_tty::sequence::SetCursorStyle;
 
-use crate::{cmp::Cmp, confirm::Confirm, help::Help, input::Input, mgr::Mgr, notify::Notify, pick::Pick, tab::{Folder, Tab}, tasks::Tasks, which::Which};
+use crate::{cmp::Cmp, confirm::Confirm, help::Help, input::{Input, InputGuard}, mgr::Mgr, notify::Notify, pick::Pick, tab::{Folder, Tab}, tasks::Tasks, which::Which};
 
 pub struct Core {
 	pub mgr:     Mgr,
@@ -31,17 +32,19 @@ impl Core {
 		}
 	}
 
-	pub fn cursor(&self) -> Option<(Position, CursorStyle)> {
-		if self.input.visible {
-			let Rect { x, y, .. } = self.mgr.area(self.input.position);
-			return Some((
-				Position { x: x + 1 + self.input.cursor(), y: y + 1 },
-				self.input.cursor_shape(),
-			));
+	pub fn cursor(&self) -> Option<(Position, SetCursorStyle)> {
+		if let Some(guard) = self.input.lock() {
+			let Rect { x, y, .. } = match &guard {
+				InputGuard::Main(_) => self.mgr.area(self.input.position()?).padding(self.input.padding()),
+				InputGuard::Alt(_) => self.mgr.area(self.input.position()?),
+			};
+			return Some((Position { x: x + guard.cursor(), y }, guard.cursor_shape()));
 		}
+
 		if let Some((x, y)) = self.help.cursor() {
-			return Some((Position { x, y }, self.help.cursor_shape()));
+			return Some((Position { x, y }, self.help.cursor_shape()?));
 		}
+
 		None
 	}
 
@@ -54,7 +57,7 @@ impl Core {
 			Layer::Help
 		} else if self.confirm.visible {
 			Layer::Confirm
-		} else if self.input.visible {
+		} else if self.input.focus() {
 			Layer::Input
 		} else if self.pick.visible {
 			Layer::Pick
diff --git a/yazi-core/src/help/help.rs b/yazi-core/src/help/help.rs
index a6ef0c9a..bbde8a98 100644
--- a/yazi-core/src/help/help.rs
+++ b/yazi-core/src/help/help.rs
@@ -1,9 +1,10 @@
 use anyhow::Result;
 use unicode_width::UnicodeWidthStr;
-use yazi_config::{KEYMAP, YAZI, keymap::{Chord, Key}};
+use yazi_config::{KEYMAP, keymap::ChordArc};
 use yazi_macro::{act, render, render_and};
 use yazi_shared::Layer;
-use yazi_term::{CursorStyle, TERM, event::KeyCode};
+use yazi_term::{TERM, event::{KeyCode, KeyEvent}};
+use yazi_tty::sequence::SetCursorStyle;
 use yazi_widgets::Scrollable;
 
 use crate::help::HELP_MARGIN;
@@ -12,7 +13,7 @@ use crate::help::HELP_MARGIN;
 pub struct Help {
 	pub visible:         bool,
 	pub layer:           Layer,
-	pub(super) bindings: Vec<&'static Chord>,
+	pub(super) bindings: Vec<ChordArc>,
 
 	// Filter
 	pub keyword:   String,
@@ -23,18 +24,18 @@ pub struct Help {
 }
 
 impl Help {
-	pub fn r#type(&mut self, key: &Key) -> Result<bool> {
+	pub fn r#type(&mut self, key: KeyEvent) -> Result<bool> {
 		let Some(input) = &mut self.in_filter else { return Ok(false) };
 		match key {
-			Key { code: KeyCode::Escape, shift: false, ctrl: false, alt: false, super_: false } => {
+			KeyEvent { code: KeyCode::Escape, modifiers, .. } if modifiers.is_empty() => {
 				self.in_filter = None;
 				render!();
 			}
-			Key { code: KeyCode::Enter, shift: false, ctrl: false, alt: false, super_: false } => {
+			KeyEvent { code: KeyCode::Enter, modifiers, .. } if modifiers.is_empty() => {
 				self.in_filter = None;
 				return Ok(render_and!(true)); // Don't do the `filter_apply` below, since we already have the filtered results.
 			}
-			Key { code: KeyCode::Backspace, shift: false, ctrl: false, alt: false, super_: false } => {
+			KeyEvent { code: KeyCode::Backspace, modifiers, .. } if modifiers.is_empty() => {
 				act!(backspace, input)?;
 			}
 			_ => {
@@ -51,10 +52,11 @@ impl Help {
 
 		if kw.is_empty() {
 			self.keyword = String::new();
-			self.bindings = KEYMAP.get(self.layer).iter().collect();
+			self.bindings = KEYMAP.chords(self.layer).iter().cloned().collect();
 		} else if self.keyword != kw {
 			self.keyword = kw.to_owned();
-			self.bindings = KEYMAP.get(self.layer).iter().filter(|&c| c.contains(kw)).collect();
+			self.bindings =
+				KEYMAP.chords(self.layer).iter().filter(|&c| c.contains(kw)).cloned().collect();
 		}
 
 		render!(self.scroll(0));
@@ -73,7 +75,7 @@ impl Help {
 	}
 
 	// --- Bindings
-	pub fn window(&self) -> &[&Chord] {
+	pub fn window(&self) -> &[ChordArc] {
 		let end = (self.offset + self.limit()).min(self.bindings.len());
 		&self.bindings[self.offset..end]
 	}
@@ -91,8 +93,8 @@ impl Help {
 
 	pub fn rel_cursor(&self) -> usize { self.cursor - self.offset }
 
-	pub fn cursor_shape(&self) -> CursorStyle {
-		if YAZI.input.cursor_blink { CursorStyle::BlinkingBlock } else { CursorStyle::SteadyBlock }
+	pub fn cursor_shape(&self) -> Option<SetCursorStyle> {
+		Some(self.in_filter.as_ref()?.cursor_shape())
 	}
 }
 
diff --git a/yazi-core/src/highlighter.rs b/yazi-core/src/highlighter.rs
index c468dc53..90d19a0a 100644
--- a/yazi-core/src/highlighter.rs
+++ b/yazi-core/src/highlighter.rs
@@ -19,7 +19,7 @@ use syntect::{
 use yazi_binding::elements::HighlightPosition;
 use yazi_config::{THEME, YAZI};
 use yazi_runner::previewer::PeekError;
-use yazi_shared::{Id, Ids, replace_to_printable};
+use yazi_shared::{id::{Id, Ids}, replace_to_printable};
 use yazi_shim::ratatui::LineIter;
 
 static INCR: Ids = Ids::new();
@@ -251,20 +251,20 @@ impl Highlighter {
 impl Highlighter {
 	fn to_line_widget<'a>(regions: Vec<(highlighting::Style, &'a str)>) -> Line<'a> {
 		Line::from_iter(regions.into_iter().map(|(style, s)| {
-			let mut modifier = ratatui::style::Modifier::empty();
+			let mut modifier = ratatui_core::style::Modifier::empty();
 			if style.font_style.contains(highlighting::FontStyle::BOLD) {
-				modifier |= ratatui::style::Modifier::BOLD;
+				modifier |= ratatui_core::style::Modifier::BOLD;
 			}
 			if style.font_style.contains(highlighting::FontStyle::ITALIC) {
-				modifier |= ratatui::style::Modifier::ITALIC;
+				modifier |= ratatui_core::style::Modifier::ITALIC;
 			}
 			if style.font_style.contains(highlighting::FontStyle::UNDERLINE) {
-				modifier |= ratatui::style::Modifier::UNDERLINED;
+				modifier |= ratatui_core::style::Modifier::UNDERLINED;
 			}
 
 			Span {
 				content: s.into(),
-				style: ratatui::style::Style {
+				style:   ratatui_core::style::Style {
 					fg: Self::to_ansi_color(style.foreground),
 					// bg: Self::to_ansi_color(style.background),
 					add_modifier: modifier,
@@ -275,7 +275,7 @@ impl Highlighter {
 	}
 
 	// Copied from https://github.com/sharkdp/bat/blob/master/src/terminal.rs
-	fn to_ansi_color(color: highlighting::Color) -> Option<ratatui::style::Color> {
+	fn to_ansi_color(color: highlighting::Color) -> Option<ratatui_core::style::Color> {
 		if color.a == 0 {
 			// Themes can specify one of the user-configurable terminal colors by
 			// encoding them as #RRGGBBAA with AA set to 00 (transparent) and RR set
@@ -286,14 +286,14 @@ impl Highlighter {
 				// sequences using codes 30-37 (foreground) and 40-47 (background).
 				// For example, red foreground is \x1b[31m. This works on terminals
 				// without 256-color support.
-				0x00 => ratatui::style::Color::Black,
-				0x01 => ratatui::style::Color::Red,
-				0x02 => ratatui::style::Color::Green,
-				0x03 => ratatui::style::Color::Yellow,
-				0x04 => ratatui::style::Color::Blue,
-				0x05 => ratatui::style::Color::Magenta,
-				0x06 => ratatui::style::Color::Cyan,
-				0x07 => ratatui::style::Color::White,
+				0x00 => ratatui_core::style::Color::Black,
+				0x01 => ratatui_core::style::Color::Red,
+				0x02 => ratatui_core::style::Color::Green,
+				0x03 => ratatui_core::style::Color::Yellow,
+				0x04 => ratatui_core::style::Color::Blue,
+				0x05 => ratatui_core::style::Color::Magenta,
+				0x06 => ratatui_core::style::Color::Cyan,
+				0x07 => ratatui_core::style::Color::White,
 				// For all other colors, use Fixed to produce escape sequences using
 				// codes 38;5 (foreground) and 48;5 (background). For example,
 				// bright red foreground is \x1b[38;5;9m. This only works on
@@ -302,7 +302,7 @@ impl Highlighter {
 				// TODO: When ansi_term adds support for bright variants using codes
 				// 90-97 (foreground) and 100-107 (background), we should use those
 				// for values 0x08 to 0x0f and only use Fixed for 0x10 to 0xff.
-				n => ratatui::style::Color::Indexed(n),
+				n => ratatui_core::style::Color::Indexed(n),
 			})
 		} else if color.a == 1 {
 			// Themes can specify the terminal's default foreground/background color
@@ -310,7 +310,7 @@ impl Highlighter {
 			// 01. The built-in theme ansi uses this.
 			None
 		} else {
-			Some(ratatui::style::Color::Rgb(color.r, color.g, color.b))
+			Some(ratatui_core::style::Color::Rgb(color.r, color.g, color.b))
 		}
 	}
 }
diff --git a/yazi-core/src/input/guard.rs b/yazi-core/src/input/guard.rs
new file mode 100644
index 00000000..c0328928
--- /dev/null
+++ b/yazi-core/src/input/guard.rs
@@ -0,0 +1,46 @@
+use std::ops::{Deref, DerefMut};
+
+use parking_lot::MutexGuard;
+
+// --- InputGuard
+pub enum InputGuard<'a> {
+	Main(&'a yazi_widgets::input::Input),
+	Alt(MutexGuard<'a, yazi_widgets::input::Input>),
+}
+
+impl Deref for InputGuard<'_> {
+	type Target = yazi_widgets::input::Input;
+
+	fn deref(&self) -> &Self::Target {
+		match self {
+			Self::Main(main) => main,
+			Self::Alt(alt) => alt,
+		}
+	}
+}
+
+// --- InputMutGuard
+pub enum InputMutGuard<'a> {
+	Main(&'a mut yazi_widgets::input::Input),
+	Alt(MutexGuard<'a, yazi_widgets::input::Input>),
+}
+
+impl Deref for InputMutGuard<'_> {
+	type Target = yazi_widgets::input::Input;
+
+	fn deref(&self) -> &Self::Target {
+		match self {
+			Self::Main(main) => main,
+			Self::Alt(alt) => alt,
+		}
+	}
+}
+
+impl DerefMut for InputMutGuard<'_> {
+	fn deref_mut(&mut self) -> &mut Self::Target {
+		match self {
+			Self::Main(main) => main,
+			Self::Alt(alt) => alt,
+		}
+	}
+}
diff --git a/yazi-core/src/input/input.rs b/yazi-core/src/input/input.rs
index 130c4e5a..4ee51058 100644
--- a/yazi-core/src/input/input.rs
+++ b/yazi-core/src/input/input.rs
@@ -1,22 +1,86 @@
-use std::ops::{Deref, DerefMut};
+use std::{ops::{Deref, DerefMut}, sync::Arc};
 
-use yazi_config::popup::Position;
+use parking_lot::Mutex;
+use ratatui_widgets::block::Padding;
+use yazi_binding::{elements::Spatial, position::Position};
+
+use crate::input::{InputGuard, InputMutGuard};
 
 #[derive(Default)]
 pub struct Input {
-	pub(super) inner: yazi_widgets::input::Input,
+	pub main: InputMain,
+	pub alt:  Option<InputAlt>,
+}
 
+impl Input {
+	pub fn focus(&self) -> bool { self.main.visible || self.alt.is_some() }
+
+	pub fn padding(&self) -> Padding { Padding::new(1, 1, 1, 1) }
+
+	pub fn position(&self) -> Option<Position> {
+		if self.main.visible {
+			Some(self.main.position)
+		} else if let Some(alt) = &self.alt {
+			Some(alt.position)
+		} else {
+			None
+		}
+	}
+
+	pub fn lock(&self) -> Option<InputGuard<'_>> {
+		if self.main.visible {
+			Some(InputGuard::Main(&self.main.inner))
+		} else if let Some(alt) = &self.alt {
+			Some(InputGuard::Alt(alt.inner.lock()))
+		} else {
+			None
+		}
+	}
+
+	pub fn lock_mut(&mut self) -> Option<InputMutGuard<'_>> {
+		if self.main.visible {
+			Some(InputMutGuard::Main(&mut self.main.inner))
+		} else if let Some(alt) = &self.alt {
+			Some(InputMutGuard::Alt(alt.inner.lock()))
+		} else {
+			None
+		}
+	}
+}
+
+// --- InputMain
+#[derive(Default)]
+pub struct InputMain {
+	inner:        yazi_widgets::input::Input,
 	pub visible:  bool,
 	pub title:    String,
 	pub position: Position,
 }
 
-impl Deref for Input {
+impl Deref for InputMain {
 	type Target = yazi_widgets::input::Input;
 
 	fn deref(&self) -> &Self::Target { &self.inner }
 }
 
-impl DerefMut for Input {
+impl DerefMut for InputMain {
 	fn deref_mut(&mut self) -> &mut Self::Target { &mut self.inner }
 }
+
+// --- InputAlt
+pub struct InputAlt {
+	inner:    Arc<Mutex<yazi_widgets::input::Input>>,
+	position: Position,
+}
+
+impl Deref for InputAlt {
+	type Target = Arc<Mutex<yazi_widgets::input::Input>>;
+
+	fn deref(&self) -> &Self::Target { &self.inner }
+}
+
+impl From<&yazi_widgets::input::InputArc> for InputAlt {
+	fn from(value: &yazi_widgets::input::InputArc) -> Self {
+		Self { inner: value.deref().clone(), position: value.area().into() }
+	}
+}
diff --git a/yazi-core/src/input/mod.rs b/yazi-core/src/input/mod.rs
index 9ad1aafa..60b5cf6d 100644
--- a/yazi-core/src/input/mod.rs
+++ b/yazi-core/src/input/mod.rs
@@ -1 +1 @@
-yazi_macro::mod_flat!(input);
+yazi_macro::mod_flat!(guard input);
diff --git a/yazi-core/src/mgr/displace.rs b/yazi-core/src/mgr/displace.rs
index 11d63448..52e078d7 100644
--- a/yazi-core/src/mgr/displace.rs
+++ b/yazi-core/src/mgr/displace.rs
@@ -1,7 +1,10 @@
+use yazi_macro::impl_data_any;
 use yazi_shared::url::UrlBuf;
 
 #[derive(Clone, Debug)]
 pub struct DisplaceOpt {
-	pub to:   Result<UrlBuf, yazi_fs::error::Error>,
+	pub to:   Result<UrlBuf, yazi_shim::fs::Error>,
 	pub from: UrlBuf,
 }
+
+impl_data_any!(DisplaceOpt);
diff --git a/yazi-core/src/mgr/filter.rs b/yazi-core/src/mgr/filter.rs
index f7fdc413..5c81de55 100644
--- a/yazi-core/src/mgr/filter.rs
+++ b/yazi-core/src/mgr/filter.rs
@@ -1,5 +1,7 @@
 use yazi_fs::FilterCase;
-use yazi_shared::{SStr, event::ActionCow};
+use yazi_macro::impl_data_any;
+use yazi_shared::event::ActionCow;
+use yazi_shim::SStr;
 
 #[derive(Clone, Debug, Default)]
 pub struct FilterOpt {
@@ -8,6 +10,8 @@ pub struct FilterOpt {
 	pub done:  bool,
 }
 
+impl_data_any!(FilterOpt);
+
 impl TryFrom<ActionCow> for FilterOpt {
 	type Error = anyhow::Error;
 
diff --git a/yazi-core/src/mgr/find.rs b/yazi-core/src/mgr/find.rs
index 18caf255..525f6446 100644
--- a/yazi-core/src/mgr/find.rs
+++ b/yazi-core/src/mgr/find.rs
@@ -1,6 +1,8 @@
 use anyhow::bail;
 use yazi_fs::FilterCase;
-use yazi_shared::{SStr, event::ActionCow};
+use yazi_macro::impl_data_any;
+use yazi_shared::event::ActionCow;
+use yazi_shim::SStr;
 
 #[derive(Clone, Debug)]
 pub struct FindDoOpt {
@@ -9,6 +11,8 @@ pub struct FindDoOpt {
 	pub case:  FilterCase,
 }
 
+impl_data_any!(FindDoOpt);
+
 impl TryFrom<ActionCow> for FindDoOpt {
 	type Error = anyhow::Error;
 
diff --git a/yazi-core/src/mgr/mgr.rs b/yazi-core/src/mgr/mgr.rs
index 437315ef..6a96c988 100644
--- a/yazi-core/src/mgr/mgr.rs
+++ b/yazi-core/src/mgr/mgr.rs
@@ -1,7 +1,7 @@
 use std::iter;
 
-use ratatui::layout::Rect;
-use yazi_config::popup::{Origin, Position};
+use ratatui_core::layout::Rect;
+use yazi_binding::position::{Origin, Position};
 use yazi_fs::Splatable;
 use yazi_shared::url::{AsUrl, Url, UrlBuf};
 use yazi_term::TERM;
@@ -35,7 +35,7 @@ impl Mgr {
 		if pos.origin == Origin::Hovered {
 			self.active().hovered_rect_based(pos)
 		} else {
-			pos.rect(TERM.dimension())
+			pos.rect(TERM.dimension().area())
 		}
 	}
 
diff --git a/yazi-core/src/mgr/open.rs b/yazi-core/src/mgr/open.rs
index ca6c5a89..478e8ad5 100644
--- a/yazi-core/src/mgr/open.rs
+++ b/yazi-core/src/mgr/open.rs
@@ -1,6 +1,8 @@
-use yazi_fs::File;
+use yazi_fs::file::File;
+use yazi_macro::impl_data_any;
 use yazi_shared::{event::ActionCow, url::UrlBuf};
 
+// --- OpenOpt
 #[derive(Clone, Debug)]
 pub struct OpenOpt {
 	pub cwd:         Option<UrlBuf>,
@@ -9,6 +11,8 @@ pub struct OpenOpt {
 	pub hovered:     bool,
 }
 
+impl_data_any!(OpenOpt);
+
 impl TryFrom<ActionCow> for OpenOpt {
 	type Error = anyhow::Error;
 
@@ -22,10 +26,12 @@ impl TryFrom<ActionCow> for OpenOpt {
 	}
 }
 
-// OpenDoOpt
+// --- OpenDoOpt
 #[derive(Clone, Debug, Default)]
 pub struct OpenDoOpt {
 	pub cwd:         UrlBuf,
 	pub targets:     Vec<File>,
 	pub interactive: bool,
 }
+
+impl_data_any!(OpenDoOpt);
diff --git a/yazi-core/src/mgr/search.rs b/yazi-core/src/mgr/search.rs
index 35f11b69..30f7adbf 100644
--- a/yazi-core/src/mgr/search.rs
+++ b/yazi-core/src/mgr/search.rs
@@ -1,8 +1,11 @@
 use anyhow::bail;
 use serde::Deserialize;
 use strum::{EnumString, IntoStaticStr};
-use yazi_shared::{SStr, event::ActionCow, url::{UrlBuf, UrlLike}};
+use yazi_macro::impl_data_any;
+use yazi_shared::{event::ActionCow, url::{UrlBuf, UrlLike}};
+use yazi_shim::SStr;
 
+// --- SearchOpt
 #[derive(Clone, Debug)]
 pub struct SearchOpt {
 	pub via:      SearchVia,
@@ -12,6 +15,8 @@ pub struct SearchOpt {
 	pub r#in:     Option<UrlBuf>,
 }
 
+impl_data_any!(SearchOpt);
+
 impl TryFrom<ActionCow> for SearchOpt {
 	type Error = anyhow::Error;
 
@@ -37,7 +42,7 @@ impl TryFrom<ActionCow> for SearchOpt {
 	}
 }
 
-// Via
+// --- Via
 #[derive(Clone, Copy, Debug, Deserialize, EnumString, Eq, IntoStaticStr, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 #[strum(serialize_all = "kebab-case")]
diff --git a/yazi-core/src/mgr/tabs.rs b/yazi-core/src/mgr/tabs.rs
index df83fcc8..0200e924 100644
--- a/yazi-core/src/mgr/tabs.rs
+++ b/yazi-core/src/mgr/tabs.rs
@@ -1,7 +1,7 @@
 use std::ops::{Deref, DerefMut};
 
 use yazi_dds::Pubsub;
-use yazi_fs::File;
+use yazi_fs::file::File;
 use yazi_macro::err;
 
 use crate::tab::{Folder, Tab};
diff --git a/yazi-core/src/notify/level.rs b/yazi-core/src/notify/level.rs
index 490f4c1d..168b7cfe 100644
--- a/yazi-core/src/notify/level.rs
+++ b/yazi-core/src/notify/level.rs
@@ -1,7 +1,8 @@
 use std::sync::Arc;
 
 use serde::{Deserialize, Serialize};
-use yazi_config::{Style, THEME};
+use yazi_binding::style::StyleFlat;
+use yazi_config::THEME;
 
 #[derive(Clone, Copy, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
 #[serde(rename_all = "kebab-case")]
@@ -21,7 +22,7 @@ impl MessageLevel {
 		}
 	}
 
-	pub fn style(self) -> Style {
+	pub fn style(self) -> StyleFlat {
 		match self {
 			Self::Info => THEME.notify.title_info.get(),
 			Self::Warn => THEME.notify.title_warn.get(),
diff --git a/yazi-core/src/notify/message.rs b/yazi-core/src/notify/message.rs
index 78abaa75..be887e6a 100644
--- a/yazi-core/src/notify/message.rs
+++ b/yazi-core/src/notify/message.rs
@@ -52,8 +52,8 @@ impl Message {
 	}
 
 	pub fn height(&self, width: u16) -> usize {
-		let lines = ratatui::widgets::Paragraph::new(self.content.as_str())
-			.wrap(ratatui::widgets::Wrap { trim: false })
+		let lines = ratatui_widgets::paragraph::Paragraph::new(self.content.as_str())
+			.wrap(ratatui_widgets::paragraph::Wrap { trim: false })
 			.line_count(width.saturating_sub(NOTIFY_BORDER));
 
 		lines + NOTIFY_BORDER as usize
diff --git a/yazi-core/src/notify/notify.rs b/yazi-core/src/notify/notify.rs
index c8032a90..377a9997 100644
--- a/yazi-core/src/notify/notify.rs
+++ b/yazi-core/src/notify/notify.rs
@@ -1,6 +1,6 @@
 use std::ops::ControlFlow;
 
-use ratatui::layout::{Constraint, Layout, Rect};
+use ratatui_core::layout::{Constraint, Layout, Rect};
 use tokio::task::JoinHandle;
 
 use super::{Message, NOTIFY_SPACING};
diff --git a/yazi-core/src/notify/option.rs b/yazi-core/src/notify/option.rs
index 0bc33b1b..066088fc 100644
--- a/yazi-core/src/notify/option.rs
+++ b/yazi-core/src/notify/option.rs
@@ -3,8 +3,9 @@ use std::time::Duration;
 use mlua::{FromLua, IntoLua, Lua, LuaSerdeExt, Value};
 use serde::{Deserialize, Serialize};
 use serde_with::{DurationSecondsWithFrac, serde_as};
-use yazi_binding::SER_OPT;
+use yazi_macro::impl_data_any;
 use yazi_shared::event::ActionCow;
+use yazi_shim::mlua::SER_OPT;
 
 use crate::notify::MessageLevel;
 
@@ -21,6 +22,8 @@ pub struct MessageOpt {
 	pub timeout: Duration,
 }
 
+impl_data_any!(MessageOpt);
+
 impl TryFrom<ActionCow> for MessageOpt {
 	type Error = anyhow::Error;
 
diff --git a/yazi-core/src/pick/pick.rs b/yazi-core/src/pick/pick.rs
index 6808b14c..59fd48db 100644
--- a/yazi-core/src/pick/pick.rs
+++ b/yazi-core/src/pick/pick.rs
@@ -1,5 +1,5 @@
 use tokio::sync::mpsc::UnboundedSender;
-use yazi_config::{YAZI, popup::Position};
+use yazi_binding::position::Position;
 use yazi_widgets::Scrollable;
 
 #[derive(Default)]
@@ -27,7 +27,7 @@ impl Scrollable for Pick {
 	fn total(&self) -> usize { self.items.len() }
 
 	fn limit(&self) -> usize {
-		self.position.offset.height.saturating_sub(YAZI.pick.border()) as usize
+		self.position.height.saturating_sub(yazi_config::popup::Pick::BORDER) as usize
 	}
 
 	fn cursor_mut(&mut self) -> &mut usize { &mut self.cursor }
diff --git a/yazi-core/src/proxy.rs b/yazi-core/src/proxy.rs
index 45c357a1..387c9e5c 100644
--- a/yazi-core/src/proxy.rs
+++ b/yazi-core/src/proxy.rs
@@ -1,10 +1,11 @@
 use mlua::ObjectLike;
-use yazi_binding::{Error, elements::Renderable};
+use yazi_binding::Error;
 use yazi_config::LAYOUT;
 use yazi_macro::{emit, relay};
 use yazi_runner::previewer::PeekJob;
 use yazi_scheduler::TaskSummary;
 use yazi_shared::url::AsUrl;
+use yazi_widgets::Renderable;
 
 use crate::{app::PluginOpt, tab::PreviewLock};
 
@@ -51,7 +52,7 @@ impl MgrProxy {
 			search_idx: job.search_idx,
 			area: area.into(),
 			data: vec![
-				Renderable::Clear(yazi_binding::elements::Clear { area: area.into() }),
+				Renderable::Clear(Default::default()).with_area(area),
 				Renderable::from(Error::custom(error)).with_area(area),
 			],
 		});
diff --git a/yazi-core/src/spot/lock.rs b/yazi-core/src/spot/lock.rs
index 86c84c20..f2dda3df 100644
--- a/yazi-core/src/spot/lock.rs
+++ b/yazi-core/src/spot/lock.rs
@@ -1,6 +1,8 @@
 use mlua::Table;
-use yazi_binding::{FileRef, elements::Renderable};
-use yazi_shared::Id;
+use yazi_fs::file::FileRef;
+use yazi_macro::impl_data_any;
+use yazi_shared::id::Id;
+use yazi_widgets::Renderable;
 
 #[derive(Clone, Debug)]
 pub struct SpotLock {
@@ -13,6 +15,8 @@ pub struct SpotLock {
 	pub data: Vec<Renderable>,
 }
 
+impl_data_any!(SpotLock);
+
 impl TryFrom<Table> for SpotLock {
 	type Error = mlua::Error;
 
@@ -23,7 +27,7 @@ impl TryFrom<Table> for SpotLock {
 			cha:  file.cha,
 			mime: t.raw_get("mime")?,
 
-			id:   *t.raw_get::<yazi_binding::Id>("id")?,
+			id:   t.raw_get("id")?,
 			skip: t.raw_get("skip")?,
 			data: Default::default(),
 		})
diff --git a/yazi-core/src/spot/spot.rs b/yazi-core/src/spot/spot.rs
index 8f1e32d0..40817224 100644
--- a/yazi-core/src/spot/spot.rs
+++ b/yazi-core/src/spot/spot.rs
@@ -1,6 +1,6 @@
 use tokio_util::sync::CancellationToken;
 use yazi_config::YAZI;
-use yazi_fs::File;
+use yazi_fs::file::File;
 use yazi_macro::render;
 use yazi_runner::RUNNER;
 use yazi_shared::{pool::Symbol, url::UrlBuf};
diff --git a/yazi-core/src/tab/folder.rs b/yazi-core/src/tab/folder.rs
index 6f2acea0..470749b4 100644
--- a/yazi-core/src/tab/folder.rs
+++ b/yazi-core/src/tab/folder.rs
@@ -2,9 +2,9 @@ use std::mem;
 
 use yazi_config::{LAYOUT, YAZI};
 use yazi_dds::Pubsub;
-use yazi_fs::{File, Files, FilesOp, FolderStage, cha::Cha};
+use yazi_fs::{Files, FilesOp, FolderStage, cha::Cha, file::File};
 use yazi_macro::err;
-use yazi_shared::{Id, path::{AsPath, PathBufDyn, PathDyn}, url::UrlBuf};
+use yazi_shared::{id::Id, path::{AsPath, PathBufDyn, PathDyn}, url::UrlBuf};
 use yazi_widgets::{Scrollable, Step};
 
 use crate::MgrProxy;
@@ -155,7 +155,8 @@ impl Folder {
 			len.saturating_sub(limit).min(self.offset)
 		} else {
 			len.saturating_sub(limit).min(self.cursor.saturating_sub(limit) + 1 + scrolloff)
-		};
+		}
+		.min(self.cursor);
 
 		old != self.offset
 	}
diff --git a/yazi-core/src/tab/preview.rs b/yazi-core/src/tab/preview.rs
index 9973a8d3..687808a4 100644
--- a/yazi-core/src/tab/preview.rs
+++ b/yazi-core/src/tab/preview.rs
@@ -4,7 +4,7 @@ use tokio::{pin, task::JoinHandle};
 use tokio_stream::{StreamExt, wrappers::UnboundedReceiverStream};
 use yazi_adapter::ADAPTOR;
 use yazi_config::{LAYOUT, YAZI};
-use yazi_fs::{File, Files, FilesOp, cha::Cha};
+use yazi_fs::{Files, FilesOp, cha::Cha, file::File};
 use yazi_macro::render;
 use yazi_runner::{
 	RUNNER,
@@ -95,14 +95,13 @@ impl Preview {
 	pub fn reset(&mut self) {
 		self.search_idx = None;
 		self.abort();
-
-		ADAPTOR.get().image_hide().ok();
+		ADAPTOR.image_hide().ok();
 		render!(self.lock.take().is_some())
 	}
 
 	pub fn reset_image(&mut self) {
 		self.abort();
-		ADAPTOR.get().image_hide().ok();
+		ADAPTOR.image_hide().ok();
 	}
 
 	pub fn same_url(&self, url: &UrlBuf) -> bool {
diff --git a/yazi-core/src/tab/preview_lock.rs b/yazi-core/src/tab/preview_lock.rs
index 7eb1f7dd..38506220 100644
--- a/yazi-core/src/tab/preview_lock.rs
+++ b/yazi-core/src/tab/preview_lock.rs
@@ -1,9 +1,9 @@
 use mlua::Table;
-use yazi_binding::{
-	FileRef,
-	elements::{Rect, Renderable},
-};
+use yazi_binding::elements::Rect;
+use yazi_fs::file::FileRef;
+use yazi_macro::impl_data_any;
 use yazi_shared::pool::{InternStr, Symbol};
+use yazi_widgets::Renderable;
 
 #[derive(Clone, Debug, Default)]
 pub struct PreviewLock {
@@ -17,6 +17,8 @@ pub struct PreviewLock {
 	pub data: Vec<Renderable>,
 }
 
+impl_data_any!(PreviewLock);
+
 impl TryFrom<Table> for PreviewLock {
 	type Error = mlua::Error;
 
diff --git a/yazi-core/src/tab/tab.rs b/yazi-core/src/tab/tab.rs
index 4f6cd367..8dd15cf3 100644
--- a/yazi-core/src/tab/tab.rs
+++ b/yazi-core/src/tab/tab.rs
@@ -1,11 +1,12 @@
 use std::borrow::Cow;
 
 use anyhow::Result;
-use ratatui::layout::Rect;
+use ratatui_core::layout::Rect;
 use tokio::task::JoinHandle;
-use yazi_config::{LAYOUT, popup::{Origin, Position}};
-use yazi_fs::File;
-use yazi_shared::{Id, Ids, url::{UrlBuf, UrlLike}};
+use yazi_binding::position::{Origin, Position};
+use yazi_config::LAYOUT;
+use yazi_fs::file::File;
+use yazi_shared::{id::{Id, Ids}, url::{UrlBuf, UrlLike}};
 use yazi_term::TERM;
 
 use super::{Backstack, Finder, Folder, History, Mode, Preference, Preview};
@@ -90,11 +91,11 @@ impl Tab {
 	}
 
 	pub fn hovered_rect_based(&self, pos: Position) -> Rect {
-		let dim = TERM.dimension();
+		let area = TERM.dimension().area();
 		if let Some(r) = self.hovered_rect() {
-			Position::sticky(dim, r, pos.offset)
+			pos.sticky(r, area)
 		} else {
-			Position::new(Origin::TopCenter, pos.offset).rect(dim)
+			Position::new(Origin::TopCenter, pos.offset).rect(area)
 		}
 	}
 
diff --git a/yazi-core/src/tasks/file.rs b/yazi-core/src/tasks/file.rs
index a737e4d3..c956c76e 100644
--- a/yazi-core/src/tasks/file.rs
+++ b/yazi-core/src/tasks/file.rs
@@ -1,5 +1,6 @@
 use indexmap::IndexSet;
 use tracing::debug;
+use yazi_scheduler::file::FileInCut;
 use yazi_shared::url::{UrlBuf, UrlBufCov, UrlLike};
 
 use super::Tasks;
@@ -17,7 +18,7 @@ impl Tasks {
 			if force && *u == to {
 				debug!("file_cut: same file, skip {to:?}");
 			} else {
-				self.scheduler.file_cut(u.0.clone(), to, force);
+				self.scheduler.file_cut(FileInCut::new(u.0.clone(), to, force));
 			}
 		}
 	}
diff --git a/yazi-core/src/tasks/option.rs b/yazi-core/src/tasks/option.rs
index 30269059..e3c14931 100644
--- a/yazi-core/src/tasks/option.rs
+++ b/yazi-core/src/tasks/option.rs
@@ -1,24 +1,34 @@
 use std::borrow::Cow;
 
-use yazi_scheduler::{TaskIn, plugin::PluginInEntry};
-use yazi_shared::{Id, SStr};
+use yazi_macro::impl_data_any;
+use yazi_scheduler::{TaskIn, file::FileInCut, plugin::PluginInEntry};
+use yazi_shared::id::Id;
+use yazi_shim::SStr;
 
 #[derive(Clone, Debug)]
 pub enum TaskOpt {
+	Cut(FileInCut),
+
 	Plugin(PluginInEntry),
 }
 
+impl_data_any!(TaskOpt);
+
 impl TaskIn for TaskOpt {
 	type Prog = ();
 
 	fn id(&self) -> Id {
 		match self {
+			Self::Cut(r#in) => r#in.id(),
+
 			Self::Plugin(r#in) => r#in.id(),
 		}
 	}
 
 	fn set_id(&mut self, id: Id) -> &mut Self {
 		match self {
+			Self::Cut(r#in) => _ = r#in.set_id(id),
+
 			Self::Plugin(r#in) => _ = r#in.set_id(id),
 		}
 		self
@@ -26,12 +36,16 @@ impl TaskIn for TaskOpt {
 
 	fn title(&self) -> Cow<'_, str> {
 		match self {
+			Self::Cut(r#in) => r#in.title(),
+
 			Self::Plugin(r#in) => r#in.title(),
 		}
 	}
 
 	fn set_title(&mut self, title: impl Into<SStr>) -> &mut Self {
 		match self {
+			Self::Cut(r#in) => _ = r#in.set_title(title),
+
 			Self::Plugin(r#in) => _ = r#in.set_title(title),
 		}
 		self
diff --git a/yazi-core/src/tasks/prework.rs b/yazi-core/src/tasks/prework.rs
index c7911c7c..b1fa4523 100644
--- a/yazi-core/src/tasks/prework.rs
+++ b/yazi-core/src/tasks/prework.rs
@@ -1,5 +1,5 @@
 use yazi_config::{YAZI, plugin::MAX_FETCHERS};
-use yazi_fs::{File, Files, FsHash64, SortBy};
+use yazi_fs::{Files, FsHash64, SortBy, file::File};
 
 use super::Tasks;
 use crate::mgr::Mimetype;
diff --git a/yazi-core/src/which/option.rs b/yazi-core/src/which/option.rs
index 4a95f83e..1b763feb 100644
--- a/yazi-core/src/which/option.rs
+++ b/yazi-core/src/which/option.rs
@@ -1,16 +1,19 @@
 use mlua::{ExternalError, FromLua, IntoLua, Lua, Table, Value};
 use tokio::sync::mpsc;
-use yazi_config::{KEYMAP, keymap::{ChordCow, Key}};
+use yazi_config::{KEYMAP, keymap::{ChordArc, Key}};
+use yazi_macro::impl_data_any;
 use yazi_shared::{Layer, event::ActionCow};
 
 #[derive(Clone, Debug)]
 pub struct WhichOpt {
-	pub tx:     Option<mpsc::UnboundedSender<Option<yazi_binding::ChordCow>>>,
-	pub cands:  Vec<ChordCow>,
+	pub tx:     Option<mpsc::UnboundedSender<Option<ChordArc>>>,
+	pub cands:  Vec<ChordArc>,
 	pub silent: bool,
 	pub times:  usize,
 }
 
+impl_data_any!(WhichOpt);
+
 impl TryFrom<ActionCow> for WhichOpt {
 	type Error = anyhow::Error;
 
@@ -21,7 +24,7 @@ impl TryFrom<ActionCow> for WhichOpt {
 
 		Ok(Self {
 			tx:     a.take_any2("tx").transpose()?,
-			cands:  a.take_any_iter::<yazi_binding::ChordCow>().map(Into::into).collect(),
+			cands:  a.take_any_iter().collect(),
 			silent: a.bool("silent"),
 			times:  a.get("times").unwrap_or(0),
 		})
@@ -33,10 +36,10 @@ impl From<(Layer, Key)> for WhichOpt {
 		Self {
 			tx:     None,
 			cands:  KEYMAP
-				.get(layer)
+				.chords(layer)
 				.iter()
-				.filter(|c| c.on.len() > 1 && c.on[0] == key)
-				.map(Into::into)
+				.filter(|&c| c.on.len() > 1 && c.on[0] == key)
+				.cloned()
 				.collect(),
 			times:  1,
 			silent: false,
@@ -52,11 +55,7 @@ impl FromLua for WhichOpt {
 
 		Ok(Self {
 			tx:     t.raw_get::<yazi_binding::MpscUnboundedTx<_>>("tx").ok().map(|t| t.0),
-			cands:  t
-				.raw_get::<Table>("cands")?
-				.sequence_values::<yazi_binding::ChordCow>()
-				.map(|c| c.map(Into::into))
-				.collect::<mlua::Result<Vec<_>>>()?,
+			cands:  t.raw_get::<Table>("cands")?.sequence_values().collect::<mlua::Result<Vec<_>>>()?,
 			times:  t.raw_get("times").unwrap_or_default(),
 			silent: t.raw_get("silent")?,
 		})
@@ -69,7 +68,7 @@ impl IntoLua for WhichOpt {
 		lua
 			.create_table_from([
 				("tx", self.tx.map(yazi_binding::MpscUnboundedTx).into_lua(lua)?),
-				("cands", lua.create_sequence_from(self.cands.into_iter().map(yazi_binding::ChordCow))?.into_lua(lua)?),
+				("cands", lua.create_sequence_from(self.cands)?.into_lua(lua)?),
 				("times", self.times.into_lua(lua)?),
 				("silent", self.silent.into_lua(lua)?),
 			])?
diff --git a/yazi-core/src/which/sorter.rs b/yazi-core/src/which/sorter.rs
index a74c9215..6b5f41ac 100644
--- a/yazi-core/src/which/sorter.rs
+++ b/yazi-core/src/which/sorter.rs
@@ -1,6 +1,6 @@
 use std::{borrow::Cow, mem};
 
-use yazi_config::{YAZI, keymap::ChordCow, which::SortBy};
+use yazi_config::{YAZI, keymap::ChordArc, which::SortBy};
 use yazi_shared::{natsort, translit::Transliterator};
 
 #[derive(Clone, Copy, PartialEq)]
@@ -23,7 +23,7 @@ impl Default for WhichSorter {
 }
 
 impl WhichSorter {
-	pub fn sort(&self, items: &mut Vec<ChordCow>) {
+	pub fn sort(&self, items: &mut Vec<ChordArc>) {
 		if self.by == SortBy::None || items.is_empty() {
 			return;
 		}
@@ -53,6 +53,7 @@ impl WhichSorter {
 			if self.reverse { ordering.reverse() } else { ordering }
 		});
 
+		// TODO: remove the `mem::take` since that involves Arc atomics refcount changes
 		*items = indices.into_iter().map(|i| mem::take(&mut items[i])).collect();
 	}
 }
diff --git a/yazi-core/src/which/which.rs b/yazi-core/src/which/which.rs
index 3c50a3b4..a046cfcd 100644
--- a/yazi-core/src/which/which.rs
+++ b/yazi-core/src/which/which.rs
@@ -1,12 +1,12 @@
 use tokio::sync::mpsc;
-use yazi_config::keymap::{ChordCow, Key};
+use yazi_config::keymap::{ChordArc, Key};
 use yazi_macro::{emit, render_and};
 
 #[derive(Default)]
 pub struct Which {
-	pub tx:    Option<mpsc::UnboundedSender<Option<yazi_binding::ChordCow>>>,
+	pub tx:    Option<mpsc::UnboundedSender<Option<ChordArc>>>,
 	pub times: usize,
-	pub cands: Vec<ChordCow>,
+	pub cands: Vec<ChordArc>,
 
 	// Active state
 	pub active: bool,
@@ -31,7 +31,7 @@ impl Which {
 		render_and!(true)
 	}
 
-	pub fn dismiss(&mut self, chord: Option<ChordCow>) {
+	pub fn dismiss(&mut self, chord: Option<ChordArc>) {
 		self.times = 0;
 		self.cands.clear();
 
@@ -39,7 +39,7 @@ impl Which {
 		self.silent = false;
 
 		if let Some(tx) = self.tx.take() {
-			_ = tx.send(chord.clone().map(Into::into));
+			_ = tx.send(chord.as_ref().map(Into::into));
 		}
 		if let Some(chord) = chord {
 			emit!(Seq(chord.into_seq()));
diff --git a/yazi-dds/Cargo.toml b/yazi-dds/Cargo.toml
index f8f50c2f..db89ac92 100644
--- a/yazi-dds/Cargo.toml
+++ b/yazi-dds/Cargo.toml
@@ -23,20 +23,21 @@ yazi-fs      = { path = "../yazi-fs", version = "26.5.6" }
 yazi-macro   = { path = "../yazi-macro", version = "26.5.6" }
 yazi-shared  = { path = "../yazi-shared", version = "26.5.6" }
 yazi-shim    = { path = "../yazi-shim", version = "26.5.6" }
+yazi-version = { path = "../yazi-version", version = "26.5.6" }
 
 # External dependencies
-anyhow        = { workspace = true }
-hashbrown     = { workspace = true }
-indexmap      = { workspace = true }
-mlua          = { workspace = true }
-ordered-float = { workspace = true }
-parking_lot   = { workspace = true }
-paste         = { workspace = true }
-serde         = { workspace = true }
-serde_json    = { workspace = true }
-tokio         = { workspace = true }
-tokio-stream  = { workspace = true }
-tracing       = { workspace = true }
+anyhow       = { workspace = true }
+hashbrown    = { workspace = true }
+indexmap     = { workspace = true }
+inventory    = { workspace = true }
+mlua         = { workspace = true }
+parking_lot  = { workspace = true }
+paste        = { workspace = true }
+serde        = { workspace = true }
+serde_json   = { workspace = true }
+tokio        = { workspace = true }
+tokio-stream = { workspace = true }
+tracing      = { workspace = true }
 
-[build-dependencies]
-vergen-gitcl = { version = "9.1.0", features = [ "build" ] }
+[target.'cfg(windows)'.dependencies]
+uds_windows = "1.2.1"
diff --git a/yazi-dds/build.rs b/yazi-dds/build.rs
deleted file mode 100644
index 48fffb89..00000000
--- a/yazi-dds/build.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-use std::{env, error::Error};
-
-use vergen_gitcl::{Emitter, GitclBuilder};
-
-fn main() -> Result<(), Box<dyn Error>> {
-	if env::var_os("YAZI_NO_GITCL").is_none() {
-		Emitter::default().add_instructions(&GitclBuilder::default().sha(true).build()?)?.emit()?;
-	} else {
-		println!("cargo:rustc-env=VERGEN_GIT_SHA=no-gitcl");
-	}
-
-	Ok(())
-}
diff --git a/yazi-dds/src/client.rs b/yazi-dds/src/client.rs
index e193e215..779d3c8b 100644
--- a/yazi-dds/src/client.rs
+++ b/yazi-dds/src/client.rs
@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};
 use tokio::{io::AsyncWriteExt, select, sync::mpsc, task::JoinHandle, time};
 use tracing::error;
 use yazi_macro::try_format;
-use yazi_shared::Id;
+use yazi_shared::id::Id;
 use yazi_shim::cell::RoCell;
 
 use crate::{ClientReader, ClientWriter, Payload, Pubsub, Server, Stream, ember::{Ember, EmberHey}};
@@ -48,8 +48,8 @@ impl Client {
 							writer.write_all(payload.as_bytes()).await.ok(); // Retry once
 						}
 					}
-					Ok(next) = lines.next_line() => {
-						let Some(line) = next else {
+					next = lines.next_line() => {
+						let Ok(Some(line)) = next else {
 							(lines, writer) = Self::reconnect(&mut server).await;
 							continue;
 						};
diff --git a/yazi-dds/src/ember/bulk_rename.rs b/yazi-dds/src/ember/bulk_rename.rs
index fedd25bf..33ed5976 100644
--- a/yazi-dds/src/ember/bulk_rename.rs
+++ b/yazi-dds/src/ember/bulk_rename.rs
@@ -39,10 +39,7 @@ impl IntoLua for EmberBulkRename<'_> {
 	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> {
 		lua
 			.create_table_from(
-				self
-					.changes
-					.into_iter()
-					.map(|(from, to)| (yazi_binding::Url::new(from), yazi_binding::Url::new(to))),
+				self.changes.into_iter().map(|(from, to)| (from.into_owned(), to.into_owned())),
 			)?
 			.into_lua(lua)
 	}
diff --git a/yazi-dds/src/ember/cd.rs b/yazi-dds/src/ember/cd.rs
index 2c790458..d691e382 100644
--- a/yazi-dds/src/ember/cd.rs
+++ b/yazi-dds/src/ember/cd.rs
@@ -2,7 +2,7 @@ use std::borrow::Cow;
 
 use mlua::{IntoLua, Lua, Value};
 use serde::{Deserialize, Serialize};
-use yazi_shared::{Id, url::UrlBuf};
+use yazi_shared::{id::Id, url::UrlBuf};
 
 use super::Ember;
 
@@ -35,7 +35,7 @@ impl IntoLua for EmberCd<'_> {
 		lua
 			.create_table_from([
 				("tab", self.tab.get().into_lua(lua)?),
-				("url", (!self.dummy).then_some(self.url).map(yazi_binding::Url::new).into_lua(lua)?),
+				("url", (!self.dummy).then_some(self.url).map(|u| u.into_owned()).into_lua(lua)?),
 			])?
 			.into_lua(lua)
 	}
diff --git a/yazi-dds/src/ember/custom.rs b/yazi-dds/src/ember/custom.rs
index 8f3a8f64..c775543b 100644
--- a/yazi-dds/src/ember/custom.rs
+++ b/yazi-dds/src/ember/custom.rs
@@ -1,9 +1,8 @@
 use mlua::{IntoLua, Lua, Value};
 use serde::Serialize;
-use yazi_shared::data::Data;
+use yazi_shared::data::{Data, Sendable};
 
 use super::Ember;
-use crate::Sendable;
 
 #[derive(Clone, Debug)]
 pub struct EmberCustom {
diff --git a/yazi-dds/src/ember/delete.rs b/yazi-dds/src/ember/delete.rs
index 8ceb8443..f2143ea5 100644
--- a/yazi-dds/src/ember/delete.rs
+++ b/yazi-dds/src/ember/delete.rs
@@ -25,8 +25,7 @@ impl<'a> From<EmberDelete<'a>> for Ember<'a> {
 
 impl IntoLua for EmberDelete<'_> {
 	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> {
-		let urls =
-			lua.create_sequence_from(self.urls.into_owned().into_iter().map(yazi_binding::Url::new))?;
+		let urls = lua.create_sequence_from(self.urls.into_owned())?;
 
 		lua.create_table_from([("urls", urls)])?.into_lua(lua)
 	}
diff --git a/yazi-dds/src/ember/download.rs b/yazi-dds/src/ember/download.rs
index 776e4e18..7a75cec8 100644
--- a/yazi-dds/src/ember/download.rs
+++ b/yazi-dds/src/ember/download.rs
@@ -25,8 +25,7 @@ impl<'a> From<EmberDownload<'a>> for Ember<'a> {
 
 impl IntoLua for EmberDownload<'_> {
 	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> {
-		let urls =
-			lua.create_sequence_from(self.urls.into_owned().into_iter().map(yazi_binding::Url::new))?;
+		let urls = lua.create_sequence_from(self.urls.into_owned())?;
 
 		lua.create_table_from([("urls", urls)])?.into_lua(lua)
 	}
diff --git a/yazi-dds/src/ember/duplicate.rs b/yazi-dds/src/ember/duplicate.rs
index b6468144..dcf28335 100644
--- a/yazi-dds/src/ember/duplicate.rs
+++ b/yazi-dds/src/ember/duplicate.rs
@@ -42,11 +42,6 @@ pub struct EmberDuplicateItem {
 
 impl IntoLua for EmberDuplicateItem {
 	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> {
-		lua
-			.create_table_from([
-				("from", yazi_binding::Url::new(self.from)),
-				("to", yazi_binding::Url::new(self.to)),
-			])?
-			.into_lua(lua)
+		lua.create_table_from([("from", self.from), ("to", self.to)])?.into_lua(lua)
 	}
 }
diff --git a/yazi-dds/src/ember/ember.rs b/yazi-dds/src/ember/ember.rs
index aeafaec1..509ede0d 100644
--- a/yazi-dds/src/ember/ember.rs
+++ b/yazi-dds/src/ember/ember.rs
@@ -1,8 +1,8 @@
 use anyhow::{Result, bail};
 use mlua::{ExternalResult, IntoLua, Lua, Value};
-use yazi_shared::Id;
+use yazi_shared::id::Id;
 
-use super::{EmberBulkRename, EmberBye, EmberCd, EmberCustom, EmberDelete, EmberDownload, EmberDuplicate, EmberHey, EmberHi, EmberHover, EmberLoad, EmberMount, EmberMove, EmberRename, EmberTab, EmberTrash, EmberYank};
+use super::{EmberBulkRename, EmberBye, EmberCd, EmberCustom, EmberDelete, EmberDownload, EmberDuplicate, EmberHey, EmberHi, EmberHover, EmberInput, EmberLoad, EmberMount, EmberMove, EmberRename, EmberTab, EmberTrash, EmberYank};
 use crate::Payload;
 
 #[derive(Clone, Debug)]
@@ -22,6 +22,7 @@ pub enum Ember<'a> {
 	Trash(EmberTrash<'a>),
 	Delete(EmberDelete<'a>),
 	Download(EmberDownload<'a>),
+	Input(EmberInput<'a>),
 	Mount(EmberMount),
 	Custom(EmberCustom),
 }
@@ -44,6 +45,7 @@ impl Ember<'static> {
 			"trash" => Self::Trash(serde_json::from_str(body)?),
 			"delete" => Self::Delete(serde_json::from_str(body)?),
 			"download" => Self::Download(serde_json::from_str(body)?),
+			"input" => Self::Input(serde_json::from_str(body)?),
 			"mount" => Self::Mount(serde_json::from_str(body)?),
 			_ => EmberCustom::from_str(kind, body)?,
 		})
@@ -72,6 +74,7 @@ impl Ember<'static> {
 				| "trash"
 				| "delete"
 				| "download"
+				| "input"
 				| "mount"
 		) || kind.starts_with("key-")
 			|| kind.starts_with("ind-")
@@ -111,6 +114,7 @@ impl<'a> Ember<'a> {
 			Self::Trash(_) => "trash",
 			Self::Delete(_) => "delete",
 			Self::Download(_) => "download",
+			Self::Input(_) => "input",
 			Self::Mount(_) => "mount",
 			Self::Custom(b) => b.kind.as_str(),
 		}
@@ -139,6 +143,7 @@ impl<'a> IntoLua for Ember<'a> {
 			Self::Trash(b) => b.into_lua(lua),
 			Self::Delete(b) => b.into_lua(lua),
 			Self::Download(b) => b.into_lua(lua),
+			Self::Input(b) => b.into_lua(lua),
 			Self::Mount(b) => b.into_lua(lua),
 			Self::Custom(b) => b.into_lua(lua),
 		}
diff --git a/yazi-dds/src/ember/hey.rs b/yazi-dds/src/ember/hey.rs
index 299cbcd6..9c95f0f4 100644
--- a/yazi-dds/src/ember/hey.rs
+++ b/yazi-dds/src/ember/hey.rs
@@ -1,9 +1,10 @@
 use hashbrown::HashMap;
 use mlua::{IntoLua, Lua, Value};
 use serde::{Deserialize, Serialize};
-use yazi_shared::{Id, SStr};
+use yazi_shared::id::Id;
+use yazi_shim::SStr;
 
-use super::{Ember, EmberHi};
+use super::Ember;
 use crate::Peer;
 
 /// Server handshake
@@ -15,7 +16,7 @@ pub struct EmberHey {
 
 impl EmberHey {
 	pub fn owned(peers: HashMap<Id, Peer>) -> Ember<'static> {
-		Self { peers, version: EmberHi::version().into() }.into()
+		Self { peers, version: yazi_version::version().into() }.into()
 	}
 }
 
diff --git a/yazi-dds/src/ember/hi.rs b/yazi-dds/src/ember/hi.rs
index f8b1149b..4ee3e315 100644
--- a/yazi-dds/src/ember/hi.rs
+++ b/yazi-dds/src/ember/hi.rs
@@ -3,7 +3,7 @@ use std::borrow::Cow;
 use hashbrown::HashSet;
 use mlua::{IntoLua, Lua, Value};
 use serde::{Deserialize, Serialize};
-use yazi_shared::SStr;
+use yazi_shim::SStr;
 
 use super::Ember;
 
@@ -22,14 +22,10 @@ impl<'a> EmberHi<'a> {
 	{
 		Self {
 			abilities: abilities.into_iter().map(Into::into).collect(),
-			version:   Self::version().into(),
+			version:   yazi_version::version().into(),
 		}
 		.into()
 	}
-
-	pub fn version() -> &'static str {
-		concat!(env!("CARGO_PKG_VERSION"), " ", env!("VERGEN_GIT_SHA"))
-	}
 }
 
 impl<'a> From<EmberHi<'a>> for Ember<'a> {
diff --git a/yazi-dds/src/ember/hover.rs b/yazi-dds/src/ember/hover.rs
index dcee7f12..cca3ef1c 100644
--- a/yazi-dds/src/ember/hover.rs
+++ b/yazi-dds/src/ember/hover.rs
@@ -2,7 +2,7 @@ use std::borrow::Cow;
 
 use mlua::{IntoLua, Lua, Value};
 use serde::{Deserialize, Serialize};
-use yazi_shared::{Id, url::UrlBuf};
+use yazi_shared::{id::Id, url::UrlBuf};
 
 use super::Ember;
 
@@ -31,7 +31,7 @@ impl IntoLua for EmberHover<'_> {
 		lua
 			.create_table_from([
 				("tab", self.tab.get().into_lua(lua)?),
-				("url", self.url.map(yazi_binding::Url::new).into_lua(lua)?),
+				("url", self.url.map(|u| u.into_owned()).into_lua(lua)?),
 			])?
 			.into_lua(lua)
 	}
diff --git a/yazi-dds/src/ember/input.rs b/yazi-dds/src/ember/input.rs
new file mode 100644
index 00000000..151f1ed0
--- /dev/null
+++ b/yazi-dds/src/ember/input.rs
@@ -0,0 +1,34 @@
+use std::borrow::Cow;
+
+use mlua::{IntoLua, Lua, Value};
+use serde::{Deserialize, Serialize};
+
+use super::Ember;
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct EmberInput<'a> {
+	pub r#type: Cow<'a, str>,
+	pub value:  Cow<'a, str>,
+}
+
+impl<'a> EmberInput<'a> {
+	pub fn borrowed(r#type: &'a str, value: &'a str) -> Ember<'a> {
+		Self { r#type: r#type.into(), value: value.into() }.into()
+	}
+}
+
+impl EmberInput<'static> {
+	pub fn owned(r#type: &'static str, value: &str) -> Ember<'static> {
+		Self { r#type: r#type.into(), value: value.to_owned().into() }.into()
+	}
+}
+
+impl<'a> From<EmberInput<'a>> for Ember<'a> {
+	fn from(value: EmberInput<'a>) -> Self { Self::Input(value) }
+}
+
+impl IntoLua for EmberInput<'_> {
+	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> {
+		lua.create_table_from([("type", self.r#type), ("value", self.value)])?.into_lua(lua)
+	}
+}
diff --git a/yazi-dds/src/ember/load.rs b/yazi-dds/src/ember/load.rs
index 84ef2576..b641c415 100644
--- a/yazi-dds/src/ember/load.rs
+++ b/yazi-dds/src/ember/load.rs
@@ -3,7 +3,7 @@ use std::borrow::Cow;
 use mlua::{IntoLua, Lua, Value};
 use serde::{Deserialize, Serialize};
 use yazi_fs::FolderStage;
-use yazi_shared::{Id, url::UrlBuf};
+use yazi_shared::{id::Id, url::UrlBuf};
 
 use super::Ember;
 
@@ -35,8 +35,8 @@ impl IntoLua for EmberLoad<'_> {
 		lua
 			.create_table_from([
 				("tab", self.tab.get().into_lua(lua)?),
-				("url", yazi_binding::Url::new(self.url).into_lua(lua)?),
-				("stage", yazi_binding::FolderStage::new(self.stage.into_owned()).into_lua(lua)?),
+				("url", self.url.into_owned().into_lua(lua)?),
+				("stage", self.stage.into_owned().into_lua(lua)?),
 			])?
 			.into_lua(lua)
 	}
diff --git a/yazi-dds/src/ember/mod.rs b/yazi-dds/src/ember/mod.rs
index 6a83139d..283039db 100644
--- a/yazi-dds/src/ember/mod.rs
+++ b/yazi-dds/src/ember/mod.rs
@@ -1,3 +1,3 @@
 yazi_macro::mod_flat!(
-	bulk_rename bye cd custom delete download duplicate ember hey hi hover load mount r#move rename tab trash yank
+	bulk_rename bye cd custom delete download duplicate ember hey hi hover input load mount r#move rename tab trash yank
 );
diff --git a/yazi-dds/src/ember/move.rs b/yazi-dds/src/ember/move.rs
index 3b5102d1..e5d83c9e 100644
--- a/yazi-dds/src/ember/move.rs
+++ b/yazi-dds/src/ember/move.rs
@@ -42,11 +42,6 @@ pub struct EmberMoveItem {
 
 impl IntoLua for EmberMoveItem {
 	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> {
-		lua
-			.create_table_from([
-				("from", yazi_binding::Url::new(self.from)),
-				("to", yazi_binding::Url::new(self.to)),
-			])?
-			.into_lua(lua)
+		lua.create_table_from([("from", self.from), ("to", self.to)])?.into_lua(lua)
 	}
 }
diff --git a/yazi-dds/src/ember/rename.rs b/yazi-dds/src/ember/rename.rs
index a86cbf2f..c4fa934a 100644
--- a/yazi-dds/src/ember/rename.rs
+++ b/yazi-dds/src/ember/rename.rs
@@ -2,7 +2,7 @@ use std::borrow::Cow;
 
 use mlua::{IntoLua, Lua, Value};
 use serde::{Deserialize, Serialize};
-use yazi_shared::{Id, url::UrlBuf};
+use yazi_shared::{id::Id, url::UrlBuf};
 
 use super::Ember;
 
@@ -34,8 +34,8 @@ impl IntoLua for EmberRename<'_> {
 		lua
 			.create_table_from([
 				("tab", self.tab.get().into_lua(lua)?),
-				("from", yazi_binding::Url::new(self.from).into_lua(lua)?),
-				("to", yazi_binding::Url::new(self.to).into_lua(lua)?),
+				("from", self.from.into_owned().into_lua(lua)?),
+				("to", self.to.into_owned().into_lua(lua)?),
 			])?
 			.into_lua(lua)
 	}
diff --git a/yazi-dds/src/ember/tab.rs b/yazi-dds/src/ember/tab.rs
index bca60015..928efbaa 100644
--- a/yazi-dds/src/ember/tab.rs
+++ b/yazi-dds/src/ember/tab.rs
@@ -1,6 +1,6 @@
 use mlua::{IntoLua, Lua, Value};
 use serde::{Deserialize, Serialize};
-use yazi_shared::Id;
+use yazi_shared::id::Id;
 
 use super::Ember;
 
diff --git a/yazi-dds/src/ember/trash.rs b/yazi-dds/src/ember/trash.rs
index 766d9b19..1416f722 100644
--- a/yazi-dds/src/ember/trash.rs
+++ b/yazi-dds/src/ember/trash.rs
@@ -25,8 +25,7 @@ impl<'a> From<EmberTrash<'a>> for Ember<'a> {
 
 impl IntoLua for EmberTrash<'_> {
 	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> {
-		let urls =
-			lua.create_sequence_from(self.urls.into_owned().into_iter().map(yazi_binding::Url::new))?;
+		let urls = lua.create_sequence_from(self.urls.into_owned())?;
 
 		lua.create_table_from([("urls", urls)])?.into_lua(lua)
 	}
diff --git a/yazi-dds/src/ember/yank.rs b/yazi-dds/src/ember/yank.rs
index a22eb4f1..2150d5b3 100644
--- a/yazi-dds/src/ember/yank.rs
+++ b/yazi-dds/src/ember/yank.rs
@@ -1,16 +1,17 @@
 use std::borrow::Cow;
 
 use indexmap::IndexSet;
-use mlua::{AnyUserData, IntoLua, Lua, MetaMethod, MultiValue, ObjectLike, UserData, UserDataFields, UserDataMethods, Value};
+use mlua::{AnyUserData, FromLua, IntoLua, Lua, MetaMethod, MultiValue, ObjectLike, UserData, UserDataFields, UserDataMethods, Value};
 use serde::{Deserialize, Serialize};
-use yazi_binding::get_metatable;
-use yazi_shared::url::UrlBufCov;
+use yazi_macro::impl_data_any;
+use yazi_shared::url::{UrlBuf, UrlBufCov};
+use yazi_shim::mlua::get_metatable;
 
 use super::Ember;
 
 type Iter = yazi_binding::Iter<
-	std::iter::Map<indexmap::set::IntoIter<UrlBufCov>, fn(UrlBufCov) -> yazi_binding::Url>,
-	yazi_binding::Url,
+	std::iter::Map<indexmap::set::IntoIter<UrlBufCov>, fn(UrlBufCov) -> UrlBuf>,
+	UrlBuf,
 >;
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
@@ -19,6 +20,8 @@ pub struct EmberYank<'a> {
 	pub urls: Cow<'a, IndexSet<UrlBufCov>>,
 }
 
+impl_data_any!(EmberYank<'static>, from_into_lua = inherit);
+
 impl<'a> EmberYank<'a> {
 	pub fn borrowed(cut: bool, urls: &'a IndexSet<UrlBufCov>) -> Ember<'a> {
 		Self { cut, urls: Cow::Borrowed(urls) }.into()
@@ -35,10 +38,23 @@ impl<'a> From<EmberYank<'a>> for Ember<'a> {
 	fn from(value: EmberYank<'a>) -> Self { Self::Yank(value) }
 }
 
+impl FromLua for EmberYank<'static> {
+	fn from_lua(value: Value, lua: &Lua) -> mlua::Result<Self> {
+		match value {
+			Value::UserData(ud) => ud.take::<EmberYankIter>()?.collect(lua),
+			_ => Err(mlua::Error::FromLuaConversionError {
+				from:    value.type_name(),
+				to:      "EmberYank".to_owned(),
+				message: Some("expected EmberYankIter userdata".to_owned()),
+			}),
+		}
+	}
+}
+
 impl IntoLua for EmberYank<'_> {
 	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> {
 		let len = self.urls.len();
-		let iter = Iter::new(self.urls.into_owned().into_iter().map(yazi_binding::Url::new), Some(len));
+		let iter = Iter::new(self.urls.into_owned().into_iter().map(UrlBuf::from), Some(len));
 		EmberYankIter { cut: self.cut, len, inner: lua.create_userdata(iter)? }.into_lua(lua)
 	}
 }
diff --git a/yazi-dds/src/lib.rs b/yazi-dds/src/lib.rs
index aa41ee8f..db05960f 100644
--- a/yazi-dds/src/lib.rs
+++ b/yazi-dds/src/lib.rs
@@ -1,12 +1,12 @@
 yazi_macro::mod_pub!(ember);
 
-yazi_macro::mod_flat!(client payload pubsub pump sendable server state stream);
+yazi_macro::mod_flat!(client payload pubsub pump server state stream);
 
 pub fn init() {
 	let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
 
 	// Client
-	ID.init(yazi_boot::ARGS.client_id.unwrap_or(yazi_shared::Id::unique()));
+	ID.init(yazi_boot::ARGS.client_id.unwrap_or(yazi_shared::id::Id::unique()));
 	PEERS.with(<_>::default);
 	QUEUE_TX.init(tx);
 	QUEUE_RX.init(rx);
diff --git a/yazi-dds/src/payload.rs b/yazi-dds/src/payload.rs
index 5d3ffe77..f2c5b641 100644
--- a/yazi-dds/src/payload.rs
+++ b/yazi-dds/src/payload.rs
@@ -3,8 +3,8 @@ use std::{fmt::Display, io::Write, str::FromStr};
 use anyhow::{Result, anyhow};
 use mlua::{IntoLua, Lua, Value};
 use yazi_boot::BOOT;
-use yazi_macro::{emit, relay};
-use yazi_shared::{Id, event::ActionCow};
+use yazi_macro::{emit, impl_data_any, relay};
+use yazi_shared::{event::ActionCow, id::Id};
 
 use crate::{ID, ember::Ember};
 
@@ -15,6 +15,8 @@ pub struct Payload<'a> {
 	pub body:     Ember<'a>,
 }
 
+impl_data_any!(Payload<'static>);
+
 impl<'a> Payload<'a> {
 	pub fn new(body: Ember<'a>) -> Self { Self { receiver: Id::ZERO, sender: *ID, body } }
 
@@ -101,6 +103,7 @@ impl Display for Payload<'_> {
 			Ember::Trash(b) => serde_json::to_string(b),
 			Ember::Delete(b) => serde_json::to_string(b),
 			Ember::Download(b) => serde_json::to_string(b),
+			Ember::Input(b) => serde_json::to_string(b),
 			Ember::Mount(b) => serde_json::to_string(b),
 			Ember::Custom(b) => serde_json::to_string(b),
 		};
@@ -117,8 +120,8 @@ impl<'a> IntoLua for Payload<'a> {
 	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> {
 		lua
 			.create_table_from([
-				("receiver", yazi_binding::Id(self.receiver).into_lua(lua)?),
-				("sender", yazi_binding::Id(self.sender).into_lua(lua)?),
+				("receiver", self.receiver.into_lua(lua)?),
+				("sender", self.sender.into_lua(lua)?),
 				("body", self.body.into_lua(lua)?),
 			])?
 			.into_lua(lua)
diff --git a/yazi-dds/src/pubsub.rs b/yazi-dds/src/pubsub.rs
index ff012795..42428a59 100644
--- a/yazi-dds/src/pubsub.rs
+++ b/yazi-dds/src/pubsub.rs
@@ -5,7 +5,7 @@ use mlua::Function;
 use parking_lot::RwLock;
 use yazi_boot::BOOT;
 use yazi_fs::FolderStage;
-use yazi_shared::{Id, url::{Url, UrlBuf, UrlBufCov}};
+use yazi_shared::{id::Id, url::{Url, UrlBuf, UrlBufCov}};
 use yazi_shim::cell::RoCell;
 
 use crate::{Client, ID, PEERS, ember::{Ember, EmberBulkRename, EmberDuplicateItem, EmberHi, EmberMoveItem}};
@@ -174,5 +174,7 @@ impl Pubsub {
 
 	pub_after!(download(urls: Vec<UrlBuf>), (&urls), (urls));
 
+	pub_after!(input(r#type: &'static str, value: &str), (r#type, value));
+
 	pub_after!(mount(), ());
 }
diff --git a/yazi-dds/src/server.rs b/yazi-dds/src/server.rs
index 5c74bfa9..0efdbacb 100644
--- a/yazi-dds/src/server.rs
+++ b/yazi-dds/src/server.rs
@@ -5,7 +5,7 @@ use hashbrown::HashMap;
 use parking_lot::RwLock;
 use tokio::{io::{AsyncBufReadExt, AsyncWriteExt, BufReader}, select, sync::mpsc::{self, UnboundedReceiver}, task::JoinHandle, time};
 use yazi_macro::try_format;
-use yazi_shared::Id;
+use yazi_shared::id::Id;
 use yazi_shim::cell::RoCell;
 
 use crate::{Client, ClientWriter, Payload, Peer, STATE, Stream, ember::{Ember, EmberBye, EmberHey}};
diff --git a/yazi-dds/src/state.rs b/yazi-dds/src/state.rs
index 830f9901..c740921a 100644
--- a/yazi-dds/src/state.rs
+++ b/yazi-dds/src/state.rs
@@ -26,6 +26,7 @@ impl Deref for State {
 
 impl State {
 	pub fn set(&self, kind: &str, sender: u64, body: &str) -> bool {
+		debug_assert!(kind.starts_with('@'));
 		let Some(inner) = &mut *self.inner.write() else { return false };
 
 		if body == "null" {
@@ -84,7 +85,7 @@ impl State {
 			let line = mem::take(&mut buf);
 			let mut parts = line.splitn(4, ',');
 
-			let Some(kind) = parts.next() else { continue };
+			let Some(kind) = parts.next().filter(|s| s.starts_with('@')) else { continue };
 			let Some(_) = parts.next() else { continue };
 			inner.insert(kind.to_owned(), line);
 		}
diff --git a/yazi-dds/src/stream.rs b/yazi-dds/src/stream.rs
index 4b2915da..5aba44bd 100644
--- a/yazi-dds/src/stream.rs
+++ b/yazi-dds/src/stream.rs
@@ -1,25 +1,24 @@
-use std::io;
+use std::{io, path::PathBuf};
 
-use tokio::io::{BufReader, Lines, ReadHalf, WriteHalf};
+use tokio::{io::{AsyncBufReadExt, BufReader, Lines, ReadHalf, WriteHalf}, sync::OnceCell};
+use yazi_fs::{Xdg, create_owned_dir, provider::{Provider, local::Local}};
 
 pub struct Stream;
 
-use tokio::io::AsyncBufReadExt;
-
 #[cfg(unix)]
 pub type ClientReader = Lines<BufReader<ReadHalf<tokio::net::UnixStream>>>;
-#[cfg(not(unix))]
+#[cfg(windows)]
 pub type ClientReader = Lines<BufReader<ReadHalf<tokio::net::TcpStream>>>;
 
 #[cfg(unix)]
 pub(super) type ClientWriter = WriteHalf<tokio::net::UnixStream>;
-#[cfg(not(unix))]
+#[cfg(windows)]
 pub(super) type ClientWriter = WriteHalf<tokio::net::TcpStream>;
 
 #[cfg(unix)]
 pub(super) type ServerListener = tokio::net::UnixListener;
-#[cfg(not(unix))]
-pub(super) type ServerListener = tokio::net::TcpListener;
+#[cfg(windows)]
+pub(super) type ServerListener = WinUnixListener;
 
 impl Stream {
 	#[cfg(unix)]
@@ -29,45 +28,74 @@ impl Stream {
 		Ok((BufReader::new(reader).lines(), writer))
 	}
 
-	#[cfg(not(unix))]
+	#[cfg(windows)]
 	pub async fn connect() -> io::Result<(ClientReader, ClientWriter)> {
-		let stream = tokio::net::TcpStream::connect("127.0.0.1:33581").await?;
-		let (reader, writer) = tokio::io::split(stream);
+		let p = Self::socket_file().await?;
+		let uds = tokio::task::spawn_blocking(move || uds_windows::UnixStream::connect(p)).await??;
+
+		let (reader, writer) = tokio::io::split(WinUnixListener::into_tokio(uds)?);
 		Ok((BufReader::new(reader).lines(), writer))
 	}
 
 	#[cfg(unix)]
 	pub(super) async fn bind() -> io::Result<ServerListener> {
-		use yazi_fs::provider::Provider;
-
 		let p = Self::socket_file().await?;
 
-		yazi_fs::provider::local::Local::regular(&p).remove_file().await.ok();
+		Local::regular(&p).remove_file().await.ok();
 		tokio::net::UnixListener::bind(p)
 	}
 
-	#[cfg(not(unix))]
+	#[cfg(windows)]
 	pub(super) async fn bind() -> io::Result<ServerListener> {
-		tokio::net::TcpListener::bind("127.0.0.1:33581").await
+		let p = Self::socket_file().await?;
+		Local::regular(&p).remove_file().await.ok();
+
+		let listener = uds_windows::UnixListener::bind(p)?;
+		listener.set_nonblocking(true)?;
+
+		Ok(WinUnixListener(listener))
 	}
 
-	#[cfg(unix)]
-	async fn socket_file() -> io::Result<&'static std::path::PathBuf> {
-		use tokio::{fs::DirBuilder, sync::OnceCell};
-		use yazi_fs::Xdg;
-
-		static ONCE: tokio::sync::OnceCell<std::path::PathBuf> = OnceCell::const_new();
+	async fn socket_file() -> io::Result<&'static PathBuf> {
+		static ONCE: OnceCell<PathBuf> = OnceCell::const_new();
 		ONCE
 			.get_or_try_init(|| async move {
 				let p = Xdg::runtime_dir();
-
-				#[cfg(unix)]
-				DirBuilder::new().mode(0o700).recursive(true).create(p).await?;
-				#[cfg(not(unix))]
-				DirBuilder::new().recursive(true).create(p).await?;
+				create_owned_dir(p).await?;
 
 				Ok(p.join(".dds.sock"))
 			})
 			.await
 	}
 }
+
+// --- WinUnixListener
+#[cfg(windows)]
+pub(super) struct WinUnixListener(uds_windows::UnixListener);
+
+#[cfg(windows)]
+impl WinUnixListener {
+	pub(super) async fn accept(
+		&self,
+	) -> io::Result<(tokio::net::TcpStream, uds_windows::SocketAddr)> {
+		loop {
+			match self.0.accept() {
+				Ok((stream, addr)) => return Ok((Self::into_tokio(stream)?, addr)),
+				Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+					tokio::time::sleep(std::time::Duration::from_millis(20)).await;
+				}
+				Err(e) => return Err(e),
+			}
+		}
+	}
+
+	fn into_tokio(uds: uds_windows::UnixStream) -> io::Result<tokio::net::TcpStream> {
+		use std::os::windows::io::{FromRawSocket, IntoRawSocket};
+
+		let raw = uds.into_raw_socket();
+		let std = unsafe { std::net::TcpStream::from_raw_socket(raw) };
+		std.set_nonblocking(true)?;
+
+		tokio::net::TcpStream::from_std(std)
+	}
+}
diff --git a/yazi-emulator/Cargo.toml b/yazi-emulator/Cargo.toml
index 7f3c1fb8..41ad3bf6 100644
--- a/yazi-emulator/Cargo.toml
+++ b/yazi-emulator/Cargo.toml
@@ -20,9 +20,9 @@ yazi-term   = { path = "../yazi-term", version = "26.5.6" }
 yazi-tty    = { path = "../yazi-tty", version = "26.5.9" }
 
 # External dependencies
-anyhow      = { workspace = true }
-either      = { workspace = true }
-ratatui     = { workspace = true }
-scopeguard  = { workspace = true }
-tokio       = { workspace = true }
-tracing     = { workspace = true }
+anyhow       = { workspace = true }
+either       = { workspace = true }
+ratatui-core = { workspace = true }
+scopeguard   = { workspace = true }
+tokio        = { workspace = true }
+tracing      = { workspace = true }
diff --git a/yazi-emulator/src/emulator.rs b/yazi-emulator/src/emulator.rs
index 4fa69927..a87f0a13 100644
--- a/yazi-emulator/src/emulator.rs
+++ b/yazi-emulator/src/emulator.rs
@@ -2,14 +2,14 @@ use std::{io::{self, BufWriter, Write}, time::Duration};
 
 use anyhow::Result;
 use either::Either;
-use ratatui::style::Color;
+use ratatui_core::style::Color;
 use scopeguard::defer;
 use tokio::time::sleep;
 use tracing::{debug, error, warn};
 use yazi_macro::writef;
 use yazi_shim::cell::RoCell;
-use yazi_term::{TERM, sequence::{HideCursor, If, KittyGraphicsQuery, MoveTo, RequestBgColor, RequestCellPixelSize, RequestDA1, RequestXtVersion, RestoreCursorPos, SaveCursorPos, SetFg, SetSgr, ShowCursor}};
-use yazi_tty::{Handle, TTY};
+use yazi_term::TERM;
+use yazi_tty::{Handle, TTY, sequence::{HideCursor, If, KittyGraphicsQuery, MoveTo, RequestBgColor, RequestCellPixelSize, RequestDA1, RequestXtVersion, RestoreCursorPos, SaveCursorPos, SetFg, SetSgr, ShowCursor}};
 
 use crate::{Brand, Mux, TMUX, Unknown};
 
diff --git a/yazi-emulator/src/mux.rs b/yazi-emulator/src/mux.rs
index c790d7a9..8fe0d402 100644
--- a/yazi-emulator/src/mux.rs
+++ b/yazi-emulator/src/mux.rs
@@ -4,8 +4,7 @@ use anyhow::Result;
 use tracing::error;
 use yazi_macro::{time, writef};
 use yazi_shim::cell::SyncCell;
-use yazi_term::sequence::RequestDeviceStatus;
-use yazi_tty::TTY;
+use yazi_tty::{TTY, sequence::RequestDeviceStatus};
 
 use crate::Emulator;
 
diff --git a/yazi-fm/Cargo.toml b/yazi-fm/Cargo.toml
index 1f97eaca..f8f04d3d 100644
--- a/yazi-fm/Cargo.toml
+++ b/yazi-fm/Cargo.toml
@@ -46,8 +46,8 @@ better-panic       = "0.3.0"
 fdlimit            = "0.3.0"
 mlua               = { workspace = true }
 paste              = { workspace = true }
-ratatui            = { workspace = true }
-scopeguard         = { workspace = true }
+ratatui-core       = { workspace = true }
+ratatui-widgets    = { workspace = true }
 tokio              = { workspace = true }
 tokio-stream       = { workspace = true }
 tracing            = { workspace = true }
diff --git a/yazi-fm/src/app/mod.rs b/yazi-fm/src/app/mod.rs
index 723744fb..694aef48 100644
--- a/yazi-fm/src/app/mod.rs
+++ b/yazi-fm/src/app/mod.rs
@@ -1 +1 @@
-yazi_macro::mod_flat!(app render);
+yazi_macro::mod_flat!(app render sync_guard);
diff --git a/yazi-fm/src/app/render.rs b/yazi-fm/src/app/render.rs
index 245c4c21..e0c0c618 100644
--- a/yazi-fm/src/app/render.rs
+++ b/yazi-fm/src/app/render.rs
@@ -1,18 +1,15 @@
-use std::{io::Write, sync::atomic::{AtomicU8, Ordering}, time::Instant};
+use std::{sync::atomic::Ordering, time::Instant};
 
 use anyhow::Result;
-use ratatui::{CompletedFrame, backend::Backend, buffer::Buffer, layout::Position};
 use yazi_actor::{Ctx, lives::Lives};
+use yazi_adapter::ADAPTOR;
 use yazi_binding::runtime_scope;
 use yazi_config::LAYOUT;
-use yazi_macro::{act, succ, writef};
+use yazi_macro::{act, succ};
 use yazi_plugin::LUA;
 use yazi_shared::{data::Data, event::NEED_RENDER};
-use yazi_term::{CursorStyle, sequence::{BeginSyncUpdate, EndSyncUpdate, MoveTo, SetCursorStyle, ShowCursor}};
-use yazi_tty::TTY;
-use yazi_tui::RatermBackend;
-use yazi_widgets::COLLISION;
 
+use super::SyncGuard;
 use crate::{app::App, root::Root};
 
 impl App {
@@ -25,30 +22,27 @@ impl App {
 			return self.render_partially();
 		}
 
-		Self::routine(true, None);
-		let _guard = scopeguard::guard(self.core.cursor(), |c| Self::routine(false, c));
-
-		let collision = COLLISION.swap(false, Ordering::Relaxed);
+		let guard = SyncGuard::enter();
+		let collision = ADAPTOR.collision.replace(false);
 		let preview_rect = LAYOUT.get().preview;
-		let frame = term.draw(|f| {
-			_ = Lives::scope(&self.core, || {
-				runtime_scope!(LUA, "root", Ok(f.render_widget(Root::new(&self.core), f.area())))
+		term.draw(|f| {
+			_ = Lives::scope(&mut self.core, |core| {
+				runtime_scope!(LUA, "root", Ok(f.render_widget(Root::new(core), f.area())))
 			});
 		})?;
 
-		if COLLISION.load(Ordering::Relaxed) {
-			Self::patch(frame);
-		}
 		if !self.core.notify.messages.is_empty() {
 			self.render_partially()?;
 		}
 
 		let cx = &mut Ctx::active(&mut self.core, &mut self.term);
-		if collision && !COLLISION.load(Ordering::Relaxed) {
+		if collision && !ADAPTOR.collision.get() {
 			act!(mgr:peek, cx, true)?; // Reload preview if collision is resolved
 		} else if preview_rect != LAYOUT.get().preview {
 			act!(mgr:peek, cx)?; // Reload preview if layout changed
 		}
+
+		guard.finish(self.core.cursor());
 		succ!();
 	}
 
@@ -58,62 +52,18 @@ impl App {
 			return self.render(false);
 		}
 
-		Self::routine(true, None);
-		let _guard = scopeguard::guard(self.core.cursor(), |c| Self::routine(false, c));
-
-		let frame = term.draw_partial(|f| {
-			_ = Lives::scope(&self.core, || {
+		let guard = SyncGuard::enter();
+		term.draw_partial(|f| {
+			_ = Lives::scope(&mut self.core, |core| {
 				runtime_scope!(LUA, "root", {
-					f.render_widget(crate::tasks::Progress::new(&self.core), f.area());
-					f.render_widget(crate::notify::Notify::new(&self.core), f.area());
+					f.render_widget(crate::tasks::Progress::new(core), f.area());
+					f.render_widget(crate::notify::Notify::new(core), f.area());
 					Ok(())
 				})
 			});
 		})?;
 
-		if COLLISION.load(Ordering::Relaxed) {
-			Self::patch(frame);
-		}
+		guard.finish(self.core.cursor());
 		succ!();
 	}
-
-	#[inline]
-	fn patch(frame: CompletedFrame) {
-		let mut new = Buffer::empty(frame.area);
-		for y in new.area.top()..new.area.bottom() {
-			for x in new.area.left()..new.area.right() {
-				let cell = &frame.buffer[(x, y)];
-				if cell.skip {
-					new[(x, y)] = cell.clone();
-				}
-				new[(x, y)].set_skip(!cell.skip);
-			}
-		}
-
-		let patches = frame.buffer.diff(&new);
-		RatermBackend::new(&mut *TTY.lockout()).draw(patches.into_iter()).ok();
-	}
-
-	fn routine(push: bool, cursor: Option<(Position, CursorStyle)>) {
-		static COUNT: AtomicU8 = AtomicU8::new(0);
-		if push && COUNT.fetch_add(1, Ordering::Relaxed) != 0 {
-			return;
-		} else if !push && COUNT.fetch_sub(1, Ordering::Relaxed) != 1 {
-			return;
-		}
-
-		if push {
-			write!(TTY.writer(), "{BeginSyncUpdate}").ok();
-		} else if let Some((Position { x, y }, shape)) = cursor {
-			writef!(
-				TTY.writer(),
-				"{}{}{ShowCursor}{EndSyncUpdate}",
-				SetCursorStyle(shape as u8),
-				MoveTo(x, y),
-			)
-			.ok();
-		} else {
-			writef!(TTY.writer(), "{EndSyncUpdate}").ok();
-		};
-	}
 }
diff --git a/yazi-fm/src/app/sync_guard.rs b/yazi-fm/src/app/sync_guard.rs
new file mode 100644
index 00000000..76455efd
--- /dev/null
+++ b/yazi-fm/src/app/sync_guard.rs
@@ -0,0 +1,46 @@
+use std::{io::Write, sync::atomic::{AtomicU8, Ordering}};
+
+use ratatui_core::layout::Position;
+use yazi_macro::writef;
+use yazi_tty::{TTY, sequence::{BeginSyncUpdate, EndSyncUpdate, MoveTo, SetCursorStyle, ShowCursor}};
+
+static DEPTH: AtomicU8 = AtomicU8::new(0);
+
+pub(super) struct SyncGuard {
+	finished: bool,
+}
+
+impl SyncGuard {
+	pub(super) fn enter() -> Self {
+		if DEPTH.fetch_add(1, Ordering::Relaxed) == 0 {
+			write!(TTY.writer(), "{BeginSyncUpdate}").ok();
+		}
+
+		Self { finished: false }
+	}
+
+	pub(super) fn finish(mut self, cursor: Option<(Position, SetCursorStyle)>) {
+		self.finished = true;
+		if DEPTH.fetch_sub(1, Ordering::Relaxed) != 1 {
+			return;
+		}
+
+		_ = if let Some((Position { x, y }, style)) = cursor {
+			writef!(TTY.writer(), "{style}{}{ShowCursor}{EndSyncUpdate}", MoveTo(x, y))
+		} else {
+			writef!(TTY.writer(), "{EndSyncUpdate}")
+		};
+	}
+}
+
+impl Drop for SyncGuard {
+	fn drop(&mut self) {
+		if self.finished {
+			return;
+		}
+
+		if DEPTH.fetch_sub(1, Ordering::Relaxed) == 1 {
+			writef!(TTY.writer(), "{EndSyncUpdate}").ok();
+		}
+	}
+}
diff --git a/yazi-fm/src/cmp/cmp.rs b/yazi-fm/src/cmp/cmp.rs
index df231612..49711759 100644
--- a/yazi-fm/src/cmp/cmp.rs
+++ b/yazi-fm/src/cmp/cmp.rs
@@ -1,7 +1,9 @@
 use std::path::MAIN_SEPARATOR_STR;
 
-use ratatui::{buffer::Buffer, layout::Rect, widgets::{Block, BorderType, List, ListItem, Widget}};
-use yazi_config::{THEME, popup::{Offset, Position}};
+use ratatui_core::{buffer::Buffer, layout::Rect, widgets::Widget};
+use ratatui_widgets::{block::Block, borders::BorderType, list::{List, ListItem}};
+use yazi_binding::position::{Offset, Position};
+use yazi_config::THEME;
 use yazi_core::Core;
 use yazi_shared::strand::StrandLike;
 use yazi_term::TERM;
@@ -37,13 +39,14 @@ impl Widget for Cmp<'_> {
 			})
 			.collect();
 
-		let input_area = self.core.mgr.area(self.core.input.position);
-		let mut area = Position::sticky(TERM.dimension(), input_area, Offset {
+		let input_area = self.core.mgr.area(self.core.input.main.position);
+		let mut area = Position::hovered(Offset {
 			x:      1,
 			y:      0,
 			width:  input_area.width.saturating_sub(2),
 			height: items.len() as u16 + 2,
-		});
+		})
+		.sticky(input_area, TERM.dimension().area());
 
 		if area.y > input_area.y {
 			area.y = area.y.saturating_sub(1);
@@ -52,7 +55,7 @@ impl Widget for Cmp<'_> {
 			area.height = rect.height.saturating_sub(area.y).min(area.height);
 		}
 
-		yazi_widgets::Clear.render(area, buf);
+		yazi_widgets::clear::Clear::default().render(area, buf);
 		List::new(items)
 			.block(
 				Block::bordered().border_type(BorderType::Rounded).border_style(THEME.cmp.border.get()),
diff --git a/yazi-fm/src/confirm/body.rs b/yazi-fm/src/confirm/body.rs
index 8da33456..a8afeb1d 100644
--- a/yazi-fm/src/confirm/body.rs
+++ b/yazi-fm/src/confirm/body.rs
@@ -1,4 +1,5 @@
-use ratatui::{buffer::Buffer, layout::{Margin, Rect}, style::Styled, widgets::{Block, Borders, Widget}};
+use ratatui_core::{buffer::Buffer, layout::{Margin, Rect}, style::Styled, widgets::Widget};
+use ratatui_widgets::{block::Block, borders::Borders};
 use yazi_config::THEME;
 use yazi_core::Core;
 
@@ -28,7 +29,7 @@ impl Widget for Body<'_> {
 		confirm
 			.body
 			.clone()
-			.alignment(ratatui::layout::Alignment::Center)
+			.alignment(ratatui_core::layout::Alignment::Center)
 			.block(block)
 			.style(THEME.confirm.body.get().derive(Styled::style(&confirm.body)))
 			.render(inner, buf);
diff --git a/yazi-fm/src/confirm/buttons.rs b/yazi-fm/src/confirm/buttons.rs
index ebfb9cb8..9049d5b5 100644
--- a/yazi-fm/src/confirm/buttons.rs
+++ b/yazi-fm/src/confirm/buttons.rs
@@ -1,4 +1,5 @@
-use ratatui::{buffer::Buffer, layout::{Constraint, Rect}, text::Span, widgets::{Paragraph, Widget}};
+use ratatui_core::{buffer::Buffer, layout::{Constraint, Rect}, text::Span, widgets::Widget};
+use ratatui_widgets::paragraph::Paragraph;
 use yazi_config::THEME;
 
 pub(crate) struct Buttons;
@@ -6,7 +7,8 @@ pub(crate) struct Buttons;
 impl Widget for Buttons {
 	fn render(self, area: Rect, buf: &mut Buffer) {
 		let chunks =
-			ratatui::layout::Layout::horizontal([Constraint::Fill(1), Constraint::Fill(1)]).split(area);
+			ratatui_core::layout::Layout::horizontal([Constraint::Fill(1), Constraint::Fill(1)])
+				.split(area);
 		let labels = THEME.confirm.btn_labels.load();
 
 		Paragraph::new(Span::raw(&labels[0]).style(THEME.confirm.btn_yes.get()))
diff --git a/yazi-fm/src/confirm/confirm.rs b/yazi-fm/src/confirm/confirm.rs
index 65f4c183..3ff88e87 100644
--- a/yazi-fm/src/confirm/confirm.rs
+++ b/yazi-fm/src/confirm/confirm.rs
@@ -1,4 +1,5 @@
-use ratatui::{buffer::Buffer, layout::{Alignment, Constraint, Layout, Margin, Rect}, widgets::{Block, BorderType, Widget}};
+use ratatui_core::{buffer::Buffer, layout::{Alignment, Constraint, Layout, Margin, Rect}, widgets::Widget};
+use ratatui_widgets::{block::Block, borders::BorderType};
 use yazi_config::THEME;
 use yazi_core::Core;
 
@@ -15,7 +16,7 @@ impl Widget for Confirm<'_> {
 		let confirm = &self.core.confirm;
 		let area = self.core.mgr.area(confirm.position);
 
-		yazi_widgets::Clear.render(area, buf);
+		yazi_widgets::clear::Clear::default().render(area, buf);
 
 		Block::bordered()
 			.border_type(BorderType::Rounded)
diff --git a/yazi-fm/src/confirm/list.rs b/yazi-fm/src/confirm/list.rs
index b0ad696c..5418ac9c 100644
--- a/yazi-fm/src/confirm/list.rs
+++ b/yazi-fm/src/confirm/list.rs
@@ -1,4 +1,5 @@
-use ratatui::{buffer::Buffer, layout::{Margin, Rect}, widgets::{Block, Borders, Scrollbar, ScrollbarOrientation, ScrollbarState, StatefulWidget, Widget, Wrap}};
+use ratatui_core::{buffer::Buffer, layout::{Margin, Rect}, widgets::{StatefulWidget, Widget}};
+use ratatui_widgets::{block::Block, borders::Borders, paragraph::Wrap, scrollbar::{Scrollbar, ScrollbarOrientation, ScrollbarState}};
 use yazi_config::THEME;
 use yazi_core::Core;
 
diff --git a/yazi-fm/src/dispatcher.rs b/yazi-fm/src/dispatcher.rs
index 53b525dd..63c7e0d5 100644
--- a/yazi-fm/src/dispatcher.rs
+++ b/yazi-fm/src/dispatcher.rs
@@ -3,10 +3,9 @@ use std::sync::atomic::Ordering;
 use anyhow::Result;
 use tracing::warn;
 use yazi_actor::Ctx;
-use yazi_config::keymap::Key;
 use yazi_macro::{act, emit};
 use yazi_shared::event::{ActionCow, Event, NEED_RENDER};
-use yazi_term::event::{Event as TermEvent, KeyEvent, MouseEvent};
+use yazi_term::event::{DndEvent, Event as TermEvent, KeyEvent, MouseEvent};
 use yazi_widgets::input::InputMode;
 
 use crate::{Executor, Router, app::App};
@@ -29,6 +28,7 @@ impl<'a> Dispatcher<'a> {
 			Event::Term(TermEvent::FocusIn) => self.dispatch_focus(),
 			Event::Term(TermEvent::FocusOut) => Ok(()),
 			Event::Term(TermEvent::Paste(str)) => self.dispatch_paste(str),
+			Event::Term(TermEvent::Dnd(dnd)) => self.dispatch_dnd(dnd),
 		};
 
 		if let Err(e) = &result {
@@ -67,7 +67,7 @@ impl<'a> Dispatcher<'a> {
 	}
 
 	fn dispatch_key(&mut self, key: KeyEvent) -> Result<()> {
-		Router::new(self.app).route(Key::from(key))?;
+		Router::new(self.app).route(key)?;
 		Ok(())
 	}
 
@@ -87,14 +87,18 @@ impl<'a> Dispatcher<'a> {
 	}
 
 	fn dispatch_paste(&mut self, str: String) -> Result<()> {
-		if self.app.core.input.visible {
-			let input = &mut self.app.core.input;
-			if input.mode() == InputMode::Insert {
-				input.type_str(&str)?;
-			} else if input.mode() == InputMode::Replace {
-				input.replace_str(&str)?;
+		if let Some(mut guard) = self.app.core.input.lock_mut() {
+			if guard.mode() == InputMode::Insert {
+				guard.type_str(&str)?;
+			} else if guard.mode() == InputMode::Replace {
+				guard.replace_str(&str)?;
 			}
 		}
 		Ok(())
 	}
+
+	fn dispatch_dnd(&mut self, dnd: DndEvent) -> Result<()> {
+		let cx = &mut Ctx::active(&mut self.app.core, &mut self.app.term);
+		act!(app:dnd, cx, dnd).map(|_| ())
+	}
 }
diff --git a/yazi-fm/src/executor.rs b/yazi-fm/src/executor.rs
index 7f7c6c5c..2ed1b401 100644
--- a/yazi-fm/src/executor.rs
+++ b/yazi-fm/src/executor.rs
@@ -249,40 +249,45 @@ impl<'a> Executor<'a> {
 	}
 
 	fn input(&mut self, action: ActionCow) -> Result<Data> {
-		let mode = self.app.core.input.mode();
-		let cx = &mut Ctx::new(&action, &mut self.app.core, &mut self.app.term)?;
-
+		let mut guard;
 		macro_rules! on {
 			($name:ident) => {
 				if action.name == stringify!($name) {
+					let cx = &mut Ctx::new(&action, &mut self.app.core, &mut self.app.term)?;
 					return act!(input:$name, cx, action);
 				}
 			};
+			($layer:ident : $name:ident, $opt:expr) => {{
+				drop(guard);
+				let cx = &mut Ctx::new(&action, &mut self.app.core, &mut self.app.term)?;
+				return act!($layer:$name, cx, $opt);
+			}};
 		}
 
 		on!(escape);
 		on!(show);
 		on!(close);
 
-		match mode {
-			InputMode::Normal => {
-				match action.name.as_ref() {
-					// Help
-					"help" => return act!(help:toggle, cx, Layer::Input),
-					// Plugin
-					"plugin" => return act!(app:plugin, cx, action),
-					// Lua
-					"lua" => return act!(app:lua, cx, action),
-					_ => {}
-				}
-			}
-			InputMode::Insert => {
-				on!(complete);
-			}
+		guard = match self.app.core.input.lock_mut() {
+			Some(g) => g,
+			None => succ!(),
+		};
+
+		match guard.mode() {
+			InputMode::Normal => match action.name.as_ref() {
+				"help" => on!(help:toggle, Layer::Input),
+				"plugin" => on!(app:plugin, action),
+				"lua" => on!(app:lua, action),
+				_ => {}
+			},
+			InputMode::Insert => match action.name.as_ref() {
+				"complete" => on!(input:complete, action),
+				_ => {}
+			},
 			InputMode::Replace => {}
 		};
 
-		self.app.core.input.execute(action)
+		guard.execute(action)
 	}
 
 	fn confirm(&mut self, action: ActionCow) -> Result<Data> {
diff --git a/yazi-fm/src/help/bindings.rs b/yazi-fm/src/help/bindings.rs
index 8c2a5c39..e121653f 100644
--- a/yazi-fm/src/help/bindings.rs
+++ b/yazi-fm/src/help/bindings.rs
@@ -1,4 +1,5 @@
-use ratatui::{buffer::Buffer, layout::{self, Constraint, Rect}, widgets::{List, ListItem, Widget}};
+use ratatui_core::{buffer::Buffer, layout::{self, Constraint, Rect}, widgets::Widget};
+use ratatui_widgets::list::{List, ListItem};
 use yazi_config::THEME;
 use yazi_core::Core;
 
diff --git a/yazi-fm/src/help/help.rs b/yazi-fm/src/help/help.rs
index 70f10fb5..24185d43 100644
--- a/yazi-fm/src/help/help.rs
+++ b/yazi-fm/src/help/help.rs
@@ -1,4 +1,4 @@
-use ratatui::{buffer::Buffer, layout::{self, Constraint, Rect}, text::Line, widgets::Widget};
+use ratatui_core::{buffer::Buffer, layout::{self, Constraint, Rect}, text::Line, widgets::Widget};
 use yazi_config::{KEYMAP, THEME};
 use yazi_core::Core;
 
@@ -12,7 +12,7 @@ impl<'a> Help<'a> {
 	pub fn new(core: &'a Core) -> Self { Self { core } }
 
 	fn tips() -> String {
-		match KEYMAP.help.iter().find(|&c| c.run.iter().any(|c| c.name == "filter")) {
+		match KEYMAP.help.load().iter().find(|&c| c.run.iter().any(|a| a.name == "filter")) {
 			Some(c) => format!(" (Press `{}` to filter)", c.on()),
 			None => String::new(),
 		}
@@ -22,7 +22,7 @@ impl<'a> Help<'a> {
 impl Widget for Help<'_> {
 	fn render(self, area: Rect, buf: &mut Buffer) {
 		let help = &self.core.help;
-		yazi_widgets::Clear.render(area, buf);
+		yazi_widgets::clear::Clear::default().render(area, buf);
 
 		let chunks = layout::Layout::vertical([Constraint::Fill(1), Constraint::Length(1)]).split(area);
 		Line::styled(
diff --git a/yazi-fm/src/input/input.rs b/yazi-fm/src/input/input.rs
index fa5bbc49..c2edf160 100644
--- a/yazi-fm/src/input/input.rs
+++ b/yazi-fm/src/input/input.rs
@@ -1,4 +1,5 @@
-use ratatui::{buffer::Buffer, layout::{Margin, Rect}, text::Line, widgets::{Block, BorderType, Widget}};
+use ratatui_core::{buffer::Buffer, layout::{Margin, Rect}, text::Line, widgets::Widget};
+use ratatui_widgets::{block::Block, borders::BorderType};
 use yazi_config::THEME;
 use yazi_core::Core;
 
@@ -13,16 +14,16 @@ impl<'a> Input<'a> {
 impl Widget for Input<'_> {
 	fn render(self, _: Rect, buf: &mut Buffer) {
 		let input = &self.core.input;
-		let area = self.core.mgr.area(input.position);
 
-		yazi_widgets::Clear.render(area, buf);
+		let outer = self.core.mgr.area(input.main.position);
+		yazi_widgets::clear::Clear::default().render(outer, buf);
 
 		Block::bordered()
 			.border_type(BorderType::Rounded)
 			.border_style(THEME.input.border.get())
-			.title(Line::styled(&input.title, THEME.input.title.get()))
-			.render(area, buf);
+			.title(Line::styled(&input.main.title, THEME.input.title.get()))
+			.render(outer, buf);
 
-		input.render(area.inner(Margin::new(1, 1)), buf);
+		input.main.render(outer.inner(Margin::new(1, 1)), buf);
 	}
 }
diff --git a/yazi-fm/src/logs.rs b/yazi-fm/src/logs.rs
index 9c99175e..bfb818c8 100644
--- a/yazi-fm/src/logs.rs
+++ b/yazi-fm/src/logs.rs
@@ -1,14 +1,14 @@
 use std::{fs::File, io};
 
 use anyhow::Context;
-use ratatui::style::Color;
+use ratatui_core::style::Color;
 use tracing_appender::non_blocking::WorkerGuard;
 use tracing_subscriber::EnvFilter;
 use yazi_fs::Xdg;
 use yazi_macro::writef;
 use yazi_shared::LOG_LEVEL;
 use yazi_shim::cell::RoCell;
-use yazi_term::sequence::{SetFg, SetSgr};
+use yazi_tty::sequence::{SetFg, SetSgr};
 
 static _GUARD: RoCell<WorkerGuard> = RoCell::new();
 
diff --git a/yazi-fm/src/main.rs b/yazi-fm/src/main.rs
index c3ea749e..f6710142 100644
--- a/yazi-fm/src/main.rs
+++ b/yazi-fm/src/main.rs
@@ -4,7 +4,7 @@ static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
 
 yazi_macro::mod_pub!(app cmp confirm help input mgr notify pick spot tasks which);
 
-yazi_macro::mod_flat!(dispatcher executor logs panic root router signals);
+yazi_macro::mod_flat!(dispatcher executor logs panic renderer root router signals);
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
@@ -14,20 +14,20 @@ async fn main() -> anyhow::Result<()> {
 	Logs::start()?;
 	_ = fdlimit::raise_fd_limit();
 
-	yazi_tty::init();
-
-	yazi_term::init()?;
-
 	yazi_fs::init();
 
-	yazi_config::init()?;
-
 	yazi_vfs::init();
 
-	yazi_adapter::init()?;
+	yazi_tty::init();
+
+	yazi_config::init()?;
 
 	yazi_boot::init();
 
+	yazi_term::init()?;
+
+	yazi_adapter::init()?;
+
 	yazi_dds::init();
 
 	yazi_widgets::init();
@@ -40,5 +40,7 @@ async fn main() -> anyhow::Result<()> {
 
 	yazi_dds::serve();
 
+	yazi_actor::init();
+
 	yazi_shared::LOCAL_SET.run_until(app::App::serve()).await
 }
diff --git a/yazi-fm/src/mgr/modal.rs b/yazi-fm/src/mgr/modal.rs
index dd578862..f53e3cfb 100644
--- a/yazi-fm/src/mgr/modal.rs
+++ b/yazi-fm/src/mgr/modal.rs
@@ -1,29 +1,24 @@
-use mlua::{ObjectLike, Table};
-use ratatui::{buffer::Buffer, layout::Rect, widgets::Widget};
+use ratatui_core::{buffer::Buffer, layout::Rect, widgets::Widget};
 use tracing::error;
-use yazi_binding::elements::render_once;
 use yazi_core::Core;
-use yazi_plugin::LUA;
+
+use crate::Renderer;
 
 pub(crate) struct Modal<'a> {
-	core: &'a Core,
+	core: &'a mut Core,
 }
 
 impl<'a> Modal<'a> {
 	#[inline]
-	pub(crate) fn new(core: &'a Core) -> Self { Self { core } }
+	pub(crate) fn new(core: &'a mut Core) -> Self { Self { core } }
 }
 
 impl Widget for Modal<'_> {
 	fn render(self, area: Rect, buf: &mut Buffer) {
-		let mut f = || {
-			let area = yazi_binding::elements::Rect::from(area);
-			let root = LUA.globals().raw_get::<Table>("Modal")?.call_method::<Table>("new", area)?;
+		let result =
+			Renderer::new(self.core, "Modal").with_redrawer("children_redraw").render(area, buf);
 
-			render_once(root.call_method("children_redraw", ())?, buf, |p| self.core.mgr.area(p));
-			Ok::<_, mlua::Error>(())
-		};
-		if let Err(e) = f() {
+		if let Err(e) = result {
 			error!("Failed to redraw the `Modal` component:\n{e}");
 		}
 	}
diff --git a/yazi-fm/src/mgr/preview.rs b/yazi-fm/src/mgr/preview.rs
index 7227edc3..39cfcba4 100644
--- a/yazi-fm/src/mgr/preview.rs
+++ b/yazi-fm/src/mgr/preview.rs
@@ -1,4 +1,5 @@
-use ratatui::{buffer::Buffer, widgets::Widget};
+use ratatui_core::{buffer::Buffer, widgets::Widget};
+use yazi_binding::elements::Spatial;
 use yazi_config::LAYOUT;
 use yazi_core::Core;
 
@@ -12,7 +13,7 @@ impl<'a> Preview<'a> {
 }
 
 impl Widget for Preview<'_> {
-	fn render(self, win: ratatui::layout::Rect, buf: &mut Buffer) {
+	fn render(self, win: ratatui_core::layout::Rect, buf: &mut Buffer) {
 		let Some(lock) = &self.core.active().preview.lock else {
 			return;
 		};
diff --git a/yazi-fm/src/notify/notify.rs b/yazi-fm/src/notify/notify.rs
index 0129dc9b..8e25037d 100644
--- a/yazi-fm/src/notify/notify.rs
+++ b/yazi-fm/src/notify/notify.rs
@@ -1,4 +1,5 @@
-use ratatui::{buffer::Buffer, layout::{self, Constraint, Offset, Rect}, widgets::{Block, BorderType, Paragraph, Widget, Wrap}};
+use ratatui_core::{buffer::Buffer, layout::{self, Constraint, Offset, Rect}, widgets::Widget};
+use ratatui_widgets::{block::Block, borders::BorderType, paragraph::{Paragraph, Wrap}};
 use yazi_core::{Core, notify::Message};
 
 pub(crate) struct Notify<'a> {
@@ -43,7 +44,7 @@ impl Widget for Notify<'_> {
 				tiles[i].offset(Offset { x: (100 - m.percent) as i32 * tiles[i].width as i32 / 100, y: 0 });
 			rect.width -= rect.x - tiles[i].x;
 
-			yazi_widgets::Clear.render(rect, buf);
+			yazi_widgets::clear::Clear::default().render(rect, buf);
 			Paragraph::new(m.content.as_str())
 				.wrap(Wrap { trim: false })
 				.block(
diff --git a/yazi-fm/src/pick/list.rs b/yazi-fm/src/pick/list.rs
index 488c053e..6704d2a8 100644
--- a/yazi-fm/src/pick/list.rs
+++ b/yazi-fm/src/pick/list.rs
@@ -1,4 +1,5 @@
-use ratatui::{buffer::Buffer, layout::{Margin, Rect}, widgets::{ListItem, Scrollbar, ScrollbarOrientation, ScrollbarState, StatefulWidget, Widget}};
+use ratatui_core::{buffer::Buffer, layout::{Margin, Rect}, widgets::{StatefulWidget, Widget}};
+use ratatui_widgets::{list::ListItem, scrollbar::{Scrollbar, ScrollbarOrientation, ScrollbarState}};
 use yazi_config::THEME;
 use yazi_core::Core;
 use yazi_widgets::Scrollable;
@@ -33,6 +34,6 @@ impl Widget for List<'_> {
 				ListItem::new(format!("  {v}")).style(THEME.pick.inactive.get())
 			}
 		});
-		Widget::render(ratatui::widgets::List::new(items), inner, buf);
+		Widget::render(ratatui_widgets::list::List::new(items), inner, buf);
 	}
 }
diff --git a/yazi-fm/src/pick/pick.rs b/yazi-fm/src/pick/pick.rs
index 844f7454..730a5ee5 100644
--- a/yazi-fm/src/pick/pick.rs
+++ b/yazi-fm/src/pick/pick.rs
@@ -1,4 +1,5 @@
-use ratatui::{buffer::Buffer, layout::{Margin, Rect}, widgets::{Block, BorderType, Widget}};
+use ratatui_core::{buffer::Buffer, layout::{Margin, Rect}, widgets::Widget};
+use ratatui_widgets::{block::Block, borders::BorderType};
 use yazi_config::THEME;
 use yazi_core::Core;
 
@@ -17,7 +18,7 @@ impl Widget for Pick<'_> {
 		let pick = &self.core.pick;
 		let area = self.core.mgr.area(pick.position);
 
-		yazi_widgets::Clear.render(area, buf);
+		yazi_widgets::clear::Clear::default().render(area, buf);
 
 		Block::bordered()
 			.title(pick.title())
diff --git a/yazi-fm/src/renderer.rs b/yazi-fm/src/renderer.rs
new file mode 100644
index 00000000..123b2bfd
--- /dev/null
+++ b/yazi-fm/src/renderer.rs
@@ -0,0 +1,52 @@
+use mlua::{ObjectLike, Table};
+use ratatui_core::{buffer::Buffer, layout::Rect};
+use yazi_core::Core;
+use yazi_plugin::LUA;
+use yazi_widgets::{Renderable, Renderables};
+
+pub(super) struct Renderer<'a> {
+	core:        &'a mut Core,
+	component:   &'a str,
+	constructor: &'a str,
+	redrawer:    &'a str,
+}
+
+impl<'a> Renderer<'a> {
+	pub(super) fn new(core: &'a mut Core, component: &'a str) -> Self {
+		Self { core, component, constructor: "new", redrawer: "redraw" }
+	}
+
+	pub(super) fn with_constructor(mut self, constructor: &'a str) -> Self {
+		self.constructor = constructor;
+		self
+	}
+
+	pub(super) fn with_redrawer(mut self, redrawer: &'a str) -> Self {
+		self.redrawer = redrawer;
+		self
+	}
+
+	pub(super) fn render(self, area: Rect, buf: &mut Buffer) -> mlua::Result<()> {
+		let area = yazi_binding::elements::Rect::from(area);
+
+		let value = LUA
+			.globals()
+			.raw_get::<Table>(self.component)?
+			.call_method::<Table>(self.constructor, area)?
+			.call_method(self.redrawer, ())?;
+
+		self.core.input.alt = None;
+		Renderables::reduce(value, |element| {
+			match &element {
+				Renderable::Input(input) if input.focus => {
+					self.core.input.alt = Some(input.into());
+				}
+				_ => {}
+			}
+
+			element.render_with(buf, |p| self.core.mgr.area(p));
+		});
+
+		Ok::<_, mlua::Error>(())
+	}
+}
diff --git a/yazi-fm/src/root.rs b/yazi-fm/src/root.rs
index 77f60683..ef4e76a5 100644
--- a/yazi-fm/src/root.rs
+++ b/yazi-fm/src/root.rs
@@ -1,18 +1,18 @@
 use mlua::{ObjectLike, Table};
-use ratatui::{buffer::Buffer, layout::Rect, widgets::Widget};
+use ratatui_core::{buffer::Buffer, layout::Rect, widgets::Widget};
 use tracing::error;
-use yazi_binding::elements::render_once;
 use yazi_core::Core;
 use yazi_plugin::LUA;
 
 use super::{cmp, confirm, help, input, mgr, pick, spot, tasks, which};
+use crate::Renderer;
 
 pub(super) struct Root<'a> {
-	core: &'a Core,
+	core: &'a mut Core,
 }
 
 impl<'a> Root<'a> {
-	pub(super) fn new(core: &'a Core) -> Self { Self { core } }
+	pub(super) fn new(core: &'a mut Core) -> Self { Self { core } }
 
 	pub(super) fn reflow(area: Rect) -> mlua::Result<Table> {
 		let area = yazi_binding::elements::Rect::from(area);
@@ -23,14 +23,7 @@ impl<'a> Root<'a> {
 
 impl Widget for Root<'_> {
 	fn render(self, area: Rect, buf: &mut Buffer) {
-		let mut f = || {
-			let area = yazi_binding::elements::Rect::from(area);
-			let root = LUA.globals().raw_get::<Table>("Root")?.call_method::<Table>("new", area)?;
-
-			render_once(root.call_method("redraw", ())?, buf, |p| self.core.mgr.area(p));
-			Ok::<_, mlua::Error>(())
-		};
-		if let Err(e) = f() {
+		if let Err(e) = Renderer::new(self.core, "Root").render(area, buf) {
 			error!("Failed to redraw the `Root` component:\n{e}");
 		}
 
@@ -49,7 +42,7 @@ impl Widget for Root<'_> {
 			pick::Pick::new(self.core).render(area, buf);
 		}
 
-		if self.core.input.visible {
+		if self.core.input.main.visible {
 			input::Input::new(self.core).render(area, buf);
 		}
 
diff --git a/yazi-fm/src/router.rs b/yazi-fm/src/router.rs
index 35cbd55f..2cc863f7 100644
--- a/yazi-fm/src/router.rs
+++ b/yazi-fm/src/router.rs
@@ -1,8 +1,9 @@
 use anyhow::Result;
 use yazi_actor::Ctx;
-use yazi_config::{KEYMAP, keymap::{Chord, ChordCow, Key}};
+use yazi_config::{KEYMAP, keymap::{Chord, Key}};
 use yazi_macro::act;
 use yazi_shared::Layer;
+use yazi_term::event::KeyEvent;
 
 use crate::{Dispatcher, app::App};
 
@@ -13,18 +14,22 @@ pub(super) struct Router<'a> {
 impl<'a> Router<'a> {
 	pub(super) fn new(app: &'a mut App) -> Self { Self { app } }
 
-	pub(super) fn route(&mut self, key: Key) -> Result<bool> {
-		let core = &mut self.app.core;
-		let layer = core.layer();
-
-		if core.help.visible && core.help.r#type(&key)? {
-			return Ok(true);
-		}
-		if core.input.visible && core.input.r#type(&key)? {
-			return Ok(true);
-		}
-
+	pub(super) fn route(&mut self, key: KeyEvent) -> Result<bool> {
 		use Layer as L;
+
+		let core = &mut self.app.core;
+		if core.help.visible && core.help.r#type(key)? {
+			return Ok(true);
+		}
+
+		if let Some(mut guard) = core.input.lock_mut()
+			&& guard.r#type(key)?
+		{
+			return Ok(true);
+		}
+
+		let layer = core.layer();
+		let key = Key::from(key);
 		Ok(match layer {
 			L::Null | L::App | L::Notify => unreachable!(),
 			L::Mgr | L::Tasks | L::Spot | L::Pick | L::Input | L::Confirm | L::Help => {
@@ -36,7 +41,8 @@ impl<'a> Router<'a> {
 	}
 
 	fn matches(&mut self, layer: Layer, key: Key) -> bool {
-		for chord @ Chord { on, .. } in KEYMAP.get(layer) {
+		for chord in &*KEYMAP.chords(layer) {
+			let Chord { on, .. } = chord.as_ref();
 			if on.is_empty() || on[0] != key {
 				continue;
 			}
@@ -45,7 +51,7 @@ impl<'a> Router<'a> {
 				let cx = &mut Ctx::active(&mut self.app.core, &mut self.app.term);
 				act!(which:activate, cx, (layer, key)).ok();
 			} else {
-				Dispatcher::new(self.app).dispatch_seq(ChordCow::from(chord).into_seq());
+				Dispatcher::new(self.app).dispatch_seq(chord.to_seq());
 			}
 			return true;
 		}
diff --git a/yazi-fm/src/spot/spot.rs b/yazi-fm/src/spot/spot.rs
index 7dd5cc6f..b5ef5c07 100644
--- a/yazi-fm/src/spot/spot.rs
+++ b/yazi-fm/src/spot/spot.rs
@@ -1,4 +1,5 @@
-use ratatui::{buffer::Buffer, layout::Rect, widgets::Widget};
+use ratatui_core::{buffer::Buffer, layout::Rect, widgets::Widget};
+use yazi_binding::elements::Spatial;
 use yazi_core::Core;
 
 pub(crate) struct Spot<'a> {
diff --git a/yazi-fm/src/tasks/list.rs b/yazi-fm/src/tasks/list.rs
index b09c46be..5e6a2933 100644
--- a/yazi-fm/src/tasks/list.rs
+++ b/yazi-fm/src/tasks/list.rs
@@ -1,29 +1,21 @@
-use mlua::{ObjectLike, Table};
-use ratatui::{buffer::Buffer, layout::Rect, widgets::Widget};
+use ratatui_core::{buffer::Buffer, layout::Rect, widgets::Widget};
 use tracing::error;
-use yazi_binding::elements::render_once;
 use yazi_core::Core;
-use yazi_plugin::LUA;
+
+use crate::Renderer;
 
 pub(crate) struct List<'a> {
-	core: &'a Core,
+	core: &'a mut Core,
 }
 
 impl<'a> List<'a> {
 	#[inline]
-	pub(crate) fn new(core: &'a Core) -> Self { Self { core } }
+	pub(crate) fn new(core: &'a mut Core) -> Self { Self { core } }
 }
 
 impl Widget for List<'_> {
 	fn render(self, area: Rect, buf: &mut Buffer) {
-		let mut f = || {
-			let area = yazi_binding::elements::Rect::from(area);
-			let root = LUA.globals().raw_get::<Table>("Tasks")?.call_method::<Table>("new", area)?;
-
-			render_once(root.call_method("redraw", ())?, buf, |p| self.core.mgr.area(p));
-			Ok::<_, mlua::Error>(())
-		};
-		if let Err(e) = f() {
+		if let Err(e) = Renderer::new(self.core, "Tasks").render(area, buf) {
 			error!("Failed to redraw the `Tasks` component:\n{e}");
 		}
 	}
diff --git a/yazi-fm/src/tasks/progress.rs b/yazi-fm/src/tasks/progress.rs
index 1040c704..ef49c29e 100644
--- a/yazi-fm/src/tasks/progress.rs
+++ b/yazi-fm/src/tasks/progress.rs
@@ -1,30 +1,24 @@
-use mlua::{ObjectLike, Table};
-use ratatui::{buffer::Buffer, layout::Rect, widgets::Widget};
+use ratatui_core::{buffer::Buffer, layout::Rect, widgets::Widget};
 use tracing::error;
-use yazi_binding::elements::render_once;
 use yazi_config::LAYOUT;
 use yazi_core::Core;
-use yazi_plugin::LUA;
+
+use crate::Renderer;
 
 pub(crate) struct Progress<'a> {
-	core: &'a Core,
+	core: &'a mut Core,
 }
 
 impl<'a> Progress<'a> {
-	pub(crate) fn new(core: &'a Core) -> Self { Self { core } }
+	pub(crate) fn new(core: &'a mut Core) -> Self { Self { core } }
 }
 
 impl Widget for Progress<'_> {
 	fn render(self, _: Rect, buf: &mut Buffer) {
-		let mut f = || {
-			let area = yazi_binding::elements::Rect::from(LAYOUT.get().progress);
-			let progress =
-				LUA.globals().raw_get::<Table>("Progress")?.call_method::<Table>("use", area)?;
+		let area = LAYOUT.get().progress;
+		let result = Renderer::new(self.core, "Progress").with_constructor("use").render(area, buf);
 
-			render_once(progress.call_method("redraw", ())?, buf, |p| self.core.mgr.area(p));
-			Ok::<_, mlua::Error>(())
-		};
-		if let Err(e) = f() {
+		if let Err(e) = result {
 			error!("Failed to redraw the `Progress` component:\n{e}");
 		}
 	}
diff --git a/yazi-fm/src/tasks/tasks.rs b/yazi-fm/src/tasks/tasks.rs
index c9e98835..3b60adcc 100644
--- a/yazi-fm/src/tasks/tasks.rs
+++ b/yazi-fm/src/tasks/tasks.rs
@@ -1,15 +1,16 @@
-use ratatui::{buffer::Buffer, layout::{self, Alignment, Constraint, Rect}, text::Line, widgets::{Block, BorderType, Widget}};
+use ratatui_core::{buffer::Buffer, layout::{self, Alignment, Constraint, Rect}, text::Line, widgets::Widget};
+use ratatui_widgets::{block::Block, borders::BorderType};
 use yazi_config::THEME;
 use yazi_core::{Core, tasks::TASKS_PERCENT};
 
 use crate::tasks::List;
 
 pub(crate) struct Tasks<'a> {
-	core: &'a Core,
+	core: &'a mut Core,
 }
 
 impl<'a> Tasks<'a> {
-	pub(crate) fn new(core: &'a Core) -> Self { Self { core } }
+	pub(crate) fn new(core: &'a mut Core) -> Self { Self { core } }
 
 	pub(super) fn area(area: Rect) -> Rect {
 		let chunk = layout::Layout::vertical([
@@ -32,7 +33,7 @@ impl Widget for Tasks<'_> {
 	fn render(self, area: Rect, buf: &mut Buffer) {
 		let area = Self::area(area);
 
-		yazi_widgets::Clear.render(area, buf);
+		yazi_widgets::clear::Clear::default().render(area, buf);
 
 		let block = Block::bordered()
 			.title(Line::styled("Tasks", THEME.tasks.title.get()))
diff --git a/yazi-fm/src/which/cand.rs b/yazi-fm/src/which/cand.rs
index 2eef1f2a..f6db60c7 100644
--- a/yazi-fm/src/which/cand.rs
+++ b/yazi-fm/src/which/cand.rs
@@ -1,4 +1,4 @@
-use ratatui::{buffer::Buffer, layout::Rect, text::{Line, Span}, widgets::Widget};
+use ratatui_core::{buffer::Buffer, layout::Rect, text::{Line, Span}, widgets::Widget};
 use yazi_config::{THEME, keymap::Chord};
 
 pub(super) struct Cand<'a> {
diff --git a/yazi-fm/src/which/which.rs b/yazi-fm/src/which/which.rs
index a47ca22d..12fdd3d8 100644
--- a/yazi-fm/src/which/which.rs
+++ b/yazi-fm/src/which/which.rs
@@ -1,4 +1,5 @@
-use ratatui::{buffer::Buffer, layout, layout::{Constraint, Rect}, widgets::{Block, Widget}};
+use ratatui_core::{buffer::Buffer, layout, layout::{Constraint, Rect}, widgets::Widget};
+use ratatui_widgets::block::Block;
 use yazi_config::THEME;
 use yazi_core::Core;
 
@@ -46,7 +47,7 @@ impl Widget for Which<'_> {
 			.split(area)
 		};
 
-		yazi_widgets::Clear.render(area, buf);
+		yazi_widgets::clear::Clear::default().render(area, buf);
 		Block::new().style(THEME.which.mask.get()).render(area, buf);
 
 		for y in 0..area.height {
diff --git a/yazi-fs/Cargo.toml b/yazi-fs/Cargo.toml
index aa42cf51..076fdc97 100644
--- a/yazi-fs/Cargo.toml
+++ b/yazi-fs/Cargo.toml
@@ -13,10 +13,11 @@ rust-version.workspace = true
 workspace = true
 
 [dependencies]
-yazi-ffi    = { path = "../yazi-ffi", version = "26.5.6" }
-yazi-macro  = { path = "../yazi-macro", version = "26.5.6" }
-yazi-shared = { path = "../yazi-shared", version = "26.5.6" }
-yazi-shim   = { path = "../yazi-shim", version = "26.5.6" }
+yazi-binding = { path = "../yazi-binding", version = "26.5.6" }
+yazi-ffi     = { path = "../yazi-ffi", version = "26.5.6" }
+yazi-macro   = { path = "../yazi-macro", version = "26.5.6" }
+yazi-shared  = { path = "../yazi-shared", version = "26.5.6" }
+yazi-shim    = { path = "../yazi-shim", version = "26.5.6" }
 
 # External dependencies
 anyhow           = { workspace = true }
@@ -26,7 +27,9 @@ dirs             = { workspace = true }
 either           = { workspace = true }
 foldhash         = { workspace = true }
 hashbrown        = { workspace = true }
+inventory        = { workspace = true }
 libc             = { workspace = true }
+mlua             = { workspace = true }
 parking_lot      = { workspace = true }
 percent-encoding = { workspace = true }
 rand             = { workspace = true }
diff --git a/yazi-fs/src/cha/cha.rs b/yazi-fs/src/cha/cha.rs
index 537289c9..deb11563 100644
--- a/yazi-fs/src/cha/cha.rs
+++ b/yazi-fs/src/cha/cha.rs
@@ -1,13 +1,14 @@
 use std::{fs::Metadata, ops::Deref, time::{Duration, SystemTime, UNIX_EPOCH}};
 
 use anyhow::bail;
+use mlua::FromLua;
 use yazi_macro::{unix_either, win_either};
 use yazi_shared::{strand::AsStrand, url::AsUrl};
 
 use super::ChaKind;
 use crate::cha::{ChaMode, ChaType};
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, Eq, FromLua, PartialEq)]
 pub struct Cha {
 	pub kind:  ChaKind,
 	pub mode:  ChaMode,
diff --git a/yazi-binding/src/cha.rs b/yazi-fs/src/cha/lua.rs
similarity index 86%
rename from yazi-binding/src/cha.rs
rename to yazi-fs/src/cha/lua.rs
index 75e54d0f..5a761cf9 100644
--- a/yazi-binding/src/cha.rs
+++ b/yazi-fs/src/cha/lua.rs
@@ -1,16 +1,8 @@
-use std::{ops::Deref, time::{Duration, SystemTime}};
+use std::time::{Duration, SystemTime};
 
-use mlua::{ExternalError, FromLua, IntoLua, Lua, Table, UserData, UserDataFields, UserDataMethods};
-use yazi_fs::{FsHash128, cha::{ChaKind, ChaMode}};
+use mlua::{ExternalError, Lua, Table, UserData, UserDataFields, UserDataMethods};
 
-#[derive(Clone, Copy, FromLua)]
-pub struct Cha(pub yazi_fs::cha::Cha);
-
-impl Deref for Cha {
-	type Target = yazi_fs::cha::Cha;
-
-	fn deref(&self) -> &Self::Target { &self.0 }
-}
+use crate::{FsHash128, cha::{Cha, ChaKind, ChaMode}};
 
 impl Cha {
 	pub fn install(lua: &Lua) -> mlua::Result<()> {
@@ -24,13 +16,13 @@ impl Cha {
 
 		lua.globals().raw_set(
 			"Cha",
-			lua.create_function(|lua, t: Table| {
+			lua.create_function(|_, t: Table| {
 				let kind = ChaKind::from_bits(t.raw_get("kind").unwrap_or_default())
 					.ok_or_else(|| "Invalid kind".into_lua_err())?;
 
 				let mode = ChaMode::try_from(t.raw_get::<u16>("mode")?)?;
 
-				Self(yazi_fs::cha::Cha {
+				Ok(Self {
 					kind,
 					mode,
 					len: t.raw_get("len").unwrap_or_default(),
@@ -43,7 +35,6 @@ impl Cha {
 					gid: t.raw_get("gid").unwrap_or_default(),
 					nlink: t.raw_get("nlink").unwrap_or_default(),
 				})
-				.into_lua(lua)
 			})?,
 		)
 	}
diff --git a/yazi-fs/src/cha/mod.rs b/yazi-fs/src/cha/mod.rs
index a72c4fb2..75d67400 100644
--- a/yazi-fs/src/cha/mod.rs
+++ b/yazi-fs/src/cha/mod.rs
@@ -1 +1 @@
-yazi_macro::mod_flat!(cha kind mode r#type);
+yazi_macro::mod_flat!(cha kind lua mode r#type);
diff --git a/yazi-fs/src/cwd.rs b/yazi-fs/src/cwd.rs
index d5f727c3..104ea125 100644
--- a/yazi-fs/src/cwd.rs
+++ b/yazi-fs/src/cwd.rs
@@ -4,7 +4,7 @@ use arc_swap::ArcSwap;
 use yazi_shared::url::{AsUrl, Url, UrlBuf, UrlLike};
 use yazi_shim::cell::RoCell;
 
-use crate::{FsUrl, Xdg};
+use crate::{FsUrl, Xdg, path::clean_url};
 
 pub static CWD: RoCell<Cwd> = RoCell::new();
 
@@ -18,13 +18,14 @@ impl Deref for Cwd {
 
 impl Default for Cwd {
 	fn default() -> Self {
-		let p = std::env::var_os("PWD")
+		let u = std::env::var_os("PWD")
 			.map(PathBuf::from)
 			.filter(|p| p.is_absolute())
-			.or_else(|| current_dir().ok())
+			.map(clean_url)
+			.or_else(|| current_dir().ok().map(UrlBuf::from))
 			.expect("failed to get current working directory");
 
-		Self(ArcSwap::new(Arc::new(UrlBuf::from(p))))
+		Self(ArcSwap::new(Arc::new(u)))
 	}
 }
 
diff --git a/yazi-fs/src/file.rs b/yazi-fs/src/file/file.rs
similarity index 100%
rename from yazi-fs/src/file.rs
rename to yazi-fs/src/file/file.rs
diff --git a/yazi-fs/src/file/inventory.rs b/yazi-fs/src/file/inventory.rs
new file mode 100644
index 00000000..624fbd0c
--- /dev/null
+++ b/yazi-fs/src/file/inventory.rs
@@ -0,0 +1,9 @@
+use mlua::UserDataRegistry;
+
+use crate::file::File;
+
+pub struct FileInventory {
+	pub register: fn(&mut UserDataRegistry<File>),
+}
+
+inventory::collect!(FileInventory);
diff --git a/yazi-fs/src/file/lua.rs b/yazi-fs/src/file/lua.rs
new file mode 100644
index 00000000..a6e93728
--- /dev/null
+++ b/yazi-fs/src/file/lua.rs
@@ -0,0 +1,51 @@
+use mlua::{AnyUserData, ExternalError, FromLua, Lua, ObjectLike, Table, UserData, UserDataMethods, UserDataRef, UserDataRegistry, Value};
+use yazi_binding::{impl_file_fields, impl_file_methods};
+
+use crate::file::{File, FileInventory};
+
+pub type FileRef = UserDataRef<File>;
+
+const EXPECTED: &str = "expected a table, File, or fs::File";
+
+impl File {
+	pub fn install(lua: &Lua) -> mlua::Result<()> {
+		lua.globals().raw_set("File", lua.create_function(|_, file: Self| Ok(file))?)
+	}
+}
+
+impl TryFrom<Table> for File {
+	type Error = mlua::Error;
+
+	fn try_from(value: Table) -> Result<Self, Self::Error> {
+		Ok(Self { url: value.raw_get("url")?, cha: value.raw_get("cha")?, ..Default::default() })
+	}
+}
+
+impl TryFrom<AnyUserData> for File {
+	type Error = mlua::Error;
+
+	fn try_from(value: AnyUserData) -> Result<Self, Self::Error> {
+		Ok(if let Ok(me) = value.take::<Self>() { me } else { value.get("bare")? })
+	}
+}
+
+impl FromLua for File {
+	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
+		match value {
+			Value::Table(tbl) => Self::try_from(tbl),
+			Value::UserData(ud) => Self::try_from(ud),
+			_ => Err(EXPECTED.into_lua_err())?,
+		}
+	}
+}
+
+impl UserData for File {
+	fn register(registry: &mut UserDataRegistry<Self>) {
+		impl_file_fields!(registry);
+		impl_file_methods!(registry);
+
+		for inv in inventory::iter::<FileInventory>() {
+			(inv.register)(registry);
+		}
+	}
+}
diff --git a/yazi-fs/src/file/mod.rs b/yazi-fs/src/file/mod.rs
new file mode 100644
index 00000000..69b498b3
--- /dev/null
+++ b/yazi-fs/src/file/mod.rs
@@ -0,0 +1 @@
+yazi_macro::mod_flat!(file inventory lua);
diff --git a/yazi-fs/src/files.rs b/yazi-fs/src/files.rs
index da21656e..f8ba5d95 100644
--- a/yazi-fs/src/files.rs
+++ b/yazi-fs/src/files.rs
@@ -1,10 +1,10 @@
 use std::{mem, ops::{Deref, DerefMut, Not}};
 
 use hashbrown::{HashMap, HashSet};
-use yazi_shared::{Id, path::{PathBufDyn, PathDyn}};
+use yazi_shared::{id::Id, path::{PathBufDyn, PathDyn}};
 
 use super::{FilesSorter, Filter};
-use crate::{FILES_TICKET, File, SortBy};
+use crate::{FILES_TICKET, SortBy, file::File};
 
 #[derive(Default)]
 pub struct Files {
diff --git a/yazi-fs/src/fns.rs b/yazi-fs/src/fns.rs
index 4718d1f0..4772769f 100644
--- a/yazi-fs/src/fns.rs
+++ b/yazi-fs/src/fns.rs
@@ -1,4 +1,5 @@
-use tokio::io;
+use std::{io, path::Path};
+
 use yazi_shared::url::{Component, UrlBuf, UrlLike};
 
 #[inline]
@@ -74,3 +75,47 @@ fn test_max_common_root() {
 	assert(&["/aa/bb/cc", "/aa/dd/ee"], "/aa");
 	assert(&["/aa/bb/cc", "/aa/bb/cc/dd/ee", "/aa/bb/cc/ff"], "/aa/bb");
 }
+
+pub async fn create_owned_dir(p: &Path) -> io::Result<()> {
+	let p = p.to_owned();
+	tokio::task::spawn_blocking(move || create_owned_dir_blocking(&p)).await?
+}
+
+pub fn create_owned_dir_blocking(p: &Path) -> io::Result<()> {
+	#[cfg(unix)]
+	{
+		use std::{fs::{DirBuilder, OpenOptions}, mem, os::unix::{fs::{DirBuilderExt, OpenOptionsExt}, io::AsRawFd}};
+
+		use libc::{O_DIRECTORY, O_NOFOLLOW};
+		use uzers::Users;
+		use yazi_shared::USERS_CACHE;
+
+		DirBuilder::new().mode(0o700).recursive(true).create(p)?;
+		let dir = OpenOptions::new().read(true).custom_flags(O_DIRECTORY | O_NOFOLLOW).open(p)?;
+
+		let mut stat: libc::stat = unsafe { mem::zeroed() };
+		if unsafe { libc::fstat(dir.as_raw_fd(), &mut stat) } != 0 {
+			return Err(io::Error::last_os_error());
+		}
+
+		// Reject directories not owned by the current user.
+		let uid = USERS_CACHE.get_current_uid();
+		if stat.st_uid != uid {
+			return Err(io::Error::new(
+				io::ErrorKind::PermissionDenied,
+				format!("directory {:?} is owned by uid {} but current uid is {}", p, stat.st_uid, uid),
+			));
+		}
+
+		// Enforce mode 0o700 via the fd.
+		if unsafe { libc::fchmod(dir.as_raw_fd(), 0o700) } != 0 {
+			return Err(io::Error::last_os_error());
+		}
+
+		Ok(())
+	}
+	#[cfg(not(unix))]
+	{
+		std::fs::DirBuilder::new().recursive(true).create(p)
+	}
+}
diff --git a/yazi-fs/src/hash.rs b/yazi-fs/src/hash.rs
index 13b879ad..852abadb 100644
--- a/yazi-fs/src/hash.rs
+++ b/yazi-fs/src/hash.rs
@@ -1,9 +1,10 @@
 use std::hash::{BuildHasher, Hash};
 
-use yazi_shared::url::AsUrl;
+use mlua::UserDataMethods;
+use yazi_shared::url::{AsUrl, UrlBufInventory};
 use yazi_shim::Twox128;
 
-use crate::{File, cha::Cha};
+use crate::{cha::Cha, file::File};
 
 pub trait FsHash64 {
 	fn hash_u64(&self) -> u64;
@@ -41,3 +42,18 @@ impl<T: AsUrl> FsHash128 for T {
 		h.finish_128()
 	}
 }
+
+// --- Inject
+inventory::submit! {
+	UrlBufInventory {
+		register: |registry| {
+			registry.add_method("hash", |_, me, long: bool| {
+				Ok(if long {
+					format!("{:x}", me.hash_u128())
+				} else {
+					format!("{:x}", me.hash_u64())
+				})
+			});
+		}
+	}
+}
diff --git a/yazi-fs/src/lib.rs b/yazi-fs/src/lib.rs
index 1ef59fc3..bfce7b20 100644
--- a/yazi-fs/src/lib.rs
+++ b/yazi-fs/src/lib.rs
@@ -1,6 +1,8 @@
-yazi_macro::mod_pub!(cha error mounts path provider);
+extern crate self as yazi_fs;
 
-yazi_macro::mod_flat!(cwd file files filter fns hash op scheme sorter sorting splatter stage url xdg);
+yazi_macro::mod_pub!(cha file mounts path provider);
+
+yazi_macro::mod_flat!(cwd files filter fns hash op scheme sorter sorting splatter stage url xdg);
 
 pub fn init() {
 	CWD.init(<_>::default());
diff --git a/yazi-fs/src/op.rs b/yazi-fs/src/op.rs
index ad4eb92e..4187f3c8 100644
--- a/yazi-fs/src/op.rs
+++ b/yazi-fs/src/op.rs
@@ -1,11 +1,10 @@
 use std::path::Path;
 
 use hashbrown::{HashMap, HashSet};
-use yazi_macro::relay;
-use yazi_shared::{Id, Ids, path::PathBufDyn, url::{UrlBuf, UrlLike, UrlMapExt}};
+use yazi_macro::{impl_data_any, relay};
+use yazi_shared::{id::{Id, Ids}, path::PathBufDyn, url::{UrlBuf, UrlLike, UrlMapExt}};
 
-use super::File;
-use crate::{cha::Cha, error::Error};
+use crate::{cha::Cha, file::File};
 
 pub static FILES_TICKET: Ids = Ids::new();
 
@@ -15,7 +14,7 @@ pub enum FilesOp {
 	Part(UrlBuf, Vec<File>, Id),
 	Done(UrlBuf, Cha, Id),
 	Size(UrlBuf, HashMap<PathBufDyn, u64>),
-	IOErr(UrlBuf, Error),
+	IOErr(UrlBuf, yazi_shim::fs::Error),
 
 	Creating(UrlBuf, Vec<File>),
 	Deleting(UrlBuf, HashSet<PathBufDyn>),
@@ -23,6 +22,8 @@ pub enum FilesOp {
 	Upserting(UrlBuf, HashMap<PathBufDyn, File>),
 }
 
+impl_data_any!(FilesOp);
+
 impl FilesOp {
 	#[inline]
 	pub fn cwd(&self) -> &UrlBuf {
diff --git a/yazi-fs/src/path/expand.rs b/yazi-fs/src/path/expand.rs
index d1061ba5..b5a49027 100644
--- a/yazi-fs/src/path/expand.rs
+++ b/yazi-fs/src/path/expand.rs
@@ -1,6 +1,7 @@
 use std::borrow::Cow;
 
-use yazi_shared::{loc::LocBuf, path::{PathBufDyn, PathCow, PathKind, PathLike}, pool::InternStr, url::{AsUrl, Url, UrlBuf, UrlCow, UrlLike}, wtf8::FromWtf8Vec};
+use yazi_shared::{loc::LocBuf, path::{PathBufDyn, PathCow, PathKind, PathLike}, pool::InternStr, url::{AsUrl, Url, UrlBuf, UrlCow, UrlLike}};
+use yazi_shim::wtf8::FromWtf8Vec;
 
 #[inline]
 pub fn expand_url<'a>(url: impl Into<UrlCow<'a>>) -> UrlCow<'a> { expand_url_impl(url.into()) }
diff --git a/yazi-fs/src/path/mod.rs b/yazi-fs/src/path/mod.rs
index 66986ab4..a3b70bd8 100644
--- a/yazi-fs/src/path/mod.rs
+++ b/yazi-fs/src/path/mod.rs
@@ -1 +1 @@
-yazi_macro::mod_flat!(clean expand path percent relative);
+yazi_macro::mod_flat!(clean expand normalize path percent relative);
diff --git a/yazi-config/src/utils.rs b/yazi-fs/src/path/normalize.rs
similarity index 68%
rename from yazi-config/src/utils.rs
rename to yazi-fs/src/path/normalize.rs
index 34f18bd5..13cb152c 100644
--- a/yazi-config/src/utils.rs
+++ b/yazi-fs/src/path/normalize.rs
@@ -1,9 +1,10 @@
 use std::path::PathBuf;
 
-use yazi_fs::path::{clean_url, expand_url};
 use yazi_shared::url::UrlBuf;
 
-pub(crate) fn normalize_path(path: PathBuf) -> Option<PathBuf> {
+use crate::path::{clean_url, expand_url};
+
+pub fn sanitize_path(path: PathBuf) -> Option<PathBuf> {
 	clean_url(yazi_fs::provider::local::try_absolute(expand_url(UrlBuf::from(path)))?)
 		.into_loc()
 		.into_os()
diff --git a/yazi-fs/src/path/relative.rs b/yazi-fs/src/path/relative.rs
index 7b0808e2..f58082e2 100644
--- a/yazi-fs/src/path/relative.rs
+++ b/yazi-fs/src/path/relative.rs
@@ -1,3 +1,5 @@
+use std::path::PrefixComponent;
+
 use anyhow::{Result, bail};
 use yazi_shared::path::{PathBufDyn, PathCow, PathDyn, PathLike};
 
@@ -28,7 +30,7 @@ fn path_relative_to_impl<'a>(from: PathCow<'_>, to: PathCow<'a>) -> Result<PathC
 	let (f_head, t_head) = loop {
 		match (f_it.next(), t_it.next()) {
 			(Some(RootDir), Some(RootDir)) => {}
-			(Some(Prefix(a)), Some(Prefix(b))) if a == b => {}
+			(Some(Prefix(a)), Some(Prefix(b))) if path_prefix_eq(a, b) => {}
 			(Some(Prefix(_) | RootDir), _) | (_, Some(Prefix(_) | RootDir)) => {
 				return Ok(to);
 			}
@@ -45,6 +47,20 @@ fn path_relative_to_impl<'a>(from: PathCow<'_>, to: PathCow<'a>) -> Result<PathC
 	Ok(buf.into())
 }
 
+#[cfg(windows)]
+fn path_prefix_eq(a: PrefixComponent<'_>, b: PrefixComponent<'_>) -> bool {
+	use std::path::Prefix::*;
+
+	match (a.kind(), b.kind()) {
+		(Disk(a), VerbatimDisk(b)) | (VerbatimDisk(a), Disk(b)) => a == b,
+		(UNC(a1, a2), VerbatimUNC(b1, b2)) | (VerbatimUNC(a1, a2), UNC(b1, b2)) => a1 == b1 && a2 == b2,
+		_ => a == b,
+	}
+}
+
+#[cfg(not(windows))]
+fn path_prefix_eq(a: PrefixComponent<'_>, b: PrefixComponent<'_>) -> bool { a == b }
+
 #[cfg(test)]
 mod tests {
 	use yazi_shared::path::PathDyn;
@@ -80,6 +96,14 @@ mod tests {
 			(r"C:\a\b\d", r"C:\a\b\c", r"..\c"),
 			(r"C:\a\b\c", r"C:\a", r"..\.."),
 			(r"C:\a\b\b", r"C:\a\a\b", r"..\..\a\b"),
+			// Verbatim (`\\?\`-prefixed) paths
+			(r"\\?\C:\a\b", r"C:\a\b\c", "c"),
+			(r"C:\a\b", r"\\?\C:\a\b\c", "c"),
+			(r"\\?\C:\a\b", r"\\?\C:\a\b\c", "c"),
+			(r"\\?\C:\a\b\c", r"C:\a\b", r".."),
+			(r"\\?\C:\a\b\d", r"C:\a\b\c", r"..\c"),
+			(r"\\?\C:\a\b\c", r"\\?\C:\a", r"..\.."),
+			(r"\\?\C:\a\b", r"D:\a\b\c", r"D:\a\b\c"),
 		];
 
 		for (from, to, expected) in cases {
diff --git a/yazi-fs/src/scheme.rs b/yazi-fs/src/scheme.rs
index a957ad4a..415a0252 100644
--- a/yazi-fs/src/scheme.rs
+++ b/yazi-fs/src/scheme.rs
@@ -1,6 +1,7 @@
 use std::path::PathBuf;
 
-use yazi_shared::scheme::{AsScheme, Scheme, SchemeRef};
+use yazi_shared::{path::PathBufDyn, scheme::{AsScheme, Scheme, SchemeInventory, SchemeRef}};
+use yazi_shim::mlua::UserDataFieldsExt;
 
 use crate::Xdg;
 
@@ -25,3 +26,12 @@ impl FsScheme for SchemeRef<'_> {
 impl FsScheme for Scheme {
 	fn cache(&self) -> Option<PathBuf> { self.as_scheme().cache() }
 }
+
+// --- Inject
+inventory::submit! {
+	SchemeInventory {
+		register: |registry| {
+			registry.add_cached_field("cache", |_, me| Ok(me.cache().map(PathBufDyn::from)));
+		}
+	}
+}
diff --git a/yazi-fs/src/sorter.rs b/yazi-fs/src/sorter.rs
index 9ef44d8b..7ff7acc0 100644
--- a/yazi-fs/src/sorter.rs
+++ b/yazi-fs/src/sorter.rs
@@ -4,7 +4,7 @@ use hashbrown::HashMap;
 use rand::{Rng, make_rng, rngs::SmallRng};
 use yazi_shared::{natsort, path::PathBufDyn, translit::Transliterator, url::UrlLike};
 
-use crate::{File, SortBy, SortFallback};
+use crate::{SortBy, SortFallback, file::File};
 
 #[derive(Clone, Copy, Debug, Default, PartialEq)]
 pub struct FilesSorter {
diff --git a/yazi-fs/src/stage.rs b/yazi-fs/src/stage.rs
index 4a6eaf0e..448e5339 100644
--- a/yazi-fs/src/stage.rs
+++ b/yazi-fs/src/stage.rs
@@ -1,15 +1,29 @@
+use mlua::{IntoLuaMulti, MetaMethod, UserData, UserDataMethods};
 use serde::{Deserialize, Serialize};
-
-use crate::error::Error;
+use yazi_binding::Error;
 
 #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
 pub enum FolderStage {
 	#[default]
 	Loading,
 	Loaded,
-	Failed(Error),
+	Failed(yazi_shim::fs::Error),
 }
 
 impl FolderStage {
 	pub fn is_loading(&self) -> bool { *self == Self::Loading }
 }
+
+impl UserData for FolderStage {
+	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
+		methods.add_meta_method(MetaMethod::Call, |lua, me, ()| {
+			use FolderStage::*;
+
+			match me {
+				Loading => false.into_lua_multi(lua),
+				Loaded => true.into_lua_multi(lua),
+				Failed(e) => (true, Error::Fs(e.clone())).into_lua_multi(lua),
+			}
+		});
+	}
+}
diff --git a/yazi-fs/src/url.rs b/yazi-fs/src/url.rs
index 9755c7ba..80d17a9a 100644
--- a/yazi-fs/src/url.rs
+++ b/yazi-fs/src/url.rs
@@ -1,6 +1,7 @@
 use std::{borrow::Cow, ffi::OsStr, path::{Path, PathBuf}};
 
-use yazi_shared::{path::{AsPath, PathDyn}, url::{AsUrl, Url, UrlBuf, UrlCow}};
+use yazi_shared::{path::{AsPath, PathDyn}, url::{AsUrl, Url, UrlBuf, UrlBufInventory, UrlCow}};
+use yazi_shim::mlua::UserDataFieldsExt;
 
 use crate::{FsHash128, FsScheme, path::PercentEncoding};
 
@@ -85,3 +86,12 @@ impl<'a> FsUrl<'a> for UrlCow<'a> {
 		}
 	}
 }
+
+// --- Inject
+inventory::submit! {
+	UrlBufInventory {
+		register: |registry| {
+			registry.add_cached_field("cache", |_, me| Ok(me.cache()));
+		}
+	}
+}
diff --git a/yazi-macro/src/asset.rs b/yazi-macro/src/asset.rs
index e3d137e6..eb75babb 100644
--- a/yazi-macro/src/asset.rs
+++ b/yazi-macro/src/asset.rs
@@ -6,7 +6,7 @@ macro_rules! config_preset {
 			std::borrow::Cow::from(
 				std::fs::read_to_string(concat!(
 					env!("CARGO_MANIFEST_DIR"),
-					"/preset/",
+					"/../yazi-config/preset/",
 					$name,
 					"-default.toml"
 				))
@@ -17,7 +17,7 @@ macro_rules! config_preset {
 		{
 			std::borrow::Cow::from(include_str!(concat!(
 				env!("CARGO_MANIFEST_DIR"),
-				"/preset/",
+				"/../yazi-config/preset/",
 				$name,
 				"-default.toml"
 			)))
diff --git a/yazi-macro/src/data.rs b/yazi-macro/src/data.rs
new file mode 100644
index 00000000..80c3f56e
--- /dev/null
+++ b/yazi-macro/src/data.rs
@@ -0,0 +1,116 @@
+#[macro_export]
+macro_rules! impl_data_any {
+	($ty:ty) => {
+		impl ::yazi_shared::data::DataAny for $ty {
+			$crate::impl_data_any!(@core);
+			$crate::impl_data_any!(@into_lua_default);
+		}
+	};
+	($ty:ty => $($target:ty),+) => {
+		impl ::yazi_shared::data::DataAny for $ty {
+			$crate::impl_data_any!(@core $($target),+);
+			$crate::impl_data_any!(@into_lua_default);
+		}
+	};
+	// --- from_into_lua
+	($ty:ty, from_into_lua = inherit) => {
+		impl ::yazi_shared::data::DataAny for $ty {
+			$crate::impl_data_any!(@core);
+			$crate::impl_data_any!(@from_lua_inherit);
+			$crate::impl_data_any!(@into_lua_inherit);
+		}
+		$crate::impl_data_any!(@from_lua_register $ty);
+	};
+	($ty:ty => $($target:ty),+ ; from_into_lua = inherit) => {
+		impl ::yazi_shared::data::DataAny for $ty {
+			$crate::impl_data_any!(@core $($target),+);
+			$crate::impl_data_any!(@from_lua_inherit);
+			$crate::impl_data_any!(@into_lua_inherit);
+		}
+		$crate::impl_data_any!(@from_lua_register $ty);
+	};
+	// --- to_lua
+	($ty:ty, to_lua = $body:expr) => {
+		impl ::yazi_shared::data::DataAny for $ty {
+			$crate::impl_data_any!(@core);
+			$crate::impl_data_any!(@from_lua_inherit);
+			$crate::impl_data_any!(@into_lua_default);
+			$crate::impl_data_any!(@to_lua $body);
+		}
+		$crate::impl_data_any!(@from_lua_register $ty);
+	};
+	($ty:ty => $($target:ty),+ ; to_lua = $body:expr) => {
+		impl ::yazi_shared::data::DataAny for $ty {
+			$crate::impl_data_any!(@core $($target),+);
+			$crate::impl_data_any!(@from_lua_inherit);
+			$crate::impl_data_any!(@into_lua_default);
+			$crate::impl_data_any!(@to_lua $body);
+		}
+		$crate::impl_data_any!(@from_lua_register $ty);
+	};
+
+	(@core $($target:ty),*) => {
+		fn as_any(&self, id: std::any::TypeId) -> Option<&dyn std::any::Any> {
+			use std::any::{TypeId, Any};
+
+			if id == TypeId::of::<Self>() {
+				return Some(self as &dyn Any);
+			}
+			$(
+				if id == TypeId::of::<$target>() {
+					return Some(<Self as AsRef<$target>>::as_ref(self) as &dyn Any);
+				}
+			)*
+			None
+		}
+
+		fn into_any(self: Box<Self>, id: std::any::TypeId) -> Result<Box<dyn std::any::Any>, Box<dyn ::yazi_shared::data::DataAny>> {
+			use std::any::TypeId;
+
+			if id == TypeId::of::<Self>() { return Ok(self); }
+			$(
+				if id == TypeId::of::<$target>() {
+					return Ok(Box::new(<Self as Into<$target>>::into(*self)));
+				}
+			)*
+			Err(self)
+		}
+	};
+	(@into_lua_default) => {
+		fn into_lua(self: Box<Self>, lua: &mlua::Lua) -> mlua::Result<mlua::Value> {
+			use ::yazi_shared::any_data::AnyData;
+			use mlua::IntoLua;
+
+			AnyData(self).into_lua(lua)
+		}
+	};
+	(@into_lua_inherit) => {
+		fn into_lua(self: Box<Self>, lua: &mlua::Lua) -> mlua::Result<mlua::Value> {
+			use mlua::IntoLua;
+
+			IntoLua::into_lua(*self, lua)
+		}
+	};
+	(@to_lua $body:expr) => {
+		fn to_lua(&self, lua: &mlua::Lua) -> mlua::Result<mlua::Value> {
+			use mlua::{self, Lua, Value};
+
+			($body as fn(&Self, &Lua) -> mlua::Result<Value>)(self, lua)
+		}
+	};
+	(@from_lua_inherit) => {
+		fn from_lua(value: mlua::Value, lua: &mlua::Lua) -> mlua::Result<Box<dyn ::yazi_shared::data::DataAny>> {
+			use mlua::FromLua;
+
+			<Self as FromLua>::from_lua(value, lua)
+				.map(|v| Box::new(v) as Box<dyn ::yazi_shared::data::DataAny>)
+		}
+	};
+	(@from_lua_register $ty:ty) => {
+		::inventory::submit! {
+			::yazi_shared::data::DataInventory {
+				from_lua: <$ty as ::yazi_shared::data::DataAny>::from_lua,
+			}
+		}
+	};
+}
diff --git a/yazi-macro/src/input.rs b/yazi-macro/src/input.rs
index 25506e8e..58f375bf 100644
--- a/yazi-macro/src/input.rs
+++ b/yazi-macro/src/input.rs
@@ -1,8 +1,17 @@
 #[macro_export]
 macro_rules! input {
-	($cx:ident, $cfg:expr) => {{
+	($cx:ident, $opt:expr) => {{
+		use yazi_dds::Pubsub;
+		use yazi_shim::strum::IntoStr;
+		use yazi_widgets::input::{InputCallback, InputEvent, InputOpt};
+
 		let (tx, rx) = ::tokio::sync::mpsc::unbounded_channel();
-		match $crate::act!(input:show, $cx, yazi_widgets::input::InputOpt { cfg: $cfg, tx }) {
+		let opt = $opt.with_cb(move |event| {
+			$crate::err!(Pubsub::pub_after_input((&event).into_str(), event.value()));
+			tx.send(event).ok();
+		});
+
+		match $crate::act!(input:show, $cx, opt) {
 			Ok(_) => Ok(rx),
 			Err(e) => Err(e)
 		}
diff --git a/yazi-macro/src/lib.rs b/yazi-macro/src/lib.rs
index 7f3b9e48..40110145 100644
--- a/yazi-macro/src/lib.rs
+++ b/yazi-macro/src/lib.rs
@@ -2,6 +2,7 @@ mod actor;
 mod asset;
 mod confirm;
 mod context;
+mod data;
 mod event;
 mod fmt;
 mod fs;
diff --git a/yazi-parser/Cargo.toml b/yazi-parser/Cargo.toml
index 3f987e48..520ee45f 100644
--- a/yazi-parser/Cargo.toml
+++ b/yazi-parser/Cargo.toml
@@ -17,7 +17,6 @@ default      = [ "vendored-lua" ]
 vendored-lua = [ "mlua/vendored" ]
 
 [dependencies]
-yazi-binding   = { path = "../yazi-binding", version = "26.5.6" }
 yazi-boot      = { path = "../yazi-boot", version = "26.5.6" }
 yazi-config    = { path = "../yazi-config", version = "26.5.6" }
 yazi-core      = { path = "../yazi-core", version = "26.5.6" }
@@ -26,18 +25,19 @@ yazi-fs        = { path = "../yazi-fs", version = "26.5.6" }
 yazi-macro     = { path = "../yazi-macro", version = "26.5.6" }
 yazi-scheduler = { path = "../yazi-scheduler", version = "26.5.6" }
 yazi-shared    = { path = "../yazi-shared", version = "26.5.6" }
+yazi-shim      = { path = "../yazi-shim", version = "26.5.6" }
 yazi-term      = { path = "../yazi-term", version = "26.5.6" }
 yazi-vfs       = { path = "../yazi-vfs", version = "26.5.6" }
 yazi-widgets   = { path = "../yazi-widgets", version = "26.5.6" }
 
 # External dependencies
-anyhow     = { workspace = true }
-bitflags   = { workspace = true }
-hashbrown  = { workspace = true }
-mlua       = { workspace = true }
-paste      = { workspace = true }
-ratatui    = { workspace = true }
-serde      = { workspace = true }
-serde_with = { workspace = true }
-strum      = { workspace = true }
-tokio      = { workspace = true }
+anyhow       = { workspace = true }
+bitflags     = { workspace = true }
+hashbrown    = { workspace = true }
+mlua         = { workspace = true }
+paste        = { workspace = true }
+ratatui-core = { workspace = true }
+serde        = { workspace = true }
+serde_with   = { workspace = true }
+strum        = { workspace = true }
+tokio        = { workspace = true }
diff --git a/yazi-parser/src/app/deprecate.rs b/yazi-parser/src/app/deprecate.rs
index ffa30597..08f8513c 100644
--- a/yazi-parser/src/app/deprecate.rs
+++ b/yazi-parser/src/app/deprecate.rs
@@ -1,6 +1,7 @@
 use mlua::{ExternalError, FromLua, IntoLua, Lua, Value};
 use serde::Deserialize;
-use yazi_shared::{SStr, event::ActionCow};
+use yazi_shared::event::ActionCow;
+use yazi_shim::SStr;
 
 #[derive(Debug, Deserialize)]
 pub struct DeprecateForm {
diff --git a/yazi-parser/src/app/dnd.rs b/yazi-parser/src/app/dnd.rs
new file mode 100644
index 00000000..b879ca51
--- /dev/null
+++ b/yazi-parser/src/app/dnd.rs
@@ -0,0 +1,19 @@
+use mlua::{ExternalError, FromLua, IntoLua, Lua, Value};
+use yazi_term::event::DndEvent;
+
+#[derive(Debug)]
+pub struct DndForm {
+	pub event: DndEvent,
+}
+
+impl From<DndEvent> for DndForm {
+	fn from(event: DndEvent) -> Self { Self { event } }
+}
+
+impl FromLua for DndForm {
+	fn from_lua(_: Value, _: &Lua) -> mlua::Result<Self> { Err("unsupported".into_lua_err()) }
+}
+
+impl IntoLua for DndForm {
+	fn into_lua(self, _: &Lua) -> mlua::Result<Value> { Err("unsupported".into_lua_err()) }
+}
diff --git a/yazi-parser/src/app/lua.rs b/yazi-parser/src/app/lua.rs
index 735ebd4a..8d9f2eca 100644
--- a/yazi-parser/src/app/lua.rs
+++ b/yazi-parser/src/app/lua.rs
@@ -3,7 +3,8 @@ use std::fmt::Debug;
 use anyhow::Result;
 use mlua::{ExternalError, FromLua, IntoLua, Lua, Value};
 use serde::Deserialize;
-use yazi_shared::{SStr, event::ActionCow};
+use yazi_shared::event::ActionCow;
+use yazi_shim::SStr;
 
 #[derive(Clone, Debug, Default, Deserialize)]
 pub struct LuaForm {
diff --git a/yazi-parser/src/app/mod.rs b/yazi-parser/src/app/mod.rs
index 881d723f..095335e8 100644
--- a/yazi-parser/src/app/mod.rs
+++ b/yazi-parser/src/app/mod.rs
@@ -1 +1 @@
-yazi_macro::mod_flat!(deprecate lua mouse plugin quit reflow title update_progress);
+yazi_macro::mod_flat!(deprecate dnd lua mouse plugin quit reflow title update_progress);
diff --git a/yazi-parser/src/app/quit.rs b/yazi-parser/src/app/quit.rs
index debd4d7b..598ad4ec 100644
--- a/yazi-parser/src/app/quit.rs
+++ b/yazi-parser/src/app/quit.rs
@@ -1,8 +1,8 @@
 use mlua::{FromLua, IntoLua, Lua, LuaSerdeExt, Value};
 use serde::{Deserialize, Serialize};
-use yazi_binding::SER_OPT;
 use yazi_core::app::QuitOpt;
 use yazi_shared::event::ActionCow;
+use yazi_shim::mlua::SER_OPT;
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct QuitForm {
diff --git a/yazi-parser/src/app/reflow.rs b/yazi-parser/src/app/reflow.rs
index ba4bc65c..2d5d7175 100644
--- a/yazi-parser/src/app/reflow.rs
+++ b/yazi-parser/src/app/reflow.rs
@@ -1,5 +1,5 @@
 use mlua::{ExternalError, FromLua, IntoLua, Lua, Table, Value};
-use ratatui::layout::Rect;
+use ratatui_core::layout::Rect;
 
 #[derive(Debug)]
 pub struct ReflowForm {
diff --git a/yazi-parser/src/app/title.rs b/yazi-parser/src/app/title.rs
index 8e7f5d56..f751d900 100644
--- a/yazi-parser/src/app/title.rs
+++ b/yazi-parser/src/app/title.rs
@@ -1,7 +1,6 @@
 use mlua::{FromLua, IntoLua, Lua, LuaSerdeExt, Value};
 use serde::{Deserialize, Serialize};
-use yazi_binding::SER_OPT;
-use yazi_shared::SStr;
+use yazi_shim::{SStr, mlua::SER_OPT};
 
 #[derive(Debug, Default, Deserialize, Serialize)]
 pub struct TitleForm {
diff --git a/yazi-parser/src/cmp/trigger.rs b/yazi-parser/src/cmp/trigger.rs
index c043ba25..a1937163 100644
--- a/yazi-parser/src/cmp/trigger.rs
+++ b/yazi-parser/src/cmp/trigger.rs
@@ -1,5 +1,6 @@
 use mlua::{ExternalError, FromLua, IntoLua, Lua, Value};
-use yazi_shared::{Id, SStr, event::ActionCow};
+use yazi_shared::{event::ActionCow, id::Id};
+use yazi_shim::SStr;
 
 #[derive(Debug)]
 pub struct TriggerForm {
diff --git a/yazi-parser/src/input/close.rs b/yazi-parser/src/input/close.rs
index fc2065eb..8f782f98 100644
--- a/yazi-parser/src/input/close.rs
+++ b/yazi-parser/src/input/close.rs
@@ -1,7 +1,9 @@
-use mlua::{ExternalError, FromLua, IntoLua, Lua, Value};
+use mlua::{FromLua, IntoLua, Lua, LuaSerdeExt, Value};
+use serde::{Deserialize, Serialize};
 use yazi_shared::event::ActionCow;
+use yazi_shim::mlua::SER_OPT;
 
-#[derive(Debug, Default)]
+#[derive(Debug, Default, Deserialize, Serialize)]
 pub struct CloseForm {
 	pub submit: bool,
 }
@@ -15,9 +17,9 @@ impl From<bool> for CloseForm {
 }
 
 impl FromLua for CloseForm {
-	fn from_lua(_: Value, _: &Lua) -> mlua::Result<Self> { Err("unsupported".into_lua_err()) }
+	fn from_lua(value: Value, lua: &Lua) -> mlua::Result<Self> { lua.from_value(value) }
 }
 
 impl IntoLua for CloseForm {
-	fn into_lua(self, _: &Lua) -> mlua::Result<Value> { Err("unsupported".into_lua_err()) }
+	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> { lua.to_value_with(&self, SER_OPT) }
 }
diff --git a/yazi-parser/src/input/mod.rs b/yazi-parser/src/input/mod.rs
index 727e6aa5..37e61514 100644
--- a/yazi-parser/src/input/mod.rs
+++ b/yazi-parser/src/input/mod.rs
@@ -1 +1 @@
-yazi_macro::mod_flat!(close);
+yazi_macro::mod_flat!(close show);
diff --git a/yazi-parser/src/input/show.rs b/yazi-parser/src/input/show.rs
new file mode 100644
index 00000000..92a7adb2
--- /dev/null
+++ b/yazi-parser/src/input/show.rs
@@ -0,0 +1,29 @@
+use anyhow::anyhow;
+use mlua::{ExternalError, FromLua, IntoLua, Lua, Value};
+use yazi_shared::event::ActionCow;
+use yazi_widgets::input::InputOpt;
+
+#[derive(Debug, Default)]
+pub struct ShowForm {
+	pub opt: InputOpt,
+}
+
+impl From<InputOpt> for ShowForm {
+	fn from(opt: InputOpt) -> Self { Self { opt } }
+}
+
+impl TryFrom<ActionCow> for ShowForm {
+	type Error = anyhow::Error;
+
+	fn try_from(mut a: ActionCow) -> Result<Self, Self::Error> {
+		Ok(Self { opt: a.take_any("opt").ok_or_else(|| anyhow!("Invalid 'opt' in ShowForm"))? })
+	}
+}
+
+impl FromLua for ShowForm {
+	fn from_lua(_: Value, _: &Lua) -> mlua::Result<Self> { Err("unsupported".into_lua_err()) }
+}
+
+impl IntoLua for ShowForm {
+	fn into_lua(self, _: &Lua) -> mlua::Result<Value> { Err("unsupported".into_lua_err()) }
+}
diff --git a/yazi-parser/src/mgr/close.rs b/yazi-parser/src/mgr/close.rs
index 0da0e32f..14f7b004 100644
--- a/yazi-parser/src/mgr/close.rs
+++ b/yazi-parser/src/mgr/close.rs
@@ -1,8 +1,8 @@
 use mlua::{FromLua, IntoLua, Lua, LuaSerdeExt, Value};
 use serde::{Deserialize, Serialize};
-use yazi_binding::SER_OPT;
 use yazi_core::app::QuitOpt;
 use yazi_shared::event::ActionCow;
+use yazi_shim::mlua::SER_OPT;
 
 #[derive(Debug, Default, Serialize, Deserialize)]
 pub struct CloseForm {
diff --git a/yazi-parser/src/mgr/copy.rs b/yazi-parser/src/mgr/copy.rs
index 65773881..57387ce6 100644
--- a/yazi-parser/src/mgr/copy.rs
+++ b/yazi-parser/src/mgr/copy.rs
@@ -3,7 +3,8 @@ use std::borrow::Cow;
 use mlua::{ExternalError, FromLua, IntoLua, Lua, Value};
 use serde::Deserialize;
 use strum::EnumString;
-use yazi_shared::{SStr, event::ActionCow, strand::AsStrand};
+use yazi_shared::{event::ActionCow, strand::AsStrand};
+use yazi_shim::SStr;
 
 #[derive(Debug, Deserialize)]
 pub struct CopyForm {
diff --git a/yazi-parser/src/mgr/hidden.rs b/yazi-parser/src/mgr/hidden.rs
index 2b7a0431..f66b43e2 100644
--- a/yazi-parser/src/mgr/hidden.rs
+++ b/yazi-parser/src/mgr/hidden.rs
@@ -1,7 +1,7 @@
 use mlua::{FromLua, IntoLua, Lua, LuaSerdeExt, Value};
 use serde::{Deserialize, Serialize};
-use yazi_binding::SER_OPT;
 use yazi_shared::event::ActionCow;
+use yazi_shim::mlua::SER_OPT;
 
 #[derive(Debug, Default, Deserialize, Serialize)]
 pub struct HiddenForm {
diff --git a/yazi-parser/src/mgr/rename.rs b/yazi-parser/src/mgr/rename.rs
index 5ca00efe..dfc00d04 100644
--- a/yazi-parser/src/mgr/rename.rs
+++ b/yazi-parser/src/mgr/rename.rs
@@ -1,5 +1,6 @@
 use mlua::{ExternalError, FromLua, IntoLua, Lua, Value};
-use yazi_shared::{SStr, event::ActionCow};
+use yazi_shared::event::ActionCow;
+use yazi_shim::SStr;
 
 #[derive(Debug)]
 pub struct RenameForm {
diff --git a/yazi-parser/src/mgr/shell.rs b/yazi-parser/src/mgr/shell.rs
index dd97a632..ced23417 100644
--- a/yazi-parser/src/mgr/shell.rs
+++ b/yazi-parser/src/mgr/shell.rs
@@ -1,7 +1,8 @@
 use anyhow::bail;
 use mlua::{ExternalError, FromLua, IntoLua, Lua, Value};
 use serde::Deserialize;
-use yazi_shared::{SStr, event::ActionCow, url::UrlBuf};
+use yazi_shared::{event::ActionCow, url::UrlBuf};
+use yazi_shim::SStr;
 
 #[derive(Debug, Deserialize)]
 pub struct ShellForm {
diff --git a/yazi-parser/src/mgr/sort.rs b/yazi-parser/src/mgr/sort.rs
index 4dd85f51..568ebd2f 100644
--- a/yazi-parser/src/mgr/sort.rs
+++ b/yazi-parser/src/mgr/sort.rs
@@ -1,8 +1,8 @@
 use mlua::{FromLua, IntoLua, Lua, LuaSerdeExt, Value};
 use serde::{Deserialize, Serialize};
-use yazi_binding::SER_OPT;
 use yazi_fs::{SortBy, SortFallback};
 use yazi_shared::event::ActionCow;
+use yazi_shim::mlua::SER_OPT;
 
 #[derive(Debug, Default, Deserialize, Serialize)]
 pub struct SortForm {
diff --git a/yazi-parser/src/mgr/stash.rs b/yazi-parser/src/mgr/stash.rs
index de8e843a..4b8265fe 100644
--- a/yazi-parser/src/mgr/stash.rs
+++ b/yazi-parser/src/mgr/stash.rs
@@ -1,8 +1,8 @@
 use mlua::{ExternalError, FromLua, IntoLua, Lua, LuaSerdeExt, Value};
 use serde::{Deserialize, Serialize};
-use yazi_binding::{SER_OPT, Url};
 use yazi_core::mgr::CdSource;
 use yazi_shared::{event::ActionCow, url::UrlBuf};
+use yazi_shim::mlua::SER_OPT;
 
 use crate::mgr::CdForm;
 
@@ -26,10 +26,8 @@ impl From<&CdForm> for StashForm {
 impl FromLua for StashForm {
 	fn from_lua(value: Value, lua: &Lua) -> mlua::Result<Self> {
 		let tbl = value.as_table().ok_or_else(|| "expected table".into_lua_err())?;
-		Ok(Self {
-			target: tbl.get::<Url>("target")?.into(),
-			source: lua.from_value(tbl.get("source")?)?,
-		})
+
+		Ok(Self { target: tbl.get("target")?, source: lua.from_value(tbl.get("source")?)? })
 	}
 }
 
@@ -37,7 +35,7 @@ impl IntoLua for StashForm {
 	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> {
 		lua
 			.create_table_from([
-				("target", Url::new(self.target).into_lua(lua)?),
+				("target", self.target.into_lua(lua)?),
 				("source", lua.to_value_with(&self.source, SER_OPT)?),
 			])?
 			.into_lua(lua)
diff --git a/yazi-parser/src/mgr/tab_rename.rs b/yazi-parser/src/mgr/tab_rename.rs
index a79b9d48..ca0ed426 100644
--- a/yazi-parser/src/mgr/tab_rename.rs
+++ b/yazi-parser/src/mgr/tab_rename.rs
@@ -1,7 +1,8 @@
 use anyhow::bail;
 use mlua::{ExternalError, FromLua, IntoLua, Lua, Value};
 use serde::Deserialize;
-use yazi_shared::{SStr, event::ActionCow};
+use yazi_shared::event::ActionCow;
+use yazi_shim::SStr;
 
 #[derive(Debug, Deserialize)]
 pub struct TabRenameForm {
diff --git a/yazi-parser/src/mgr/update_mimes.rs b/yazi-parser/src/mgr/update_mimes.rs
index a6f5a8de..65a14c64 100644
--- a/yazi-parser/src/mgr/update_mimes.rs
+++ b/yazi-parser/src/mgr/update_mimes.rs
@@ -1,7 +1,8 @@
 use hashbrown::HashMap;
 use mlua::{ExternalError, FromLua, IntoLua, Lua, Value};
 use serde::Deserialize;
-use yazi_shared::{SStr, event::ActionCow, url::UrlCow};
+use yazi_shared::{event::ActionCow, url::UrlCow};
+use yazi_shim::SStr;
 
 #[derive(Debug, Deserialize)]
 pub struct UpdateMimesForm {
diff --git a/yazi-parser/src/spark/kind.rs b/yazi-parser/src/spark/kind.rs
index 382e00ea..4eeb31f6 100644
--- a/yazi-parser/src/spark/kind.rs
+++ b/yazi-parser/src/spark/kind.rs
@@ -20,6 +20,10 @@ pub enum SparkKind {
 	// mgr:quit
 	KeyQuit,
 
+	// input:close
+	KeyInputClose,
+	IndInputClose,
+
 	// which:activate
 	IndWhichActivate,
 
diff --git a/yazi-parser/src/spark/spark.rs b/yazi-parser/src/spark/spark.rs
index a2f6234f..01c94ba1 100644
--- a/yazi-parser/src/spark/spark.rs
+++ b/yazi-parser/src/spark/spark.rs
@@ -11,6 +11,7 @@ pub enum Spark<'a> {
 	AppAcceptPayload(yazi_dds::Payload<'a>),
 	AppBootstrap(crate::VoidForm),
 	AppDeprecate(crate::app::DeprecateForm),
+	AppDnd(crate::app::DndForm),
 	AppFocus(crate::VoidForm),
 	AppLua(crate::app::LuaForm),
 	AppMouse(crate::app::MouseForm),
@@ -125,7 +126,7 @@ pub enum Spark<'a> {
 	InputKill(yazi_widgets::input::parser::KillOpt),
 	InputMove(yazi_widgets::input::parser::MoveOpt),
 	InputPaste(yazi_widgets::input::parser::PasteOpt),
-	InputShow(yazi_widgets::input::InputOpt),
+	InputShow(crate::input::ShowForm),
 
 	// Notify
 	NotifyPush(crate::notify::PushForm),
@@ -180,6 +181,10 @@ impl<'a> Spark<'a> {
 			// mgr:quit
 			KeyQuit => Self::Quit(<_>::from_lua(value, lua)?),
 
+			// input:close
+			KeyInputClose => Self::InputClose(<_>::from_lua(value, lua)?),
+			IndInputClose => Self::InputClose(<_>::from_lua(value, lua)?),
+
 			// which:activate
 			IndWhichActivate => Self::WhichActivate(<_>::from_lua(value, lua)?),
 
@@ -199,6 +204,7 @@ impl<'a> IntoLua for Spark<'a> {
 			Self::AppAcceptPayload(b) => b.into_lua(lua),
 			Self::AppBootstrap(b) => b.into_lua(lua),
 			Self::AppDeprecate(b) => b.into_lua(lua),
+			Self::AppDnd(b) => b.into_lua(lua),
 			Self::AppFocus(b) => b.into_lua(lua),
 			Self::AppLua(b) => b.into_lua(lua),
 			Self::AppMouse(b) => b.into_lua(lua),
@@ -376,6 +382,7 @@ try_from_spark!(
 // App
 try_from_spark!(crate::ArrowForm, mgr:arrow, mgr:tab_swap);
 try_from_spark!(crate::app::DeprecateForm, app:deprecate);
+try_from_spark!(crate::app::DndForm, app:dnd);
 try_from_spark!(crate::app::LuaForm, app:lua);
 try_from_spark!(crate::app::MouseForm, app:mouse);
 try_from_spark!(crate::app::PluginForm, app:plugin, app:plugin_do);
@@ -445,7 +452,7 @@ try_from_spark!(crate::tasks::SpawnForm, tasks:spawn);
 try_from_spark!(crate::tasks::UpdateSucceedForm, tasks:update_succeed);
 try_from_spark!(crate::which::ActivateForm, which:activate);
 try_from_spark!(yazi_dds::Payload<'a>, app:accept_payload);
-try_from_spark!(yazi_widgets::input::InputOpt, input:show);
+try_from_spark!(crate::input::ShowForm, input:show);
 try_from_spark!(yazi_widgets::input::parser::BackspaceOpt, input:backspace);
 try_from_spark!(yazi_widgets::input::parser::BackwardOpt, input:backward);
 try_from_spark!(yazi_widgets::input::parser::CompleteOpt, input:complete);
diff --git a/yazi-parser/src/spot/copy.rs b/yazi-parser/src/spot/copy.rs
index dd371a90..907596e5 100644
--- a/yazi-parser/src/spot/copy.rs
+++ b/yazi-parser/src/spot/copy.rs
@@ -1,5 +1,6 @@
 use mlua::{ExternalError, FromLua, IntoLua, Lua, Value};
-use yazi_shared::{SStr, event::ActionCow};
+use yazi_shared::event::ActionCow;
+use yazi_shim::SStr;
 
 #[derive(Debug)]
 pub struct CopyForm {
diff --git a/yazi-parser/src/tasks/update_succeed.rs b/yazi-parser/src/tasks/update_succeed.rs
index 6bf33593..63a48fb9 100644
--- a/yazi-parser/src/tasks/update_succeed.rs
+++ b/yazi-parser/src/tasks/update_succeed.rs
@@ -1,6 +1,6 @@
 use mlua::{ExternalError, FromLua, IntoLua, Lua, Value};
 use serde::Deserialize;
-use yazi_shared::{Id, event::ActionCow, url::UrlBuf};
+use yazi_shared::{event::ActionCow, id::Id, url::UrlBuf};
 
 #[derive(Debug, Deserialize)]
 pub struct UpdateSucceedForm {
diff --git a/yazi-plugin/Cargo.toml b/yazi-plugin/Cargo.toml
index 882a6de3..1ccbe053 100644
--- a/yazi-plugin/Cargo.toml
+++ b/yazi-plugin/Cargo.toml
@@ -20,6 +20,7 @@ vendored-lua = [ "mlua/vendored" ]
 yazi-adapter   = { path = "../yazi-adapter", version = "26.5.6" }
 yazi-binding   = { path = "../yazi-binding", version = "26.5.6" }
 yazi-boot      = { path = "../yazi-boot", version = "26.5.6" }
+yazi-codegen   = { path = "../yazi-codegen", version = "26.5.6" }
 yazi-config    = { path = "../yazi-config", version = "26.5.6" }
 yazi-core      = { path = "../yazi-core", version = "26.5.6" }
 yazi-dds       = { path = "../yazi-dds", version = "26.5.6" }
@@ -32,22 +33,25 @@ yazi-scheduler = { path = "../yazi-scheduler", version = "26.5.6" }
 yazi-shared    = { path = "../yazi-shared", version = "26.5.6" }
 yazi-shim      = { path = "../yazi-shim", version = "26.5.6" }
 yazi-term      = { path = "../yazi-term", version = "26.5.6" }
+yazi-tty       = { path = "../yazi-tty", version = "26.5.6" }
 yazi-vfs       = { path = "../yazi-vfs", version = "26.5.6" }
 yazi-widgets   = { path = "../yazi-widgets", version = "26.5.6" }
 
 # External dependencies
-ansi-to-tui   = { workspace = true }
-anyhow        = { workspace = true }
-futures       = { workspace = true }
-mlua          = { workspace = true }
-paste         = { workspace = true }
-ratatui       = { workspace = true }
-serde_json    = { workspace = true }
-tokio         = { workspace = true }
-tokio-stream  = { workspace = true }
-tracing       = { workspace = true }
-twox-hash     = { workspace = true }
-unicode-width = { workspace = true }
+ansi-to-tui      = { workspace = true }
+anyhow           = { workspace = true }
+futures          = { workspace = true }
+inventory        = { workspace = true }
+mlua             = { workspace = true }
+percent-encoding = { workspace = true }
+ratatui-core     = { workspace = true }
+ratatui-widgets  = { workspace = true }
+serde_json       = { workspace = true }
+tokio            = { workspace = true }
+tokio-stream     = { workspace = true }
+tracing          = { workspace = true }
+twox-hash        = { workspace = true }
+unicode-width    = { workspace = true }
 
 [target."cfg(unix)".dependencies]
 libc  = { workspace = true }
diff --git a/yazi-plugin/preset/components/app.lua b/yazi-plugin/preset/components/app.lua
new file mode 100644
index 00000000..951e8fd3
--- /dev/null
+++ b/yazi-plugin/preset/components/app.lua
@@ -0,0 +1,5 @@
+App = {
+	_id = "app",
+}
+
+function App.bg() return th.app.overall:bg() or "reset" end
diff --git a/yazi-plugin/preset/components/backdrop.lua b/yazi-plugin/preset/components/backdrop.lua
new file mode 100644
index 00000000..05856f31
--- /dev/null
+++ b/yazi-plugin/preset/components/backdrop.lua
@@ -0,0 +1,13 @@
+Backdrop = {
+	_id = "backdrop",
+}
+
+function Backdrop:new(area) return setmetatable({ _area = area }, { __index = self }) end
+
+function Backdrop:reflow() return {} end
+
+function Backdrop:redraw()
+	return {
+		ui.Fill(self._area):style(th.app.overall),
+	}
+end
diff --git a/yazi-plugin/preset/components/current.lua b/yazi-plugin/preset/components/current.lua
index 74f73fe4..0c15db76 100644
--- a/yazi-plugin/preset/components/current.lua
+++ b/yazi-plugin/preset/components/current.lua
@@ -1,5 +1,7 @@
 Current = {
 	_id = "current",
+	_dragging = false,
+	_dropping = false,
 }
 
 function Current:new(area, tab)
@@ -24,6 +26,14 @@ function Current:empty()
 	}
 end
 
+function Current:dropping()
+	if Current._dropping then
+		return Tip:new(self._area, "Drop to move here…"):redraw()
+	else
+		return {}
+	end
+end
+
 function Current:reflow() return { self } end
 
 function Current:redraw()
@@ -44,6 +54,7 @@ function Current:redraw()
 	return {
 		ui.List(left):area(self._area),
 		ui.Text(right):area(self._area):align(ui.Align.RIGHT),
+		table.unpack(self:dropping()),
 	}
 end
 
@@ -62,3 +73,31 @@ end
 function Current:scroll(event, step) ya.emit("arrow", { step }) end
 
 function Current:touch(event, step) end
+
+function Current:drag(event)
+	if event.type == "offer" then
+		Current._dragging = require("dnd").offer_uri_list()
+	elseif event.type == "end" or event.type == "error" then
+		Current._dragging = false
+	end
+end
+
+function Current:drop(event)
+	if Current._dragging then
+		return
+	elseif event.type == "enter" then
+		rt.tty:queue("AgreeDrop", { type = "move", mimes = { "text/uri-list" } })
+	elseif event.type == "ready" then
+		rt.tty:queue("StartDrop", { idx = 1 })
+	elseif event.type == "arrive" then
+		rt.tty:queue("FinishDrop", { type = "move" })
+		require("dnd").cut_uri_list(event.data)
+	end
+	rt.tty:flush()
+
+	local d = event.type == "enter"
+	if Current._dropping ~= d then
+		Current._dropping = d
+		ui.render()
+	end
+end
diff --git a/yazi-plugin/preset/components/entity.lua b/yazi-plugin/preset/components/entity.lua
index 5ecabbad..99c61581 100644
--- a/yazi-plugin/preset/components/entity.lua
+++ b/yazi-plugin/preset/components/entity.lua
@@ -115,9 +115,9 @@ function Entity:style_rev()
 	local s = self:style()
 	local bg = s:bg(true)
 	if bg then
-		return ui.Style():fg(bg):bg("reset"):reverse(true)
+		return ui.Style():fg(bg):bg(App.bg()):reverse(true)
 	elseif s:raw().reversed then
-		return ui.Style():bg("reset"):reverse(true)
+		return ui.Style():bg(App.bg()):reverse(true)
 	end
 end
 
diff --git a/yazi-plugin/preset/components/rail.lua b/yazi-plugin/preset/components/rail.lua
index 40d938d8..305f9694 100644
--- a/yazi-plugin/preset/components/rail.lua
+++ b/yazi-plugin/preset/components/rail.lua
@@ -24,6 +24,10 @@ function Rail:scroll(event, step) end
 function Rail:touch(event, step) end
 
 function Rail:drag(event)
+	if event.type ~= "legacy" then
+		return
+	end
+
 	local c, x, parent, current, preview = self._chunks, 0, 0, 0, 0
 	if self._id == "rail-left" then
 		x = math.min(event.x, c[2].right - 2)
diff --git a/yazi-plugin/preset/components/root.lua b/yazi-plugin/preset/components/root.lua
index 201d37fa..466994a1 100644
--- a/yazi-plugin/preset/components/root.lua
+++ b/yazi-plugin/preset/components/root.lua
@@ -1,6 +1,7 @@
 Root = {
 	_id = "root",
 	_dragging = nil,
+	_dropping = nil,
 }
 
 function Root:new(area)
@@ -24,6 +25,7 @@ end
 
 function Root:build()
 	self._children = {
+		Backdrop:new(self._area),
 		Header:new(self._chunks[1], cx.active),
 		Tabs:new(self._chunks[2]),
 		Tab:new(self._chunks[3], cx.active),
@@ -50,11 +52,11 @@ end
 
 -- Mouse events
 function Root:click(event, up)
-	local c = Root._dragging or ya.child_at(ui.Rect { x = event.x, y = event.y }, self:reflow())
+	local c = ya.child_at(ui.Rect { x = event.x, y = event.y }, self:reflow())
 	Root._dragging = not up and c or nil
 
 	if tostring(cx.layer) == "mgr" then
-		return c and c:click(event, up)
+		return c and c.click and c:click(event, up)
 	end
 end
 
@@ -63,7 +65,7 @@ function Root:scroll(event, step)
 		return
 	end
 	local c = ya.child_at(ui.Rect { x = event.x, y = event.y }, self:reflow())
-	return c and c:scroll(event, step)
+	return c and c.scroll and c:scroll(event, step)
 end
 
 function Root:touch(event, step)
@@ -71,7 +73,7 @@ function Root:touch(event, step)
 		return
 	end
 	local c = ya.child_at(ui.Rect { x = event.x, y = event.y }, self:reflow())
-	return c and c:touch(event, step)
+	return c and c.touch and c:touch(event, step)
 end
 
 function Root:move(event) end
@@ -84,3 +86,16 @@ function Root:drag(event)
 	local c = Root._dragging
 	return c and c.drag and c:drag(event)
 end
+
+function Root:drop(event)
+	local d = Root._dropping
+	local c = event.x and ya.child_at(ui.Rect { x = event.x, y = event.y }, self:reflow()) or d
+	if d and d.drop and d._id ~= c._id then
+		d:drop { type = "leave" }
+	end
+
+	Root._dropping = c
+	if tostring(cx.layer) == "mgr" then
+		return c and c.drop and c:drop(event)
+	end
+end
diff --git a/yazi-plugin/preset/components/status.lua b/yazi-plugin/preset/components/status.lua
index 1d0e2969..377ae94c 100644
--- a/yazi-plugin/preset/components/status.lua
+++ b/yazi-plugin/preset/components/status.lua
@@ -41,7 +41,7 @@ function Status:mode()
 
 	local style = self:style()
 	return ui.Line {
-		ui.Span(th.status.sep_left.open):fg(style.main:bg()):bg("reset"),
+		ui.Span(th.status.sep_left.open):fg(style.main:bg()):bg(App.bg()),
 		ui.Span(" " .. mode .. " "):style(style.main),
 		ui.Span(th.status.sep_left.close):fg(style.main:bg()):bg(style.alt:bg()),
 	}
@@ -127,7 +127,7 @@ function Status:position()
 	return ui.Line {
 		ui.Span(th.status.sep_right.open):fg(style.main:bg()):bg(style.alt:bg()),
 		ui.Span(string.format(" %2d/%-2d ", math.min(cursor + 1, length), length)):style(style.main),
-		ui.Span(th.status.sep_right.close):fg(style.main:bg()):bg("reset"),
+		ui.Span(th.status.sep_right.close):fg(style.main:bg()):bg(App.bg()),
 	}
 end
 
diff --git a/yazi-plugin/preset/components/tip.lua b/yazi-plugin/preset/components/tip.lua
new file mode 100644
index 00000000..8012e4ce
--- /dev/null
+++ b/yazi-plugin/preset/components/tip.lua
@@ -0,0 +1,30 @@
+Tip = {
+	_id = "tip",
+}
+
+function Tip:new(area, text)
+	local me = setmetatable({ _area = area, _text = text }, { __index = self })
+	me:layout()
+	return me
+end
+
+function Tip:layout()
+	self._chunks = ui.Layout()
+		:direction(ui.Layout.VERTICAL)
+		:constraints({
+			ui.Constraint.Fill(1),
+			ui.Constraint.Length(3),
+			ui.Constraint.Fill(1),
+		})
+		:split(self._area)
+end
+
+function Tip:reflow() return {} end
+
+function Tip:redraw()
+	return {
+		ui.Clear(self._chunks[2]),
+		ui.Text(""):area(self._chunks[2]):align(ui.Align.CENTER):bg("yellow"),
+		ui.Text(self._text):area(self._chunks[2]:pad(ui.Pad.xy(1, 1))):align(ui.Align.CENTER):fg("black"):bold(),
+	}
+end
diff --git a/yazi-plugin/preset/plugins/dnd.lua b/yazi-plugin/preset/plugins/dnd.lua
new file mode 100644
index 00000000..552c26de
--- /dev/null
+++ b/yazi-plugin/preset/plugins/dnd.lua
@@ -0,0 +1,46 @@
+local M = {}
+
+function M.selected_uri_list()
+	local paths = {}
+	for _, u in pairs(cx.active.selected) do
+		paths[#paths + 1] = "file://" .. ya.percent_encode(tostring(u.path))
+	end
+	if #paths == 0 and cx.active.current.hovered then
+		paths[1] = "file://" .. ya.percent_encode(tostring(cx.active.current.hovered.path))
+	end
+	return paths
+end
+
+function M.cut_uri_list(list)
+	cx.tasks.behavior:reset()
+	for line in list:gmatch("[^\r\n]+") do
+		if line:sub(1, 7) ~= "file://" then
+			goto continue
+		end
+
+		local from = Url(ya.percent_decode(line:sub(8)))
+		if from.name then
+			local to = cx.active.current.cwd:join(Path.os(from.name))
+			ya.async(function() ya.task("cut", { from = from, to = to }):spawn() end)
+		end
+
+		::continue::
+	end
+end
+
+function M.offer_uri_list()
+	local list = M.selected_uri_list()
+	if #list == 0 then
+		return false
+	end
+
+	local icon = string.format("%d selected file(s)", #list)
+	rt.tty:queue("AgreeDrag", { type = "either", mimes = { "text/uri-list" } })
+	rt.tty:queue("PresentDrag", { idx = 0, data = table.concat(list, "\r\n") })
+	rt.tty:queue("PresentDragIcon", { format = 0, opacity = 0, width = 6, height = 4, data = icon })
+	rt.tty:queue("StartDrag", {})
+	rt.tty:flush()
+	return true
+end
+
+return M
diff --git a/yazi-plugin/preset/plugins/json.lua b/yazi-plugin/preset/plugins/json.lua
index 159bfc65..bbe51382 100644
--- a/yazi-plugin/preset/plugins/json.lua
+++ b/yazi-plugin/preset/plugins/json.lua
@@ -28,7 +28,7 @@ function M:peek(job)
 
 		i = i + #wrapped
 		for j = from, to do
-			lines[#lines + 1] = wrapped[j]
+			lines[#lines + 1] = M.normalize_bg(wrapped[j])
 		end
 	until i >= job.skip + limit
 
@@ -42,4 +42,13 @@ end
 
 function M:seek(job) require("code"):seek(job) end
 
+function M.normalize_bg(line)
+	local bg = th.app.overall:bg()
+	if bg then
+		return line:map(function(span) return span:bg(bg) end)
+	else
+		return line
+	end
+end
+
 return M
diff --git a/yazi-plugin/preset/plugins/magick.lua b/yazi-plugin/preset/plugins/magick.lua
index 80257838..15993771 100644
--- a/yazi-plugin/preset/plugins/magick.lua
+++ b/yazi-plugin/preset/plugins/magick.lua
@@ -49,7 +49,7 @@ function M:preload(job)
 		cmd:arg { "-background", job.args.bg, "-alpha", "remove" }
 	end
 
-	local status, err = cmd:arg(string.format("JPG:%s", cache)):status()
+	local status, err = cmd:arg(string.format("WEBP:%s", cache)):status()
 	if not status then
 		return true, Err("Failed to start `magick`, error: %s", err)
 	elseif not status.success then
diff --git a/yazi-plugin/src/elements/mod.rs b/yazi-plugin/src/elements/mod.rs
deleted file mode 100644
index 06ab4314..00000000
--- a/yazi-plugin/src/elements/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-yazi_macro::mod_flat!(elements);
diff --git a/yazi-plugin/src/external/fd.rs b/yazi-plugin/src/external/fd.rs
index a8311aeb..aa245d6f 100644
--- a/yazi-plugin/src/external/fd.rs
+++ b/yazi-plugin/src/external/fd.rs
@@ -2,7 +2,7 @@ use std::{path::Path, process::Stdio};
 
 use anyhow::Result;
 use tokio::{io::{AsyncBufReadExt, BufReader}, process::{Child, Command}, sync::mpsc::{self, UnboundedReceiver}};
-use yazi_fs::{File, FsUrl};
+use yazi_fs::{FsUrl, file::File};
 use yazi_shared::url::{AsUrl, UrlBuf, UrlLike};
 use yazi_vfs::VfsFile;
 
diff --git a/yazi-plugin/src/external/rg.rs b/yazi-plugin/src/external/rg.rs
index be0c2e72..99651ff2 100644
--- a/yazi-plugin/src/external/rg.rs
+++ b/yazi-plugin/src/external/rg.rs
@@ -1,12 +1,8 @@
 use std::{fmt::format, process::Stdio};
 
 use anyhow::Result;
-use tokio::{
-	io::{AsyncBufReadExt, BufReader},
-	process::Command,
-	sync::mpsc::{self, UnboundedReceiver},
-};
-use yazi_fs::{File, FsUrl};
+use tokio::{io::{AsyncBufReadExt, BufReader}, process::Command, sync::mpsc::{self, UnboundedReceiver}};
+use yazi_fs::{FsUrl, file::File};
 use yazi_shared::url::{AsUrl, UrlBuf, UrlLike};
 use yazi_vfs::VfsFile;
 
diff --git a/yazi-plugin/src/external/rga.rs b/yazi-plugin/src/external/rga.rs
index 5da3f7f6..bfece528 100644
--- a/yazi-plugin/src/external/rga.rs
+++ b/yazi-plugin/src/external/rga.rs
@@ -2,7 +2,7 @@ use std::{path::Path, process::Stdio};
 
 use anyhow::Result;
 use tokio::{io::{AsyncBufReadExt, BufReader}, process::Command, sync::mpsc::{self, UnboundedReceiver}};
-use yazi_fs::{File, FsUrl};
+use yazi_fs::{FsUrl, file::File};
 use yazi_shared::url::{AsUrl, UrlBuf, UrlLike};
 use yazi_vfs::VfsFile;
 
diff --git a/yazi-binding/src/calculator.rs b/yazi-plugin/src/fs/calculator.rs
similarity index 93%
rename from yazi-binding/src/calculator.rs
rename to yazi-plugin/src/fs/calculator.rs
index 11f9894b..9c9a5b83 100644
--- a/yazi-binding/src/calculator.rs
+++ b/yazi-plugin/src/fs/calculator.rs
@@ -1,6 +1,5 @@
 use mlua::{IntoLuaMulti, UserData, UserDataFields, UserDataMethods, Value};
-
-use crate::{Cha, Error};
+use yazi_binding::Error;
 
 pub enum SizeCalculator {
 	Local(yazi_fs::provider::local::SizeCalculator),
@@ -10,10 +9,10 @@ pub enum SizeCalculator {
 impl UserData for SizeCalculator {
 	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
 		fields.add_field_method_get("cha", |_, me| {
-			Ok(Cha(match me {
+			Ok(match me {
 				Self::Local(c) => c.cha(),
 				Self::Remote(c) => c.cha(),
-			}))
+			})
 		});
 	}
 
diff --git a/yazi-plugin/src/fs/fs.rs b/yazi-plugin/src/fs/fs.rs
index b0d4c6f1..b75c043b 100644
--- a/yazi-plugin/src/fs/fs.rs
+++ b/yazi-plugin/src/fs/fs.rs
@@ -1,12 +1,14 @@
 use std::str::FromStr;
 
 use mlua::{ExternalError, Function, IntoLua, IntoLuaMulti, Lua, Table, Value};
-use yazi_binding::{Cha, Composer, ComposerGet, ComposerSet, Error, File, SizeCalculator, Url, UrlRef, deprecate};
+use yazi_binding::{Composer, ComposerGet, ComposerSet, Error};
 use yazi_config::Pattern;
-use yazi_fs::{mounts::PARTITIONS, provider::{Attrs, DirReader, FileHolder}};
-use yazi_shared::url::{UrlCow, UrlLike};
+use yazi_fs::{file::File, mounts::PARTITIONS, provider::{Attrs, DirReader, FileHolder}};
+use yazi_shared::url::{UrlBuf, UrlCow, UrlLike, UrlRef};
 use yazi_vfs::{VfsFile, provider};
 
+use crate::fs::SizeCalculator;
+
 pub fn compose() -> Composer<ComposerGet, ComposerSet> {
 	fn get(lua: &Lua, key: &[u8]) -> mlua::Result<Value> {
 		match key {
@@ -23,7 +25,6 @@ pub fn compose() -> Composer<ComposerGet, ComposerSet> {
 			b"remove" => remove(lua)?,
 			b"rename" => rename(lua)?,
 			b"unique" => unique(lua)?,
-			b"unique_name" => unique_name(lua)?,
 			b"write" => write(lua)?,
 			_ => return Ok(Value::Nil),
 		}
@@ -36,7 +37,7 @@ pub fn compose() -> Composer<ComposerGet, ComposerSet> {
 }
 
 fn access(lua: &Lua) -> mlua::Result<Function> {
-	lua.create_function(|_, ()| Ok(yazi_binding::Access::default()))
+	lua.create_function(|_, ()| Ok(yazi_vfs::provider::Gate::default()))
 }
 
 fn calc_size(lua: &Lua) -> mlua::Result<Function> {
@@ -63,7 +64,7 @@ fn cha(lua: &Lua) -> mlua::Result<Function> {
 		};
 
 		match cha {
-			Ok(c) => Cha(c).into_lua_multi(&lua),
+			Ok(c) => c.into_lua_multi(&lua),
 			Err(e) => (Value::Nil, Error::Io(e)).into_lua_multi(&lua),
 		}
 	})
@@ -95,7 +96,7 @@ fn create(lua: &Lua) -> mlua::Result<Function> {
 
 fn cwd(lua: &Lua) -> mlua::Result<Function> {
 	lua.create_function(|lua, ()| match std::env::current_dir() {
-		Ok(p) => Url::new(p).into_lua_multi(lua),
+		Ok(p) => UrlBuf::from(p).into_lua_multi(lua),
 		Err(e) => (Value::Nil, Error::Io(e)).into_lua_multi(lua),
 	})
 }
@@ -105,12 +106,12 @@ fn expand_url(lua: &Lua) -> mlua::Result<Function> {
 	lua.create_function(|lua, value: Value| {
 		use yazi_fs::path::expand_url;
 		match &value {
-			Value::String(s) => Url::new(expand_url(UrlCow::try_from(&*s.as_bytes())?)).into_lua(lua),
+			Value::String(s) => expand_url(UrlCow::try_from(&*s.as_bytes())?).into_owned().into_lua(lua),
 			Value::UserData(ud) => {
-				if let u = expand_url(&*ud.borrow::<yazi_binding::Url>()?)
+				if let u = expand_url(&*ud.borrow::<UrlBuf>()?)
 					&& u.is_owned()
 				{
-					Url::new(u.into_owned()).into_lua(lua)
+					u.into_owned().into_lua(lua)
 				} else {
 					Ok(value)
 				}
@@ -173,14 +174,14 @@ fn read_dir(lua: &Lua) -> mlua::Result<Function> {
 			}
 
 			let file = if !resolve {
-				yazi_fs::File::from_dummy(url, next.file_type().await.ok())
+				File::from_dummy(url, next.file_type().await.ok())
 			} else if let Ok(cha) = next.metadata().await {
-				yazi_fs::File::from_follow(url, cha).await
+				File::from_follow(url, cha).await
 			} else {
-				yazi_fs::File::from_dummy(url, next.file_type().await.ok())
+				File::from_dummy(url, next.file_type().await.ok())
 			};
 
-			files.push(File::new(file));
+			files.push(file);
 			if files.len() == limit {
 				break;
 			}
@@ -225,17 +226,7 @@ fn unique(lua: &Lua) -> mlua::Result<Function> {
 		};
 
 		match result {
-			Ok(u) => Url::new(u).into_lua_multi(&lua),
-			Err(e) => (Value::Nil, Error::Io(e)).into_lua_multi(&lua),
-		}
-	})
-}
-
-fn unique_name(lua: &Lua) -> mlua::Result<Function> {
-	lua.create_async_function(|lua, url: UrlRef| async move {
-		deprecate!(lua, "`fs.unique_name()` is deprecated, use `fs.unique()` instead, in your {}\nSee #3677 for more details: https://github.com/sxyazi/yazi/pull/3677");
-		match yazi_vfs::unique_name(url.clone(), async { false }).await {
-			Ok(u) => Url::new(u).into_lua_multi(&lua),
+			Ok(u) => u.into_lua_multi(&lua),
 			Err(e) => (Value::Nil, Error::Io(e)).into_lua_multi(&lua),
 		}
 	})
diff --git a/yazi-plugin/src/fs/mod.rs b/yazi-plugin/src/fs/mod.rs
index c6ecf3bb..888c3e6e 100644
--- a/yazi-plugin/src/fs/mod.rs
+++ b/yazi-plugin/src/fs/mod.rs
@@ -1 +1 @@
-yazi_macro::mod_flat!(fs op);
+yazi_macro::mod_flat!(calculator fs op);
diff --git a/yazi-plugin/src/fs/op.rs b/yazi-plugin/src/fs/op.rs
index 93dcd2c7..d894985a 100644
--- a/yazi-plugin/src/fs/op.rs
+++ b/yazi-plugin/src/fs/op.rs
@@ -1,48 +1,48 @@
-use mlua::{IntoLua, Lua, Table, Value};
-use yazi_binding::{Cha, File, Id, Path, Url};
+use mlua::{Lua, Table, UserData};
+use yazi_codegen::FromLuaOwned;
+use yazi_macro::impl_data_any;
+use yazi_shared::url::UrlBuf;
 
+#[derive(Clone, FromLuaOwned)]
 pub(super) struct FilesOp(yazi_fs::FilesOp);
 
+impl_data_any!(FilesOp => yazi_fs::FilesOp; from_into_lua = inherit);
+
+impl From<FilesOp> for yazi_fs::FilesOp {
+	fn from(op: FilesOp) -> Self { op.0 }
+}
+
+impl AsRef<yazi_fs::FilesOp> for FilesOp {
+	fn as_ref(&self) -> &yazi_fs::FilesOp { &self.0 }
+}
+
 impl FilesOp {
 	pub(super) fn part(_: &Lua, t: Table) -> mlua::Result<Self> {
-		let id: Id = t.raw_get("id")?;
-		let url: Url = t.raw_get("url")?;
+		let id = t.raw_get("id")?;
+		let url = t.raw_get("url")?;
 		let files: Table = t.raw_get("files")?;
 
 		Ok(Self(yazi_fs::FilesOp::Part(
-			url.into(),
-			files
-				.sequence_values::<File>()
-				.map(|f| f.map(Into::into))
-				.collect::<mlua::Result<Vec<_>>>()?,
-			*id,
+			url,
+			files.sequence_values().collect::<mlua::Result<Vec<_>>>()?,
+			id,
 		)))
 	}
 
 	pub(super) fn done(_: &Lua, t: Table) -> mlua::Result<Self> {
-		let id: Id = t.raw_get("id")?;
-		let cha: Cha = t.raw_get("cha")?;
-		let url: Url = t.raw_get("url")?;
+		let id = t.raw_get("id")?;
+		let cha = t.raw_get("cha")?;
+		let url = t.raw_get("url")?;
 
-		Ok(Self(yazi_fs::FilesOp::Done(url.into(), *cha, *id)))
+		Ok(Self(yazi_fs::FilesOp::Done(url, cha, id)))
 	}
 
 	pub(super) fn size(_: &Lua, t: Table) -> mlua::Result<Self> {
-		let url: Url = t.raw_get("url")?;
+		let url: UrlBuf = t.raw_get("url")?;
 		let sizes: Table = t.raw_get("sizes")?;
 
-		Ok(Self(yazi_fs::FilesOp::Size(
-			url.into(),
-			sizes
-				.pairs::<Path, u64>()
-				.map(|r| r.map(|(urn, size)| (urn.into(), size)))
-				.collect::<mlua::Result<_>>()?,
-		)))
+		Ok(Self(yazi_fs::FilesOp::Size(url, sizes.pairs().collect::<mlua::Result<_>>()?)))
 	}
 }
 
-impl IntoLua for FilesOp {
-	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> {
-		lua.create_any_userdata(self.0)?.into_lua(lua)
-	}
-}
+impl UserData for FilesOp {}
diff --git a/yazi-plugin/src/keymap/keymap.rs b/yazi-plugin/src/keymap/keymap.rs
new file mode 100644
index 00000000..82b511cb
--- /dev/null
+++ b/yazi-plugin/src/keymap/keymap.rs
@@ -0,0 +1,14 @@
+use mlua::{ExternalResult, IntoLua, Lua, Value};
+use yazi_binding::{Composer, ComposerGet, ComposerSet};
+use yazi_config::KEYMAP;
+
+pub fn compose() -> Composer<ComposerGet, ComposerSet> {
+	fn get(lua: &Lua, key: &[u8]) -> mlua::Result<Value> {
+		let layer = str::from_utf8(key)?.parse().into_lua_err()?;
+		KEYMAP.section(layer).into_lua(lua)
+	}
+
+	fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> { Ok(value) }
+
+	Composer::new(get, set)
+}
diff --git a/yazi-plugin/src/keymap/mod.rs b/yazi-plugin/src/keymap/mod.rs
new file mode 100644
index 00000000..bfbbc6dd
--- /dev/null
+++ b/yazi-plugin/src/keymap/mod.rs
@@ -0,0 +1 @@
+yazi_macro::mod_flat!(keymap);
diff --git a/yazi-plugin/src/lib.rs b/yazi-plugin/src/lib.rs
index a716d0dc..de95f296 100644
--- a/yazi-plugin/src/lib.rs
+++ b/yazi-plugin/src/lib.rs
@@ -1,4 +1,4 @@
-yazi_macro::mod_pub!(elements external fs pubsub runtime tasks theme utils);
+yazi_macro::mod_pub!(external fs keymap pubsub runtime tasks theme ui utils);
 
 yazi_macro::mod_flat!(slim standard);
 
diff --git a/yazi-plugin/src/pubsub/pubsub.rs b/yazi-plugin/src/pubsub/pubsub.rs
index 4b1768e8..21c1388a 100644
--- a/yazi-plugin/src/pubsub/pubsub.rs
+++ b/yazi-plugin/src/pubsub/pubsub.rs
@@ -1,6 +1,7 @@
 use mlua::{ExternalResult, Function, Lua, Value};
-use yazi_binding::{Id, runtime};
+use yazi_binding::runtime;
 use yazi_dds::ember::Ember;
+use yazi_shared::id::Id;
 
 pub struct Pubsub;
 
@@ -13,7 +14,7 @@ impl Pubsub {
 
 	pub(super) fn pub_to(lua: &Lua) -> mlua::Result<Function> {
 		lua.create_function(|lua, (receiver, kind, value): (Id, mlua::String, Value)| {
-			yazi_dds::Pubsub::pub_to(*receiver, Ember::from_lua(lua, &kind.to_str()?, value)?)
+			yazi_dds::Pubsub::pub_to(receiver, Ember::from_lua(lua, &kind.to_str()?, value)?)
 				.into_lua_err()
 		})
 	}
diff --git a/yazi-plugin/src/runtime/plugin.rs b/yazi-plugin/src/runtime/plugin.rs
index 988b8a3c..2db77ab0 100644
--- a/yazi-plugin/src/runtime/plugin.rs
+++ b/yazi-plugin/src/runtime/plugin.rs
@@ -1,13 +1,14 @@
 use mlua::{IntoLua, Lua, Value};
-use yazi_binding::{Composer, ComposerGet, ComposerSet, config::{Fetchers, Preloaders, Previewers, Spotters}};
+use yazi_binding::{Composer, ComposerGet, ComposerSet};
+use yazi_config::YAZI;
 
 pub(super) fn plugin() -> Composer<ComposerGet, ComposerSet> {
 	fn get(lua: &Lua, key: &[u8]) -> mlua::Result<Value> {
 		match key {
-			b"fetchers" => Fetchers.into_lua(lua),
-			b"spotters" => Spotters.into_lua(lua),
-			b"preloaders" => Preloaders.into_lua(lua),
-			b"previewers" => Previewers.into_lua(lua),
+			b"fetchers" => YAZI.plugin.fetchers.into_lua(lua),
+			b"spotters" => YAZI.plugin.spotters.into_lua(lua),
+			b"preloaders" => YAZI.plugin.preloaders.into_lua(lua),
+			b"previewers" => YAZI.plugin.previewers.into_lua(lua),
 			_ => Ok(Value::Nil),
 		}
 	}
diff --git a/yazi-plugin/src/runtime/runtime.rs b/yazi-plugin/src/runtime/runtime.rs
index 757ec015..0de71d41 100644
--- a/yazi-plugin/src/runtime/runtime.rs
+++ b/yazi-plugin/src/runtime/runtime.rs
@@ -1,16 +1,20 @@
 use mlua::{IntoLua, Lua, LuaSerdeExt, Value};
-use yazi_binding::{Composer, ComposerGet, ComposerSet, SER_OPT, Url, config::{OpenRules, Opener}, elements::Wrap};
+use yazi_binding::{Composer, ComposerGet, ComposerSet, elements::Wrap};
 use yazi_boot::ARGS;
 use yazi_config::YAZI;
+use yazi_shared::url::UrlBuf;
+use yazi_shim::mlua::SER_OPT;
+use yazi_tty::TTY;
 
 pub fn compose() -> Composer<ComposerGet, ComposerSet> {
 	fn get(lua: &Lua, key: &[u8]) -> mlua::Result<Value> {
 		match key {
 			b"args" => args().into_lua(lua)?,
+			b"tty" => TTY.into_lua(lua)?,
 			b"term" => super::term().into_lua(lua)?,
 			b"mgr" => mgr().into_lua(lua)?,
 			b"open" => open().into_lua(lua)?,
-			b"opener" => Opener.into_lua(lua)?,
+			b"opener" => YAZI.opener.into_lua(lua)?,
 			b"plugin" => super::plugin().into_lua(lua)?,
 			b"preview" => preview().into_lua(lua)?,
 			b"tasks" => tasks().into_lua(lua)?,
@@ -27,7 +31,7 @@ pub fn compose() -> Composer<ComposerGet, ComposerSet> {
 fn open() -> Composer<ComposerGet, ComposerSet> {
 	fn get(lua: &Lua, key: &[u8]) -> mlua::Result<Value> {
 		match key {
-			b"rules" => OpenRules.into_lua(lua),
+			b"rules" => YAZI.open.into_lua(lua),
 			_ => Ok(Value::Nil),
 		}
 	}
@@ -40,9 +44,9 @@ fn open() -> Composer<ComposerGet, ComposerSet> {
 fn args() -> Composer<ComposerGet, ComposerSet> {
 	fn get(lua: &Lua, key: &[u8]) -> mlua::Result<Value> {
 		match key {
-			b"entries" => lua.create_sequence_from(ARGS.entries.iter().map(Url::new))?.into_lua(lua),
-			b"cwd_file" => ARGS.cwd_file.as_ref().map(Url::new).into_lua(lua),
-			b"chooser_file" => ARGS.chooser_file.as_ref().map(Url::new).into_lua(lua),
+			b"entries" => lua.create_sequence_from(ARGS.entries.iter().cloned())?.into_lua(lua),
+			b"cwd_file" => ARGS.cwd_file.as_ref().map(UrlBuf::from).into_lua(lua),
+			b"chooser_file" => ARGS.chooser_file.as_ref().map(UrlBuf::from).into_lua(lua),
 			_ => Ok(Value::Nil),
 		}
 	}
diff --git a/yazi-plugin/src/slim.rs b/yazi-plugin/src/slim.rs
index 8d618749..8c35d94f 100644
--- a/yazi-plugin/src/slim.rs
+++ b/yazi-plugin/src/slim.rs
@@ -4,16 +4,17 @@ use yazi_macro::plugin_preset as preset;
 pub fn slim_lua(lua: &Lua) -> mlua::Result<()> {
 	// Base
 	let globals = lua.globals();
-	globals.raw_set("ui", crate::elements::compose())?;
+	globals.raw_set("ui", crate::ui::compose())?;
 	globals.raw_set("ya", crate::utils::compose(true))?;
 	globals.raw_set("fs", crate::fs::compose())?;
 	globals.raw_set("rt", crate::runtime::compose())?;
+	globals.raw_set("km", crate::keymap::compose())?;
 	globals.raw_set("th", crate::theme::compose().into_lua(lua)?)?;
 
-	yazi_binding::Cha::install(lua)?;
-	yazi_binding::File::install(lua)?;
-	yazi_binding::Url::install(lua)?;
-	yazi_binding::Path::install(lua)?;
+	yazi_fs::cha::Cha::install(lua)?;
+	yazi_fs::file::File::install(lua)?;
+	yazi_shared::url::UrlBuf::install(lua)?;
+	yazi_shared::path::PathBufDyn::install(lua)?;
 
 	yazi_binding::Error::install(lua)?;
 	yazi_binding::process::install(lua)?;
diff --git a/yazi-plugin/src/standard.rs b/yazi-plugin/src/standard.rs
index 811b1673..0a659fff 100644
--- a/yazi-plugin/src/standard.rs
+++ b/yazi-plugin/src/standard.rs
@@ -22,19 +22,20 @@ fn stage_1(lua: &Lua) -> Result<()> {
 
 	// Base
 	let globals = lua.globals();
-	globals.raw_set("ui", crate::elements::compose())?;
+	globals.raw_set("ui", crate::ui::compose())?;
 	globals.raw_set("ya", crate::utils::compose(false))?;
 	globals.raw_set("fs", crate::fs::compose())?;
 	globals.raw_set("ps", crate::pubsub::compose())?;
 	globals.raw_set("rt", crate::runtime::compose())?;
+	globals.raw_set("km", crate::keymap::compose())?;
 	globals.raw_set("th", crate::theme::compose())?;
 
 	yazi_binding::Error::install(lua)?;
-	yazi_binding::Cha::install(lua)?;
+	yazi_fs::cha::Cha::install(lua)?;
 	yazi_binding::process::install(lua)?;
-	yazi_binding::File::install(lua)?;
-	yazi_binding::Url::install(lua)?;
-	yazi_binding::Path::install(lua)?;
+	yazi_fs::file::File::install(lua)?;
+	yazi_shared::url::UrlBuf::install(lua)?;
+	yazi_shared::path::PathBufDyn::install(lua)?;
 	yazi_runner::loader::install(lua)?;
 
 	// Addons
@@ -46,6 +47,8 @@ fn stage_1(lua: &Lua) -> Result<()> {
 	lua.load(preset!("components/header")).set_name("header.lua").exec()?;
 	lua.load(preset!("components/linemode")).set_name("linemode.lua").exec()?;
 
+	lua.load(preset!("components/app")).set_name("app.lua").exec()?;
+	lua.load(preset!("components/backdrop")).set_name("backdrop.lua").exec()?;
 	lua.load(preset!("components/marker")).set_name("marker.lua").exec()?;
 	lua.load(preset!("components/markers")).set_name("markers.lua").exec()?;
 	lua.load(preset!("components/modal")).set_name("modal.lua").exec()?;
@@ -59,6 +62,7 @@ fn stage_1(lua: &Lua) -> Result<()> {
 	lua.load(preset!("components/tab")).set_name("tab.lua").exec()?;
 	lua.load(preset!("components/tabs")).set_name("tabs.lua").exec()?;
 	lua.load(preset!("components/tasks")).set_name("tasks.lua").exec()?;
+	lua.load(preset!("components/tip")).set_name("tip.lua").exec()?;
 
 	Ok(())
 }
diff --git a/yazi-plugin/src/tasks/task.rs b/yazi-plugin/src/tasks/task.rs
index 0ab825a9..912d704e 100644
--- a/yazi-plugin/src/tasks/task.rs
+++ b/yazi-plugin/src/tasks/task.rs
@@ -1,5 +1,5 @@
 use mlua::{UserData, UserDataFields};
-use yazi_shared::Id;
+use yazi_shared::id::Id;
 
 #[derive(Clone, Debug)]
 pub(crate) struct Task {
@@ -8,6 +8,6 @@ pub(crate) struct Task {
 
 impl UserData for Task {
 	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
-		fields.add_field_method_get("id", |_, me| Ok(yazi_binding::Id(me.id)));
+		fields.add_field_method_get("id", |_, me| Ok(me.id));
 	}
 }
diff --git a/yazi-plugin/src/theme/theme.rs b/yazi-plugin/src/theme/theme.rs
index 554b2027..c13b47fc 100644
--- a/yazi-plugin/src/theme/theme.rs
+++ b/yazi-plugin/src/theme/theme.rs
@@ -1,6 +1,7 @@
 use mlua::{IntoLua, Lua, Value};
-use yazi_binding::{Composer, ComposerGet, ComposerSet, Style, Url, theme::CustomSection};
-use yazi_config::THEME;
+use yazi_binding::{Composer, ComposerGet, ComposerSet, style::Style};
+use yazi_config::{THEME, theme::CustomSectionArc};
+use yazi_shared::url::UrlBuf;
 
 use crate::LUA;
 
@@ -73,7 +74,7 @@ fn mgr() -> Composer<ComposerGet, ComposerSet> {
 			b"border_symbol" => lua.create_string(&**m.border_symbol.load())?.into_lua(lua),
 			b"border_style" => Style::from(&m.border_style).into_lua(lua),
 
-			b"syntect_theme" => Url::new(&**m.syntect_theme.load()).into_lua(lua),
+			b"syntect_theme" => UrlBuf::from(&**m.syntect_theme.load()).into_lua(lua),
 			_ => Ok(Value::Nil),
 		}
 	}
@@ -377,8 +378,5 @@ fn help() -> Composer<ComposerGet, ComposerSet> {
 }
 
 fn custom(lua: &Lua, key: &[u8]) -> mlua::Result<Value> {
-	match THEME.custom.load().get(str::from_utf8(key)?) {
-		Some(section) => CustomSection::new(section.load_full()).into_lua(lua),
-		None => Ok(Value::Nil),
-	}
+	THEME.custom.load().get(str::from_utf8(key)?).map(CustomSectionArc::from).into_lua(lua)
 }
diff --git a/yazi-plugin/src/ui/mod.rs b/yazi-plugin/src/ui/mod.rs
new file mode 100644
index 00000000..3f072523
--- /dev/null
+++ b/yazi-plugin/src/ui/mod.rs
@@ -0,0 +1 @@
+yazi_macro::mod_flat!(ui utils);
diff --git a/yazi-plugin/src/ui/ui.rs b/yazi-plugin/src/ui/ui.rs
new file mode 100644
index 00000000..c8a8c010
--- /dev/null
+++ b/yazi-plugin/src/ui/ui.rs
@@ -0,0 +1,50 @@
+use mlua::{IntoLua, Lua, Value};
+use yazi_binding::{Composer, ComposerGet, ComposerSet, elements::{Align, Bar, Border, Color, Constraint, Edge, Fill, Gauge, Layout, Line, List, Pad, Rect, Row, Span, Table, Text, Wrap}, position::Position, style::Style};
+use yazi_config::THEME;
+use yazi_widgets::{clear::Clear, input::InputArc};
+
+pub fn compose() -> Composer<ComposerGet, ComposerSet> {
+	fn get(lua: &Lua, key: &[u8]) -> mlua::Result<Value> {
+		match key {
+			// Elements
+			b"Align" => Align::compose(lua)?,
+			b"Bar" => Bar::compose(lua)?,
+			b"Border" => Border::compose(lua)?,
+			b"Clear" => Clear::compose(lua)?,
+			b"Color" => Color::compose(lua)?,
+			b"Constraint" => Constraint::compose(lua)?,
+			b"Edge" => Edge::compose(lua)?,
+			b"Fill" => Fill::compose(lua)?,
+			b"Gauge" => Gauge::compose(lua)?,
+			b"Input" => InputArc::compose(lua, (&THEME.input).into())?,
+			b"Layout" => Layout::compose(lua)?,
+			b"Line" => Line::compose(lua)?,
+			b"List" => List::compose(lua)?,
+			b"Pad" => Pad::compose(lua)?,
+			b"Pos" => Position::compose(lua)?,
+			b"Rect" => Rect::compose(lua)?,
+			b"Row" => Row::compose(lua)?,
+			b"Span" => Span::compose(lua)?,
+			b"Style" => Style::compose(lua)?,
+			b"Table" => Table::compose(lua)?,
+			b"Text" => Text::compose(lua)?,
+			b"Wrap" => Wrap::compose(lua)?,
+
+			// Functions
+			b"area" => super::area(lua)?,
+			b"hide" => super::hide(lua)?,
+			b"lines" => super::lines(lua)?,
+			b"printable" => super::printable(lua)?,
+			b"redraw" => super::redraw(lua)?,
+			b"render" => super::render(lua)?,
+			b"truncate" => super::truncate(lua)?,
+			b"width" => super::width(lua)?,
+			_ => return Ok(Value::Nil),
+		}
+		.into_lua(lua)
+	}
+
+	fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> { Ok(value) }
+
+	Composer::new(get, set)
+}
diff --git a/yazi-plugin/src/elements/elements.rs b/yazi-plugin/src/ui/utils.rs
similarity index 91%
rename from yazi-plugin/src/elements/elements.rs
rename to yazi-plugin/src/ui/utils.rs
index 84e06003..b5a61827 100644
--- a/yazi-plugin/src/elements/elements.rs
+++ b/yazi-plugin/src/ui/utils.rs
@@ -4,34 +4,13 @@ use ansi_to_tui::IntoText;
 use mlua::{AnyUserData, ExternalError, ExternalResult, IntoLua, Lua, ObjectLike, Table, Value};
 use tracing::error;
 use unicode_width::{UnicodeWidthChar, UnicodeWidthStr};
-use yazi_binding::{Composer, ComposerGet, ComposerSet, Permit, PermitRef, elements::{Line, Rect, Span, Wrap}, runtime};
+use yazi_binding::{Permit, PermitRef, elements::{Line, Rect, Span, Wrap}, runtime};
 use yazi_config::LAYOUT;
 use yazi_scheduler::AppProxy;
 use yazi_shared::replace_to_printable;
 use yazi_shim::ratatui::LineIter;
 use yazi_term::YIELD_TO_SUBPROCESS;
 
-pub fn compose() -> Composer<ComposerGet, ComposerSet> {
-	fn get(lua: &Lua, key: &[u8]) -> mlua::Result<Value> {
-		match key {
-			b"area" => area(lua)?,
-			b"hide" => hide(lua)?,
-			b"lines" => lines(lua)?,
-			b"printable" => printable(lua)?,
-			b"redraw" => redraw(lua)?,
-			b"render" => render(lua)?,
-			b"truncate" => truncate(lua)?,
-			b"width" => width(lua)?,
-			_ => return Ok(Value::Nil),
-		}
-		.into_lua(lua)
-	}
-
-	fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> { Ok(value) }
-
-	yazi_binding::elements::compose(get, set)
-}
-
 pub(super) fn area(lua: &Lua) -> mlua::Result<Value> {
 	let f = lua.create_function(|_, s: mlua::String| {
 		let layout = LAYOUT.get();
@@ -123,7 +102,7 @@ pub(super) fn redraw(lua: &Lua) -> mlua::Result<Value> {
 			Value::UserData(ud) => lua.create_sequence_from([ud]),
 			_ => {
 				error!(
-					"Failed to `redraw()` the `{}` component: expected a table or UserData",
+					"Failed to `redraw()` the `{}` component: expected an element or a table of them",
 					id.display(),
 				);
 				lua.create_table()
diff --git a/yazi-plugin/src/utils/app.rs b/yazi-plugin/src/utils/app.rs
index 9dd56649..ca760651 100644
--- a/yazi-plugin/src/utils/app.rs
+++ b/yazi-plugin/src/utils/app.rs
@@ -2,25 +2,25 @@ use std::any::TypeId;
 
 use mlua::{AnyUserData, ExternalError, Function, Lua};
 use tokio::process::{ChildStderr, ChildStdin, ChildStdout};
-use yazi_binding::{Fd, Id};
+use yazi_vfs::provider::RwFile;
 
 use super::Utils;
 
 impl Utils {
 	pub(super) fn id(lua: &Lua) -> mlua::Result<Function> {
 		lua.create_function(|_, r#type: mlua::String| {
-			Ok(Id(match &*r#type.as_bytes() {
+			Ok(match &*r#type.as_bytes() {
 				b"app" => *yazi_dds::ID,
 				b"ft" => yazi_fs::FILES_TICKET.next(),
 				_ => Err("Invalid id type".into_lua_err())?,
-			}))
+			})
 		})
 	}
 
 	pub(super) fn drop(lua: &Lua) -> mlua::Result<Function> {
 		lua.create_function(|_, ud: AnyUserData| {
 			match ud.type_id() {
-				Some(t) if t == TypeId::of::<Fd>() => {}
+				Some(t) if t == TypeId::of::<RwFile>() => {}
 				Some(t) if t == TypeId::of::<ChildStdin>() => {}
 				Some(t) if t == TypeId::of::<ChildStdout>() => {}
 				Some(t) if t == TypeId::of::<ChildStderr>() => {}
diff --git a/yazi-plugin/src/utils/cache.rs b/yazi-plugin/src/utils/cache.rs
index 1b7438aa..58d5fe63 100644
--- a/yazi-plugin/src/utils/cache.rs
+++ b/yazi-plugin/src/utils/cache.rs
@@ -1,9 +1,9 @@
 use std::hash::Hash;
 
 use mlua::{Function, Lua, Table};
-use yazi_binding::{FileRef, Url};
 use yazi_config::YAZI;
-use yazi_shared::url::UrlLike;
+use yazi_fs::file::FileRef;
+use yazi_shared::url::{UrlBuf, UrlLike};
 use yazi_shim::Twox128;
 
 use super::Utils;
@@ -23,7 +23,7 @@ impl Utils {
 				format!("{:x}", h.finish_128())
 			};
 
-			Ok(Some(Url::new(YAZI.preview.cache_dir.join(hex))))
+			Ok(Some(UrlBuf::from(YAZI.preview.cache_dir.join(hex))))
 		})
 	}
 }
diff --git a/yazi-plugin/src/utils/call.rs b/yazi-plugin/src/utils/call.rs
index 343ad17e..51b4fb28 100644
--- a/yazi-plugin/src/utils/call.rs
+++ b/yazi-plugin/src/utils/call.rs
@@ -1,9 +1,7 @@
 use mlua::{ExternalError, Function, Lua, Table};
 use tokio::sync::mpsc;
-use yazi_binding::deprecate;
-use yazi_dds::Sendable;
 use yazi_macro::emit;
-use yazi_shared::{Layer, Source, event::{Action, Cmd}};
+use yazi_shared::{Layer, Source, data::Sendable, event::Action};
 
 use super::Utils;
 
@@ -16,18 +14,6 @@ impl Utils {
 		})
 	}
 
-	pub(super) fn mgr_emit(lua: &Lua) -> mlua::Result<Function> {
-		lua.create_function(|lua, (name, args): (String, Table)| {
-			deprecate!(lua, "ya.mgr_emit() has been deprecated since v25.5.28 and will soon-to-be removed in a future release. \n\nUse ya.emit() in your {} instead, see #2653 for details: https://github.com/sxyazi/yazi/pull/2653");
-			emit!(Call(Action {
-				cmd: Cmd { name: name.into(), args: Sendable::table_to_args(lua, args)? },
-				layer:  Layer::Mgr,
-				source: Source::Emit,
-			}));
-			Ok(())
-		})
-	}
-
 	pub(super) fn exec(lua: &Lua) -> mlua::Result<Function> {
 		lua.create_async_function(|lua, (name, args): (String, Table)| async move {
 			let mut action = Action::new(name, Source::Emit, Layer::Mgr)?;
diff --git a/yazi-plugin/src/utils/image.rs b/yazi-plugin/src/utils/image.rs
index b34f93f2..c13d9883 100644
--- a/yazi-plugin/src/utils/image.rs
+++ b/yazi-plugin/src/utils/image.rs
@@ -1,8 +1,8 @@
 use mlua::{Function, IntoLuaMulti, Lua, Value};
 use yazi_adapter::{ADAPTOR, Image};
-use yazi_binding::{Error, ImageInfo, UrlRef, elements::Rect};
+use yazi_binding::{Error, ImageInfo, elements::Rect};
 use yazi_fs::FsUrl;
-use yazi_shared::url::{AsUrl, UrlLike};
+use yazi_shared::url::{AsUrl, UrlLike, UrlRef};
 
 use super::Utils;
 
@@ -10,8 +10,8 @@ impl Utils {
 	pub(super) fn image_info(lua: &Lua) -> mlua::Result<Function> {
 		lua.create_async_function(|lua, url: UrlRef| async move {
 			let path = url.as_url().unified_path().into_owned();
-			match yazi_adapter::ImageInfo::new(path).await {
-				Ok(info) => ImageInfo::from(info).into_lua_multi(&lua),
+			match ImageInfo::new(path).await {
+				Ok(info) => info.into_lua_multi(&lua),
 				Err(e) => (Value::Nil, Error::custom(e.to_string())).into_lua_multi(&lua),
 			}
 		})
@@ -20,7 +20,7 @@ impl Utils {
 	pub(super) fn image_show(lua: &Lua) -> mlua::Result<Function> {
 		lua.create_async_function(|lua, (url, rect): (UrlRef, Rect)| async move {
 			let path = url.as_url().unified_path();
-			match ADAPTOR.get().image_show(path, *rect).await {
+			match ADAPTOR.image_show(path, *rect).await {
 				Ok(area) => Rect::from(area).into_lua_multi(&lua),
 				Err(e) => (Value::Nil, Error::custom(e.to_string())).into_lua_multi(&lua),
 			}
diff --git a/yazi-plugin/src/utils/json.rs b/yazi-plugin/src/utils/json.rs
index c8a45c46..447e5e82 100644
--- a/yazi-plugin/src/utils/json.rs
+++ b/yazi-plugin/src/utils/json.rs
@@ -1,5 +1,6 @@
 use mlua::{Function, IntoLuaMulti, Lua, LuaSerdeExt, Value};
-use yazi_binding::{Error, SER_OPT};
+use yazi_binding::Error;
+use yazi_shim::mlua::SER_OPT;
 
 use super::Utils;
 
diff --git a/yazi-plugin/src/utils/layer.rs b/yazi-plugin/src/utils/layer.rs
index 096a0aef..16d6c775 100644
--- a/yazi-plugin/src/utils/layer.rs
+++ b/yazi-plugin/src/utils/layer.rs
@@ -2,12 +2,13 @@ use std::{str::FromStr, time::Duration};
 
 use mlua::{ExternalError, ExternalResult, Function, IntoLuaMulti, Lua, Table, Value};
 use tokio_stream::wrappers::UnboundedReceiverStream;
-use yazi_binding::{InputRx, elements::{Line, Pos, Text}, runtime};
-use yazi_config::{Platform, keymap::{Chord, ChordCow, Key}, popup::{ConfirmCfg, InputCfg}};
+use yazi_binding::{elements::{Line, Text}, runtime};
+use yazi_config::{Platform, keymap::{Chord, ChordArc, Key}, popup::ConfirmCfg};
 use yazi_core::notify::MessageOpt;
 use yazi_macro::relay;
 use yazi_proxy::{ConfirmProxy, InputProxy, NotifyProxy, WhichProxy};
 use yazi_shared::{Debounce, Layer};
+use yazi_widgets::input::{InputOpt, InputStream};
 
 use super::Utils;
 
@@ -24,9 +25,10 @@ impl Utils {
 				.enumerate()
 				.map(|(i, cand)| {
 					let cand = cand?;
-					Ok(ChordCow::Owned(Chord {
+					Ok(ChordArc::from(Chord::<{ Layer::Null as u8 }> {
+						id:    yazi_config::keymap::chord_id(),
 						on:    Self::parse_keys(cand.raw_get("on")?)?,
-						run:   vec![relay!(which:callback, [i + 1])],
+						run:   relay!(which:callback, [i + 1]).into(),
 						desc:  cand.raw_get("desc").unwrap_or_default(),
 						r#for: Platform::All,
 					}))
@@ -50,28 +52,21 @@ impl Utils {
 				return Err("Cannot call `ya.input()` while main thread is blocked".into_lua_err());
 			}
 
-			let realtime = t.raw_get("realtime")?;
-			let rx = UnboundedReceiverStream::new(InputProxy::show(InputCfg {
-				title: t.raw_get("title")?,
-				value: t.raw_get("value").unwrap_or_default(),
-				cursor: None, // TODO
-				obscure: t.raw_get("obscure")?,
-				position: t.raw_get::<Pos>("pos")?.with_height(3).into(),
-				realtime,
-				completion: false,
-			}));
+			let opt = InputOpt::try_from(&t)?;
+			let realtime = opt.realtime;
 
+			let rx = UnboundedReceiverStream::new(InputProxy::show(opt));
 			if !realtime {
-				return InputRx::consume(rx).await.into_lua_multi(&lua);
+				return InputStream::consume(rx).await.into_lua_multi(&lua);
 			}
 
 			let debounce = t.raw_get::<f64>("debounce").unwrap_or_default();
 			if debounce < 0.0 {
 				Err("negative debounce duration".into_lua_err())
 			} else if debounce == 0.0 {
-				InputRx::new(rx).into_lua_multi(&lua)
+				InputStream::new(rx).into_lua_multi(&lua)
 			} else {
-				InputRx::new(Debounce::new(rx, Duration::from_secs_f64(debounce))).into_lua_multi(&lua)
+				InputStream::new(Debounce::new(rx, Duration::from_secs_f64(debounce))).into_lua_multi(&lua)
 			}
 		})
 	}
@@ -83,7 +78,7 @@ impl Utils {
 			}
 
 			let result = ConfirmProxy::show(ConfirmCfg {
-				position: t.raw_get::<Pos>("pos")?.into(),
+				position: t.raw_get("pos")?,
 				title:    t.raw_get::<Line>("title")?.into(),
 				body:     t.raw_get::<Option<Text>>("body")?.unwrap_or_default().into(),
 				list:     Default::default(), // TODO
diff --git a/yazi-plugin/src/utils/log.rs b/yazi-plugin/src/utils/log.rs
index b45bf127..e1dc93c2 100644
--- a/yazi-plugin/src/utils/log.rs
+++ b/yazi-plugin/src/utils/log.rs
@@ -2,6 +2,7 @@ use std::{any::TypeId, fmt::Write};
 
 use mlua::{Function, Lua, MultiValue, Value};
 use tracing::{debug, error};
+use yazi_shared::{id::Id, path::PathBufDyn, url::UrlBuf};
 
 use super::Utils;
 
@@ -33,15 +34,13 @@ impl Utils {
 		let id = ud.type_id();
 		let ptr = ud.to_pointer();
 		Ok(match id {
-			Some(t) if t == TypeId::of::<yazi_binding::Url>() => {
-				write!(buf, "Url({ptr:?}): {:?}", **ud.borrow::<yazi_binding::Url>()?)?
+			Some(t) if t == TypeId::of::<UrlBuf>() => {
+				write!(buf, "Url({ptr:?}): {:?}", *ud.borrow::<UrlBuf>()?)?
 			}
-			Some(t) if t == TypeId::of::<yazi_binding::Path>() => {
-				write!(buf, "Path({ptr:?}): {:?}", **ud.borrow::<yazi_binding::Path>()?)?
-			}
-			Some(t) if t == TypeId::of::<yazi_binding::Id>() => {
-				write!(buf, "Id({ptr:?}): {}", **ud.borrow::<yazi_binding::Id>()?)?
+			Some(t) if t == TypeId::of::<PathBufDyn>() => {
+				write!(buf, "Path({ptr:?}): {:?}", *ud.borrow::<PathBufDyn>()?)?
 			}
+			Some(t) if t == TypeId::of::<Id>() => write!(buf, "Id({ptr:?}): {}", *ud.borrow::<Id>()?)?,
 			_ => write!(buf, "{value:#?}")?,
 		})
 	}
diff --git a/yazi-plugin/src/utils/preview.rs b/yazi-plugin/src/utils/preview.rs
index fb2d19c4..6709ccc1 100644
--- a/yazi-plugin/src/utils/preview.rs
+++ b/yazi-plugin/src/utils/preview.rs
@@ -1,13 +1,10 @@
 use mlua::{ExternalError, Function, IntoLuaMulti, Lua, Table, Value};
-// use ratatui::style::Color;
-use yazi_binding::{
-	Error,
-	elements::{Area, HighlightPosition, Renderable, Text},
-};
+use yazi_binding::{Error, elements::Area};
 use yazi_core::{Highlighter, MgrProxy, tab::PreviewLock};
 use yazi_fs::FsUrl;
 use yazi_runner::previewer::PeekError;
 use yazi_shared::url::AsUrl;
+use yazi_widgets::Renderable;
 
 use super::Utils;
 
@@ -31,7 +28,7 @@ impl Utils {
 				}
 			};
 
-			lock.data = vec![Renderable::Text(Text { area, inner, ..Default::default() })];
+			lock.data = vec![Renderable::Text(inner.into()).with_area(area)];
 
 			MgrProxy::update_peeked(lock);
 			().into_lua_multi(&lua)
@@ -51,7 +48,7 @@ impl Utils {
 					Err(e) => {
 						if let Ok(err) = ud.take::<Error>() {
 							vec![
-								Renderable::Clear(yazi_binding::elements::Clear { area: lock.area.into() }),
+								Renderable::Clear(Default::default()).with_area(lock.area),
 								Renderable::from(err).with_area(lock.area),
 							]
 						} else {
diff --git a/yazi-plugin/src/utils/spot.rs b/yazi-plugin/src/utils/spot.rs
index e0b4b709..085ea509 100644
--- a/yazi-plugin/src/utils/spot.rs
+++ b/yazi-plugin/src/utils/spot.rs
@@ -1,8 +1,9 @@
 use mlua::{AnyUserData, Function, Lua, Table};
-use yazi_binding::elements::{Edge, Renderable};
+use yazi_binding::elements::{Edge, Spatial};
 use yazi_config::THEME;
 use yazi_core::spot::SpotLock;
 use yazi_proxy::MgrProxy;
+use yazi_widgets::Renderable;
 
 use super::Utils;
 
@@ -10,21 +11,22 @@ impl Utils {
 	pub(super) fn spot_table(lua: &Lua) -> mlua::Result<Function> {
 		lua.create_function(|_, (t, table): (mlua::Table, AnyUserData)| {
 			let mut lock = SpotLock::try_from(t)?;
-			let mut table = yazi_binding::elements::Table::try_from(table)?;
+			let mut table = yazi_binding::elements::Table::try_from(&table)?;
 
-			let area = table.area;
-			table.area = area.inner(ratatui::widgets::Padding::uniform(1));
+			let area = table.area();
+			table.set_area(area.padding(ratatui_widgets::block::Padding::uniform(1)));
 
 			lock.data = vec![
-				Renderable::Clear(yazi_binding::elements::Clear { area }),
+				Renderable::Clear(Default::default()).with_area(area),
 				Renderable::Border(yazi_binding::elements::Border {
 					area,
-					edge: Edge(ratatui::widgets::Borders::ALL),
-					r#type: ratatui::widgets::BorderType::Rounded,
+					edge: Edge(ratatui_widgets::borders::Borders::ALL),
+					r#type: ratatui_widgets::borders::BorderType::Rounded,
 					style: THEME.spot.border.get().into(),
+					merge: Default::default(),
 					titles: vec![(
-						ratatui::widgets::TitlePosition::Top,
-						ratatui::text::Line::raw("Spot").centered().style(THEME.spot.title.get()),
+						ratatui_widgets::block::TitlePosition::Top,
+						ratatui_core::text::Line::raw("Spot").centered().style(THEME.spot.title.get()),
 					)],
 				}),
 				Renderable::Table(Box::new(table)),
diff --git a/yazi-plugin/src/utils/sync.rs b/yazi-plugin/src/utils/sync.rs
index 1f224783..e8ebf7da 100644
--- a/yazi-plugin/src/utils/sync.rs
+++ b/yazi-plugin/src/utils/sync.rs
@@ -4,9 +4,8 @@ use mlua::{ExternalError, ExternalResult, Function, IntoLuaMulti, Lua, MultiValu
 use tokio::sync::mpsc;
 use yazi_binding::{Handle, MpscRx, MpscTx, MpscUnboundedRx, MpscUnboundedTx, OneshotRx, OneshotTx, runtime, runtime_mut};
 use yazi_core::{AppProxy, app::PluginOpt};
-use yazi_dds::Sendable;
 use yazi_runner::loader::LOADER;
-use yazi_shared::{LOCAL_SET, data::Data};
+use yazi_shared::{LOCAL_SET, data::{Data, Sendable}};
 
 use super::Utils;
 
diff --git a/yazi-plugin/src/utils/tasks.rs b/yazi-plugin/src/utils/tasks.rs
index 302fe1b6..4c5c63e7 100644
--- a/yazi-plugin/src/utils/tasks.rs
+++ b/yazi-plugin/src/utils/tasks.rs
@@ -8,7 +8,10 @@ impl Utils {
 	pub(super) fn task(lua: &Lua) -> mlua::Result<Function> {
 		lua.create_function(|lua, (kind, value): (mlua::String, Value)| {
 			Ok(TaskOpt(match &*kind.as_bytes() {
+				b"cut" => tasks::TaskOpt::Cut(<_>::from_lua(value, lua)?),
+
 				b"plugin" => tasks::TaskOpt::Plugin(<_>::from_lua(value, lua)?),
+
 				_ => Err(format!("unsupported spawn kind: {}", kind.display()).into_lua_err())?,
 			}))
 		})
diff --git a/yazi-plugin/src/utils/text.rs b/yazi-plugin/src/utils/text.rs
index 8e3e8e95..f5522195 100644
--- a/yazi-plugin/src/utils/text.rs
+++ b/yazi-plugin/src/utils/text.rs
@@ -1,5 +1,8 @@
+use std::borrow::Cow;
+
 use mlua::{Function, Lua};
 use twox_hash::XxHash3_128;
+use yazi_shim::RFC_3986;
 use yazi_widgets::CLIPBOARD;
 
 use super::Utils;
@@ -33,4 +36,24 @@ impl Utils {
 			}
 		})
 	}
+
+	pub(super) fn percent_decode(lua: &Lua) -> mlua::Result<Function> {
+		lua.create_function(|lua, s: mlua::String| {
+			let b = s.as_bytes();
+			match percent_encoding::percent_decode(&b).into() {
+				Cow::Borrowed(_) => Ok(s),
+				Cow::Owned(b) => lua.create_external_string(b),
+			}
+		})
+	}
+
+	pub(super) fn percent_encode(lua: &Lua) -> mlua::Result<Function> {
+		lua.create_function(|lua, s: mlua::String| {
+			let b = s.as_bytes();
+			match percent_encoding::percent_encode(&b, RFC_3986).into() {
+				Cow::Borrowed(_) => Ok(s),
+				Cow::Owned(s) => lua.create_external_string(s),
+			}
+		})
+	}
 }
diff --git a/yazi-plugin/src/utils/utils.rs b/yazi-plugin/src/utils/utils.rs
index 10245716..c128e66e 100644
--- a/yazi-plugin/src/utils/utils.rs
+++ b/yazi-plugin/src/utils/utils.rs
@@ -17,7 +17,6 @@ pub fn compose(
 
 			// Call
 			b"emit" => Utils::emit(lua)?,
-			b"mgr_emit" => Utils::mgr_emit(lua)?,
 			b"exec" => Utils::exec(lua)?,
 
 			// Image
@@ -66,6 +65,8 @@ pub fn compose(
 			b"hash" => Utils::hash(lua)?,
 			b"quote" => Utils::quote(lua)?,
 			b"clipboard" => Utils::clipboard(lua)?,
+			b"percent_encode" => Utils::percent_encode(lua)?,
+			b"percent_decode" => Utils::percent_decode(lua)?,
 
 			// Time
 			b"time" => Utils::time(lua)?,
diff --git a/yazi-proxy/Cargo.toml b/yazi-proxy/Cargo.toml
index 6ca45327..88e4ef78 100644
--- a/yazi-proxy/Cargo.toml
+++ b/yazi-proxy/Cargo.toml
@@ -17,10 +17,12 @@ yazi-config    = { path = "../yazi-config", version = "26.5.6" }
 yazi-core      = { path = "../yazi-core", version = "26.5.6" }
 yazi-macro     = { path = "../yazi-macro", version = "26.5.6" }
 yazi-scheduler = { path = "../yazi-scheduler", version = "26.5.6" }
+yazi-dds       = { path = "../yazi-dds", version = "26.5.6" }
 yazi-shared    = { path = "../yazi-shared", version = "26.5.6" }
 yazi-shim      = { path = "../yazi-shim", version = "26.5.6" }
 yazi-widgets   = { path = "../yazi-widgets", version = "26.5.6" }
 
 # External dependencies
-anyhow = { workspace = true }
-tokio  = { workspace = true }
+anyhow  = { workspace = true }
+tokio   = { workspace = true }
+tracing = { workspace = true }
diff --git a/yazi-proxy/src/cmp.rs b/yazi-proxy/src/cmp.rs
index 8c40abf6..7a77a41e 100644
--- a/yazi-proxy/src/cmp.rs
+++ b/yazi-proxy/src/cmp.rs
@@ -1,6 +1,6 @@
 use yazi_core::cmp::CmpOpt;
 use yazi_macro::{emit, relay};
-use yazi_shared::Id;
+use yazi_shared::id::Id;
 
 pub struct CmpProxy;
 
diff --git a/yazi-proxy/src/input.rs b/yazi-proxy/src/input.rs
index 3e0b7270..025d75fa 100644
--- a/yazi-proxy/src/input.rs
+++ b/yazi-proxy/src/input.rs
@@ -1,14 +1,20 @@
 use tokio::sync::mpsc;
-use yazi_config::popup::InputCfg;
-use yazi_macro::{emit, relay};
-use yazi_widgets::input::InputEvent;
+use yazi_dds::Pubsub;
+use yazi_macro::{emit, err, relay};
+use yazi_shim::strum::IntoStr;
+use yazi_widgets::input::{InputEvent, InputOpt};
 
 pub struct InputProxy;
 
 impl InputProxy {
-	pub fn show(cfg: InputCfg) -> mpsc::UnboundedReceiver<InputEvent> {
+	pub fn show(mut opt: InputOpt) -> mpsc::UnboundedReceiver<InputEvent> {
 		let (tx, rx) = mpsc::unbounded_channel();
-		emit!(Call(relay!(input:show).with_any("tx", tx).with_any("cfg", cfg)));
+		opt = opt.with_cb(move |event| {
+			err!(Pubsub::pub_after_input((&event).into_str(), event.value()));
+			tx.send(event).ok();
+		});
+
+		emit!(Call(relay!(input:show).with_any("opt", opt)));
 		rx
 	}
 }
diff --git a/yazi-proxy/src/mgr.rs b/yazi-proxy/src/mgr.rs
index 5253218c..dae29a97 100644
--- a/yazi-proxy/src/mgr.rs
+++ b/yazi-proxy/src/mgr.rs
@@ -1,7 +1,7 @@
 use yazi_core::{mgr::{CdSource, DisplaceOpt, FilterOpt, FindDoOpt, OpenDoOpt, OpenOpt, SearchOpt}, spot::SpotLock};
 use yazi_macro::{emit, relay};
-use yazi_shared::{Id, SStr, url::UrlBuf};
-use yazi_shim::strum::IntoStr;
+use yazi_shared::{id::Id, url::UrlBuf};
+use yazi_shim::{SStr, strum::IntoStr};
 
 pub struct MgrProxy;
 
diff --git a/yazi-proxy/src/tasks.rs b/yazi-proxy/src/tasks.rs
index 23a96e31..bc64a3df 100644
--- a/yazi-proxy/src/tasks.rs
+++ b/yazi-proxy/src/tasks.rs
@@ -5,7 +5,7 @@ use tokio::sync::mpsc;
 use yazi_core::tasks::TaskOpt;
 use yazi_macro::{emit, relay};
 use yazi_scheduler::process::ProcessOpt;
-use yazi_shared::{Id, url::{UrlBuf, UrlCow}};
+use yazi_shared::{id::Id, url::{UrlBuf, UrlCow}};
 
 pub struct TasksProxy;
 
diff --git a/yazi-proxy/src/which.rs b/yazi-proxy/src/which.rs
index 3d52d8ab..baf25ef0 100644
--- a/yazi-proxy/src/which.rs
+++ b/yazi-proxy/src/which.rs
@@ -1,12 +1,12 @@
 use tokio::sync::mpsc;
-use yazi_config::keymap::ChordCow;
+use yazi_config::keymap::ChordArc;
 use yazi_core::which::WhichOpt;
 use yazi_macro::{emit, relay};
 
 pub struct WhichProxy;
 
 impl WhichProxy {
-	pub async fn activate(cands: Vec<ChordCow>, silent: bool) -> Option<ChordCow> {
+	pub async fn activate(cands: Vec<ChordArc>, silent: bool) -> Option<ChordArc> {
 		let (tx, mut rx) = mpsc::unbounded_channel();
 		emit!(Call(relay!(which:activate).with_any("opt", WhichOpt {
 			tx: Some(tx),
@@ -14,6 +14,6 @@ impl WhichProxy {
 			silent,
 			times: 0,
 		})));
-		Some(rx.recv().await??.0)
+		rx.recv().await?
 	}
 }
diff --git a/yazi-runner/Cargo.toml b/yazi-runner/Cargo.toml
index 97434127..29506f35 100644
--- a/yazi-runner/Cargo.toml
+++ b/yazi-runner/Cargo.toml
@@ -18,13 +18,12 @@ vendored-lua = [ "mlua/vendored" ]
 
 [dependencies]
 yazi-binding = { path = "../yazi-binding", version = "26.5.6" }
-yazi-boot    = { path = "../yazi-boot", version = "26.5.6" }
 yazi-config  = { path = "../yazi-config", version = "26.5.6" }
-yazi-dds     = { path = "../yazi-dds", version = "26.5.6" }
 yazi-fs      = { path = "../yazi-fs", version = "26.5.6" }
 yazi-macro   = { path = "../yazi-macro", version = "26.5.6" }
 yazi-shared  = { path = "../yazi-shared", version = "26.5.6" }
 yazi-shim    = { path = "../yazi-shim", version = "26.5.6" }
+yazi-version = { path = "../yazi-version", version = "26.5.6" }
 
 # External dependencies
 anyhow      = { workspace = true }
diff --git a/yazi-runner/src/entry/job.rs b/yazi-runner/src/entry/job.rs
index 773616ae..df57a72b 100644
--- a/yazi-runner/src/entry/job.rs
+++ b/yazi-runner/src/entry/job.rs
@@ -1,7 +1,7 @@
 use hashbrown::HashMap;
 use mlua::{IntoLua, Lua, Value};
-use yazi_dds::Sendable;
-use yazi_shared::{Id, SStr, data::{Data, DataKey}};
+use yazi_shared::{data::{Data, DataKey, Sendable}, id::Id};
+use yazi_shim::SStr;
 
 #[derive(Clone, Debug, Default)]
 pub struct EntryJob {
diff --git a/yazi-runner/src/fetcher/job.rs b/yazi-runner/src/fetcher/job.rs
index 5ef3eccf..f82edb17 100644
--- a/yazi-runner/src/fetcher/job.rs
+++ b/yazi-runner/src/fetcher/job.rs
@@ -1,12 +1,11 @@
-use std::sync::Arc;
-
 use mlua::{IntoLua, Lua, Value};
-use yazi_binding::File;
-use yazi_dds::Sendable;
+use yazi_config::plugin::FetcherArc;
+use yazi_fs::file::File;
+use yazi_shared::data::Sendable;
 
 pub struct FetchJob {
-	pub fetcher: Arc<yazi_config::plugin::Fetcher>,
-	pub files:   Vec<yazi_fs::File>,
+	pub fetcher: FetcherArc,
+	pub files:   Vec<File>,
 }
 
 impl IntoLua for FetchJob {
@@ -14,7 +13,7 @@ impl IntoLua for FetchJob {
 		lua
 			.create_table_from([
 				("args", Sendable::args_to_table_ref(lua, &self.fetcher.args)?.into_lua(lua)?),
-				("files", lua.create_sequence_from(self.files.into_iter().map(File::new))?.into_lua(lua)?),
+				("files", lua.create_sequence_from(self.files)?.into_lua(lua)?),
 			])?
 			.into_lua(lua)
 	}
diff --git a/yazi-runner/src/loader/chunk.rs b/yazi-runner/src/loader/chunk.rs
index 3fbfad08..33cff2b9 100644
--- a/yazi-runner/src/loader/chunk.rs
+++ b/yazi-runner/src/loader/chunk.rs
@@ -13,7 +13,7 @@ pub struct Chunk {
 
 impl Chunk {
 	pub fn compatible(&self) -> bool {
-		let s = yazi_boot::actions::Actions::version();
+		let s = yazi_version::version();
 		natsort(s.as_bytes(), self.since.as_bytes(), false) != std::cmp::Ordering::Less
 	}
 
diff --git a/yazi-runner/src/loader/loader.rs b/yazi-runner/src/loader/loader.rs
index d5c99e18..6f69da1a 100644
--- a/yazi-runner/src/loader/loader.rs
+++ b/yazi-runner/src/loader/loader.rs
@@ -30,6 +30,7 @@ impl Default for Loader {
 			("archive".to_owned(), preset!("plugins/archive").into()),
 			("code".to_owned(), preset!("plugins/code").into()),
 			("dds".to_owned(), preset!("plugins/dds").into()),
+			("dnd".to_owned(), preset!("plugins/dnd").into()),
 			("empty".to_owned(), preset!("plugins/empty").into()),
 			("extract".to_owned(), preset!("plugins/extract").into()),
 			("file".to_owned(), preset!("plugins/file").into()),
@@ -54,6 +55,8 @@ impl Default for Loader {
 			("video".to_owned(), preset!("plugins/video").into()),
 			("zoxide".to_owned(), preset!("plugins/zoxide").into()),
 			// Components
+			("app".to_owned(), [][..].into()),
+			("backdrop".to_owned(), [][..].into()),
 			("current".to_owned(), [][..].into()),
 			("entity".to_owned(), [][..].into()),
 			("header".to_owned(), [][..].into()),
@@ -71,6 +74,7 @@ impl Default for Loader {
 			("tab".to_owned(), [][..].into()),
 			("tabs".to_owned(), [][..].into()),
 			("tasks".to_owned(), [][..].into()),
+			("tip".to_owned(), [][..].into()),
 			// Reserved
 			("inline".to_owned(), [][..].into()),
 		]);
@@ -168,7 +172,7 @@ impl Loader {
 		bail!(
 			"Plugin `{id}` requires at least Yazi {}, but your current version is Yazi {}.",
 			chunk.since,
-			yazi_boot::actions::Actions::version()
+			yazi_version::version_long()
 		);
 	}
 
diff --git a/yazi-runner/src/preloader/job.rs b/yazi-runner/src/preloader/job.rs
index 1ae1ebe5..42a61a28 100644
--- a/yazi-runner/src/preloader/job.rs
+++ b/yazi-runner/src/preloader/job.rs
@@ -1,13 +1,12 @@
-use std::sync::Arc;
-
 use mlua::{IntoLua, Lua, Value};
-use yazi_binding::{File, elements::Rect};
-use yazi_config::LAYOUT;
-use yazi_dds::Sendable;
+use yazi_binding::elements::Rect;
+use yazi_config::{LAYOUT, plugin::PreloaderArc};
+use yazi_fs::file::File;
+use yazi_shared::data::Sendable;
 
 pub struct PreloadJob {
-	pub preloader: Arc<yazi_config::plugin::Preloader>,
-	pub file:      yazi_fs::File,
+	pub preloader: PreloaderArc,
+	pub file:      File,
 }
 
 impl IntoLua for PreloadJob {
@@ -16,7 +15,7 @@ impl IntoLua for PreloadJob {
 			.create_table_from([
 				("area", Rect::from(LAYOUT.get().preview).into_lua(lua)?),
 				("args", Sendable::args_to_table_ref(lua, &self.preloader.args)?.into_lua(lua)?),
-				("file", File::new(self.file).into_lua(lua)?),
+				("file", self.file.into_lua(lua)?),
 				("skip", 0.into_lua(lua)?),
 			])?
 			.into_lua(lua)
diff --git a/yazi-runner/src/previewer/job.rs b/yazi-runner/src/previewer/job.rs
index f2a492a2..e8430654 100644
--- a/yazi-runner/src/previewer/job.rs
+++ b/yazi-runner/src/previewer/job.rs
@@ -1,15 +1,13 @@
-use std::sync::Arc;
-
 use mlua::{IntoLua, Lua, Value};
-use yazi_binding::{File, elements::Rect};
-use yazi_config::LAYOUT;
-use yazi_dds::Sendable;
-use yazi_shared::pool::Symbol;
+use yazi_binding::elements::Rect;
+use yazi_config::{LAYOUT, plugin::PreviewerArc};
+use yazi_fs::file::File;
+use yazi_shared::{data::Sendable, pool::Symbol};
 
 #[derive(Clone, Debug)]
 pub struct PeekJob {
-	pub previewer: Arc<yazi_config::plugin::Previewer>,
-	pub file: yazi_fs::File,
+	pub previewer: PreviewerArc,
+	pub file: File,
 	pub mime: Symbol<str>,
 	pub skip: usize,
 	pub search_idx: Option<usize>,
@@ -21,7 +19,7 @@ impl IntoLua for PeekJob {
 			.create_table_from([
 				("area", Rect::from(LAYOUT.get().preview).into_lua(lua)?),
 				("args", Sendable::args_to_table_ref(lua, &self.previewer.args)?.into_lua(lua)?),
-				("file", File::new(self.file).into_lua(lua)?),
+				("file", self.file.into_lua(lua)?),
 				("mime", self.mime.into_lua(lua)?),
 				("skip", self.skip.into_lua(lua)?),
 				("search_idx", self.search_idx.into_lua(lua)?),
@@ -33,7 +31,7 @@ impl IntoLua for PeekJob {
 // --- Seek
 #[derive(Clone, Debug)]
 pub struct SeekJob {
-	pub file: yazi_fs::File,
+	pub file: File,
 	pub units: i16,
 }
 
@@ -42,7 +40,7 @@ impl IntoLua for SeekJob {
 		lua
 			.create_table_from([
 				("area", Rect::from(LAYOUT.get().preview).into_lua(lua)?),
-				("file", File::new(self.file).into_lua(lua)?),
+				("file", self.file.into_lua(lua)?),
 				("units", self.units.into_lua(lua)?),
 			])?
 			.into_lua(lua)
diff --git a/yazi-runner/src/spot.rs b/yazi-runner/src/spot.rs
index e23e8f7b..a636cfb2 100644
--- a/yazi-runner/src/spot.rs
+++ b/yazi-runner/src/spot.rs
@@ -1,13 +1,10 @@
-use std::sync::Arc;
-
 use mlua::{ExternalError, ExternalResult, HookTriggers, IntoLua, ObjectLike, VmState};
 use tokio::{runtime::Handle, select};
 use tokio_util::sync::CancellationToken;
 use tracing::error;
-use yazi_binding::{File, Id};
-use yazi_config::plugin::Spotter;
-use yazi_dds::Sendable;
-use yazi_shared::{Ids, pool::Symbol};
+use yazi_config::plugin::SpotterArc;
+use yazi_fs::file::File;
+use yazi_shared::{data::Sendable, id::Ids, pool::Symbol};
 
 use crate::{Runner, loader::LOADER};
 
@@ -16,8 +13,8 @@ static IDS: Ids = Ids::new();
 impl Runner {
 	pub fn spot(
 		&'static self,
-		spotter: Arc<Spotter>,
-		file: yazi_fs::File,
+		spotter: SpotterArc,
+		file: File,
 		mime: Symbol<str>,
 		skip: usize,
 	) -> CancellationToken {
@@ -42,9 +39,9 @@ impl Runner {
 
 				let plugin = LOADER.load(&lua, &spotter.name).await?;
 				let job = lua.create_table_from([
-					("id", Id(IDS.next()).into_lua(&lua)?),
+					("id", IDS.next().into_lua(&lua)?),
 					("args", Sendable::args_to_table_ref(&lua, &spotter.args)?.into_lua(&lua)?),
-					("file", File::new(file).into_lua(&lua)?),
+					("file", file.into_lua(&lua)?),
 					("mime", mime.into_lua(&lua)?),
 					("skip", skip.into_lua(&lua)?),
 				])?;
diff --git a/yazi-scheduler/Cargo.toml b/yazi-scheduler/Cargo.toml
index 549e3b0b..3ae3e034 100644
--- a/yazi-scheduler/Cargo.toml
+++ b/yazi-scheduler/Cargo.toml
@@ -24,6 +24,7 @@ yazi-fs      = { path = "../yazi-fs", version = "26.5.6" }
 yazi-macro   = { path = "../yazi-macro", version = "26.5.6" }
 yazi-runner  = { path = "../yazi-runner", version = "26.5.6" }
 yazi-shared  = { path = "../yazi-shared", version = "26.5.6" }
+yazi-shim    = { path = "../yazi-shim", version = "26.5.6" }
 yazi-term    = { path = "../yazi-term", version = "26.5.6" }
 yazi-vfs     = { path = "../yazi-vfs", version = "26.5.6" }
 
diff --git a/yazi-scheduler/src/behavior.rs b/yazi-scheduler/src/behavior.rs
index d10e6f6c..8eda5ea4 100644
--- a/yazi-scheduler/src/behavior.rs
+++ b/yazi-scheduler/src/behavior.rs
@@ -1,6 +1,6 @@
 use std::sync::atomic::{AtomicU64, Ordering};
 
-use yazi_shared::Id;
+use yazi_shared::id::Id;
 
 pub struct Behavior {
 	first_id: AtomicU64,
diff --git a/yazi-scheduler/src/fetch/in.rs b/yazi-scheduler/src/fetch/in.rs
index 770a70b7..5cdd5cd0 100644
--- a/yazi-scheduler/src/fetch/in.rs
+++ b/yazi-scheduler/src/fetch/in.rs
@@ -1,16 +1,16 @@
-use std::{borrow::Cow, sync::Arc};
+use std::borrow::Cow;
 
-use yazi_config::plugin::Fetcher;
+use yazi_config::plugin::FetcherArc;
 use yazi_runner::fetcher::FetchJob;
-use yazi_shared::Id;
+use yazi_shared::id::Id;
 
 use crate::{TaskIn, fetch::FetchProg};
 
 #[derive(Debug)]
 pub(crate) struct FetchIn {
 	pub(crate) id:      Id,
-	pub(crate) fetcher: Arc<Fetcher>,
-	pub(crate) targets: Vec<yazi_fs::File>,
+	pub(crate) fetcher: FetcherArc,
+	pub(crate) targets: Vec<yazi_fs::file::File>,
 }
 
 impl TaskIn for FetchIn {
diff --git a/yazi-scheduler/src/file/in.rs b/yazi-scheduler/src/file/in.rs
index 09101ef8..2a92ef16 100644
--- a/yazi-scheduler/src/file/in.rs
+++ b/yazi-scheduler/src/file/in.rs
@@ -1,8 +1,9 @@
 use std::{borrow::Cow, mem, path::PathBuf};
 
+use mlua::{ExternalError, FromLua, Lua, Value};
 use tokio::sync::mpsc;
 use yazi_fs::cha::Cha;
-use yazi_shared::{Id, url::{UrlBuf, UrlLike}};
+use yazi_shared::{id::Id, url::{UrlBuf, UrlLike}};
 
 use crate::{TaskIn, file::{FileProgCopy, FileProgCut, FileProgDelete, FileProgDownload, FileProgHardlink, FileProgLink, FileProgTrash, FileProgUpload}};
 
@@ -172,7 +173,7 @@ impl FileInCopy {
 
 // --- Cut
 #[derive(Clone, Debug)]
-pub(crate) struct FileInCut {
+pub struct FileInCut {
 	pub(crate) id:     Id,
 	pub(crate) from:   UrlBuf,
 	pub(crate) to:     UrlBuf,
@@ -203,6 +204,19 @@ impl Drop for FileInCut {
 }
 
 impl FileInCut {
+	pub fn new(from: UrlBuf, to: UrlBuf, force: bool) -> Self {
+		Self {
+			follow: !from.scheme().covariant(to.scheme()),
+			id: Id::ZERO,
+			from,
+			to,
+			force,
+			cha: None,
+			retry: 0,
+			drop: None,
+		}
+	}
+
 	pub(super) fn into_link(mut self) -> FileInLink {
 		FileInLink {
 			id:       self.id,
@@ -222,6 +236,16 @@ impl FileInCut {
 	}
 }
 
+impl FromLua for FileInCut {
+	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
+		let Value::Table(t) = value else {
+			return Err("constructing FileInCut from non-table value".into_lua_err());
+		};
+
+		Ok(Self::new(t.raw_get("from")?, t.raw_get("to")?, t.raw_get("force")?))
+	}
+}
+
 // --- Link
 #[derive(Clone, Debug)]
 pub(crate) struct FileInLink {
diff --git a/yazi-scheduler/src/hook/in.rs b/yazi-scheduler/src/hook/in.rs
index 280d6e7c..fd4e5795 100644
--- a/yazi-scheduler/src/hook/in.rs
+++ b/yazi-scheduler/src/hook/in.rs
@@ -1,6 +1,6 @@
 use std::borrow::Cow;
 
-use yazi_shared::{Id, url::{UrlBuf, UrlLike}};
+use yazi_shared::{id::Id, url::{UrlBuf, UrlLike}};
 
 use crate::{Task, TaskIn, TaskProg};
 
diff --git a/yazi-scheduler/src/in.rs b/yazi-scheduler/src/in.rs
index b463e70e..749ed702 100644
--- a/yazi-scheduler/src/in.rs
+++ b/yazi-scheduler/src/in.rs
@@ -1,6 +1,7 @@
 use std::borrow::Cow;
 
-use yazi_shared::{Id, SStr};
+use yazi_shared::id::Id;
+use yazi_shim::SStr;
 
 pub trait TaskIn {
 	type Prog;
diff --git a/yazi-scheduler/src/ongoing.rs b/yazi-scheduler/src/ongoing.rs
index f2228efc..a1bfebac 100644
--- a/yazi-scheduler/src/ongoing.rs
+++ b/yazi-scheduler/src/ongoing.rs
@@ -1,6 +1,6 @@
 use hashbrown::{HashMap, hash_map::Entry};
 use yazi_config::YAZI;
-use yazi_shared::{CompletionToken, Id, Ids};
+use yazi_shared::{CompletionToken, id::{Id, Ids}};
 
 use super::Task;
 use crate::{TaskIn, TaskProg, hook::HookIn};
diff --git a/yazi-scheduler/src/op.rs b/yazi-scheduler/src/op.rs
index 91aca3c1..679beeb5 100644
--- a/yazi-scheduler/src/op.rs
+++ b/yazi-scheduler/src/op.rs
@@ -1,5 +1,5 @@
 use tokio::sync::mpsc;
-use yazi_shared::Id;
+use yazi_shared::id::Id;
 
 use crate::TaskOut;
 
diff --git a/yazi-scheduler/src/plugin/in.rs b/yazi-scheduler/src/plugin/in.rs
index 0d0dc423..4a5bbb2f 100644
--- a/yazi-scheduler/src/plugin/in.rs
+++ b/yazi-scheduler/src/plugin/in.rs
@@ -2,9 +2,9 @@ use std::borrow::Cow;
 
 use hashbrown::HashMap;
 use mlua::{ExternalError, FromLua, Lua, Value};
-use yazi_dds::Sendable;
 use yazi_runner::entry::EntryJob;
-use yazi_shared::{Id, SStr, data::{Data, DataKey}};
+use yazi_shared::{data::{Data, DataKey, Sendable}, id::Id};
+use yazi_shim::SStr;
 
 use crate::{TaskIn, plugin::PluginProgEntry};
 
@@ -72,9 +72,9 @@ impl TaskIn for PluginInEntry {
 	}
 }
 
-impl PluginInEntry {
-	pub(crate) fn into_job(self) -> EntryJob {
-		EntryJob { id: self.id, args: self.args, plugin: self.plugin }
+impl From<PluginInEntry> for EntryJob {
+	fn from(value: PluginInEntry) -> Self {
+		Self { id: value.id, args: value.args, plugin: value.plugin }
 	}
 }
 
diff --git a/yazi-scheduler/src/plugin/plugin.rs b/yazi-scheduler/src/plugin/plugin.rs
index 43ee7f1b..876fd68e 100644
--- a/yazi-scheduler/src/plugin/plugin.rs
+++ b/yazi-scheduler/src/plugin/plugin.rs
@@ -20,7 +20,7 @@ impl Plugin {
 	pub(crate) async fn entry(&self, task: PluginInEntry) -> Result<(), PluginOutEntry> {
 		let id = task.id;
 
-		RUNNER.entry(task.into_job()).await?;
+		RUNNER.entry(task.into()).await?;
 		Ok(self.ops.out(id, PluginOutEntry::Succ))
 	}
 }
diff --git a/yazi-scheduler/src/preload/in.rs b/yazi-scheduler/src/preload/in.rs
index 0695cd12..a2adf144 100644
--- a/yazi-scheduler/src/preload/in.rs
+++ b/yazi-scheduler/src/preload/in.rs
@@ -1,15 +1,15 @@
-use std::{borrow::Cow, sync::Arc};
+use std::borrow::Cow;
 
-use yazi_config::plugin::Preloader;
-use yazi_shared::Id;
+use yazi_config::plugin::PreloaderArc;
+use yazi_shared::id::Id;
 
 use crate::{TaskIn, preload::PreloadProg};
 
 #[derive(Clone, Debug)]
 pub(crate) struct PreloadIn {
 	pub(crate) id:        Id,
-	pub(crate) preloader: Arc<Preloader>,
-	pub(crate) target:    yazi_fs::File,
+	pub(crate) preloader: PreloaderArc,
+	pub(crate) target:    yazi_fs::file::File,
 }
 
 impl TaskIn for PreloadIn {
diff --git a/yazi-scheduler/src/preload/preload.rs b/yazi-scheduler/src/preload/preload.rs
index 2a5a3854..9aad08b2 100644
--- a/yazi-scheduler/src/preload/preload.rs
+++ b/yazi-scheduler/src/preload/preload.rs
@@ -8,6 +8,7 @@ use tracing::error;
 use yazi_config::Priority;
 use yazi_fs::FsHash64;
 use yazi_runner::{RUNNER, preloader::{PreloadError, PreloadJob}};
+use yazi_shared::id::Id;
 
 use crate::{HIGH, LOW, NORMAL, TaskOp, TaskOps, preload::{PreloadIn, PreloadOut}};
 
@@ -16,7 +17,7 @@ pub struct Preload {
 	tx:  async_priority_channel::Sender<PreloadIn, u8>,
 
 	pub loaded:  Mutex<LruCache<u64, u16>>,
-	pub loading: Mutex<LruCache<u64, yazi_shared::Id>>,
+	pub loading: Mutex<LruCache<u64, Id>>,
 }
 
 impl Preload {
diff --git a/yazi-scheduler/src/process/in.rs b/yazi-scheduler/src/process/in.rs
index 84e9e8e8..082742f1 100644
--- a/yazi-scheduler/src/process/in.rs
+++ b/yazi-scheduler/src/process/in.rs
@@ -1,6 +1,6 @@
 use std::{borrow::Cow, ffi::OsString};
 
-use yazi_shared::{CompletionToken, Id, url::{UrlBuf, UrlCow}};
+use yazi_shared::{CompletionToken, id::Id, url::{UrlBuf, UrlCow}};
 
 use super::ShellOpt;
 use crate::{TaskIn, process::{ProcessProgBg, ProcessProgBlock, ProcessProgOrphan}};
diff --git a/yazi-scheduler/src/process/option.rs b/yazi-scheduler/src/process/option.rs
index 2bf5b6c6..6b95af14 100644
--- a/yazi-scheduler/src/process/option.rs
+++ b/yazi-scheduler/src/process/option.rs
@@ -1,5 +1,6 @@
 use std::ffi::OsString;
 
+use yazi_macro::impl_data_any;
 use yazi_shared::url::{UrlBuf, UrlCow};
 
 // TODO: remove in favor of ShellForm
@@ -13,3 +14,5 @@ pub struct ProcessOpt {
 
 	pub spread: bool, // TODO: remove
 }
+
+impl_data_any!(ProcessOpt);
diff --git a/yazi-scheduler/src/proxy.rs b/yazi-scheduler/src/proxy.rs
index 413df7e4..5a2c8ba2 100644
--- a/yazi-scheduler/src/proxy.rs
+++ b/yazi-scheduler/src/proxy.rs
@@ -1,6 +1,7 @@
 use tokio::sync::mpsc;
 use yazi_macro::{emit, relay};
-use yazi_shared::{Id, SStr, url::UrlBuf};
+use yazi_shared::{id::Id, url::UrlBuf};
+use yazi_shim::SStr;
 
 pub struct AppProxy;
 
diff --git a/yazi-scheduler/src/scheduler.rs b/yazi-scheduler/src/scheduler.rs
index f569a4bc..e52376e9 100644
--- a/yazi-scheduler/src/scheduler.rs
+++ b/yazi-scheduler/src/scheduler.rs
@@ -1,9 +1,9 @@
 use std::{ops::Deref, sync::Arc, time::Duration};
 
 use tokio::task::JoinHandle;
-use yazi_config::{YAZI, plugin::{Fetcher, Preloader}};
+use yazi_config::{YAZI, plugin::{FetcherArc, PreloaderArc}};
 use yazi_fs::FsHash64;
-use yazi_shared::{CompletionToken, Id, Throttle, url::{UrlBuf, UrlLike}};
+use yazi_shared::{CompletionToken, Throttle, id::Id, url::{UrlBuf, UrlLike}};
 
 use crate::{Behavior, HIGH, LOW, NORMAL, Task, TaskIn, TaskProg, Worker, fetch::FetchIn, file::{FileInCopy, FileInCut, FileInDelete, FileInDownload, FileInHardlink, FileInLink, FileInTrash, FileInUpload, FileOutCopy, FileOutCut, FileOutDownload, FileOutHardlink, FileOutUpload}, hook::{HookIn, HookInDelete, HookInDownload, HookInPreload, HookInTrash, HookInUpload}, plugin::PluginInEntry, preload::PreloadIn, process::{ProcessIn, ProcessInBg, ProcessInBlock, ProcessInOrphan, ProcessOpt}, size::SizeIn};
 
@@ -65,17 +65,16 @@ impl Scheduler {
 		}
 	}
 
-	pub fn file_cut(&self, from: UrlBuf, to: UrlBuf, force: bool) {
-		let follow = !from.scheme().covariant(to.scheme());
-		let mut r#in =
-			FileInCut { id: Id::ZERO, from, to, force, cha: None, follow, retry: 0, drop: None };
+	pub fn file_cut(&self, mut r#in: FileInCut) -> Id {
+		let id = self.add(&mut r#in, |t| t.id);
 
-		self.add(&mut r#in, |_| ());
 		if r#in.to.try_starts_with(&r#in.from).unwrap_or(false) && !r#in.to.covariant(&r#in.from) {
 			self.ops.out(r#in.id, FileOutCut::Fail("Cannot cut directory into itself".to_owned()));
 		} else {
 			self.file.submit(r#in, LOW);
 		}
+
+		id
 	}
 
 	pub fn file_copy(&self, from: UrlBuf, to: UrlBuf, force: bool, follow: bool) {
@@ -177,7 +176,11 @@ impl Scheduler {
 		id
 	}
 
-	pub fn fetch_paged(&self, fetcher: Arc<Fetcher>, targets: Vec<yazi_fs::File>) -> CompletionToken {
+	pub fn fetch_paged(
+		&self,
+		fetcher: FetcherArc,
+		targets: Vec<yazi_fs::file::File>,
+	) -> CompletionToken {
 		let mut r#in = FetchIn { id: Id::ZERO, fetcher, targets };
 
 		let done = self.add(&mut r#in, |t| t.done.clone());
@@ -186,7 +189,7 @@ impl Scheduler {
 		done
 	}
 
-	pub async fn fetch_mimetype(&self, targets: Vec<yazi_fs::File>) -> bool {
+	pub async fn fetch_mimetype(&self, targets: Vec<yazi_fs::file::File>) -> bool {
 		let mut wg = vec![];
 		for (fetcher, targets) in YAZI.plugin.fetchers.mime(targets) {
 			wg.push(self.fetch_paged(fetcher, targets));
@@ -200,7 +203,7 @@ impl Scheduler {
 		true
 	}
 
-	pub fn preload_paged(&self, preloader: Arc<Preloader>, target: &yazi_fs::File) {
+	pub fn preload_paged(&self, preloader: PreloaderArc, target: &yazi_fs::file::File) {
 		let hook = HookInPreload::new(preloader.idx, target.hash_u64());
 		let mut r#in = PreloadIn { id: Id::ZERO, preloader, target: target.clone() };
 
diff --git a/yazi-scheduler/src/size/in.rs b/yazi-scheduler/src/size/in.rs
index 1780a839..a3bc8d31 100644
--- a/yazi-scheduler/src/size/in.rs
+++ b/yazi-scheduler/src/size/in.rs
@@ -1,6 +1,6 @@
 use std::{borrow::Cow, sync::Arc};
 
-use yazi_shared::{Id, Throttle, url::{UrlBuf, UrlLike}};
+use yazi_shared::{Throttle, id::Id, url::{UrlBuf, UrlLike}};
 
 use crate::{TaskIn, size::SizeProg};
 
diff --git a/yazi-scheduler/src/summary.rs b/yazi-scheduler/src/summary.rs
index 4e0134c6..4b6c192d 100644
--- a/yazi-scheduler/src/summary.rs
+++ b/yazi-scheduler/src/summary.rs
@@ -1,5 +1,6 @@
 use ordered_float::OrderedFloat;
 use serde::Serialize;
+use yazi_macro::impl_data_any;
 
 use crate::{Ongoing, Progress};
 
@@ -11,6 +12,8 @@ pub struct TaskSummary {
 	pub percent: Option<OrderedFloat<f32>>,
 }
 
+impl_data_any!(TaskSummary);
+
 impl From<&Ongoing> for TaskSummary {
 	fn from(value: &Ongoing) -> Self {
 		let mut summary = Self::default();
diff --git a/yazi-scheduler/src/task.rs b/yazi-scheduler/src/task.rs
index 0dd937d4..35ca7ce3 100644
--- a/yazi-scheduler/src/task.rs
+++ b/yazi-scheduler/src/task.rs
@@ -1,5 +1,5 @@
 use tokio::sync::mpsc;
-use yazi_shared::{CompletionToken, Id};
+use yazi_shared::{CompletionToken, id::Id};
 
 use crate::{TaskIn, TaskProg, hook::HookIn};
 
diff --git a/yazi-shared/Cargo.toml b/yazi-shared/Cargo.toml
index 7dc674df..15e4434c 100644
--- a/yazi-shared/Cargo.toml
+++ b/yazi-shared/Cargo.toml
@@ -13,9 +13,10 @@ rust-version.workspace = true
 workspace = true
 
 [dependencies]
-yazi-macro = { path = "../yazi-macro", version = "26.5.6" }
-yazi-shim  = { path = "../yazi-shim", version = "26.5.6" }
-yazi-term  = { path = "../yazi-term", version = "26.5.6" }
+yazi-codegen = { path = "../yazi-codegen", version = "26.5.6" }
+yazi-macro   = { path = "../yazi-macro", version = "26.5.6" }
+yazi-shim    = { path = "../yazi-shim", version = "26.5.6" }
+yazi-term    = { path = "../yazi-term", version = "26.5.6" }
 
 # External dependencies
 anyhow           = { workspace = true }
@@ -23,7 +24,9 @@ dyn-clone        = { workspace = true }
 foldhash         = { workspace = true }
 futures          = { workspace = true }
 hashbrown        = { workspace = true }
-memchr           = "2.8.0"
+inventory        = { workspace = true }
+memchr           = "2.8.2"
+mlua             = { workspace = true }
 ordered-float    = { workspace = true }
 parking_lot      = { workspace = true }
 paste            = { workspace = true }
diff --git a/yazi-shared/src/any_data.rs b/yazi-shared/src/any_data.rs
new file mode 100644
index 00000000..ecd4208e
--- /dev/null
+++ b/yazi-shared/src/any_data.rs
@@ -0,0 +1,8 @@
+use mlua::UserData;
+
+use crate::data::DataAny;
+
+#[derive(Debug)]
+pub struct AnyData(pub Box<dyn DataAny>);
+
+impl UserData for AnyData {}
diff --git a/yazi-shared/src/chars.rs b/yazi-shared/src/chars.rs
index 40bfe8f9..3b72ce8c 100644
--- a/yazi-shared/src/chars.rs
+++ b/yazi-shared/src/chars.rs
@@ -1,29 +1,6 @@
 use core::str;
 use std::borrow::Cow;
 
-#[derive(Clone, Copy, PartialEq, Eq)]
-pub enum CharKind {
-	Space,
-	Punct,
-	Other,
-}
-
-impl CharKind {
-	pub fn new(c: char) -> Self {
-		if c.is_whitespace() {
-			Self::Space
-		} else if c.is_ascii_punctuation() {
-			Self::Punct
-		} else {
-			Self::Other
-		}
-	}
-
-	pub fn vary(self, other: Self, far: bool) -> bool {
-		if far { (self == Self::Space) != (other == Self::Space) } else { self != other }
-	}
-}
-
 pub fn strip_trailing_newline(mut s: String) -> String {
 	while s.ends_with('\n') || s.ends_with('\r') {
 		s.pop();
diff --git a/yazi-shared/src/completion_token.rs b/yazi-shared/src/completion_token.rs
index 029f5ef0..84504050 100644
--- a/yazi-shared/src/completion_token.rs
+++ b/yazi-shared/src/completion_token.rs
@@ -1,12 +1,15 @@
 use std::sync::{Arc, atomic::{AtomicU8, Ordering}};
 
 use tokio::sync::Notify;
+use yazi_macro::impl_data_any;
 
 #[derive(Clone, Debug, Default)]
 pub struct CompletionToken {
 	inner: Arc<(AtomicU8, Notify)>,
 }
 
+impl_data_any!(CompletionToken);
+
 impl CompletionToken {
 	pub fn complete(&self, success: bool) {
 		let new = if success { 1 } else { 2 };
diff --git a/yazi-shared/src/data/any.rs b/yazi-shared/src/data/any.rs
index e11a284e..4c4c159c 100644
--- a/yazi-shared/src/data/any.rs
+++ b/yazi-shared/src/data/any.rs
@@ -1,20 +1,39 @@
-use std::{any::Any, fmt::{self, Debug}};
+use std::{any::{self, Any, TypeId}, fmt::{self, Debug}};
 
 use dyn_clone::DynClone;
+use mlua::{IntoLua, Lua, Value};
+
+use crate::any_data::AnyData;
 
 pub trait DataAny: Any + Send + Sync + DynClone {
-	fn as_any(&self) -> &dyn Any;
+	fn as_any(&self, id: TypeId) -> Option<&dyn Any>;
 
-	fn into_any(self: Box<Self>) -> Box<dyn Any>;
+	fn into_any(self: Box<Self>, id: TypeId) -> Result<Box<dyn Any>, Box<dyn DataAny>>;
+
+	fn into_lua(self: Box<Self>, lua: &Lua) -> mlua::Result<Value>;
+
+	fn to_lua(&self, lua: &Lua) -> mlua::Result<Value> { dyn_clone::clone_box(self).into_lua(lua) }
+
+	fn from_lua(_value: Value, _lua: &Lua) -> mlua::Result<Box<dyn DataAny>>
+	where
+		Self: Sized,
+	{
+		Err(mlua::Error::runtime(format!(
+			"DataAny::from_lua is not implemented for `{}`",
+			any::type_name::<Self>(),
+		)))
+	}
 }
 
-impl<T> DataAny for T
-where
-	T: Any + Send + Sync + DynClone,
-{
-	fn as_any(&self) -> &dyn Any { self }
+impl dyn DataAny {
+	pub fn downcast_ref<T: 'static>(&self) -> Option<&T> {
+		self.as_any(TypeId::of::<T>()).and_then(|a| a.downcast_ref::<T>())
+	}
 
-	fn into_any(self: Box<Self>) -> Box<dyn Any> { self }
+	pub fn downcast<T: 'static>(self: Box<Self>) -> Result<Box<T>, Box<dyn Any>> {
+		let id = TypeId::of::<T>();
+		self.into_any(id).map_or_else(|me| Err(me as Box<dyn Any>), |a| a.downcast::<T>())
+	}
 }
 
 impl Clone for Box<dyn DataAny> {
@@ -26,3 +45,27 @@ impl Debug for dyn DataAny {
 		f.debug_struct("DataAny").finish_non_exhaustive()
 	}
 }
+
+impl<T: Clone + Send + Sync + 'static> DataAny for Vec<T> {
+	fn as_any(&self, id: TypeId) -> Option<&dyn Any> {
+		(id == TypeId::of::<Self>()).then_some(self as &dyn Any)
+	}
+
+	fn into_any(self: Box<Self>, id: TypeId) -> Result<Box<dyn Any>, Box<dyn DataAny>> {
+		if id == TypeId::of::<Self>() { Ok(self) } else { Err(self) }
+	}
+
+	fn into_lua(self: Box<Self>, lua: &Lua) -> mlua::Result<Value> { AnyData(self).into_lua(lua) }
+}
+
+impl<T: Send + 'static> DataAny for tokio::sync::mpsc::UnboundedSender<T> {
+	fn as_any(&self, id: TypeId) -> Option<&dyn Any> {
+		(id == TypeId::of::<Self>()).then_some(self as &dyn Any)
+	}
+
+	fn into_any(self: Box<Self>, id: TypeId) -> Result<Box<dyn Any>, Box<dyn DataAny>> {
+		if id == TypeId::of::<Self>() { Ok(self) } else { Err(self) }
+	}
+
+	fn into_lua(self: Box<Self>, lua: &Lua) -> mlua::Result<Value> { AnyData(self).into_lua(lua) }
+}
diff --git a/yazi-shared/src/data/data.rs b/yazi-shared/src/data/data.rs
index 8b85d56a..7d6498bb 100644
--- a/yazi-shared/src/data/data.rs
+++ b/yazi-shared/src/data/data.rs
@@ -3,8 +3,9 @@ use std::borrow::Cow;
 use anyhow::{Result, anyhow, bail};
 use hashbrown::HashMap;
 use serde::{Deserialize, Serialize};
+use yazi_shim::SStr;
 
-use crate::{Id, SStr, data::{DataAny, DataKey}, path::PathBufDyn, strand::{IntoStrand, StrandBuf}, url::{Url, UrlBuf, UrlCow}};
+use crate::{data::{DataAny, DataKey}, id::Id, path::PathBufDyn, strand::{IntoStrand, StrandBuf}, url::{Url, UrlBuf, UrlCow}};
 
 // --- Data
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
@@ -244,7 +245,7 @@ impl TryFrom<&Data> for StrandBuf {
 }
 
 impl PartialEq<bool> for Data {
-	fn eq(&self, other: &bool) -> bool { self.try_into().is_ok_and(|b| *other == b) }
+	fn eq(&self, other: &bool) -> bool { self.try_into().is_ok_and(|b: bool| b == *other) }
 }
 
 impl Data {
@@ -257,7 +258,7 @@ impl Data {
 
 	pub fn as_any<T: 'static>(&self) -> Option<&T> {
 		match self {
-			Self::Any(b) => (**b).as_any().downcast_ref::<T>(),
+			Self::Any(a) => a.downcast_ref::<T>(),
 			_ => None,
 		}
 	}
@@ -271,15 +272,15 @@ impl Data {
 
 	pub fn into_any<T: 'static>(self) -> Option<T> {
 		match self {
-			Self::Any(b) => b.into_any().downcast::<T>().ok().map(|b| *b),
+			Self::Any(a) => a.downcast::<T>().ok().map(|b| *b),
 			_ => None,
 		}
 	}
 
 	// FIXME: find a better name
 	pub fn into_any2<T: 'static>(self) -> Result<T> {
-		if let Self::Any(b) = self
-			&& let Ok(t) = b.into_any().downcast::<T>()
+		if let Self::Any(a) = self
+			&& let Ok(t) = a.downcast::<T>()
 		{
 			Ok(*t)
 		} else {
@@ -288,5 +289,5 @@ impl Data {
 	}
 }
 
-impl_into_integer!(Data, i8, i16, i32, i64, isize, u8, u16, u32, u64, usize, crate::Id);
+impl_into_integer!(Data, i8, i16, i32, i64, isize, u8, u16, u32, u64, usize, crate::id::Id);
 impl_into_number!(Data, f32, f64);
diff --git a/yazi-shared/src/data/inventory.rs b/yazi-shared/src/data/inventory.rs
new file mode 100644
index 00000000..b4114236
--- /dev/null
+++ b/yazi-shared/src/data/inventory.rs
@@ -0,0 +1,9 @@
+use mlua::{Lua, Value};
+
+use crate::data::DataAny;
+
+pub struct DataInventory {
+	pub from_lua: fn(Value, &Lua) -> mlua::Result<Box<dyn DataAny>>,
+}
+
+inventory::collect!(DataInventory);
diff --git a/yazi-shared/src/data/key.rs b/yazi-shared/src/data/key.rs
index c88240b0..28344f74 100644
--- a/yazi-shared/src/data/key.rs
+++ b/yazi-shared/src/data/key.rs
@@ -2,8 +2,9 @@ use std::borrow::Cow;
 
 use ordered_float::OrderedFloat;
 use serde::{Deserialize, Serialize, de};
+use yazi_shim::SStr;
 
-use crate::{Id, SStr, path::PathBufDyn, url::UrlBuf};
+use crate::{id::Id, path::PathBufDyn, url::UrlBuf};
 
 #[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
 #[serde(untagged)]
@@ -72,5 +73,5 @@ impl From<String> for DataKey {
 	fn from(value: String) -> Self { Self::String(Cow::Owned(value)) }
 }
 
-impl_into_integer!(DataKey, i8, i16, i32, i64, isize, u8, u16, u32, u64, usize, crate::Id);
+impl_into_integer!(DataKey, i8, i16, i32, i64, isize, u8, u16, u32, u64, usize, crate::id::Id);
 impl_into_number!(DataKey, f32, f64);
diff --git a/yazi-shared/src/data/macros.rs b/yazi-shared/src/data/macros.rs
index cdbda856..dd394334 100644
--- a/yazi-shared/src/data/macros.rs
+++ b/yazi-shared/src/data/macros.rs
@@ -65,10 +65,10 @@ macro_rules! impl_into_number {
 				fn try_from(value: $a) -> Result<Self, Self::Error> {
 					paste::paste! {
 						Ok(match ref_or_owned!($kind, value) {
-							$t::Integer(i) if *i == (*i as $b as _) => *i as $b,
-							$t::Number(n) if f64::from(*n) == (f64::from(*n) as $b as _) => f64::from(*n) as $b,
+							$t::Integer(i) if *i == *i as $b as i64 => *i as $b,
+							$t::Number(n) if f64::from(*n) == f64::from(*n) as $b as f64 => f64::from(*n) as $b,
 							$t::String(s) => s.parse()?,
-							$t::Id(i) if i.get() == (i.get() as $b as _) => i.get() as $b,
+							$t::Id(i) if i.get() == i.get() as $b as u64 => i.get() as $b,
 							_ => anyhow::bail!("not a number"),
 						})
 					}
diff --git a/yazi-shared/src/data/mod.rs b/yazi-shared/src/data/mod.rs
index 1f290c8a..af61104c 100644
--- a/yazi-shared/src/data/mod.rs
+++ b/yazi-shared/src/data/mod.rs
@@ -1,4 +1,4 @@
 #[macro_use]
 mod macros;
 
-yazi_macro::mod_flat!(any data de de_bytes de_key de_owned key);
+yazi_macro::mod_flat!(any data de de_bytes de_key de_owned inventory key sendable);
diff --git a/yazi-dds/src/sendable.rs b/yazi-shared/src/data/sendable.rs
similarity index 64%
rename from yazi-dds/src/sendable.rs
rename to yazi-shared/src/data/sendable.rs
index 860213e7..39e0c8b4 100644
--- a/yazi-dds/src/sendable.rs
+++ b/yazi-shared/src/data/sendable.rs
@@ -3,26 +3,24 @@ use std::{any::TypeId, borrow::Cow};
 use hashbrown::HashMap;
 use mlua::{ExternalError, IntoLua, Lua, MultiValue, Table, Value};
 use ordered_float::OrderedFloat;
-use yazi_shared::{data::{Data, DataKey}, replace_cow};
 
-use crate::ember;
+use crate::{any_data::AnyData, data::{Data, DataInventory, DataKey}, id::Id, path::PathBufDyn, replace_cow, url::UrlBuf};
 
 pub struct Sendable;
 
 impl Sendable {
 	pub fn value_to_data(lua: &Lua, value: Value) -> mlua::Result<Data> {
-		Ok(match value {
-			Value::Nil => Data::Nil,
-			Value::Boolean(b) => Data::Boolean(b),
-			Value::LightUserData(_) => Err("light userdata is not supported".into_lua_err())?,
-			Value::Integer(i) => Data::Integer(i),
-			Value::Number(n) => Data::Number(n),
+		match &value {
+			Value::Nil => return Ok(Data::Nil),
+			Value::Boolean(b) => return Ok(Data::Boolean(*b)),
+			Value::Integer(i) => return Ok(Data::Integer(*i)),
+			Value::Number(n) => return Ok(Data::Number(*n)),
 			Value::String(b) => {
-				if let Ok(s) = b.to_str() {
+				return Ok(if let Ok(s) = b.to_str() {
 					Data::String(s.to_owned().into())
 				} else {
 					Data::Bytes(b.as_bytes().to_owned())
-				}
+				});
 			}
 			Value::Table(t) => {
 				let (mut i, mut map) = (1, HashMap::with_capacity(t.raw_len()));
@@ -36,38 +34,40 @@ impl Sendable {
 					map.insert(k, Self::value_to_data(lua, v)?);
 				}
 
-				if map.len() == i as usize - 1 {
+				return Ok(if map.len() == i as usize - 1 {
 					Data::List((1..i).map(|i| map.remove(&DataKey::Integer(i)).unwrap()).collect())
 				} else {
 					Data::Dict(map)
-				}
+				});
 			}
-			Value::Function(_) => Err("function is not supported".into_lua_err())?,
-			Value::Thread(_) => Err("thread is not supported".into_lua_err())?,
 			Value::UserData(ud) => match ud.type_id() {
-				Some(t) if t == TypeId::of::<yazi_binding::Url>() => {
-					Data::Url(ud.take::<yazi_binding::Url>()?.into())
+				Some(t) if t == TypeId::of::<UrlBuf>() => {
+					return Ok(Data::Url(ud.take()?));
 				}
-				Some(t) if t == TypeId::of::<yazi_binding::Path>() => {
-					Data::Path(ud.take::<yazi_binding::Path>()?.into())
+				Some(t) if t == TypeId::of::<PathBufDyn>() => {
+					return Ok(Data::Path(ud.take()?));
 				}
-				Some(t) if t == TypeId::of::<yazi_binding::Id>() => {
-					Data::Id(**ud.borrow::<yazi_binding::Id>()?)
+				Some(t) if t == TypeId::of::<Id>() => {
+					return Ok(Data::Id(*ud.borrow::<Id>()?));
 				}
-				Some(t) if t == TypeId::of::<yazi_fs::FilesOp>() => {
-					Data::Any(Box::new(ud.take::<yazi_fs::FilesOp>()?))
-				}
-				Some(t) if t == TypeId::of::<ember::EmberYankIter>() => {
-					Data::Any(Box::new(ud.take::<ember::EmberYankIter>()?.collect(lua)?))
-				}
-				Some(t) if t == TypeId::of::<yazi_binding::ChordCow>() => {
-					Data::Any(Box::new(ud.take::<yazi_binding::ChordCow>()?))
-				}
-				_ => Err(format!("unsupported userdata included: {ud:?}").into_lua_err())?,
+				Some(t) if t == TypeId::of::<AnyData>() => return Ok(Data::Any(ud.take::<AnyData>()?.0)),
+				_ => {}
 			},
-			Value::Error(_) => Err("error is not supported".into_lua_err())?,
-			Value::Other(..) => Err("unknown data is not supported".into_lua_err())?,
-		})
+			Value::LightUserData(_) => {}
+			Value::Function(_) => {}
+			Value::Thread(_) => {}
+			Value::Error(_) => {}
+			Value::Other(_) => {}
+		}
+
+		for inv in inventory::iter::<DataInventory> {
+			match (inv.from_lua)(value.clone(), lua) {
+				Ok(data) => return Ok(Data::Any(data)),
+				Err(mlua::Error::UserDataTypeMismatch) => continue,
+				Err(e) => return Err(e),
+			}
+		}
+		Err(format!("unsupported value included: {value:?}").into_lua_err())?
 	}
 
 	pub fn data_to_value(lua: &Lua, data: Data) -> mlua::Result<Value> {
@@ -88,26 +88,10 @@ impl Sendable {
 				}
 				Value::Table(tbl)
 			}
-			Data::Url(u) => yazi_binding::Url::new(u).into_lua(lua)?,
-			Data::Path(u) => yazi_binding::Path::new(u).into_lua(lua)?,
+			Data::Url(u) => u.into_lua(lua)?,
+			Data::Path(p) => p.into_lua(lua)?,
 			Data::Bytes(b) => Value::String(lua.create_external_string(b)?),
-			Data::Any(b) => {
-				let mut b = b.into_any();
-				macro_rules! try_cast {
-					($f:expr) => {
-						match b.downcast() {
-							Ok(v) => return $f(*v)?.into_lua(lua),
-							#[allow(unused_assignments)]
-							Err(e) => b = e,
-						}
-					};
-				}
-
-				try_cast!(|v: yazi_fs::FilesOp| lua.create_any_userdata(v));
-				try_cast!(|v: ember::EmberYank| v.into_lua(lua));
-				try_cast!(|v: yazi_binding::ChordCow| v.into_lua(lua));
-				Err("unsupported DataAny included".into_lua_err())?
-			}
+			Data::Any(a) => a.into_lua(lua)?,
 			_ => Self::data_to_value_ref(lua, &data)?,
 		})
 	}
@@ -134,24 +118,11 @@ impl Sendable {
 				}
 				Value::Table(tbl)
 			}
-			Data::Id(i) => yazi_binding::Id(*i).into_lua(lua)?,
-			Data::Url(u) => yazi_binding::Url::new(u).into_lua(lua)?,
-			Data::Path(u) => yazi_binding::Path::new(u).into_lua(lua)?,
+			Data::Id(i) => i.into_lua(lua)?,
+			Data::Url(u) => u.clone().into_lua(lua)?,
+			Data::Path(p) => p.clone().into_lua(lua)?,
 			Data::Bytes(b) => Value::String(lua.create_string(b)?),
-			Data::Any(b) => {
-				macro_rules! try_cast {
-					($f:expr) => {
-						if let Some(v) = b.as_any().downcast_ref() {
-							return $f(Clone::clone(v))?.into_lua(lua);
-						}
-					};
-				}
-
-				try_cast!(|v: yazi_fs::FilesOp| lua.create_any_userdata(v));
-				try_cast!(|v: ember::EmberYank| v.into_lua(lua));
-				try_cast!(|v: yazi_binding::ChordCow| v.into_lua(lua));
-				Err("unsupported DataAny included".into_lua_err())?
-			}
+			Data::Any(a) => a.to_lua(lua)?,
 		})
 	}
 
@@ -231,15 +202,9 @@ impl Sendable {
 			Value::Function(_) => Err("function is not supported".into_lua_err())?,
 			Value::Thread(_) => Err("thread is not supported".into_lua_err())?,
 			Value::UserData(ud) => match ud.type_id() {
-				Some(t) if t == TypeId::of::<yazi_binding::Url>() => {
-					DataKey::Url(ud.take::<yazi_binding::Url>()?.into())
-				}
-				Some(t) if t == TypeId::of::<yazi_binding::Path>() => {
-					DataKey::Path(ud.take::<yazi_binding::Path>()?.into())
-				}
-				Some(t) if t == TypeId::of::<yazi_binding::Id>() => {
-					DataKey::Id(**ud.borrow::<yazi_binding::Id>()?)
-				}
+				Some(t) if t == TypeId::of::<UrlBuf>() => DataKey::Url(ud.take()?),
+				Some(t) if t == TypeId::of::<PathBufDyn>() => DataKey::Path(ud.take()?),
+				Some(t) if t == TypeId::of::<Id>() => DataKey::Id(*ud.borrow::<Id>()?),
 				_ => Err(format!("unsupported userdata included: {ud:?}").into_lua_err())?,
 			},
 			Value::Error(_) => Err("error is not supported".into_lua_err())?,
@@ -250,8 +215,8 @@ impl Sendable {
 	fn key_to_value(lua: &Lua, key: DataKey) -> mlua::Result<Value> {
 		match key {
 			DataKey::String(Cow::Owned(s)) => lua.create_external_string(s).map(Value::String),
-			DataKey::Url(u) => yazi_binding::Url::new(u).into_lua(lua),
-			DataKey::Path(u) => yazi_binding::Path::new(u).into_lua(lua),
+			DataKey::Url(u) => u.into_lua(lua),
+			DataKey::Path(p) => p.into_lua(lua),
 			DataKey::Bytes(b) => lua.create_external_string(b).map(Value::String),
 			_ => Self::key_to_value_ref(lua, &key),
 		}
@@ -264,9 +229,9 @@ impl Sendable {
 			DataKey::Integer(i) => Value::Integer(*i),
 			DataKey::Number(n) => Value::Number(n.0),
 			DataKey::String(s) => Value::String(lua.create_string(&**s)?),
-			DataKey::Id(i) => yazi_binding::Id(*i).into_lua(lua)?,
-			DataKey::Url(u) => yazi_binding::Url::new(u).into_lua(lua)?,
-			DataKey::Path(u) => yazi_binding::Path::new(u).into_lua(lua)?,
+			DataKey::Id(i) => i.into_lua(lua)?,
+			DataKey::Url(u) => u.clone().into_lua(lua)?,
+			DataKey::Path(p) => p.clone().into_lua(lua)?,
 			DataKey::Bytes(b) => Value::String(lua.create_string(b)?),
 		})
 	}
diff --git a/yazi-shared/src/event/action.rs b/yazi-shared/src/event/action.rs
index d02fd499..19909cfa 100644
--- a/yazi-shared/src/event/action.rs
+++ b/yazi-shared/src/event/action.rs
@@ -1,9 +1,11 @@
 use std::{borrow::Cow, fmt::{self, Display}, ops::{Deref, DerefMut}, str::FromStr};
 
 use anyhow::{Result, bail};
+use mlua::{FromLua, Lua, UserData, UserDataFields, Value};
 use serde_with::DeserializeFromStr;
+use yazi_shim::{SStr, mlua::UserDataFieldsExt};
 
-use crate::{Layer, SStr, Source, data::{Data, DataAny, DataKey}, event::{Cmd, Replier}};
+use crate::{Layer, Source, data::{Data, DataAny, DataKey}, event::{Cmd, Replier}};
 
 #[derive(Clone, Debug, Default, DeserializeFromStr)]
 pub struct Action {
@@ -262,3 +264,23 @@ impl FromStr for Action {
 		Ok(me)
 	}
 }
+
+impl FromLua for Action {
+	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
+		Ok(match value {
+			Value::String(s) => s.to_str()?.parse()?,
+			Value::UserData(ud) => ud.take()?,
+			_ => Err(mlua::Error::FromLuaConversionError {
+				from:    value.type_name(),
+				to:      "Action".to_owned(),
+				message: Some("expected a string or an Action".to_string()),
+			})?,
+		})
+	}
+}
+
+impl UserData for Action {
+	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
+		fields.add_cached_field("cmd", |_, me| Ok(me.cmd.clone()));
+	}
+}
diff --git a/yazi-shared/src/event/cow.rs b/yazi-shared/src/event/action_cow.rs
similarity index 100%
rename from yazi-shared/src/event/cow.rs
rename to yazi-shared/src/event/action_cow.rs
diff --git a/yazi-shared/src/event/actions.rs b/yazi-shared/src/event/actions.rs
new file mode 100644
index 00000000..01b71916
--- /dev/null
+++ b/yazi-shared/src/event/actions.rs
@@ -0,0 +1,83 @@
+use std::{ops::{Deref, DerefMut}, slice, vec};
+
+use mlua::{ExternalError, FromLua, IntoLua, Lua, Value};
+use serde::{Deserializer, de};
+use serde_with::{DeserializeAs, DisplayFromStr, OneOrMany};
+
+use crate::{Layer, Source, event::Action};
+
+#[derive(Clone, Debug, Default)]
+pub struct Actions(pub Vec<Action>);
+
+impl Deref for Actions {
+	type Target = Vec<Action>;
+
+	fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+impl DerefMut for Actions {
+	fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0 }
+}
+
+impl From<Action> for Actions {
+	fn from(value: Action) -> Self { Self(vec![value]) }
+}
+
+impl From<Vec<Action>> for Actions {
+	fn from(value: Vec<Action>) -> Self { Self(value) }
+}
+
+impl Actions {
+	pub fn set(&mut self, layer: Layer, source: Source) {
+		for action in &mut self.0 {
+			action.source = source;
+			if action.layer == Layer::Null {
+				action.layer = layer;
+			}
+		}
+	}
+}
+
+impl IntoIterator for Actions {
+	type IntoIter = vec::IntoIter<Action>;
+	type Item = Action;
+
+	fn into_iter(self) -> Self::IntoIter { self.0.into_iter() }
+}
+
+impl<'a> IntoIterator for &'a Actions {
+	type IntoIter = slice::Iter<'a, Action>;
+	type Item = &'a Action;
+
+	fn into_iter(self) -> Self::IntoIter { self.0.iter() }
+}
+
+impl FromLua for Actions {
+	fn from_lua(value: Value, lua: &Lua) -> mlua::Result<Self> {
+		Ok(match value {
+			Value::Table(t) => t.sequence_values::<Action>().collect::<mlua::Result<Vec<_>>>()?.into(),
+			v @ Value::String(_) => Action::from_lua(v, lua)?.into(),
+			_ => Err("expected a string or a table of actions".into_lua_err())?,
+		})
+	}
+}
+
+impl IntoLua for Actions {
+	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> {
+		lua.create_sequence_from(self.0)?.into_lua(lua)
+	}
+}
+
+pub fn deserialize_actions<'de, const L: u8, D>(deserializer: D) -> Result<Actions, D::Error>
+where
+	D: Deserializer<'de>,
+{
+	let Some(layer) = Layer::from_repr(L) else {
+		return Err(de::Error::custom(format!("invalid keymap layer const: {L}")));
+	};
+
+	let mut actions = Actions(OneOrMany::<DisplayFromStr>::deserialize_as(deserializer)?);
+	actions.set(layer, Source::Key);
+
+	Ok(actions)
+}
diff --git a/yazi-shared/src/event/cmd.rs b/yazi-shared/src/event/cmd.rs
index b26ed7a8..009a0b93 100644
--- a/yazi-shared/src/event/cmd.rs
+++ b/yazi-shared/src/event/cmd.rs
@@ -2,9 +2,11 @@ use std::{mem, str::FromStr};
 
 use anyhow::{Result, bail};
 use hashbrown::HashMap;
+use mlua::{UserData, UserDataFields};
 use serde_with::DeserializeFromStr;
+use yazi_shim::{SStr, mlua::UserDataFieldsExt};
 
-use crate::{SStr, data::{Data, DataKey}};
+use crate::data::{Data, DataKey, Sendable};
 
 #[derive(Clone, Debug, Default, DeserializeFromStr)]
 pub struct Cmd {
@@ -55,3 +57,13 @@ impl Cmd {
 			.collect()
 	}
 }
+
+impl UserData for Cmd {
+	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
+		fields.add_cached_field_mut("name", |_, me| Ok(mem::take(&mut me.name)));
+
+		fields.add_cached_field_mut("args", |lua, me| {
+			Sendable::args_to_table(lua, mem::take(&mut me.args))
+		});
+	}
+}
diff --git a/yazi-shared/src/event/mod.rs b/yazi-shared/src/event/mod.rs
index 49963f67..2b0615a8 100644
--- a/yazi-shared/src/event/mod.rs
+++ b/yazi-shared/src/event/mod.rs
@@ -1,4 +1,4 @@
-yazi_macro::mod_flat!(action cmd cow de de_owned event);
+yazi_macro::mod_flat!(action action_cow actions cmd de de_owned event);
 
 pub type Replier = tokio::sync::mpsc::UnboundedSender<anyhow::Result<crate::data::Data>>;
 
diff --git a/yazi-shared/src/id.rs b/yazi-shared/src/id/id.rs
similarity index 64%
rename from yazi-shared/src/id.rs
rename to yazi-shared/src/id/id.rs
index 3394c554..a402a7a9 100644
--- a/yazi-shared/src/id.rs
+++ b/yazi-shared/src/id/id.rs
@@ -1,11 +1,11 @@
-use std::{fmt::Display, str::FromStr, sync::atomic::{AtomicU64, Ordering}};
+use std::{fmt::Display, str::FromStr};
 
 use serde::{Deserialize, Serialize};
 
 #[derive(
 	Clone, Copy, Debug, Default, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize,
 )]
-pub struct Id(u64);
+pub struct Id(pub(super) u64);
 
 impl Id {
 	pub const ZERO: Self = Self(0);
@@ -43,30 +43,3 @@ impl TryFrom<i64> for Id {
 impl PartialEq<u64> for Id {
 	fn eq(&self, other: &u64) -> bool { self.0 == *other }
 }
-
-// --- Ids
-pub struct Ids {
-	next: AtomicU64,
-}
-
-impl Ids {
-	#[inline]
-	pub const fn new() -> Self { Self { next: AtomicU64::new(1) } }
-
-	#[inline]
-	pub fn next(&self) -> Id {
-		loop {
-			let old = self.next.fetch_add(1, Ordering::Relaxed);
-			if old != 0 {
-				return Id(old);
-			}
-		}
-	}
-
-	#[inline]
-	pub fn current(&self) -> Id { Id(self.next.load(Ordering::Relaxed)) }
-}
-
-impl Default for Ids {
-	fn default() -> Self { Self::new() }
-}
diff --git a/yazi-shared/src/id/ids.rs b/yazi-shared/src/id/ids.rs
new file mode 100644
index 00000000..77ce1eb4
--- /dev/null
+++ b/yazi-shared/src/id/ids.rs
@@ -0,0 +1,30 @@
+use std::sync::atomic::{AtomicU64, Ordering};
+
+use crate::id::Id;
+
+#[derive(Debug)]
+pub struct Ids {
+	next: AtomicU64,
+}
+
+impl Ids {
+	#[inline]
+	pub const fn new() -> Self { Self { next: AtomicU64::new(1) } }
+
+	#[inline]
+	pub fn next(&self) -> Id {
+		loop {
+			let old = self.next.fetch_add(1, Ordering::Relaxed);
+			if old != 0 {
+				return Id(old);
+			}
+		}
+	}
+
+	#[inline]
+	pub fn current(&self) -> Id { Id(self.next.load(Ordering::Relaxed)) }
+}
+
+impl Default for Ids {
+	fn default() -> Self { Self::new() }
+}
diff --git a/yazi-binding/src/id.rs b/yazi-shared/src/id/lua.rs
similarity index 55%
rename from yazi-binding/src/id.rs
rename to yazi-shared/src/id/lua.rs
index ca608ef8..15b68077 100644
--- a/yazi-binding/src/id.rs
+++ b/yazi-shared/src/id/lua.rs
@@ -1,20 +1,11 @@
-use std::ops::Deref;
-
 use mlua::{ExternalError, ExternalResult, FromLua, Lua, UserData, UserDataFields, Value};
 
-#[derive(Clone, Copy, Default)]
-pub struct Id(pub yazi_shared::Id);
-
-impl Deref for Id {
-	type Target = yazi_shared::Id;
-
-	fn deref(&self) -> &Self::Target { &self.0 }
-}
+use crate::id::Id;
 
 impl FromLua for Id {
 	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
 		Ok(match value {
-			Value::Integer(i) => Self(i.try_into().into_lua_err()?),
+			Value::Integer(i) => Self::try_from(i).into_lua_err()?,
 			Value::UserData(ud) => *ud.borrow::<Self>()?,
 			_ => Err("expected integer or userdata".into_lua_err())?,
 		})
@@ -23,6 +14,6 @@ impl FromLua for Id {
 
 impl UserData for Id {
 	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
-		fields.add_field_method_get("value", |_, me| Ok(me.0.get()));
+		fields.add_field_method_get("value", |_, me| Ok(me.get()));
 	}
 }
diff --git a/yazi-shared/src/id/mod.rs b/yazi-shared/src/id/mod.rs
new file mode 100644
index 00000000..3619ad8f
--- /dev/null
+++ b/yazi-shared/src/id/mod.rs
@@ -0,0 +1 @@
+yazi_macro::mod_flat!(id ids lua);
diff --git a/yazi-shared/src/layer.rs b/yazi-shared/src/layer.rs
index 44f74c66..f3e10377 100644
--- a/yazi-shared/src/layer.rs
+++ b/yazi-shared/src/layer.rs
@@ -1,5 +1,7 @@
+use mlua::{MetaMethod, UserData, UserDataMethods};
 use serde::Deserialize;
 use strum::{Display, EnumString, FromRepr, IntoStaticStr};
+use yazi_shim::strum::IntoStr;
 
 #[derive(
 	Clone,
@@ -33,3 +35,9 @@ pub enum Layer {
 	Which,
 	Notify,
 }
+
+impl UserData for Layer {
+	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
+		methods.add_meta_method(MetaMethod::ToString, |_, me, ()| Ok(me.into_str()));
+	}
+}
diff --git a/yazi-shared/src/lib.rs b/yazi-shared/src/lib.rs
index 98317f74..c9e663d8 100644
--- a/yazi-shared/src/lib.rs
+++ b/yazi-shared/src/lib.rs
@@ -1,6 +1,8 @@
-yazi_macro::mod_pub!(data event loc path pool scheme shell strand translit url wtf8);
+extern crate self as yazi_shared;
 
-yazi_macro::mod_flat!(alias bytes chars completion_token condition debounce env id kebab_cased_string last_value layer localset natsort non_empty_string os predictor snake_cased_string source tests throttle time);
+yazi_macro::mod_pub!(any_data data event id loc path pool scheme shell strand translit url);
+
+yazi_macro::mod_flat!(bytes chars completion_token condition debounce env kebab_cased_string last_value layer localset natsort non_empty_string os predictor snake_cased_string source tests throttle time);
 
 pub fn init() {
 	LOCAL_SET.with(tokio::task::LocalSet::new);
diff --git a/yazi-shared/src/path/buf.rs b/yazi-shared/src/path/buf.rs
index b580ddb0..5abaedde 100644
--- a/yazi-shared/src/path/buf.rs
+++ b/yazi-shared/src/path/buf.rs
@@ -1,11 +1,13 @@
 use std::{borrow::Cow, ffi::OsString, hash::{Hash, Hasher}};
 
 use hashbrown::Equivalent;
+use yazi_codegen::FromLuaOwned;
+use yazi_shim::wtf8::FromWtf8Vec;
 
-use crate::{path::{AsPath, Component, PathDyn, PathDynError, PathKind, SetNameError}, strand::AsStrand, wtf8::FromWtf8Vec};
+use crate::{path::{AsPath, Component, PathDyn, PathDynError, PathKind, SetNameError}, strand::AsStrand};
 
 // --- PathBufDyn
-#[derive(Clone, Debug, Eq)]
+#[derive(Clone, Debug, Eq, FromLuaOwned)]
 pub enum PathBufDyn {
 	Os(std::path::PathBuf),
 	Unix(typed_path::UnixPathBuf),
diff --git a/yazi-binding/src/path.rs b/yazi-shared/src/path/lua.rs
similarity index 69%
rename from yazi-binding/src/path.rs
rename to yazi-shared/src/path/lua.rs
index 09cc38d2..a087470e 100644
--- a/yazi-binding/src/path.rs
+++ b/yazi-shared/src/path/lua.rs
@@ -1,60 +1,18 @@
-use std::ops::Deref;
-
 use mlua::{ExternalError, ExternalResult, Lua, MetaMethod, UserData, UserDataFields, UserDataMethods, UserDataRef, Value};
-use yazi_codegen::FromLuaOwned;
-use yazi_shared::{path::{PathBufDyn, PathLike, StripPrefixError}, strand::{AsStrand, Strand, StrandCow}};
+use yazi_shim::mlua::UserDataFieldsExt;
 
-use crate::cached_field;
+use crate::{path::{PathBufDyn, PathLike, StripPrefixError}, strand::{AsStrand, StrandCow}};
 
-pub type PathRef = UserDataRef<Path>;
-
-#[derive(FromLuaOwned)]
-pub struct Path {
-	inner: PathBufDyn,
-
-	v_ext:    Option<Value>,
-	v_name:   Option<Value>,
-	v_parent: Option<Value>,
-	v_stem:   Option<Value>,
-}
-
-impl Deref for Path {
-	type Target = PathBufDyn;
-
-	fn deref(&self) -> &Self::Target { &self.inner }
-}
-
-impl From<Path> for PathBufDyn {
-	fn from(value: Path) -> Self { value.inner }
-}
-
-impl AsStrand for Path {
-	fn as_strand(&self) -> Strand<'_> { self.inner.as_strand() }
-}
-
-impl AsStrand for &Path {
-	fn as_strand(&self) -> Strand<'_> { self.inner.as_strand() }
-}
-
-impl Path {
-	pub fn new(path: impl Into<PathBufDyn>) -> Self {
-		Self {
-			inner: path.into(),
-
-			v_ext:    None,
-			v_name:   None,
-			v_parent: None,
-			v_stem:   None,
-		}
-	}
+pub type PathRef = UserDataRef<PathBufDyn>;
 
+impl PathBufDyn {
 	pub fn install(lua: &Lua) -> mlua::Result<()> {
 		lua.globals().raw_set(
 			"Path",
 			lua.create_table_from([(
 				"os",
 				lua.create_function(|_, s: mlua::String| {
-					Ok(Self::new(s.as_bytes().as_strand().as_os_path().into_lua_err()?))
+					Ok(Self::from(s.as_bytes().as_strand().as_os_path().into_lua_err()?))
 				})?,
 			)])?,
 		)
@@ -71,7 +29,7 @@ impl Path {
 	}
 
 	fn join(&self, other: Value) -> mlua::Result<Self> {
-		Ok(Self::new(match other {
+		Ok(match other {
 			Value::String(s) => {
 				self.try_join(StrandCow::with(self.kind(), &*s.as_bytes())?).into_lua_err()?
 			}
@@ -80,7 +38,7 @@ impl Path {
 				self.try_join(&*path).into_lua_err()?
 			}
 			_ => Err("must be a string or Path".into_lua_err())?,
-		}))
+		})
 	}
 
 	fn starts_with(&self, base: Value) -> mlua::Result<bool> {
@@ -101,23 +59,23 @@ impl Path {
 		};
 
 		Ok(match strip {
-			Ok(p) => Some(Self::new(p)),
+			Ok(p) => Some(p.to_owned()),
 			Err(StripPrefixError::Exotic | StripPrefixError::NotPrefix) => None,
 			Err(e @ StripPrefixError::WrongEncoding) => Err(e.into_lua_err())?,
 		})
 	}
 }
 
-impl UserData for Path {
+impl UserData for PathBufDyn {
 	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
-		cached_field!(fields, ext, |lua, me| {
+		fields.add_cached_field("ext", |lua, me| {
 			me.ext().map(|s| lua.create_string(s.encoded_bytes())).transpose()
 		});
-		cached_field!(fields, name, |lua, me| {
+		fields.add_cached_field("name", |lua, me| {
 			me.name().map(|s| lua.create_string(s.encoded_bytes())).transpose()
 		});
-		cached_field!(fields, parent, |_, me| Ok(me.parent().map(Self::new)));
-		cached_field!(fields, stem, |lua, me| {
+		fields.add_cached_field("parent", |_, me| Ok(me.parent().map(|p| p.to_owned())));
+		fields.add_cached_field("stem", |lua, me| {
 			me.stem().map(|s| lua.create_string(s.encoded_bytes())).transpose()
 		});
 
@@ -134,7 +92,7 @@ impl UserData for Path {
 		methods.add_meta_method(MetaMethod::Concat, |lua, lhs, rhs: mlua::String| {
 			lua.create_external_string([lhs.encoded_bytes(), &rhs.as_bytes()].concat())
 		});
-		methods.add_meta_method(MetaMethod::Eq, |_, me, other: PathRef| Ok(me.inner == other.inner));
+		methods.add_meta_method(MetaMethod::Eq, |_, me, other: PathRef| Ok(*me == *other));
 		methods
 			.add_meta_method(MetaMethod::ToString, |lua, me, ()| lua.create_string(me.encoded_bytes()));
 	}
diff --git a/yazi-shared/src/path/mod.rs b/yazi-shared/src/path/mod.rs
index a3d7f658..fe574952 100644
--- a/yazi-shared/src/path/mod.rs
+++ b/yazi-shared/src/path/mod.rs
@@ -1 +1 @@
-yazi_macro::mod_flat!(buf component components conversion cow display error kind like path view);
+yazi_macro::mod_flat!(buf component components conversion cow display error kind like lua path view);
diff --git a/yazi-shared/src/scheme/inventory.rs b/yazi-shared/src/scheme/inventory.rs
new file mode 100644
index 00000000..dcc850d0
--- /dev/null
+++ b/yazi-shared/src/scheme/inventory.rs
@@ -0,0 +1,9 @@
+use mlua::UserDataRegistry;
+
+use crate::scheme::Scheme;
+
+pub struct SchemeInventory {
+	pub register: fn(&mut UserDataRegistry<Scheme>),
+}
+
+inventory::collect!(SchemeInventory);
diff --git a/yazi-shared/src/scheme/lua.rs b/yazi-shared/src/scheme/lua.rs
new file mode 100644
index 00000000..5764a70b
--- /dev/null
+++ b/yazi-shared/src/scheme/lua.rs
@@ -0,0 +1,20 @@
+use mlua::{UserData, UserDataFields, UserDataRegistry};
+use yazi_shim::{mlua::UserDataFieldsExt, strum::IntoStr};
+
+use crate::scheme::{Scheme, SchemeInventory, SchemeLike};
+
+impl UserData for Scheme {
+	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
+		fields.add_cached_field("kind", |_, me| Ok(me.kind().into_str()));
+		fields.add_field_method_get("is_virtual", |_, me| Ok(me.is_virtual()));
+	}
+
+	fn register(registry: &mut UserDataRegistry<Self>) {
+		Self::add_fields(registry);
+		Self::add_methods(registry);
+
+		for inv in inventory::iter::<SchemeInventory>() {
+			(inv.register)(registry);
+		}
+	}
+}
diff --git a/yazi-shared/src/scheme/mod.rs b/yazi-shared/src/scheme/mod.rs
index f65b6204..465e626b 100644
--- a/yazi-shared/src/scheme/mod.rs
+++ b/yazi-shared/src/scheme/mod.rs
@@ -1 +1 @@
-yazi_macro::mod_flat!(cow encode kind r#ref scheme traits);
+yazi_macro::mod_flat!(cow encode inventory kind lua r#ref scheme traits);
diff --git a/yazi-shared/src/shell/windows.rs b/yazi-shared/src/shell/windows.rs
index ad25beee..2de6ae8c 100644
--- a/yazi-shared/src/shell/windows.rs
+++ b/yazi-shared/src/shell/windows.rs
@@ -40,7 +40,7 @@ pub fn escape_os_bytes(b: &[u8]) -> Cow<'_, [u8]> {
 
 #[cfg(windows)]
 pub fn escape_os_str(s: &std::ffi::OsStr) -> Cow<'_, std::ffi::OsStr> {
-	use crate::wtf8::FromWtf8Vec;
+	use yazi_shim::wtf8::FromWtf8Vec;
 
 	match escape_os_bytes(s.as_encoded_bytes()) {
 		Cow::Borrowed(_) => Cow::Borrowed(s),
diff --git a/yazi-shared/src/strand/buf.rs b/yazi-shared/src/strand/buf.rs
index 7b513bf0..76c87cb7 100644
--- a/yazi-shared/src/strand/buf.rs
+++ b/yazi-shared/src/strand/buf.rs
@@ -1,8 +1,9 @@
 use std::{borrow::Cow, ffi::OsString, hash::{Hash, Hasher}};
 
 use anyhow::Result;
+use yazi_shim::wtf8::FromWtf8Vec;
 
-use crate::{path::PathDyn, strand::{AsStrand, Strand, StrandCow, StrandError, StrandKind}, wtf8::FromWtf8Vec};
+use crate::{path::PathDyn, strand::{AsStrand, Strand, StrandCow, StrandError, StrandKind}};
 
 // --- StrandBuf
 #[derive(Clone, Debug, Eq)]
diff --git a/yazi-shared/src/strand/strand.rs b/yazi-shared/src/strand/strand.rs
index a9d7335d..4337bf29 100644
--- a/yazi-shared/src/strand/strand.rs
+++ b/yazi-shared/src/strand/strand.rs
@@ -1,8 +1,9 @@
 use std::{borrow::Cow, ffi::OsStr, fmt::Display};
 
 use anyhow::Result;
+use yazi_shim::wtf8::FromWtf8;
 
-use crate::{BytesExt, strand::{AsStrand, StrandBuf, StrandError, StrandKind}, wtf8::FromWtf8};
+use crate::{BytesExt, strand::{AsStrand, StrandBuf, StrandError, StrandKind}};
 
 // --- Strand
 #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialOrd)]
diff --git a/yazi-shared/src/url/buf.rs b/yazi-shared/src/url/buf.rs
index cf3bbc25..ef9b2e05 100644
--- a/yazi-shared/src/url/buf.rs
+++ b/yazi-shared/src/url/buf.rs
@@ -2,10 +2,12 @@ use std::{borrow::Cow, fmt::{Debug, Formatter}, hash::{Hash, Hasher}, path::{Pat
 
 use anyhow::Result;
 use serde::{Deserialize, Serialize, de::{self, IntoDeserializer}};
+use yazi_codegen::FromLuaOwned;
+use yazi_macro::impl_data_any;
 
 use crate::{loc::LocBuf, path::{PathBufDyn, PathDynError, SetNameError}, pool::{InternStr, Pool, Symbol}, scheme::{Scheme, SchemeLike}, strand::AsStrand, url::{AsUrl, Url, UrlCow, UrlDeserializer, UrlLike}};
 
-#[derive(Clone, Eq)]
+#[derive(Clone, Eq, FromLuaOwned)]
 pub enum UrlBuf {
 	Regular(LocBuf),
 	Search { loc: LocBuf, domain: Symbol<str> },
@@ -13,6 +15,8 @@ pub enum UrlBuf {
 	Sftp { loc: LocBuf<typed_path::UnixPathBuf>, domain: Symbol<str> },
 }
 
+impl_data_any!(UrlBuf);
+
 // FIXME: remove
 impl Default for UrlBuf {
 	fn default() -> Self { Self::Regular(Default::default()) }
diff --git a/yazi-shared/src/url/inventory.rs b/yazi-shared/src/url/inventory.rs
new file mode 100644
index 00000000..e0717521
--- /dev/null
+++ b/yazi-shared/src/url/inventory.rs
@@ -0,0 +1,9 @@
+use mlua::UserDataRegistry;
+
+use crate::url::UrlBuf;
+
+pub struct UrlBufInventory {
+	pub register: fn(&mut UserDataRegistry<UrlBuf>),
+}
+
+inventory::collect!(UrlBufInventory);
diff --git a/yazi-binding/src/url.rs b/yazi-shared/src/url/lua.rs
similarity index 52%
rename from yazi-binding/src/url.rs
rename to yazi-shared/src/url/lua.rs
index dba0b1b3..bd8e787a 100644
--- a/yazi-binding/src/url.rs
+++ b/yazi-shared/src/url/lua.rs
@@ -1,97 +1,24 @@
-use std::ops::Deref;
+use mlua::{AnyUserData, ExternalError, ExternalResult, IntoLua, Lua, MetaMethod, UserData, UserDataFields, UserDataMethods, UserDataRef, UserDataRegistry, Value};
+use yazi_shim::mlua::UserDataFieldsExt;
 
-use mlua::{AnyUserData, ExternalError, ExternalResult, IntoLua, Lua, MetaMethod, UserData, UserDataFields, UserDataMethods, UserDataRef, Value};
-use yazi_codegen::FromLuaOwned;
-use yazi_fs::{FsHash64, FsHash128, FsUrl};
-use yazi_shared::{path::{PathLike, StripPrefixError}, scheme::{SchemeCow, SchemeLike}, strand::{StrandLike, ToStrand}, url::{AsUrl, UrlCow, UrlLike}};
+use crate::{path::{PathBufDyn, PathLike, StripPrefixError}, scheme::{SchemeCow, SchemeLike}, strand::{StrandLike, ToStrand}, url::{UrlBuf, UrlBufInventory, UrlCow, UrlLike}};
 
-use crate::{Path, Scheme, cached_field};
-
-pub type UrlRef = UserDataRef<Url>;
+pub type UrlRef = UserDataRef<UrlBuf>;
 
 const EXPECTED: &str = "expected a string, Url, or Path";
 
-#[derive(FromLuaOwned)]
-pub struct Url {
-	inner: yazi_shared::url::UrlBuf,
-
-	v_path:   Option<Value>,
-	v_name:   Option<Value>,
-	v_stem:   Option<Value>,
-	v_ext:    Option<Value>,
-	v_urn:    Option<Value>,
-	v_base:   Option<Value>,
-	v_parent: Option<Value>,
-
-	v_scheme: Option<Value>,
-	v_domain: Option<Value>,
-
-	v_cache: Option<Value>,
-}
-
-impl Deref for Url {
-	type Target = yazi_shared::url::UrlBuf;
-
-	fn deref(&self) -> &Self::Target { &self.inner }
-}
-
-impl AsUrl for Url {
-	fn as_url(&self) -> yazi_shared::url::Url<'_> { self.inner.as_url() }
-}
-
-impl AsUrl for &Url {
-	fn as_url(&self) -> yazi_shared::url::Url<'_> { self.inner.as_url() }
-}
-
-impl From<Url> for yazi_shared::url::UrlBuf {
-	fn from(value: Url) -> Self { value.inner }
-}
-
-impl From<Url> for yazi_shared::url::UrlBufCov {
-	fn from(value: Url) -> Self { Self(value.inner) }
-}
-
-impl From<Url> for yazi_shared::url::UrlCow<'_> {
-	fn from(value: Url) -> Self { value.inner.into() }
-}
-
-impl TryFrom<&[u8]> for Url {
-	type Error = mlua::Error;
-
-	fn try_from(value: &[u8]) -> mlua::Result<Self> { Ok(Self::new(UrlCow::try_from(value)?)) }
-}
-
-impl Url {
-	pub fn new(url: impl Into<yazi_shared::url::UrlBuf>) -> Self {
-		Self {
-			inner: url.into(),
-
-			v_path:   None,
-			v_name:   None,
-			v_stem:   None,
-			v_ext:    None,
-			v_urn:    None,
-			v_base:   None,
-			v_parent: None,
-
-			v_scheme: None,
-			v_domain: None,
-
-			v_cache: None,
-		}
-	}
-
+impl UrlBuf {
 	pub fn install(lua: &Lua) -> mlua::Result<()> {
 		lua.globals().raw_set(
 			"Url",
 			lua.create_function(|_, value: Value| {
 				Ok(match value {
-					Value::String(s) => Self::try_from(&*s.as_bytes())?,
+					Value::String(s) => UrlCow::try_from(&*s.as_bytes())?.into(),
 					Value::UserData(ud) => {
 						if let Ok(url) = ud.borrow::<Self>() {
-							Self::new(&url.inner)
-						} else if let Ok(path) = ud.borrow::<Path>() {
-							Self::new(path.as_os().into_lua_err()?)
+							url.clone()
+						} else if let Ok(path) = ud.borrow::<PathBufDyn>() {
+							path.as_os().into_lua_err()?.into()
 						} else {
 							Err(EXPECTED.into_lua_err())?
 						}
@@ -110,34 +37,31 @@ impl Url {
 		}
 	}
 
-	fn hash(&self, long: Option<bool>) -> mlua::Result<String> {
-		Ok(if long.unwrap_or(false) {
-			format!("{:x}", self.hash_u128())
-		} else {
-			format!("{:x}", self.hash_u64())
-		})
-	}
-
 	fn join(&self, lua: &Lua, other: Value) -> mlua::Result<Value> {
 		match other {
 			Value::String(s) => {
 				let b = s.as_bytes();
 				let (scheme, path) = SchemeCow::parse(&b)?;
 				if scheme.covariant(self.scheme()) {
-					Self::new(self.try_join(path).into_lua_err()?).into_lua(lua)
+					self.try_join(path).into_lua_err()?.into_lua(lua)
 				} else {
-					Self::new(UrlCow::try_from((scheme, path))?).into_lua(lua)
+					UrlCow::try_from((scheme, path))?.into_owned().into_lua(lua)
 				}
 			}
 			Value::UserData(ref ud) => {
-				let url = ud.borrow::<Self>()?;
-				if url.scheme().covariant(self.scheme()) {
-					Self::new(self.try_join(url.loc()).into_lua_err()?).into_lua(lua)
+				if let Ok(url) = ud.borrow::<Self>() {
+					if url.scheme().covariant(self.scheme()) {
+						self.try_join(url.loc()).into_lua_err()?.into_lua(lua)
+					} else {
+						Ok(other)
+					}
+				} else if let Ok(path) = ud.borrow::<PathBufDyn>() {
+					self.try_join(&*path).into_lua_err()?.into_lua(lua)
 				} else {
-					Ok(other)
+					Err(EXPECTED.into_lua_err())?
 				}
 			}
-			_ => Err("must be a string or Url".into_lua_err())?,
+			_ => Err(EXPECTED.into_lua_err())?,
 		}
 	}
 
@@ -149,7 +73,7 @@ impl Url {
 		}
 	}
 
-	fn strip_prefix(&self, base: Value) -> mlua::Result<Option<Path>> {
+	fn strip_prefix(&self, base: Value) -> mlua::Result<Option<PathBufDyn>> {
 		let strip = match base {
 			Value::String(s) => self.try_strip_prefix(UrlCow::try_from(&*s.as_bytes())?),
 			Value::UserData(ud) => self.try_strip_prefix(&*ud.borrow::<Self>()?),
@@ -157,38 +81,36 @@ impl Url {
 		};
 
 		Ok(match strip {
-			Ok(p) => Some(Path::new(p)),
+			Ok(p) => Some(p.to_owned()),
 			Err(StripPrefixError::Exotic | StripPrefixError::NotPrefix) => None,
 			Err(e @ StripPrefixError::WrongEncoding) => Err(e.into_lua_err())?,
 		})
 	}
 }
 
-impl UserData for Url {
+impl UserData for UrlBuf {
 	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
-		cached_field!(fields, path, |_, me| Ok(Path::new(me.loc())));
-		cached_field!(fields, name, |lua, me| {
+		fields.add_cached_field("path", |_, me| Ok(me.loc().to_owned()));
+		fields.add_cached_field("name", |lua, me| {
 			me.name().map(|s| lua.create_string(s.encoded_bytes())).transpose()
 		});
-		cached_field!(fields, stem, |lua, me| {
+		fields.add_cached_field("stem", |lua, me| {
 			me.stem().map(|s| lua.create_string(s.encoded_bytes())).transpose()
 		});
-		cached_field!(fields, ext, |lua, me| {
+		fields.add_cached_field("ext", |lua, me| {
 			me.ext().map(|s| lua.create_string(s.encoded_bytes())).transpose()
 		});
-		cached_field!(fields, urn, |_, me| Ok(Path::new(me.urn())));
-		cached_field!(fields, base, |_, me| {
-			Ok(Some(me.base()).filter(|u| !u.loc().is_empty()).map(Self::new))
+		fields.add_cached_field("urn", |_, me| Ok(me.urn().to_owned()));
+		fields.add_cached_field("base", |_, me| {
+			Ok(Some(me.base()).filter(|u| !u.loc().is_empty()).map(Self::from))
 		});
-		cached_field!(fields, parent, |_, me| Ok(me.parent().map(Self::new)));
+		fields.add_cached_field("parent", |_, me| Ok(me.parent().map(Self::from)));
 
-		cached_field!(fields, scheme, |_, me| Ok(Scheme::new(me.scheme())));
-		cached_field!(fields, domain, |lua, me| {
+		fields.add_cached_field("scheme", |_, me| Ok(me.scheme().to_owned()));
+		fields.add_cached_field("domain", |lua, me| {
 			me.scheme().domain().map(|s| lua.create_string(s)).transpose()
 		});
 
-		cached_field!(fields, cache, |_, me| Ok(me.cache().map(Path::new)));
-
 		fields.add_field_method_get("is_regular", |_, me| Ok(me.is_regular()));
 		fields.add_field_method_get("is_search", |_, me| Ok(me.is_search()));
 		fields.add_field_method_get("is_archive", |_, me| Ok(me.is_archive()));
@@ -198,17 +120,15 @@ impl UserData for Url {
 
 	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
 		methods.add_method("ends_with", |_, me, child: Value| me.ends_with(child));
-		methods.add_method("hash", |_, me, long: Option<bool>| me.hash(long));
 		methods.add_method("join", |lua, me, other: Value| me.join(lua, other));
 		methods.add_method("starts_with", |_, me, base: Value| me.starts_with(base));
 		methods.add_method("strip_prefix", |_, me, base: Value| me.strip_prefix(base));
 
 		methods.add_function("into_search", |_, (ud, domain): (AnyUserData, mlua::String)| {
-			let url = ud.take::<Self>()?.inner.into_search(domain.to_str()?).into_lua_err()?;
-			Ok(Self::new(url))
+			ud.take::<Self>()?.into_search(domain.to_str()?).into_lua_err()
 		});
 
-		methods.add_meta_method(MetaMethod::Eq, |_, me, other: UrlRef| Ok(me.inner == other.inner));
+		methods.add_meta_method(MetaMethod::Eq, |_, me, other: UrlRef| Ok(*me == *other));
 		methods.add_meta_method(MetaMethod::ToString, |lua, me, ()| {
 			lua.create_string(me.to_strand().encoded_bytes())
 		});
@@ -216,4 +136,13 @@ impl UserData for Url {
 			lua.create_external_string([lhs.to_strand().encoded_bytes(), &rhs.as_bytes()].concat())
 		});
 	}
+
+	fn register(registry: &mut UserDataRegistry<Self>) {
+		Self::add_fields(registry);
+		Self::add_methods(registry);
+
+		for inv in inventory::iter::<UrlBufInventory>() {
+			(inv.register)(registry);
+		}
+	}
 }
diff --git a/yazi-shared/src/url/mod.rs b/yazi-shared/src/url/mod.rs
index 6d7f2bd8..719b1e01 100644
--- a/yazi-shared/src/url/mod.rs
+++ b/yazi-shared/src/url/mod.rs
@@ -1 +1 @@
-yazi_macro::mod_flat!(buf component components cov cow de display encode like traits url);
+yazi_macro::mod_flat!(buf component components cov cow de display encode inventory like lua traits url);
diff --git a/yazi-shim/Cargo.toml b/yazi-shim/Cargo.toml
index b6154dea..6c07000c 100644
--- a/yazi-shim/Cargo.toml
+++ b/yazi-shim/Cargo.toml
@@ -20,15 +20,19 @@ vendored-lua = [ "mlua/vendored" ]
 yazi-macro = { path = "../yazi-macro", version = "26.5.6" }
 
 # External dependencies
-arc-swap      = { workspace = true }
-hashbrown     = { workspace = true }
-mlua          = { workspace = true }
-ratatui       = { workspace = true }
-serde         = { workspace = true }
-thiserror     = { workspace = true }
-toml          = { workspace = true }
-twox-hash     = { workspace = true }
-unicode-width = { workspace = true }
+anyhow           = { workspace = true }
+arc-swap         = { workspace = true }
+base64           = { workspace = true }
+hashbrown        = { workspace = true }
+mlua             = { workspace = true }
+percent-encoding = { workspace = true }
+ratatui-core     = { workspace = true }
+ratatui-widgets  = { workspace = true }
+serde            = { workspace = true }
+thiserror        = { workspace = true }
+toml             = { workspace = true }
+twox-hash        = { workspace = true }
+unicode-width    = { workspace = true }
 
 [dependencies.unicode-segmentation]
-version = "1.13.2"
+version = "1.13.3"
diff --git a/yazi-shim/src/base64.rs b/yazi-shim/src/base64.rs
new file mode 100644
index 00000000..c3f6dae0
--- /dev/null
+++ b/yazi-shim/src/base64.rs
@@ -0,0 +1,8 @@
+use base64::{alphabet::STANDARD, engine::{DecodePaddingMode, GeneralPurpose, GeneralPurposeConfig}};
+
+pub const BASE64_SANE: GeneralPurpose = GeneralPurpose::new(
+	&STANDARD,
+	GeneralPurposeConfig::new()
+		.with_encode_padding(false)
+		.with_decode_padding_mode(DecodePaddingMode::Indifferent),
+);
diff --git a/yazi-fs/src/error/error.rs b/yazi-shim/src/fs/error.rs
similarity index 97%
rename from yazi-fs/src/error/error.rs
rename to yazi-shim/src/fs/error.rs
index a017ae54..55e7796a 100644
--- a/yazi-fs/src/error/error.rs
+++ b/yazi-shim/src/fs/error.rs
@@ -2,7 +2,7 @@ use std::{fmt, io, sync::Arc};
 
 use anyhow::Result;
 
-use crate::error::{kind_from_str, kind_to_str};
+use crate::fs::{kind_from_str, kind_to_str};
 
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub enum Error {
diff --git a/yazi-fs/src/error/mod.rs b/yazi-shim/src/fs/mod.rs
similarity index 100%
rename from yazi-fs/src/error/mod.rs
rename to yazi-shim/src/fs/mod.rs
diff --git a/yazi-fs/src/error/serde.rs b/yazi-shim/src/fs/serde.rs
similarity index 100%
rename from yazi-fs/src/error/serde.rs
rename to yazi-shim/src/fs/serde.rs
diff --git a/yazi-shim/src/lib.rs b/yazi-shim/src/lib.rs
index ad4cb83b..6a1c09c3 100644
--- a/yazi-shim/src/lib.rs
+++ b/yazi-shim/src/lib.rs
@@ -1,6 +1,6 @@
-yazi_macro::mod_pub!(arc_swap cell mlua path ratatui serde strum toml vec);
+yazi_macro::mod_pub!(arc_swap cell fs mlua path ratatui serde strum toml vec wtf8);
 
-yazi_macro::mod_flat!(twox utf8);
+yazi_macro::mod_flat!(base64 percent_encoding sstr twox utf8);
 
 #[cfg(windows)]
 yazi_macro::mod_flat!(win32);
diff --git a/yazi-shim/src/mlua/cache.rs b/yazi-shim/src/mlua/cache.rs
new file mode 100644
index 00000000..5897fc56
--- /dev/null
+++ b/yazi-shim/src/mlua/cache.rs
@@ -0,0 +1,9 @@
+use mlua::{Error::UserDataDestructed, Value};
+
+pub(super) fn is_alive(v: &Value) -> bool {
+	if let Value::UserData(ud) = v {
+		!matches!(ud.borrow::<()>(), Err(UserDataDestructed))
+	} else {
+		true
+	}
+}
diff --git a/yazi-binding/src/utils.rs b/yazi-shim/src/mlua/metatable.rs
similarity index 55%
rename from yazi-binding/src/utils.rs
rename to yazi-shim/src/mlua/metatable.rs
index c48f3173..52cada49 100644
--- a/yazi-binding/src/utils.rs
+++ b/yazi-shim/src/mlua/metatable.rs
@@ -1,7 +1,4 @@
-use mlua::{IntoLua, Lua, SerializeOptions, Table, Value};
-
-pub const SER_OPT: SerializeOptions =
-	SerializeOptions::new().serialize_none_to_null(false).serialize_unit_to_null(false);
+use mlua::{IntoLua, Lua, Table, Value};
 
 pub fn get_metatable(lua: &Lua, value: impl IntoLua) -> mlua::Result<Table> {
 	let (_, mt): (Value, Table) = unsafe {
diff --git a/yazi-shim/src/mlua/mod.rs b/yazi-shim/src/mlua/mod.rs
index ff9b6f21..ba69ae66 100644
--- a/yazi-shim/src/mlua/mod.rs
+++ b/yazi-shim/src/mlua/mod.rs
@@ -1 +1 @@
-yazi_macro::mod_flat!(traits);
+yazi_macro::mod_flat!(cache metatable sequence ser string traits);
diff --git a/yazi-shim/src/mlua/sequence.rs b/yazi-shim/src/mlua/sequence.rs
new file mode 100644
index 00000000..d6d0f108
--- /dev/null
+++ b/yazi-shim/src/mlua/sequence.rs
@@ -0,0 +1,49 @@
+use std::marker::PhantomData;
+
+use mlua::{FromLua, Integer, IntoLua, Lua, Table, ffi};
+
+// mlua's `TableSequence<'_, V>` holds `table: &'a Table` and cannot be Clone.
+// By owning both `Lua` and `Table` (both are reference-counted; Clone = two
+// atomic increments) we get a Clone-able sequence iterator with zero heap
+// allocation.
+//
+// `next()` acquires the Lua lock once per element (same as `raw_get`), but uses
+// `lua_rawgeti` to skip the separate integer key push that `raw_get` requires.
+// Holding the lock across all elements (as `TableSequence` does) is not
+// possible here because `LuaGuard` is `pub(crate)` and cannot be stored in
+// Clone types outside mlua.
+#[derive(Clone)]
+pub struct SequenceIter<V> {
+	pub(super) lua:      Lua,
+	pub(super) table:    Table,
+	pub(super) index:    Integer,
+	pub(super) _phantom: PhantomData<V>,
+}
+
+impl<V: FromLua> Iterator for SequenceIter<V> {
+	type Item = mlua::Result<V>;
+
+	fn next(&mut self) -> Option<mlua::Result<V>> {
+		self.index += 1;
+		self.lua.exec_raw_lua(|lua| {
+			unsafe {
+				let state = lua.state();
+				if ffi::lua_checkstack(state, 2) == 0 {
+					return Some(Err(mlua::Error::StackError));
+				}
+
+				if let Err(e) = <&Table as IntoLua>::push_into_stack(&self.table, lua) {
+					return Some(Err(e));
+				};
+
+				let result = match ffi::lua_rawgeti(state, -1, self.index) {
+					ffi::LUA_TNIL => None,
+					_ => Some(<V as FromLua>::from_stack(-1, lua)),
+				};
+
+				ffi::lua_pop(state, 2); // table + value
+				result
+			}
+		})
+	}
+}
diff --git a/yazi-shim/src/mlua/ser.rs b/yazi-shim/src/mlua/ser.rs
new file mode 100644
index 00000000..f7c55eb2
--- /dev/null
+++ b/yazi-shim/src/mlua/ser.rs
@@ -0,0 +1,4 @@
+use mlua::SerializeOptions;
+
+pub const SER_OPT: SerializeOptions =
+	SerializeOptions::new().serialize_none_to_null(false).serialize_unit_to_null(false);
diff --git a/yazi-shim/src/mlua/string.rs b/yazi-shim/src/mlua/string.rs
new file mode 100644
index 00000000..176ecb79
--- /dev/null
+++ b/yazi-shim/src/mlua/string.rs
@@ -0,0 +1,26 @@
+use std::{fmt, ops::Deref};
+
+use mlua::{FromLua, IntoLua, Lua, Value};
+
+#[derive(Clone)]
+pub struct ByteString(mlua::String);
+
+impl Deref for ByteString {
+	type Target = mlua::String;
+
+	fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+impl fmt::Display for ByteString {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { self.0.display().fmt(f) }
+}
+
+impl FromLua for ByteString {
+	fn from_lua(value: Value, lua: &Lua) -> mlua::Result<Self> {
+		Ok(Self(mlua::String::from_lua(value, lua)?))
+	}
+}
+
+impl IntoLua for ByteString {
+	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> { self.0.into_lua(lua) }
+}
diff --git a/yazi-shim/src/mlua/traits.rs b/yazi-shim/src/mlua/traits.rs
index 992430b0..82488cba 100644
--- a/yazi-shim/src/mlua/traits.rs
+++ b/yazi-shim/src/mlua/traits.rs
@@ -1,7 +1,10 @@
-use mlua::{ExternalError, Table, Value};
+use std::marker::PhantomData;
 
-use crate::toml::DeserializeOverWith;
+use mlua::{ExternalError, FromLua, IntoLua, Lua, Table, UserData, UserDataFields, Value};
 
+use crate::{mlua::{SequenceIter, is_alive}, toml::DeserializeOverWith};
+
+// --- DeserializeOverLua
 pub trait DeserializeOverLua: DeserializeOverWith {
 	fn deserialize_over_lua(self, table: &Table) -> mlua::Result<Self> {
 		let de = mlua::serde::Deserializer::new(Value::Table(table.clone()));
@@ -10,3 +13,83 @@ pub trait DeserializeOverLua: DeserializeOverWith {
 }
 
 impl<T: DeserializeOverWith> DeserializeOverLua for T {}
+
+// --- LuaTableExt
+pub trait LuaTableExt {
+	fn sequence_iter<V: FromLua>(&self, lua: &Lua) -> SequenceIter<V>;
+}
+
+impl LuaTableExt for Table {
+	fn sequence_iter<V: FromLua>(&self, lua: &Lua) -> SequenceIter<V> {
+		SequenceIter {
+			lua:      lua.clone(),
+			table:    self.clone(),
+			index:    0,
+			_phantom: PhantomData,
+		}
+	}
+}
+
+// --- UserDataFieldsExt
+pub trait UserDataFieldsExt<S: UserData + 'static>: UserDataFields<S> {
+	fn add_cached_field<R: IntoLua + 'static>(
+		&mut self,
+		key: &'static str,
+		compute: fn(&Lua, &S) -> mlua::Result<R>,
+	) -> &mut Self {
+		self.add_field_function_get(key, move |lua, ud| {
+			match ud.named_user_value::<Option<Value>>(key)? {
+				Some(v) if is_alive(&v) => Ok(v),
+				_ => {
+					let v = compute(lua, &*ud.borrow::<S>()?)?.into_lua(lua)?;
+					ud.set_named_user_value(key, &v)?;
+					Ok(v)
+				}
+			}
+		});
+		self
+	}
+
+	fn add_cached_field_mut<R: IntoLua + 'static>(
+		&mut self,
+		key: &'static str,
+		compute: fn(&Lua, &mut S) -> mlua::Result<R>,
+	) -> &mut Self {
+		self.add_field_function_get(key, move |lua, ud| {
+			match ud.named_user_value::<Option<Value>>(key)? {
+				Some(Value::Error(e)) => Err(*e),
+				Some(v) if is_alive(&v) => Ok(v),
+				_ => {
+					let v = match compute(lua, &mut *ud.borrow_mut::<S>()?).and_then(|r| r.into_lua(lua)) {
+						Ok(v) => v,
+						Err(e) => Value::Error(Box::new(e)),
+					};
+
+					ud.set_named_user_value(key, &v)?;
+					Ok(v)
+				}
+			}
+		});
+		self
+	}
+
+	fn add_static_field<R: IntoLua + 'static>(
+		&mut self,
+		key: &'static str,
+		compute: fn(&Lua, &S) -> mlua::Result<R>,
+	) -> &mut Self {
+		self.add_field_function_get(key, move |lua, ud| {
+			match ud.named_user_value::<Option<Value>>(key)? {
+				Some(v) => Ok(v),
+				_ => {
+					let v = compute(lua, &*ud.borrow::<S>()?)?.into_lua(lua)?;
+					ud.set_named_user_value(key, &v)?;
+					Ok(v)
+				}
+			}
+		});
+		self
+	}
+}
+
+impl<S: UserData + 'static, F: UserDataFields<S>> UserDataFieldsExt<S> for F {}
diff --git a/yazi-shim/src/percent_encoding.rs b/yazi-shim/src/percent_encoding.rs
new file mode 100644
index 00000000..24e9ce54
--- /dev/null
+++ b/yazi-shim/src/percent_encoding.rs
@@ -0,0 +1,20 @@
+use percent_encoding::{AsciiSet, CONTROLS};
+
+// RFC 3986 path component: encode everything that is not a safe path character.
+// Safe chars: unreserved (A-Za-z0-9 -._~) + sub-delims (!$&'()*+,;=) + : @ /
+pub const RFC_3986: &AsciiSet = &CONTROLS
+	.add(b' ')
+	.add(b'"')
+	.add(b'#')
+	.add(b'%')
+	.add(b'<')
+	.add(b'>')
+	.add(b'?')
+	.add(b'[')
+	.add(b'\\')
+	.add(b']')
+	.add(b'^')
+	.add(b'`')
+	.add(b'{')
+	.add(b'|')
+	.add(b'}');
diff --git a/yazi-shim/src/ratatui/line.rs b/yazi-shim/src/ratatui/line.rs
index 554e9545..ef714fe8 100644
--- a/yazi-shim/src/ratatui/line.rs
+++ b/yazi-shim/src/ratatui/line.rs
@@ -1,6 +1,7 @@
 use std::{boxed::Box, iter, slice::Iter, str::{self, Lines}};
 
-use ratatui::{layout::Alignment, style::Style, text::Line, widgets::Wrap};
+use ratatui_core::{layout::Alignment, style::Style, text::Line};
+use ratatui_widgets::paragraph::Wrap;
 
 use super::wrapper::{LineComposer, WordWrapper};
 use crate::ratatui::SpanIter;
diff --git a/yazi-shim/src/ratatui/mod.rs b/yazi-shim/src/ratatui/mod.rs
index ae7fd6e5..ecda8dca 100644
--- a/yazi-shim/src/ratatui/mod.rs
+++ b/yazi-shim/src/ratatui/mod.rs
@@ -1 +1 @@
-yazi_macro::mod_flat!(line span wrapper);
+yazi_macro::mod_flat!(line padding span wrapper);
diff --git a/yazi-shim/src/ratatui/padding.rs b/yazi-shim/src/ratatui/padding.rs
new file mode 100644
index 00000000..afe8969e
--- /dev/null
+++ b/yazi-shim/src/ratatui/padding.rs
@@ -0,0 +1,20 @@
+use ratatui_widgets::block::Padding;
+
+pub trait Padable {
+	fn padding(self, pad: impl Into<Padding>) -> Self;
+}
+
+impl Padable for ratatui_core::layout::Rect {
+	fn padding(self, padding: impl Into<Padding>) -> Self {
+		let p = padding.into();
+		let horizontal = p.left.saturating_add(p.right);
+		let vertical = p.top.saturating_add(p.bottom);
+
+		Self {
+			x:      self.x.saturating_add(p.left),
+			y:      self.y.saturating_add(p.top),
+			width:  self.width.saturating_sub(horizontal),
+			height: self.height.saturating_sub(vertical),
+		}
+	}
+}
diff --git a/yazi-shim/src/ratatui/span.rs b/yazi-shim/src/ratatui/span.rs
index 17eaf114..e2586703 100644
--- a/yazi-shim/src/ratatui/span.rs
+++ b/yazi-shim/src/ratatui/span.rs
@@ -1,6 +1,6 @@
 use std::slice::Iter;
 
-use ratatui::{style::Style, text::{Line, Span, StyledGrapheme}};
+use ratatui_core::{style::Style, text::{Line, Span, StyledGrapheme}};
 use unicode_segmentation::{Graphemes, UnicodeSegmentation};
 
 #[allow(private_interfaces)]
diff --git a/yazi-shim/src/ratatui/wrapper.rs b/yazi-shim/src/ratatui/wrapper.rs
index da71da7b..44723cf9 100644
--- a/yazi-shim/src/ratatui/wrapper.rs
+++ b/yazi-shim/src/ratatui/wrapper.rs
@@ -1,7 +1,7 @@
 // Copied from https://github.com/ratatui/ratatui/blob/main/ratatui-widgets/src/reflow.rs
 use std::{collections::VecDeque, mem};
 
-use ratatui::{layout::Alignment, text::StyledGrapheme};
+use ratatui_core::{layout::Alignment, text::StyledGrapheme};
 use unicode_width::UnicodeWidthStr;
 
 pub trait LineComposer<'a> {
diff --git a/yazi-shared/src/alias.rs b/yazi-shim/src/sstr.rs
similarity index 100%
rename from yazi-shared/src/alias.rs
rename to yazi-shim/src/sstr.rs
diff --git a/yazi-shared/src/wtf8/mod.rs b/yazi-shim/src/wtf8/mod.rs
similarity index 100%
rename from yazi-shared/src/wtf8/mod.rs
rename to yazi-shim/src/wtf8/mod.rs
diff --git a/yazi-shared/src/wtf8/validator.rs b/yazi-shim/src/wtf8/validator.rs
similarity index 100%
rename from yazi-shared/src/wtf8/validator.rs
rename to yazi-shim/src/wtf8/validator.rs
diff --git a/yazi-shared/src/wtf8/wtf8.rs b/yazi-shim/src/wtf8/wtf8.rs
similarity index 100%
rename from yazi-shared/src/wtf8/wtf8.rs
rename to yazi-shim/src/wtf8/wtf8.rs
diff --git a/yazi-term/Cargo.toml b/yazi-term/Cargo.toml
index 7d2a506d..a41e5553 100644
--- a/yazi-term/Cargo.toml
+++ b/yazi-term/Cargo.toml
@@ -22,8 +22,10 @@ anyhow      = { workspace = true }
 base64      = { workspace = true }
 bitflags    = { workspace = true }
 futures     = { workspace = true }
+mlua        = { workspace = true }
 parking_lot = { workspace = true }
-ratatui     = { workspace = true }
+serde       = { workspace = true }
+strum       = { workspace = true }
 thiserror   = { workspace = true }
 tokio       = { workspace = true }
 
diff --git a/yazi-term/src/dimension.rs b/yazi-term/src/dimension.rs
index 9cb9c7ce..9b54531f 100644
--- a/yazi-term/src/dimension.rs
+++ b/yazi-term/src/dimension.rs
@@ -31,6 +31,8 @@ impl Dimension {
 		}
 	}
 
+	pub fn area(self) -> (u16, u16) { (self.cols, self.rows) }
+
 	pub fn ratio(self) -> Option<(f64, f64)> {
 		if self.rows == 0 || self.cols == 0 || self.width == 0 || self.height == 0 {
 			None
diff --git a/yazi-term/src/error.rs b/yazi-term/src/error.rs
index 3d376b36..8d9cf715 100644
--- a/yazi-term/src/error.rs
+++ b/yazi-term/src/error.rs
@@ -1,4 +1,4 @@
-use std::str;
+use std::{num, str};
 
 pub type Result<T, E = ParseError> = std::result::Result<T, E>;
 
@@ -19,3 +19,7 @@ pub enum ParseError {
 impl From<str::Utf8Error> for ParseError {
 	fn from(_: str::Utf8Error) -> Self { Self::Invalid }
 }
+
+impl From<num::ParseIntError> for ParseError {
+	fn from(_: num::ParseIntError) -> Self { Self::Invalid }
+}
diff --git a/yazi-term/src/event/dnd.rs b/yazi-term/src/event/dnd.rs
new file mode 100644
index 00000000..d3c81b6a
--- /dev/null
+++ b/yazi-term/src/event/dnd.rs
@@ -0,0 +1,237 @@
+use std::str::SplitWhitespace;
+
+use base64::Engine;
+use strum::{FromRepr, IntoStaticStr};
+use yazi_shim::BASE64_SANE;
+
+use crate::parser::StateOsc72;
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum DndEvent {
+	// Drag
+	DragOffer(DndDragOffer),
+	DragAccept(DndDragAccept),
+	DragChange(DndDragChange),
+	DragLand,
+	DragEnd(DndDragEnd),
+	DragSend(DndDragSend),
+	DragError(DndDragError),
+
+	// Drop
+	DropEnter(DndDropEnter),
+	DropLeave,
+	DropReady(DndDropReady),
+	DropArrive(DndDropArrive),
+	DropError(DndDropError),
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct DndDragOffer {
+	pub x: u32,
+	pub y: u32,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct DndDragAccept {
+	pub idx: u8,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct DndDragChange {
+	pub op: DndOp,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct DndDragEnd {
+	pub canceled: bool,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct DndDragSend {
+	pub idx: u8,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct DndDragError {
+	pub idx:  u8,
+	pub name: String,
+	pub desc: String,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct DndDropEnter {
+	pub x:     u32,
+	pub y:     u32,
+	pub op:    DndOp,
+	pub mimes: DndMimeList,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct DndDropReady {
+	pub x:     u32,
+	pub y:     u32,
+	pub op:    DndOp,
+	pub mimes: DndMimeList,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct DndDropArrive {
+	pub idx:  u8,
+	pub data: Vec<u8>,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct DndDropError {
+	pub idx:  u8,
+	pub name: String,
+	pub desc: String,
+}
+
+impl DndEvent {
+	pub fn r#type(&self) -> &'static str {
+		match self {
+			Self::DragOffer(_) => "offer",
+			Self::DragAccept(_) => "accept",
+			Self::DragChange(_) => "change",
+			Self::DragLand => "land",
+			Self::DragEnd(_) => "end",
+			Self::DragSend(_) => "send",
+			Self::DragError(_) => "error",
+
+			Self::DropEnter(_) => "enter",
+			Self::DropLeave => "leave",
+			Self::DropReady(_) => "ready",
+			Self::DropArrive(_) => "arrive",
+			Self::DropError(_) => "error",
+		}
+	}
+
+	pub fn x(&self) -> Option<u32> {
+		match self {
+			Self::DragOffer(e) => Some(e.x),
+			Self::DropEnter(e) => Some(e.x),
+			Self::DropReady(e) => Some(e.x),
+			_ => None,
+		}
+	}
+
+	pub fn y(&self) -> Option<u32> {
+		match self {
+			Self::DragOffer(e) => Some(e.y),
+			Self::DropEnter(e) => Some(e.y),
+			Self::DropReady(e) => Some(e.y),
+			_ => None,
+		}
+	}
+
+	pub fn idx(&self) -> Option<u8> {
+		match self {
+			Self::DragAccept(e) => Some(e.idx),
+			Self::DragSend(e) => Some(e.idx),
+			Self::DragError(e) => Some(e.idx),
+			Self::DropArrive(e) => Some(e.idx),
+			Self::DropError(e) => Some(e.idx),
+			_ => None,
+		}
+	}
+
+	pub fn op(&self) -> Option<DndOp> {
+		match self {
+			Self::DragChange(e) => Some(e.op),
+			Self::DropEnter(e) => Some(e.op),
+			Self::DropReady(e) => Some(e.op),
+			_ => None,
+		}
+	}
+
+	pub fn mimes(&self) -> Option<&DndMimeList> {
+		match self {
+			Self::DropEnter(e) => Some(&e.mimes),
+			Self::DropReady(e) => Some(&e.mimes),
+			_ => None,
+		}
+	}
+
+	pub fn is_drag(&self) -> bool {
+		matches!(
+			self,
+			Self::DragOffer(_)
+				| Self::DragAccept(_)
+				| Self::DragChange(_)
+				| Self::DragLand
+				| Self::DragEnd(_)
+				| Self::DragSend(_)
+				| Self::DragError(_)
+		)
+	}
+
+	pub(crate) fn from_state(s: StateOsc72) -> Option<Self> {
+		Some(match s.r#type.unwrap_or_default() {
+			// Drag
+			b'o' => Self::DragOffer(DndDragOffer { x: s.x?.try_into().ok()?, y: s.y?.try_into().ok()? }),
+			b'e' if s.x? == 1 => Self::DragAccept(DndDragAccept { idx: s.y?.try_into().ok()? }),
+			b'e' if s.x? == 2 => Self::DragChange(DndDragChange { op: DndOp::from_repr(s.op?)? }),
+			b'e' if s.x? == 3 => Self::DragLand,
+			b'e' if s.x? == 4 => Self::DragEnd(DndDragEnd { canceled: s.y? != 0 }),
+			b'e' if s.x? == 5 => Self::DragSend(DndDragSend { idx: s.y?.try_into().ok()? }),
+			b'E' => {
+				let (name, desc) = parse_error(s.payload)?;
+				Self::DragError(DndDragError { idx: s.y?.try_into().ok()?, name, desc })
+			}
+
+			// Drop
+			b'm' if s.x == Some(-1) && s.y == Some(-1) => Self::DropLeave,
+			b'm' => Self::DropEnter(DndDropEnter {
+				x:     s.x?.try_into().ok()?,
+				y:     s.y?.try_into().ok()?,
+				op:    DndOp::from_repr(s.op?)?,
+				mimes: DndMimeList::new(s.payload)?,
+			}),
+			b'M' => Self::DropReady(DndDropReady {
+				x:     s.x?.try_into().ok()?,
+				y:     s.y?.try_into().ok()?,
+				op:    DndOp::from_repr(s.op?)?,
+				mimes: DndMimeList::new(s.payload)?,
+			}),
+			b'r' => Self::DropArrive(DndDropArrive {
+				idx:  s.x?.try_into().ok()?,
+				data: BASE64_SANE.decode(&s.payload).ok()?,
+			}),
+			b'R' => {
+				let (name, desc) = parse_error(s.payload)?;
+				Self::DropError(DndDropError { idx: s.x?.try_into().ok()?, name, desc })
+			}
+
+			_ => return None,
+		})
+	}
+}
+
+// --- Operation
+#[derive(Clone, Copy, Debug, Eq, FromRepr, IntoStaticStr, PartialEq)]
+#[repr(u8)]
+pub enum DndOp {
+	Copy   = 1,
+	Move   = 2,
+	Either = 3,
+}
+
+// --- MIME list
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct DndMimeList(String);
+
+impl DndMimeList {
+	pub fn new(b: Vec<u8>) -> Option<Self> { Some(Self(String::from_utf8(b).ok()?)) }
+
+	pub fn iter(&self) -> SplitWhitespace<'_> { self.0.split_whitespace() }
+}
+
+// --- Error payload parsing
+fn parse_error(payload: Vec<u8>) -> Option<(String, String)> {
+	let s = String::from_utf8(payload).ok()?;
+	Some(match s.split_once(':') {
+		Some((name, desc)) => (name.to_owned(), desc.to_owned()),
+		None if s.is_empty() => return None,
+		None => (s, String::new()),
+	})
+}
diff --git a/yazi-term/src/event/event.rs b/yazi-term/src/event/event.rs
index f83e0f05..0df95509 100644
--- a/yazi-term/src/event/event.rs
+++ b/yazi-term/src/event/event.rs
@@ -1,4 +1,4 @@
-use crate::{Dimension, event::{KeyEvent, MouseEvent}};
+use crate::{Dimension, event::{DndEvent, KeyEvent, MouseEvent}};
 
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub enum Event {
@@ -8,4 +8,5 @@ pub enum Event {
 	FocusIn,
 	FocusOut,
 	Paste(String),
+	Dnd(DndEvent),
 }
diff --git a/yazi-term/src/event/keyboard.rs b/yazi-term/src/event/keyboard.rs
index 7836230f..b94130da 100644
--- a/yazi-term/src/event/keyboard.rs
+++ b/yazi-term/src/event/keyboard.rs
@@ -1,9 +1,11 @@
 use bitflags::bitflags;
+use serde::{Deserialize, Serialize};
 
 use crate::{ParseError, Result, bail, event::Modifiers};
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq, Serialize)]
 pub struct KeyEvent {
+	#[serde(flatten)]
 	pub code:      KeyCode,
 	pub kind:      KeyEventKind,
 	pub modifiers: Modifiers,
@@ -14,6 +16,15 @@ impl KeyEvent {
 	pub const fn new(code: KeyCode, modifiers: Modifiers) -> Self {
 		Self { code, kind: KeyEventKind::Press, modifiers, state: KeyEventState::empty() }
 	}
+
+	pub fn plain(&self) -> Option<char> {
+		use Modifiers as M;
+
+		match self.code {
+			KeyCode::Char(c) if !self.modifiers.intersects(M::CONTROL | M::ALT | M::SUPER) => Some(c),
+			_ => None,
+		}
+	}
 }
 
 impl From<KeyCode> for KeyEvent {
@@ -28,7 +39,8 @@ impl From<KeyCode> for KeyEvent {
 }
 
 // --- Kind
-#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq, Serialize)]
+#[serde(rename_all = "lowercase")]
 pub enum KeyEventKind {
 	#[default]
 	Press,
@@ -48,7 +60,7 @@ impl KeyEventKind {
 
 // --- State
 bitflags! {
-	#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+	#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq, Serialize)]
 	pub struct KeyEventState: u8 {
 		const KEYPAD    = 1;
 		const CAPS_LOCK = 2;
@@ -71,7 +83,8 @@ impl KeyEventState {
 }
 
 // --- Code
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+#[derive(Clone, Copy, Debug, Default, Deserialize, Eq, Hash, PartialEq, Serialize)]
+#[serde(tag = "type", content = "value")]
 pub enum KeyCode {
 	Char(char),
 	Enter,
@@ -95,6 +108,7 @@ pub enum KeyCode {
 	PrintScreen,
 	Pause,
 	Menu,
+	#[default]
 	Null,
 	Fn(u8),
 	Modifier(ModifierKeyCode),
@@ -104,16 +118,16 @@ pub enum KeyCode {
 impl KeyCode {
 	pub(crate) fn from_xterm_modifier(r#final: u8) -> Result<Self> {
 		Ok(match r#final {
-			b'A' => KeyCode::Up,
-			b'B' => KeyCode::Down,
-			b'C' => KeyCode::Right,
-			b'D' => KeyCode::Left,
-			b'F' => KeyCode::End,
-			b'H' => KeyCode::Home,
-			b'P' => KeyCode::Fn(1),
-			b'Q' => KeyCode::Fn(2),
-			b'R' => KeyCode::Fn(3),
-			b'S' => KeyCode::Fn(4),
+			b'A' => Self::Up,
+			b'B' => Self::Down,
+			b'C' => Self::Right,
+			b'D' => Self::Left,
+			b'F' => Self::End,
+			b'H' => Self::Home,
+			b'P' => Self::Fn(1),
+			b'Q' => Self::Fn(2),
+			b'R' => Self::Fn(3),
+			b'S' => Self::Fn(4),
 			_ => bail!(),
 		})
 	}
@@ -217,7 +231,8 @@ impl KeyCode {
 }
 
 // --- Modifier key
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
+#[serde(untagged)]
 pub enum ModifierKeyCode {
 	LeftShift,
 	LeftControl,
@@ -250,7 +265,8 @@ impl ModifierKeyCode {
 }
 
 // --- Media key
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
+#[serde(untagged)]
 pub enum MediaKeyCode {
 	Play,
 	Pause,
diff --git a/yazi-term/src/event/lua.rs b/yazi-term/src/event/lua.rs
new file mode 100644
index 00000000..d6c4a8a1
--- /dev/null
+++ b/yazi-term/src/event/lua.rs
@@ -0,0 +1,62 @@
+use std::mem;
+
+use mlua::{IntoLua, Lua, LuaSerdeExt, UserData, UserDataFields, Value};
+use yazi_shim::{mlua::{SER_OPT, UserDataFieldsExt}, strum::IntoStr};
+
+use crate::event::{DndDropArrive, DndEvent, KeyEvent, MouseButton, MouseEvent, MouseEventKind};
+
+// --- DndEvent
+impl UserData for DndEvent {
+	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
+		fields.add_field_method_get("type", |_, me| Ok(me.r#type()));
+
+		fields.add_field_method_get("x", |_, me| Ok(me.x()));
+
+		fields.add_field_method_get("y", |_, me| Ok(me.y()));
+
+		fields.add_field_method_get("idx", |_, me| Ok(me.idx()));
+
+		fields.add_field_method_get("op", |_, me| Ok(me.op().map(IntoStr::into_str)));
+
+		fields.add_cached_field("mimes", |lua, me| {
+			if let Some(mimes) = me.mimes() {
+				lua.create_sequence_from(mimes.iter())?.into_lua(lua)
+			} else {
+				Ok(Value::Nil)
+			}
+		});
+
+		fields.add_cached_field_mut("data", |lua, me| match me {
+			Self::DropArrive(DndDropArrive { data, .. }) => {
+				lua.create_external_string(mem::take(data))?.into_lua(lua)
+			}
+			_ => Ok(Value::Nil),
+		});
+	}
+}
+
+// --- MouseEvent
+impl UserData for MouseEvent {
+	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
+		fields.add_field("type", "legacy");
+		fields.add_field_method_get("x", |_, me| Ok(me.column));
+		fields.add_field_method_get("y", |_, me| Ok(me.row));
+		fields.add_field_method_get("is_left", |_, me| {
+			use MouseEventKind as K;
+			Ok(matches!(me.kind, K::Down(b) | K::Up(b) | K::Drag(b) if b == MouseButton::Left))
+		});
+		fields.add_field_method_get("is_right", |_, me| {
+			use MouseEventKind as K;
+			Ok(matches!(me.kind, K::Down(b) | K::Up(b) | K::Drag(b) if b == MouseButton::Right))
+		});
+		fields.add_field_method_get("is_middle", |_, me| {
+			use MouseEventKind as K;
+			Ok(matches!(me.kind, K::Down(b) | K::Up(b) | K::Drag(b) if b == MouseButton::Middle))
+		});
+	}
+}
+
+// --- KeyEvent
+impl IntoLua for KeyEvent {
+	fn into_lua(self, lua: &Lua) -> mlua::Result<Value> { lua.to_value_with(&self, SER_OPT) }
+}
diff --git a/yazi-term/src/event/mod.rs b/yazi-term/src/event/mod.rs
index 6a7bbaf9..54533203 100644
--- a/yazi-term/src/event/mod.rs
+++ b/yazi-term/src/event/mod.rs
@@ -1 +1 @@
-yazi_macro::mod_flat!(event keyboard modifiers mouse);
+yazi_macro::mod_flat!(dnd event keyboard lua modifiers mouse);
diff --git a/yazi-term/src/event/modifiers.rs b/yazi-term/src/event/modifiers.rs
index 97ecd1f6..e5990741 100644
--- a/yazi-term/src/event/modifiers.rs
+++ b/yazi-term/src/event/modifiers.rs
@@ -1,7 +1,8 @@
 use bitflags::bitflags;
+use serde::Serialize;
 
 bitflags! {
-	#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+	#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq, Serialize)]
 	pub struct Modifiers: u8 {
 		const SHIFT   = 1;
 		const ALT     = 2;
diff --git a/yazi-term/src/lib.rs b/yazi-term/src/lib.rs
index 9f4f9b38..2e26e75f 100644
--- a/yazi-term/src/lib.rs
+++ b/yazi-term/src/lib.rs
@@ -1,8 +1,8 @@
 mod macros;
 
-yazi_macro::mod_flat!(dimension error semaphore style term timeout);
+yazi_macro::mod_flat!(dimension error semaphore term timeout);
 
-yazi_macro::mod_pub!(event parser restorer sequence source stream terminal waker);
+yazi_macro::mod_pub!(event parser restorer source stream terminal waker);
 
 pub fn init() -> anyhow::Result<()> {
 	YIELD_TO_SUBPROCESS.init(tokio::sync::Semaphore::new(1));
diff --git a/yazi-term/src/parser/mod.rs b/yazi-term/src/parser/mod.rs
index cc7f5c59..72b7cbef 100644
--- a/yazi-term/src/parser/mod.rs
+++ b/yazi-term/src/parser/mod.rs
@@ -1,4 +1,4 @@
-yazi_macro::mod_flat!(csi ground parser state);
+yazi_macro::mod_flat!(csi ground osc parser state);
 
 #[cfg(windows)]
 yazi_macro::mod_flat!(windows);
diff --git a/yazi-term/src/parser/osc.rs b/yazi-term/src/parser/osc.rs
new file mode 100644
index 00000000..268dae2b
--- /dev/null
+++ b/yazi-term/src/parser/osc.rs
@@ -0,0 +1,40 @@
+use crate::{ParseError, Result, parser::{Parser, State}};
+
+impl Parser {
+	pub(super) fn parse_osc72(&mut self) -> Result<()> {
+		debug_assert!(self.seq.starts_with(b"\x1b]72;"));
+		debug_assert!(self.seq.ends_with(b"\x1b\\"));
+
+		let mut it = self.seq[5..self.seq.len() - 2].splitn(2, |&b| b == b';');
+		let meta = str::from_utf8(it.next().ok_or(ParseError::Invalid)?)?;
+		let payload = it.next().unwrap_or(&[]);
+
+		let State::Osc72(state) = &mut self.state else { unreachable!() };
+		state.has_more = false; // reset has_more for this new sequence
+
+		for part in meta.split(':') {
+			match part.split_once('=').ok_or(ParseError::Invalid)? {
+				("t", v) if let Some(b) = v.bytes().next() => state.r#type = Some(b),
+				("x", v) => state.x = Some(v.parse()?),
+				("y", v) => state.y = Some(v.parse()?),
+				("o", v) => state.op = Some(v.parse()?),
+				("m", "1") => state.has_more = true,
+				_ => {}
+			}
+		}
+
+		// For `t=r`, the presence of a payload indicates more data is coming,
+		// even if `m=1` is not set.
+		if state.r#type == Some(b'r') && !payload.is_empty() {
+			state.has_more = true;
+		}
+
+		// Limit payload size to 1MiB to prevent potential DoS
+		if state.payload.len() + payload.len() > 1 << 20 {
+			return Err(ParseError::Invalid);
+		}
+
+		state.payload.extend(payload);
+		Ok(())
+	}
+}
diff --git a/yazi-term/src/parser/parser.rs b/yazi-term/src/parser/parser.rs
index 826a3c94..79f2a6f2 100644
--- a/yazi-term/src/parser/parser.rs
+++ b/yazi-term/src/parser/parser.rs
@@ -1,13 +1,13 @@
-use std::{collections::VecDeque, num::NonZeroU8, str};
+use std::{collections::VecDeque, mem, num::NonZeroU8, str};
 
 use yazi_shim::utf8_char_width;
 
 use super::state::State;
-use crate::event::{Event, KeyCode, KeyEvent, Modifiers};
+use crate::event::{DndEvent, Event, KeyCode, KeyEvent, Modifiers};
 
 #[derive(Debug)]
 pub struct Parser {
-	state:             State,
+	pub(super) state:  State,
 	pub(super) seq:    Vec<u8>,
 	pub(crate) events: VecDeque<Event>,
 }
@@ -30,7 +30,7 @@ impl Parser {
 	}
 
 	fn step(&mut self, b: u8) {
-		match self.state {
+		match &self.state {
 			State::Ground => self.on_ground(b),
 			State::Esc => self.on_esc(b),
 			State::EscO => self.on_esco(b),
@@ -38,9 +38,10 @@ impl Parser {
 			State::NormalMouse => self.on_normal_mouse(b),
 			State::BracketedPaste => self.on_bracketed_paste(b),
 			State::Osc | State::OscSt => self.on_osc(b),
+			State::Osc72(_) => self.on_osc72(b),
 			State::Dcs | State::DcsSt => self.on_dcs(b),
-			State::Utf8(n) => self.on_utf8(b, n),
-			State::AltUtf8(n) => self.on_alt_utf8(b, n),
+			State::Utf8(n) => self.on_utf8(b, *n),
+			State::AltUtf8(n) => self.on_alt_utf8(b, *n),
 		}
 	}
 
@@ -51,9 +52,12 @@ impl Parser {
 	/// been seen but no follow-up bytes arrived), this emits a bare
 	/// [`KeyCode::Escape`] event and resets to [`State::Ground`].
 	pub fn flush(&mut self) {
-		if self.state == State::Esc {
-			self.emit_key(KeyCode::Escape);
+		match &self.state {
+			State::Esc => self.emit_key(KeyCode::Escape),
+			State::Osc72(s) if s.has_more => return,
+			_ => {}
 		}
+
 		self.reset();
 	}
 
@@ -193,8 +197,11 @@ impl Parser {
 	fn on_osc(&mut self, b: u8) {
 		self.seq.push(b);
 
-		match (self.state, b) {
+		match (&self.state, b) {
 			(State::Osc, b'\x07') => self.reset(), // BEL — OSC complete (discard)
+			(State::Osc, _) if self.seq.starts_with(b"\x1b]72;") => {
+				self.state = State::Osc72(Default::default());
+			}
 			(State::Osc, b'\x1B') => self.state = State::OscSt,
 			(State::Osc, _) => {}                         // keep accumulating
 			(State::OscSt, b'\\') => self.reset(),        // ST (`\x1B\\`) — OSC complete (discard)
@@ -204,10 +211,34 @@ impl Parser {
 		}
 	}
 
+	fn on_osc72(&mut self, b: u8) {
+		self.seq.push(b);
+
+		if !self.seq.ends_with(b"\x1b\\") {
+			return;
+		} else if self.parse_osc72().is_err() {
+			return self.reset();
+		}
+
+		match mem::take(&mut self.state) {
+			State::Osc72(s) if s.has_more => {
+				self.seq.clear();
+				self.state = State::Osc72(s);
+			}
+			State::Osc72(s) => {
+				if let Some(e) = DndEvent::from_state(s) {
+					self.emit(Event::Dnd(e));
+				}
+				self.reset();
+			}
+			_ => unreachable!(),
+		}
+	}
+
 	fn on_dcs(&mut self, b: u8) {
 		self.seq.push(b);
 
-		match (self.state, b) {
+		match (&self.state, b) {
 			(State::Dcs, b'\x1B') => self.state = State::DcsSt,
 			(State::Dcs, _) => {}
 			(State::DcsSt, b'\\') => self.reset(), // ST — DCS complete (discard)
diff --git a/yazi-term/src/parser/state.rs b/yazi-term/src/parser/state.rs
index 49780ccb..b2934f53 100644
--- a/yazi-term/src/parser/state.rs
+++ b/yazi-term/src/parser/state.rs
@@ -1,8 +1,9 @@
 use std::num::NonZeroU8;
 
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, PartialEq)]
 pub(crate) enum State {
 	/// Normal ground state.
+	#[default]
 	Ground,
 	/// Saw `\x1B`, waiting for the next byte.
 	Esc,
@@ -16,6 +17,8 @@ pub(crate) enum State {
 	BracketedPaste,
 	/// Inside an OSC sequence (`\x1B]` … BEL or ST).
 	Osc,
+	/// Inside an OSC 72 (DnD) sequence (`\x1B]72;` … ST).
+	Osc72(StateOsc72),
 	/// Inside OSC, just saw `\x1B` (potential start of ST = `\x1B\\`).
 	OscSt,
 	/// Inside a DCS sequence (`\x1BP` … ST).
@@ -27,3 +30,13 @@ pub(crate) enum State {
 	/// `\x1B` + mid-UTF-8 character: `n` continuation bytes still needed.
 	AltUtf8(NonZeroU8),
 }
+
+#[derive(Debug, Default, PartialEq)]
+pub(crate) struct StateOsc72 {
+	pub(crate) r#type:   Option<u8>,
+	pub(crate) x:        Option<i32>,
+	pub(crate) y:        Option<i32>,
+	pub(crate) op:       Option<u8>,
+	pub(crate) payload:  Vec<u8>,
+	pub(crate) has_more: bool,
+}
diff --git a/yazi-term/src/sequence/mod.rs b/yazi-term/src/sequence/mod.rs
deleted file mode 100644
index 5d166474..00000000
--- a/yazi-term/src/sequence/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-yazi_macro::mod_flat!(clipboard csi_u cursor erase mode query r#if restore_background set_background style sync);
diff --git a/yazi-term/src/sequence/restore_background.rs b/yazi-term/src/sequence/restore_background.rs
deleted file mode 100644
index 136fe8ac..00000000
--- a/yazi-term/src/sequence/restore_background.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-use std::fmt::{self, Display};
-
-/// Restore background color to default
-pub struct RestoreBackground;
-
-impl Display for RestoreBackground {
-	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "\x1b]111\x1b\\") }
-}
diff --git a/yazi-term/src/sequence/set_background.rs b/yazi-term/src/sequence/set_background.rs
deleted file mode 100644
index f6d944aa..00000000
--- a/yazi-term/src/sequence/set_background.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use std::fmt::{self, Display};
-
-/// Set background color to a RGB value or named color
-pub struct SetBackground<'a>(pub &'a str);
-
-impl Display for SetBackground<'_> {
-	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-		if self.0.is_empty() { Ok(()) } else { write!(f, "\x1b]11;{}\x1b\\", self.0) }
-	}
-}
diff --git a/yazi-term/src/source/unix.rs b/yazi-term/src/source/unix.rs
index ed1c2862..7e7f94a3 100644
--- a/yazi-term/src/source/unix.rs
+++ b/yazi-term/src/source/unix.rs
@@ -49,18 +49,22 @@ impl<'a> EventSource<'a> {
 		// Stop waiting for events.
 		if wakeup_ready {
 			while read_complete(&*self.waker, &mut [0u8; 1024])? != 0 {}
-			return Err(io::Error::from(io::ErrorKind::UnexpectedEof));
+			return Err(io::Error::from(io::ErrorKind::ConnectionAborted));
 		}
 
 		// More input is ready.
 		if read_ready {
 			let mut buf = [0u8; 1024];
+
 			let len = read_complete(&mut *reader, &mut buf)?;
+			if len == 0 {
+				return Err(io::Error::from(io::ErrorKind::UnexpectedEof));
+			}
 
 			let mut parser = self.parser.lock();
 			parser.parse(&buf[..len]);
 
-			if len > 0 && len < buf.len() {
+			if len < buf.len() {
 				parser.flush();
 			}
 			return Ok(());
diff --git a/yazi-term/src/source/windows.rs b/yazi-term/src/source/windows.rs
index a0cc3bde..072546a5 100644
--- a/yazi-term/src/source/windows.rs
+++ b/yazi-term/src/source/windows.rs
@@ -28,7 +28,7 @@ impl<'a> EventSource<'a> {
 			// More input is ready.
 			WAIT_OBJECT_0 => Ok(()),
 			// Stop waiting for events.
-			r if r == WAIT_OBJECT_0 + 1 => Err(io::Error::from(io::ErrorKind::UnexpectedEof)),
+			r if r == WAIT_OBJECT_0 + 1 => Err(io::Error::from(io::ErrorKind::ConnectionAborted)),
 			// Timeout expired.
 			WAIT_TIMEOUT => Err(io::Error::from(io::ErrorKind::TimedOut)),
 			// An error occurred.
diff --git a/yazi-term/src/stream/stream.rs b/yazi-term/src/stream/stream.rs
index 0f311008..ad83a29e 100644
--- a/yazi-term/src/stream/stream.rs
+++ b/yazi-term/src/stream/stream.rs
@@ -31,7 +31,10 @@ impl EventStream {
 							break;
 						}
 					}
-					Err(e) if e.kind() == io::ErrorKind::Interrupted => break,
+					// try_poll() already handles Interrupted, this is defensive.
+					Err(e) if e.kind() == io::ErrorKind::Interrupted => continue,
+					// event source was gracefully stopped, stop the stream as well.
+					Err(e) if e.kind() == io::ErrorKind::ConnectionAborted => break,
 					Err(e) => {
 						tx.send(Err(e)).ok();
 						break;
diff --git a/yazi-term/src/style.rs b/yazi-term/src/style.rs
deleted file mode 100644
index 10157c6e..00000000
--- a/yazi-term/src/style.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
-pub enum CursorStyle {
-	#[default]
-	Default           = 0,
-	BlinkingBlock     = 1,
-	SteadyBlock       = 2,
-	BlinkingUnderline = 3,
-	SteadyUnderline   = 4,
-	BlinkingBar       = 5,
-	SteadyBar         = 6,
-}
diff --git a/yazi-tty/Cargo.toml b/yazi-tty/Cargo.toml
index cd598d63..9931bf37 100644
--- a/yazi-tty/Cargo.toml
+++ b/yazi-tty/Cargo.toml
@@ -13,12 +13,17 @@ rust-version.workspace = true
 workspace = true
 
 [dependencies]
-yazi-macro = { path = "../yazi-macro", version = "26.5.6" }
-yazi-shim  = { path = "../yazi-shim", version = "26.5.6" }
+yazi-binding = { path = "../yazi-binding", version = "26.5.6" }
+yazi-macro   = { path = "../yazi-macro", version = "26.5.6" }
+yazi-shim    = { path = "../yazi-shim", version = "26.5.6" }
 
 # External dependencies
-parking_lot = { workspace = true }
-tracing     = { workspace = true }
+base64       = { workspace = true }
+bitflags     = { workspace = true }
+mlua         = { workspace = true }
+parking_lot  = { workspace = true }
+ratatui-core = { workspace = true }
+tracing      = { workspace = true }
 
 [target."cfg(unix)".dependencies]
 libc = { workspace = true }
diff --git a/yazi-tty/src/lib.rs b/yazi-tty/src/lib.rs
index c78441b8..341fe9b2 100644
--- a/yazi-tty/src/lib.rs
+++ b/yazi-tty/src/lib.rs
@@ -1,4 +1,6 @@
-yazi_macro::mod_flat!(handle reader tty writer);
+yazi_macro::mod_flat!(handle lua reader tty writer);
+
+yazi_macro::mod_pub!(sequence);
 
 pub static TTY: yazi_shim::cell::RoCell<Tty> = yazi_shim::cell::RoCell::new();
 
diff --git a/yazi-tty/src/lua.rs b/yazi-tty/src/lua.rs
new file mode 100644
index 00000000..70ae40ca
--- /dev/null
+++ b/yazi-tty/src/lua.rs
@@ -0,0 +1,77 @@
+use std::io::Write;
+
+use mlua::{BorrowedBytes, ExternalError, IntoLuaMulti, Lua, MultiValue, Table, UserData, UserDataMethods};
+use yazi_binding::Error;
+use yazi_shim::mlua::{ByteString, LuaTableExt};
+
+use crate::{Tty, sequence::{AgreeDrag, AgreeDrop, FinishDrop, PresentDrag, PresentDragIcon, StartDrag, StartDrop}};
+
+impl Tty {
+	fn queue(&self, lua: &Lua, kind: &[u8], t: &Table) -> mlua::Result<MultiValue> {
+		let mut w = self.writer();
+
+		let result = match kind {
+			b"Print" => {
+				write!(w, "{}", t.raw_get::<ByteString>(1)?)
+			}
+
+			// DnD
+			b"AgreeDrag" => {
+				let it = t.raw_get::<Table>("mimes")?.sequence_iter::<ByteString>(lua).flatten();
+				write!(w, "{}", match &*t.raw_get::<BorrowedBytes>("type")? {
+					b"copy" => AgreeDrag::Copy(it),
+					b"move" => AgreeDrag::Move(it),
+					b"either" => AgreeDrag::Either(it),
+					_ => return Err("invalid AgreeDrag type".into_lua_err()),
+				})
+			}
+			b"AgreeDrop" => {
+				let it = t.raw_get::<Table>("mimes")?.sequence_iter::<ByteString>(lua).flatten();
+				write!(w, "{}", match &*t.raw_get::<BorrowedBytes>("type")? {
+					b"reject" => AgreeDrop::Reject,
+					b"copy" => AgreeDrop::Copy(it),
+					b"move" => AgreeDrop::Move(it),
+					_ => return Err("invalid AgreeDrop type".into_lua_err()),
+				})
+			}
+			b"StartDrag" => write!(w, "{StartDrag}"),
+			b"StartDrop" => write!(w, "{}", StartDrop(t.raw_get("idx")?)),
+			b"PresentDrag" => {
+				write!(w, "{}", PresentDrag(t.raw_get("idx")?, &t.raw_get::<BorrowedBytes>("data")?))
+			}
+			b"PresentDragIcon" => {
+				write!(w, "{}", PresentDragIcon {
+					format:  t.raw_get("format")?,
+					opacity: t.raw_get("opacity")?,
+					width:   t.raw_get("width")?,
+					height:  t.raw_get("height")?,
+					data:    &t.raw_get::<BorrowedBytes>("data")?,
+				})
+			}
+			b"FinishDrop" => match &*t.raw_get::<BorrowedBytes>("type")? {
+				b"copy" => write!(w, "{}", FinishDrop::Copy),
+				b"move" => write!(w, "{}", FinishDrop::Move),
+				_ => return Err("invalid FinishDrop type".into_lua_err()),
+			},
+
+			_ => return Err("invalid sequence kind".into_lua_err()),
+		};
+
+		match result {
+			Ok(()) => true.into_lua_multi(lua),
+			Err(e) => (false, Error::Io(e)).into_lua_multi(lua),
+		}
+	}
+}
+
+impl UserData for &'static Tty {
+	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
+		methods
+			.add_method("queue", |lua, &me, (kind, t): (BorrowedBytes, Table)| me.queue(lua, &kind, &t));
+
+		methods.add_method("flush", |lua, &me, ()| match me.writer().flush() {
+			Ok(()) => true.into_lua_multi(lua),
+			Err(e) => (false, Error::Io(e)).into_lua_multi(lua),
+		});
+	}
+}
diff --git a/yazi-term/src/sequence/clipboard.rs b/yazi-tty/src/sequence/clipboard.rs
similarity index 100%
rename from yazi-term/src/sequence/clipboard.rs
rename to yazi-tty/src/sequence/clipboard.rs
diff --git a/yazi-term/src/sequence/csi_u.rs b/yazi-tty/src/sequence/csi_u.rs
similarity index 100%
rename from yazi-term/src/sequence/csi_u.rs
rename to yazi-tty/src/sequence/csi_u.rs
diff --git a/yazi-term/src/sequence/cursor.rs b/yazi-tty/src/sequence/cursor.rs
similarity index 73%
rename from yazi-term/src/sequence/cursor.rs
rename to yazi-tty/src/sequence/cursor.rs
index 67036c19..1581ccdd 100644
--- a/yazi-term/src/sequence/cursor.rs
+++ b/yazi-tty/src/sequence/cursor.rs
@@ -1,7 +1,5 @@
 use std::fmt::{self, Display};
 
-use crate::style::CursorStyle;
-
 /// Move cursor to 0-based (col, row) position
 pub struct MoveTo(pub u16, pub u16);
 
@@ -47,10 +45,20 @@ impl Display for SetTitle<'_> {
 }
 
 /// Set cursor style
-pub struct SetCursorStyle(pub u8);
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub enum SetCursorStyle {
+	#[default]
+	Default           = 0,
+	BlinkingBlock     = 1,
+	SteadyBlock       = 2,
+	BlinkingUnderline = 3,
+	SteadyUnderline   = 4,
+	BlinkingBar       = 5,
+	SteadyBar         = 6,
+}
 
 impl Display for SetCursorStyle {
-	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "\x1b[{} q", self.0) }
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "\x1b[{} q", *self as u8) }
 }
 
 /// Restore cursor shape and blink state
@@ -67,16 +75,15 @@ impl Display for RestoreCursorStyle {
 		};
 
 		let blink = shape_blink.unwrap_or(self.blink);
-		let style = match shape {
-			2 if blink => CursorStyle::BlinkingUnderline,
-			2 if !blink => CursorStyle::SteadyUnderline,
-			3 if blink => CursorStyle::BlinkingBar,
-			3 if !blink => CursorStyle::SteadyBar,
-			_ if blink => CursorStyle::Default,
-			_ if !blink => CursorStyle::SteadyBlock,
+		match shape {
+			2 if blink => SetCursorStyle::BlinkingUnderline,
+			2 if !blink => SetCursorStyle::SteadyUnderline,
+			3 if blink => SetCursorStyle::BlinkingBar,
+			3 if !blink => SetCursorStyle::SteadyBar,
+			_ if blink => SetCursorStyle::Default,
+			_ if !blink => SetCursorStyle::SteadyBlock,
 			_ => unreachable!(),
-		};
-
-		SetCursorStyle(style as u8).fmt(f)
+		}
+		.fmt(f)
 	}
 }
diff --git a/yazi-tty/src/sequence/dnd.rs b/yazi-tty/src/sequence/dnd.rs
new file mode 100644
index 00000000..9591ff17
--- /dev/null
+++ b/yazi-tty/src/sequence/dnd.rs
@@ -0,0 +1,173 @@
+use std::{fmt::{self, Display}, str};
+
+use base64::Engine;
+use yazi_shim::BASE64_SANE;
+
+use super::traits::Mimelist;
+
+/// Enable drag support: `OSC 72 ; t=o:x=1 ; machine id ST`
+pub struct EnableDrag<'a>(pub &'a str);
+
+impl Display for EnableDrag<'_> {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		write!(f, "\x1b]72;t=o:x=1;{}\x1b\\", self.0)
+	}
+}
+
+/// Enable drop support: `OSC 72 ; t=a ; MIME list ST`
+pub struct EnableDrop<M>(pub M);
+
+impl<M: Mimelist> Display for EnableDrop<M> {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		write!(f, "\x1b]72;t=a;{}\x1b\\", ListDndMimes(self.0.clone()))
+	}
+}
+
+/// Disable drag support: `OSC 72 ; t=o:x=2 ST`
+pub struct DisableDrag;
+
+impl Display for DisableDrag {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { f.write_str("\x1b]72;t=o:x=2\x1b\\") }
+}
+
+/// Disable drop support: `OSC 72 ; t=A ST`
+pub struct DisableDrop;
+
+impl Display for DisableDrop {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { f.write_str("\x1b]72;t=A\x1b\\") }
+}
+
+/// Agree drag: `OSC 72 ; t=o:o=operation ST`
+pub enum AgreeDrag<M> {
+	Copy(M),
+	Move(M),
+	Either(M),
+}
+
+impl<M: Mimelist> Display for AgreeDrag<M> {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		match self {
+			Self::Copy(mimes) => write!(f, "\x1b]72;t=o:o=1;{}\x1b\\", ListDndMimes(mimes.clone())),
+			Self::Move(mimes) => write!(f, "\x1b]72;t=o:o=2;{}\x1b\\", ListDndMimes(mimes.clone())),
+			Self::Either(mimes) => write!(f, "\x1b]72;t=o:o=3;{}\x1b\\", ListDndMimes(mimes.clone())),
+		}
+	}
+}
+
+/// Agree drop: `OSC 72 ; t=m:o=O ; MIME list ST`
+pub enum AgreeDrop<M> {
+	Reject,
+	Copy(M),
+	Move(M),
+}
+
+impl<M: Mimelist> Display for AgreeDrop<M> {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		match self {
+			Self::Reject => write!(f, "\x1b]72;t=m:o=0\x1b\\"),
+			Self::Copy(mimes) => write!(f, "\x1b]72;t=m:o=1;{}\x1b\\", ListDndMimes(mimes.clone())),
+			Self::Move(mimes) => write!(f, "\x1b]72;t=m:o=2;{}\x1b\\", ListDndMimes(mimes.clone())),
+		}
+	}
+}
+
+/// Start dragging: `OSC 72 ; t=P:x=-1 ST`
+pub struct StartDrag;
+
+impl Display for StartDrag {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { f.write_str("\x1b]72;t=P:x=-1\x1b\\") }
+}
+
+/// Start requesting dropped data: `OSC 72 ; t=r:x=idx ST`
+pub struct StartDrop(pub u8);
+
+impl Display for StartDrop {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		write!(f, "\x1b]72;t=r:x={}\x1b\\", self.0)
+	}
+}
+
+/// Present drag data: `OSC 72 ; t=p:x=idx ; base64 encoded data ST`
+pub struct PresentDrag<'a>(pub u8, pub &'a [u8]);
+
+impl Display for PresentDrag<'_> {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		let b64 = BASE64_SANE.encode(self.1).into_bytes();
+		let chunks = b64.len().div_ceil(4096);
+
+		for (i, chunk) in b64.chunks(4096).enumerate() {
+			let s = unsafe { str::from_utf8_unchecked(chunk) };
+			if i == 0 {
+				write!(f, "\x1b]72;t=p:x={}:m={};{s}\x1b\\", self.0, (chunks > 1) as u8)?;
+			} else {
+				write!(f, "\x1b]72;m={};{s}\x1b\\", (i + 1 < chunks) as u8)?;
+			}
+		}
+
+		write!(f, "\x1b]72;t=p:x={}\x1b\\", self.0)
+	}
+}
+
+/// Present drag icon data:
+/// `OSC 72 ; t=p:x=-1:y=fmt:X=width:Y=height:o=opacity ; base64 payload ST`
+pub struct PresentDragIcon<'a> {
+	pub format:  u8,
+	pub opacity: u16,
+	pub width:   u32,
+	pub height:  u32,
+	pub data:    &'a [u8],
+}
+
+impl Display for PresentDragIcon<'_> {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		let b64 = BASE64_SANE.encode(self.data).into_bytes();
+		let chunks = b64.len().div_ceil(4096);
+
+		for (i, chunk) in b64.chunks(4096).enumerate() {
+			let s = unsafe { str::from_utf8_unchecked(chunk) };
+			if i == 0 {
+				write!(
+					f,
+					"\x1b]72;t=p:x=-1:y={}:X={}:Y={}:o={}:m={};{s}\x1b\\",
+					self.format,
+					self.width,
+					self.height,
+					self.opacity,
+					(chunks > 1) as u8
+				)?;
+			} else {
+				write!(f, "\x1b]72;m={};{s}\x1b\\", (i + 1 < chunks) as u8)?;
+			}
+		}
+
+		Ok(())
+	}
+}
+
+/// Finish requesting dropped data: `OSC 72 ; t=r:o=operation ST`
+#[derive(Clone, Copy)]
+pub enum FinishDrop {
+	Copy = 1,
+	Move = 2,
+}
+
+impl Display for FinishDrop {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		write!(f, "\x1b]72;t=r:o={}\x1b\\", *self as u8)
+	}
+}
+
+/// Write MIME types separated by spaces.
+struct ListDndMimes<M>(pub M);
+
+impl<M: Mimelist> Display for ListDndMimes<M> {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		for (i, m) in self.0.clone().into_iter().enumerate() {
+			if i != 0 {
+				write!(f, " ")?;
+			}
+			write!(f, "{m}")?;
+		}
+		Ok(())
+	}
+}
diff --git a/yazi-term/src/sequence/erase.rs b/yazi-tty/src/sequence/erase.rs
similarity index 94%
rename from yazi-term/src/sequence/erase.rs
rename to yazi-tty/src/sequence/erase.rs
index dafd896a..659fe986 100644
--- a/yazi-term/src/sequence/erase.rs
+++ b/yazi-tty/src/sequence/erase.rs
@@ -1,6 +1,6 @@
 use std::fmt::{self, Display};
 
-use ratatui::backend::ClearType;
+use ratatui_core::backend::ClearType;
 
 /// Erase entire display
 pub struct EraseScreen;
diff --git a/yazi-term/src/sequence/if.rs b/yazi-tty/src/sequence/if.rs
similarity index 100%
rename from yazi-term/src/sequence/if.rs
rename to yazi-tty/src/sequence/if.rs
diff --git a/yazi-tty/src/sequence/mod.rs b/yazi-tty/src/sequence/mod.rs
new file mode 100644
index 00000000..b101ad74
--- /dev/null
+++ b/yazi-tty/src/sequence/mod.rs
@@ -0,0 +1 @@
+yazi_macro::mod_flat!(clipboard csi_u cursor dnd erase mode query r#if style sync traits);
diff --git a/yazi-term/src/sequence/mode.rs b/yazi-tty/src/sequence/mode.rs
similarity index 100%
rename from yazi-term/src/sequence/mode.rs
rename to yazi-tty/src/sequence/mode.rs
diff --git a/yazi-term/src/sequence/query.rs b/yazi-tty/src/sequence/query.rs
similarity index 100%
rename from yazi-term/src/sequence/query.rs
rename to yazi-tty/src/sequence/query.rs
diff --git a/yazi-term/src/sequence/style.rs b/yazi-tty/src/sequence/style.rs
similarity index 99%
rename from yazi-term/src/sequence/style.rs
rename to yazi-tty/src/sequence/style.rs
index 15e0988c..cf8c913b 100644
--- a/yazi-term/src/sequence/style.rs
+++ b/yazi-tty/src/sequence/style.rs
@@ -1,6 +1,6 @@
 use std::fmt::{self, Display};
 
-use ratatui::style::Color;
+use ratatui_core::style::Color;
 
 /// Set foreground color from a `Color`.
 pub struct SetFg(pub Color);
diff --git a/yazi-term/src/sequence/sync.rs b/yazi-tty/src/sequence/sync.rs
similarity index 100%
rename from yazi-term/src/sequence/sync.rs
rename to yazi-tty/src/sequence/sync.rs
diff --git a/yazi-tty/src/sequence/traits.rs b/yazi-tty/src/sequence/traits.rs
new file mode 100644
index 00000000..9911d60b
--- /dev/null
+++ b/yazi-tty/src/sequence/traits.rs
@@ -0,0 +1,11 @@
+use std::fmt::Display;
+
+/// Types that can be iterated to produce a list of MIME types.
+pub(super) trait Mimelist: IntoIterator<Item: Display> + Clone {}
+
+impl<T> Mimelist for T
+where
+	T: IntoIterator + Clone,
+	T::Item: Display,
+{
+}
diff --git a/yazi-tty/src/writer.rs b/yazi-tty/src/writer.rs
index ca997d63..e69d7f9f 100644
--- a/yazi-tty/src/writer.rs
+++ b/yazi-tty/src/writer.rs
@@ -1,4 +1,4 @@
-use std::{fmt::{self, Debug}, io::{self, BufWriter, Write}, ops::Deref};
+use std::{fmt::{self, Debug}, io::{self, BufWriter}, ops::Deref};
 
 use parking_lot::Mutex;
 
@@ -23,12 +23,6 @@ impl io::Write for TtyWriter<'_> {
 	fn flush(&mut self) -> io::Result<()> { self.0.lock().flush() }
 }
 
-impl fmt::Write for TtyWriter<'_> {
-	fn write_str(&mut self, s: &str) -> fmt::Result {
-		self.0.lock().write_all(s.as_bytes()).map_err(|_| fmt::Error)
-	}
-}
-
 #[cfg(unix)]
 impl std::os::fd::AsFd for TtyWriter<'_> {
 	fn as_fd(&self) -> std::os::fd::BorrowedFd<'_> {
diff --git a/yazi-tui/Cargo.toml b/yazi-tui/Cargo.toml
index 4a4f4f8d..d5440518 100644
--- a/yazi-tui/Cargo.toml
+++ b/yazi-tui/Cargo.toml
@@ -16,12 +16,13 @@ workspace = true
 yazi-config   = { path = "../yazi-config", version = "26.5.6" }
 yazi-emulator = { path = "../yazi-emulator", version = "26.5.6" }
 yazi-macro    = { path = "../yazi-macro", version = "26.5.6" }
+yazi-proxy    = { path = "../yazi-proxy", version = "26.5.6" }
 yazi-shared   = { path = "../yazi-shared", version = "26.5.6" }
 yazi-shim     = { path = "../yazi-shim", version = "26.5.6" }
 yazi-term     = { path = "../yazi-term", version = "26.5.6" }
 yazi-tty      = { path = "../yazi-tty", version = "26.5.9" }
 
 # External dependencies
-anyhow  = { workspace = true }
-ratatui = { workspace = true }
-tokio   = { workspace = true }
+anyhow       = { workspace = true }
+ratatui-core = { workspace = true }
+tokio        = { workspace = true }
diff --git a/yazi-tui/src/backend.rs b/yazi-tui/src/backend.rs
index f76fba60..4a90913d 100644
--- a/yazi-tui/src/backend.rs
+++ b/yazi-tui/src/backend.rs
@@ -1,8 +1,9 @@
 use std::{io::{self, Write}, ops::{Deref, DerefMut}};
 
-use ratatui::{backend::{Backend, ClearType, WindowSize}, buffer::Cell, layout::{Position, Size}, style::{Color, Modifier}};
+use ratatui_core::{backend::{Backend, ClearType, WindowSize}, buffer::Cell, layout::{Position, Size}, style::{Color, Modifier}};
 use yazi_macro::writef;
-use yazi_term::{TERM, sequence::{EraseRegion, HideCursor, MoveTo, ResetAttrs, SetBg, SetFg, SetSgr, SetUnderlineColor, ShowCursor}};
+use yazi_term::TERM;
+use yazi_tty::sequence::{EraseRegion, HideCursor, MoveTo, ResetAttrs, SetBg, SetFg, SetSgr, SetUnderlineColor, ShowCursor};
 
 pub struct RatermBackend<W> {
 	writer:     W,
diff --git a/yazi-tui/src/option.rs b/yazi-tui/src/option.rs
index bdfc81da..04c2c051 100644
--- a/yazi-tui/src/option.rs
+++ b/yazi-tui/src/option.rs
@@ -1,12 +1,9 @@
-use yazi_config::{THEME, YAZI};
+use yazi_config::YAZI;
 
 pub(super) struct RatermOption {
-	pub bg:    String,
 	pub mouse: bool,
 }
 
 impl Default for RatermOption {
-	fn default() -> Self {
-		Self { bg: THEME.app.bg_color(), mouse: !YAZI.mgr.mouse_events.get().is_empty() }
-	}
+	fn default() -> Self { Self { mouse: !YAZI.mgr.mouse_events.get().is_empty() } }
 }
diff --git a/yazi-tui/src/raterm.rs b/yazi-tui/src/raterm.rs
index 1fd82217..24b8a259 100644
--- a/yazi-tui/src/raterm.rs
+++ b/yazi-tui/src/raterm.rs
@@ -1,13 +1,14 @@
 use std::{io::{self, Write}, ops::Deref};
 
 use anyhow::Result;
-use ratatui::{CompletedFrame, Frame, Terminal, buffer::Buffer, layout::Rect};
+use ratatui_core::{buffer::Buffer, layout::Rect, terminal::{CompletedFrame, Frame, Terminal}};
 use yazi_config::YAZI;
 use yazi_emulator::{Emulator, Mux, TMUX};
 use yazi_macro::writef;
+use yazi_proxy::AppProxy;
 use yazi_shim::cell::SyncCell;
-use yazi_term::{TERM, event::{Event, KeyEventKind}, sequence::{DisableBracketedPaste, DisableFocusChange, DisableMouseCapture, EnableBracketedPaste, EnableFocusChange, EnableMouseCapture, EnterAlternateScreen, If, LeaveAlternateScreen, PopKeyboardFlags, PushKeyboardFlags, RequestCursorBlink, RequestCursorStyle, RequestDA1, RequestKeyboardFlags, RestoreBackground, RestoreCursorStyle, SetBackground, SetTitle, ShowCursor}, stream::EventStream};
-use yazi_tty::{TTY, TtyWriter};
+use yazi_term::{TERM, event::{Event, KeyEventKind}, stream::EventStream};
+use yazi_tty::{TTY, TtyWriter, sequence::{DisableBracketedPaste, DisableDrag, DisableDrop, DisableFocusChange, DisableMouseCapture, EnableBracketedPaste, EnableDrag, EnableDrop, EnableFocusChange, EnableMouseCapture, EnterAlternateScreen, If, LeaveAlternateScreen, PopKeyboardFlags, PushKeyboardFlags, RequestCursorBlink, RequestCursorStyle, RequestDA1, RequestKeyboardFlags, RestoreCursorStyle, SetTitle, ShowCursor}};
 
 use crate::{RatermBackend, RatermOption, RatermState};
 
@@ -42,10 +43,11 @@ impl Raterm {
 		let opt = RatermOption::default();
 		writef!(
 			TTY.writer(),
-			"{}{RequestCursorStyle}{RequestCursorBlink}{RequestKeyboardFlags}{RequestDA1}{}{}{EnableBracketedPaste}{EnableFocusChange}{}",
+			"{}{RequestCursorStyle}{RequestCursorBlink}{RequestKeyboardFlags}{RequestDA1}{}{EnableBracketedPaste}{EnableFocusChange}{}{}{}",
 			If(!TMUX.get(), EnterAlternateScreen),
 			If(TMUX.get(), EnterAlternateScreen),
-			SetBackground(&opt.bg),
+			EnableDrag(""),
+			EnableDrop(&["text/uri-list"]),
 			If(opt.mouse, EnableMouseCapture),
 		)?;
 
@@ -80,9 +82,8 @@ impl Raterm {
 
 		_ = writef!(
 			TTY.writer(),
-			"{}{}{}{}{}{DisableFocusChange}{DisableBracketedPaste}{LeaveAlternateScreen}{ShowCursor}",
+			"{}{DisableDrop}{DisableDrag}{}{}{}{DisableFocusChange}{DisableBracketedPaste}{LeaveAlternateScreen}{ShowCursor}",
 			If(state.mouse, DisableMouseCapture),
-			If(state.bg, RestoreBackground),
 			If(state.csi_u, PopKeyboardFlags),
 			RestoreCursorStyle { shape: state.cursor_shape, blink: state.cursor_blink },
 			If(state.title, SetTitle("")),
@@ -96,13 +97,20 @@ impl Raterm {
 		let mut rx = self.stream.take().unwrap();
 
 		tokio::spawn(async move {
-			while let Some(Ok(event)) = rx.recv().await {
-				match event {
-					Event::Key(key) if key.kind != KeyEventKind::Press => continue,
-					Event::Mouse(mouse) if !YAZI.mgr.mouse_events.get().contains(mouse.kind.into()) => {
-						continue;
+			loop {
+				match rx.recv().await {
+					Some(Ok(event)) => match event {
+						Event::Key(key) if key.kind != KeyEventKind::Press => continue,
+						Event::Mouse(mouse) if !YAZI.mgr.mouse_events.get().contains(mouse.kind.into()) => {
+							continue;
+						}
+						_ => yazi_shared::event::Event::Term(event).emit(),
+					},
+					Some(Err(_)) => {
+						AppProxy::quit(Default::default());
+						break;
 					}
-					_ => yazi_shared::event::Event::Term(event).emit(),
+					None => break,
 				}
 			}
 		});
@@ -121,9 +129,7 @@ impl Raterm {
 			let buffer = frame.buffer_mut();
 			for y in self.last_area.top()..self.last_area.bottom() {
 				for x in self.last_area.left()..self.last_area.right() {
-					let mut cell = self.last_buffer[(x, y)].clone();
-					cell.skip = false;
-					buffer[(x, y)] = cell;
+					buffer[(x, y)] = self.last_buffer[(x, y)].clone();
 				}
 			}
 
diff --git a/yazi-tui/src/state.rs b/yazi-tui/src/state.rs
index e096e031..645e3c43 100644
--- a/yazi-tui/src/state.rs
+++ b/yazi-tui/src/state.rs
@@ -2,7 +2,6 @@ use crate::RatermOption;
 
 #[derive(Clone, Copy)]
 pub struct RatermState {
-	pub bg:           bool,
 	pub csi_u:        bool,
 	pub mouse:        bool,
 	pub title:        bool,
@@ -13,7 +12,6 @@ pub struct RatermState {
 impl RatermState {
 	pub(super) const fn default() -> Self {
 		Self {
-			bg:           false,
 			csi_u:        false,
 			mouse:        false,
 			title:        false,
@@ -33,13 +31,6 @@ impl RatermState {
 
 		let cursor_blink = resp.contains("\x1b[?12;1$y");
 
-		Self {
-			bg: !opt.bg.is_empty(),
-			csi_u,
-			mouse: opt.mouse,
-			title: false,
-			cursor_shape,
-			cursor_blink,
-		}
+		Self { csi_u, mouse: opt.mouse, title: false, cursor_shape, cursor_blink }
 	}
 }
diff --git a/yazi-version/Cargo.toml b/yazi-version/Cargo.toml
new file mode 100644
index 00000000..44dfdecc
--- /dev/null
+++ b/yazi-version/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name                   = "yazi-version"
+description            = "Yazi version information"
+version.workspace      = true
+edition.workspace      = true
+license.workspace      = true
+authors.workspace      = true
+homepage.workspace     = true
+repository.workspace   = true
+rust-version.workspace = true
+
+[lints]
+workspace = true
+
+[build-dependencies]
+vergen-gitcl = { version = "10.0.0", features = [ "build", "rustc" ] }
diff --git a/yazi-version/README.md b/yazi-version/README.md
new file mode 100644
index 00000000..21384463
--- /dev/null
+++ b/yazi-version/README.md
@@ -0,0 +1,5 @@
+# yazi-version
+
+This crate is part of [Yazi][source], and it is not supposed to be used outside, as there are no guarantees about the stability of its API.
+
+[source]: https://github.com/sxyazi/yazi
diff --git a/yazi-version/build.rs b/yazi-version/build.rs
new file mode 100644
index 00000000..3f9a46af
--- /dev/null
+++ b/yazi-version/build.rs
@@ -0,0 +1,20 @@
+use std::{env, error::Error};
+
+use vergen_gitcl::{Build, Emitter, Gitcl, Rustc};
+
+fn main() -> Result<(), Box<dyn Error>> {
+	Emitter::default()
+		.add_instructions(&Build::builder().build_date(true).build())?
+		.add_instructions(
+			&Rustc::builder().commit_date(true).commit_hash(true).host_triple(true).semver(true).build(),
+		)?
+		.emit()?;
+
+	if env::var_os("YAZI_NO_GITCL").is_none() {
+		Emitter::default().add_instructions(&Gitcl::builder().sha(true).build())?.emit()?;
+	} else {
+		println!("cargo:rustc-env=VERGEN_GIT_SHA=no-gitcl");
+	}
+
+	Ok(())
+}
diff --git a/yazi-version/src/lib.rs b/yazi-version/src/lib.rs
new file mode 100644
index 00000000..a7bce380
--- /dev/null
+++ b/yazi-version/src/lib.rs
@@ -0,0 +1,27 @@
+use std::{env::consts::{ARCH, OS}, fmt::Write};
+
+pub fn version() -> &'static str { concat!(env!("CARGO_PKG_VERSION"), " ", env!("VERGEN_GIT_SHA")) }
+
+pub fn version_long() -> &'static str {
+	concat!(
+		env!("CARGO_PKG_VERSION"),
+		" (",
+		env!("VERGEN_GIT_SHA"),
+		" ",
+		env!("VERGEN_BUILD_DATE"),
+		")"
+	)
+}
+
+pub fn version_full() -> String {
+	let mut s = String::new();
+
+	writeln!(s, "    Version: {}", version_long()).ok();
+	writeln!(s, "    Debug  : {}", cfg!(debug_assertions)).ok();
+	#[rustfmt::skip]
+	writeln!(s, "    Triple : {} ({OS}-{ARCH})", env!("VERGEN_RUSTC_HOST_TRIPLE")).ok();
+	#[rustfmt::skip]
+	writeln!(s, "    Rustc  : {} ({} {})", env!("VERGEN_RUSTC_SEMVER"), &env!("VERGEN_RUSTC_COMMIT_HASH")[..8], env!("VERGEN_RUSTC_COMMIT_DATE")).ok();
+
+	s
+}
diff --git a/yazi-vfs/Cargo.toml b/yazi-vfs/Cargo.toml
index 481a5bb1..4bbbe40c 100644
--- a/yazi-vfs/Cargo.toml
+++ b/yazi-vfs/Cargo.toml
@@ -13,12 +13,13 @@ rust-version.workspace = true
 workspace = true
 
 [dependencies]
-yazi-config = { path = "../yazi-config", version = "26.5.6" }
-yazi-fs     = { path = "../yazi-fs", version = "26.5.6" }
-yazi-macro  = { path = "../yazi-macro", version = "26.5.6" }
-yazi-sftp   = { path = "../yazi-sftp", version = "26.5.6" }
-yazi-shared = { path = "../yazi-shared", version = "26.5.6" }
-yazi-shim   = { path = "../yazi-shim", version = "26.5.6" }
+yazi-binding = { path = "../yazi-binding", version = "26.5.6" }
+yazi-codegen = { path = "../yazi-codegen", version = "26.5.6" }
+yazi-fs      = { path = "../yazi-fs", version = "26.5.6" }
+yazi-macro   = { path = "../yazi-macro", version = "26.5.6" }
+yazi-sftp    = { path = "../yazi-sftp", version = "26.5.6" }
+yazi-shared  = { path = "../yazi-shared", version = "26.5.6" }
+yazi-shim    = { path = "../yazi-shim", version = "26.5.6" }
 
 # External dependencies
 anyhow      = { workspace = true }
@@ -27,8 +28,11 @@ deadpool    = { version = "0.13.0", default-features = false, features = [ "mana
 either      = { workspace = true }
 futures     = { workspace = true }
 hashbrown   = { workspace = true }
+mlua        = { workspace = true }
 parking_lot = { workspace = true }
 russh       = { workspace = true }
+serde       = { workspace = true }
 tokio       = { workspace = true }
+toml        = { workspace = true }
 tracing     = { workspace = true }
 typed-path  = { workspace = true }
diff --git a/yazi-config/src/vfs/mod.rs b/yazi-vfs/src/config/mod.rs
similarity index 100%
rename from yazi-config/src/vfs/mod.rs
rename to yazi-vfs/src/config/mod.rs
diff --git a/yazi-config/src/vfs/service.rs b/yazi-vfs/src/config/service.rs
similarity index 92%
rename from yazi-config/src/vfs/service.rs
rename to yazi-vfs/src/config/service.rs
index 627cd5d0..283f7db7 100644
--- a/yazi-config/src/vfs/service.rs
+++ b/yazi-vfs/src/config/service.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::vfs::ServiceSftp;
+use crate::config::ServiceSftp;
 
 #[derive(Deserialize, Serialize)]
 #[serde(tag = "type", rename_all = "kebab-case")]
diff --git a/yazi-config/src/vfs/services.rs b/yazi-vfs/src/config/services.rs
similarity index 98%
rename from yazi-config/src/vfs/services.rs
rename to yazi-vfs/src/config/services.rs
index 7e7666e4..1264c0ff 100644
--- a/yazi-config/src/vfs/services.rs
+++ b/yazi-vfs/src/config/services.rs
@@ -6,7 +6,7 @@ use serde::{Deserialize, Deserializer, Serialize, de, de::{MapAccess, Visitor}};
 use yazi_codegen::DeserializeOver;
 use yazi_shim::toml::DeserializeOverWith;
 
-use crate::vfs::Service;
+use crate::config::Service;
 
 #[derive(Serialize, Deserialize, DeserializeOver)]
 pub struct Services(HashMap<String, Service>);
diff --git a/yazi-config/src/vfs/sftp.rs b/yazi-vfs/src/config/sftp.rs
similarity index 94%
rename from yazi-config/src/vfs/sftp.rs
rename to yazi-vfs/src/config/sftp.rs
index 733cd2cb..81d67e88 100644
--- a/yazi-config/src/vfs/sftp.rs
+++ b/yazi-vfs/src/config/sftp.rs
@@ -1,8 +1,7 @@
 use std::{env, path::PathBuf};
 
 use serde::{Deserialize, Deserializer, Serialize, de};
-
-use crate::normalize_path;
+use yazi_fs::path::sanitize_path;
 
 #[derive(Deserialize, Eq, Hash, PartialEq, Serialize)]
 pub struct ServiceSftp {
@@ -27,7 +26,7 @@ where
 {
 	let mut path = PathBuf::deserialize(deserializer)?;
 	if !path.as_os_str().is_empty() {
-		path = normalize_path(path)
+		path = sanitize_path(path)
 			.ok_or_else(|| de::Error::custom("path must be either empty or an absolute path"))?;
 	}
 
@@ -46,7 +45,7 @@ where
 	if path.as_os_str().is_empty() {
 		Ok(default_identity_agent())
 	} else {
-		normalize_path(path)
+		sanitize_path(path)
 			.ok_or_else(|| de::Error::custom("identity_agent must be either empty or an absolute path"))
 	}
 }
diff --git a/yazi-config/src/vfs/vfs.rs b/yazi-vfs/src/config/vfs.rs
similarity index 90%
rename from yazi-config/src/vfs/vfs.rs
rename to yazi-vfs/src/config/vfs.rs
index fc2e2c3b..2b90389b 100644
--- a/yazi-config/src/vfs/vfs.rs
+++ b/yazi-vfs/src/config/vfs.rs
@@ -8,7 +8,7 @@ use yazi_fs::{Xdg, ok_or_not_found};
 use yazi_shim::toml::DeserializeOver;
 
 use super::Service;
-use crate::{Preset, vfs::Services};
+use crate::config::Services;
 
 #[derive(Deserialize, Serialize, DeserializeOver, DeserializeOver1)]
 pub struct Vfs {
@@ -21,7 +21,8 @@ impl Vfs {
 
 		async fn init() -> io::Result<Vfs> {
 			tokio::task::spawn_blocking(|| -> anyhow::Result<Vfs> {
-				Ok(Preset::vfs()?.deserialize_over(&Vfs::read()?)?)
+				let vfs: Vfs = toml::from_str(&yazi_macro::config_preset!("vfs"))?;
+				Ok(vfs.deserialize_over(&Vfs::read()?)?)
 			})
 			.await?
 			.map_err(io::Error::other)
diff --git a/yazi-vfs/src/file.rs b/yazi-vfs/src/file.rs
index 7cb1f578..06d29965 100644
--- a/yazi-vfs/src/file.rs
+++ b/yazi-vfs/src/file.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use yazi_fs::{File, cha::Cha};
+use yazi_fs::{cha::Cha, file::File};
 use yazi_shared::url::{UrlBuf, UrlCow};
 
 use crate::{VfsCha, provider};
diff --git a/yazi-vfs/src/files.rs b/yazi-vfs/src/files.rs
index 726cb90a..7b5168b6 100644
--- a/yazi-vfs/src/files.rs
+++ b/yazi-vfs/src/files.rs
@@ -1,7 +1,7 @@
 use std::io;
 
 use tokio::{select, sync::mpsc::{self, UnboundedReceiver}};
-use yazi_fs::{File, Files, FilesOp, cha::Cha, mounts::PARTITIONS, provider::{DirReader, FileHolder}};
+use yazi_fs::{Files, FilesOp, cha::Cha, file::File, mounts::PARTITIONS, provider::{DirReader, FileHolder}};
 use yazi_shared::url::UrlBuf;
 
 use crate::{VfsCha, VfsFile, VfsFilesOp, provider::{self, DirEntry}};
diff --git a/yazi-vfs/src/fns.rs b/yazi-vfs/src/fns.rs
index c2848c74..445b635f 100644
--- a/yazi-vfs/src/fns.rs
+++ b/yazi-vfs/src/fns.rs
@@ -1,6 +1,5 @@
 use std::io::{self};
 
-use yazi_macro::ok_or_not_found;
 use yazi_shared::{strand::{StrandBuf, StrandLike}, url::{AsUrl, UrlBuf, UrlLike}};
 
 use crate::provider;
@@ -12,53 +11,6 @@ pub async fn maybe_exists(url: impl AsUrl) -> bool {
 	}
 }
 
-// TODO: deprecate
-pub async fn unique_name<F>(u: UrlBuf, append: F) -> io::Result<UrlBuf>
-where
-	F: Future<Output = bool>,
-{
-	match provider::symlink_metadata(&u).await {
-		Ok(_) => _unique_name(u, append.await).await,
-		Err(e) if e.kind() == io::ErrorKind::NotFound => Ok(u),
-		Err(e) => Err(e),
-	}
-}
-
-async fn _unique_name(mut url: UrlBuf, append: bool) -> io::Result<UrlBuf> {
-	let Some(stem) = url.stem().map(|s| s.to_owned()) else {
-		return Err(io::Error::new(io::ErrorKind::InvalidInput, "empty file stem"));
-	};
-
-	let dot_ext = match url.ext() {
-		Some(e) => {
-			let mut s = StrandBuf::with_capacity(url.kind(), e.len() + 1);
-			s.push_str(".");
-			s.try_push(e)?;
-			s
-		}
-		None => StrandBuf::default(),
-	};
-
-	let mut name = StrandBuf::with_capacity(url.kind(), stem.len() + dot_ext.len() + 5);
-	for i in 1u64.. {
-		name.clear();
-		name.try_push(&stem)?;
-
-		if append {
-			name.try_push(&dot_ext)?;
-			name.push_str(format!("_{i}"));
-		} else {
-			name.push_str(format!("_{i}"));
-			name.try_push(&dot_ext)?;
-		}
-
-		url.try_set_name(&name)?;
-		ok_or_not_found!(provider::symlink_metadata(&url).await, break);
-	}
-
-	Ok(url)
-}
-
 pub async fn unique_file(u: UrlBuf, is_dir: bool) -> io::Result<UrlBuf> {
 	let result = if is_dir {
 		provider::create_dir(&u).await
diff --git a/yazi-vfs/src/lib.rs b/yazi-vfs/src/lib.rs
index 8abc3e7d..498f440f 100644
--- a/yazi-vfs/src/lib.rs
+++ b/yazi-vfs/src/lib.rs
@@ -1,4 +1,4 @@
-yazi_macro::mod_pub!(provider);
+yazi_macro::mod_pub!(config provider);
 
 yazi_macro::mod_flat!(cha file files fns op);
 
diff --git a/yazi-vfs/src/op.rs b/yazi-vfs/src/op.rs
index b0fe21d8..e317e0a5 100644
--- a/yazi-vfs/src/op.rs
+++ b/yazi-vfs/src/op.rs
@@ -4,11 +4,11 @@ use yazi_shared::url::{UrlBuf, UrlLike};
 use crate::maybe_exists;
 
 pub trait VfsFilesOp {
-	fn issue_error(cwd: &UrlBuf, kind: impl Into<yazi_fs::error::Error>) -> impl Future<Output = ()>;
+	fn issue_error(cwd: &UrlBuf, kind: impl Into<yazi_shim::fs::Error>) -> impl Future<Output = ()>;
 }
 
 impl VfsFilesOp for FilesOp {
-	async fn issue_error(cwd: &UrlBuf, err: impl Into<yazi_fs::error::Error>) {
+	async fn issue_error(cwd: &UrlBuf, err: impl Into<yazi_shim::fs::Error>) {
 		let err = err.into();
 		if err.kind() != std::io::ErrorKind::NotFound {
 			Self::IOErr(cwd.clone(), err).emit();
diff --git a/yazi-vfs/src/provider/gate.rs b/yazi-vfs/src/provider/gate.rs
index a62f9465..3210dd16 100644
--- a/yazi-vfs/src/provider/gate.rs
+++ b/yazi-vfs/src/provider/gate.rs
@@ -1,7 +1,9 @@
 use std::io;
 
+use mlua::{AnyUserData, IntoLuaMulti, UserData, UserDataMethods, Value};
+use yazi_binding::Error;
 use yazi_fs::provider::{Attrs, FileBuilder};
-use yazi_shared::{scheme::SchemeKind, url::AsUrl};
+use yazi_shared::{scheme::SchemeKind, url::{AsUrl, UrlRef}};
 
 #[derive(Clone, Copy, Default)]
 pub struct Gate {
@@ -94,3 +96,38 @@ impl Gate {
 		gate
 	}
 }
+
+impl UserData for Gate {
+	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
+		methods.add_function("append", |_, (ud, append): (AnyUserData, bool)| {
+			ud.borrow_mut::<Self>()?.append(append);
+			Ok(ud)
+		});
+		methods.add_function("create", |_, (ud, create): (AnyUserData, bool)| {
+			ud.borrow_mut::<Self>()?.create(create);
+			Ok(ud)
+		});
+		methods.add_function("create_new", |_, (ud, create_new): (AnyUserData, bool)| {
+			ud.borrow_mut::<Self>()?.create_new(create_new);
+			Ok(ud)
+		});
+		methods.add_async_method("open", |lua, me, url: UrlRef| async move {
+			match me.open(&*url).await {
+				Ok(fd) => fd.into_lua_multi(&lua),
+				Err(e) => (Value::Nil, Error::Io(e)).into_lua_multi(&lua),
+			}
+		});
+		methods.add_function("read", |_, (ud, read): (AnyUserData, bool)| {
+			ud.borrow_mut::<Self>()?.read(read);
+			Ok(ud)
+		});
+		methods.add_function("truncate", |_, (ud, truncate): (AnyUserData, bool)| {
+			ud.borrow_mut::<Self>()?.truncate(truncate);
+			Ok(ud)
+		});
+		methods.add_function("write", |_, (ud, write): (AnyUserData, bool)| {
+			ud.borrow_mut::<Self>()?.write(write);
+			Ok(ud)
+		});
+	}
+}
diff --git a/yazi-binding/src/fd.rs b/yazi-vfs/src/provider/lua.rs
similarity index 80%
rename from yazi-binding/src/fd.rs
rename to yazi-vfs/src/provider/lua.rs
index 931329a7..5e86b21e 100644
--- a/yazi-binding/src/fd.rs
+++ b/yazi-vfs/src/provider/lua.rs
@@ -1,21 +1,20 @@
 use mlua::{IntoLuaMulti, UserData, UserDataMethods, Value};
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
+use yazi_binding::Error;
 
-use crate::Error;
+use crate::provider::RwFile;
 
-pub struct Fd(pub yazi_vfs::provider::RwFile);
-
-impl UserData for Fd {
+impl UserData for RwFile {
 	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
 		methods.add_async_method_mut("flush", |lua, mut me, ()| async move {
-			match me.0.flush().await {
+			match me.flush().await {
 				Ok(()) => true.into_lua_multi(&lua),
 				Err(e) => (false, Error::Io(e)).into_lua_multi(&lua),
 			}
 		});
 		methods.add_async_method_mut("read", |lua, mut me, len: usize| async move {
 			let mut buf = vec![0; len];
-			match me.0.read(&mut buf).await {
+			match me.read(&mut buf).await {
 				Ok(n) => {
 					buf.truncate(n);
 					lua.create_external_string(buf)?.into_lua_multi(&lua)
@@ -24,7 +23,7 @@ impl UserData for Fd {
 			}
 		});
 		methods.add_async_method_mut("write_all", |lua, mut me, src: mlua::String| async move {
-			match me.0.write_all(&src.as_bytes()).await {
+			match me.write_all(&src.as_bytes()).await {
 				Ok(()) => true.into_lua_multi(&lua),
 				Err(e) => (false, Error::Io(e)).into_lua_multi(&lua),
 			}
diff --git a/yazi-vfs/src/provider/mod.rs b/yazi-vfs/src/provider/mod.rs
index 375515cc..b8afef8f 100644
--- a/yazi-vfs/src/provider/mod.rs
+++ b/yazi-vfs/src/provider/mod.rs
@@ -1,5 +1,5 @@
 yazi_macro::mod_pub!(sftp);
 
-yazi_macro::mod_flat!(calculator copier dir_entry gate provider providers read_dir rw_file);
+yazi_macro::mod_flat!(calculator copier dir_entry gate lua provider providers read_dir rw_file);
 
 pub(super) fn init() { sftp::init(); }
diff --git a/yazi-vfs/src/provider/sftp/conn.rs b/yazi-vfs/src/provider/sftp/conn.rs
index bfc03290..413f41db 100644
--- a/yazi-vfs/src/provider/sftp/conn.rs
+++ b/yazi-vfs/src/provider/sftp/conn.rs
@@ -2,9 +2,10 @@ use std::{io, sync::Arc, time::{Duration, SystemTime}};
 
 use chrono::DateTime;
 use russh::keys::{PrivateKeyWithHashAlg, agent::AgentIdentity};
-use yazi_config::vfs::ServiceSftp;
 use yazi_fs::provider::local::Local;
 
+use crate::config::ServiceSftp;
+
 #[derive(Clone, Copy)]
 pub(super) struct Conn {
 	pub(super) name:   &'static str,
diff --git a/yazi-vfs/src/provider/sftp/gate.rs b/yazi-vfs/src/provider/sftp/gate.rs
index 5ad087c0..5f4a4b7d 100644
--- a/yazi-vfs/src/provider/sftp/gate.rs
+++ b/yazi-vfs/src/provider/sftp/gate.rs
@@ -1,11 +1,10 @@
 use std::io;
 
-use yazi_config::vfs::{ServiceSftp, Vfs};
 use yazi_fs::provider::{Attrs, FileBuilder};
 use yazi_sftp::fs::Flags;
 use yazi_shared::url::{AsUrl, Url};
 
-use crate::provider::sftp::Conn;
+use crate::{config::{ServiceSftp, Vfs}, provider::sftp::Conn};
 
 #[derive(Clone, Copy, Default)]
 pub struct Gate(crate::provider::Gate);
diff --git a/yazi-vfs/src/provider/sftp/mod.rs b/yazi-vfs/src/provider/sftp/mod.rs
index 9768af8d..8bf7b524 100644
--- a/yazi-vfs/src/provider/sftp/mod.rs
+++ b/yazi-vfs/src/provider/sftp/mod.rs
@@ -2,10 +2,7 @@ yazi_macro::mod_flat!(absolute conn gate metadata read_dir sftp);
 
 static CONN: yazi_shim::cell::RoCell<
 	parking_lot::Mutex<
-		hashbrown::HashMap<
-			&'static yazi_config::vfs::ServiceSftp,
-			&'static deadpool::managed::Pool<Conn>,
-		>,
+		hashbrown::HashMap<&'static crate::config::ServiceSftp, &'static deadpool::managed::Pool<Conn>>,
 	>,
 > = yazi_shim::cell::RoCell::new();
 
diff --git a/yazi-vfs/src/provider/sftp/sftp.rs b/yazi-vfs/src/provider/sftp/sftp.rs
index dc7b8b65..a12690b2 100644
--- a/yazi-vfs/src/provider/sftp/sftp.rs
+++ b/yazi-vfs/src/provider/sftp/sftp.rs
@@ -1,13 +1,12 @@
 use std::{io, sync::Arc};
 
 use tokio::{io::{AsyncWriteExt, BufReader, BufWriter}, sync::mpsc::Receiver};
-use yazi_config::vfs::{ServiceSftp, Vfs};
 use yazi_fs::{cha::ChaMode, provider::{Capabilities, DirReader, FileHolder, Provider}};
 use yazi_sftp::fs::{Attrs, Flags};
 use yazi_shared::{loc::LocBuf, path::{AsPath, PathBufDyn}, pool::InternStr, scheme::SchemeKind, strand::AsStrand, url::{Url, UrlBuf, UrlCow, UrlLike}};
 
 use super::Cha;
-use crate::provider::sftp::Conn;
+use crate::{config::{ServiceSftp, Vfs}, provider::sftp::Conn};
 
 #[derive(Clone)]
 pub struct Sftp<'a> {
diff --git a/yazi-watcher/src/local/local.rs b/yazi-watcher/src/local/local.rs
index 6d534f5a..5392c22f 100644
--- a/yazi-watcher/src/local/local.rs
+++ b/yazi-watcher/src/local/local.rs
@@ -5,7 +5,7 @@ use notify::{PollWatcher, RecommendedWatcher, RecursiveMode, Result, Watcher};
 use tokio::{pin, sync::mpsc::{self, UnboundedReceiver}};
 use tokio_stream::{StreamExt, wrappers::UnboundedReceiverStream};
 use tracing::error;
-use yazi_fs::{File, FilesOp, mounts::PARTITIONS, provider::{self, Provider}};
+use yazi_fs::{FilesOp, file::File, mounts::PARTITIONS, provider::{self, Provider}};
 use yazi_shared::url::{UrlBuf, UrlLike};
 use yazi_vfs::VfsFile;
 
diff --git a/yazi-watcher/src/remote/remote.rs b/yazi-watcher/src/remote/remote.rs
index 88584795..336f470f 100644
--- a/yazi-watcher/src/remote/remote.rs
+++ b/yazi-watcher/src/remote/remote.rs
@@ -4,7 +4,7 @@ use hashbrown::HashMap;
 use notify::Result;
 use tokio::{pin, sync::mpsc::UnboundedReceiver};
 use tokio_stream::{StreamExt, wrappers::UnboundedReceiverStream};
-use yazi_fs::{File, FilesOp};
+use yazi_fs::{FilesOp, file::File};
 use yazi_shared::url::{UrlBuf, UrlLike};
 use yazi_vfs::VfsFile;
 
diff --git a/yazi-widgets/Cargo.toml b/yazi-widgets/Cargo.toml
index 0dd98c4c..0e7dee39 100644
--- a/yazi-widgets/Cargo.toml
+++ b/yazi-widgets/Cargo.toml
@@ -17,8 +17,8 @@ default      = [ "vendored-lua" ]
 vendored-lua = [ "mlua/vendored" ]
 
 [dependencies]
-yazi-adapter = { path = "../yazi-adapter", version = "26.5.6" }
-yazi-config  = { path = "../yazi-config", version = "26.5.6" }
+yazi-binding = { path = "../yazi-binding", version = "26.5.6" }
+yazi-dds     = { path = "../yazi-dds", version = "26.5.6" }
 yazi-macro   = { path = "../yazi-macro", version = "26.5.6" }
 yazi-shared  = { path = "../yazi-shared", version = "26.5.6" }
 yazi-shim    = { path = "../yazi-shim", version = "26.5.6" }
@@ -26,14 +26,20 @@ yazi-term    = { path = "../yazi-term", version = "26.5.6" }
 yazi-tty     = { path = "../yazi-tty", version = "26.5.9" }
 
 # External dependencies
-anyhow        = { workspace = true }
-futures       = { workspace = true }
-mlua          = { workspace = true }
-parking_lot   = { workspace = true }
-ratatui       = { workspace = true }
-serde         = { workspace = true }
-tokio         = { workspace = true }
-unicode-width = { workspace = true }
+anyhow          = { workspace = true }
+dyn-clone       = { workspace = true }
+futures         = { workspace = true }
+inventory       = { workspace = true }
+mlua            = { workspace = true }
+parking_lot     = { workspace = true }
+ratatui-core    = { workspace = true }
+ratatui-widgets = { workspace = true }
+serde           = { workspace = true }
+strum           = { workspace = true }
+tokio           = { workspace = true }
+tokio-stream    = { workspace = true }
+tracing         = { workspace = true }
+unicode-width   = { workspace = true }
 
 [target."cfg(windows)".dependencies]
 clipboard-win = "5.4.1"
diff --git a/yazi-widgets/src/clear.rs b/yazi-widgets/src/clear.rs
deleted file mode 100644
index 2b615fe5..00000000
--- a/yazi-widgets/src/clear.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-use std::sync::atomic::{AtomicBool, Ordering};
-
-use ratatui::{buffer::Buffer, layout::Rect, widgets::Widget};
-use yazi_adapter::ADAPTOR;
-
-pub static COLLISION: AtomicBool = AtomicBool::new(false);
-
-#[derive(Clone, Copy, Debug)]
-pub struct Clear;
-
-impl Widget for Clear {
-	fn render(self, area: Rect, buf: &mut Buffer)
-	where
-		Self: Sized,
-	{
-		ratatui::widgets::Clear.render(area, buf);
-
-		let Some(r) = ADAPTOR.get().shown_load().and_then(|r| overlap(area, r)) else {
-			return;
-		};
-
-		ADAPTOR.get().image_erase(r).ok();
-		COLLISION.store(true, Ordering::Relaxed);
-		for y in r.top()..r.bottom() {
-			for x in r.left()..r.right() {
-				buf[(x, y)].set_skip(true);
-			}
-		}
-	}
-}
-
-const fn is_overlapping(a: Rect, b: Rect) -> bool {
-	a.x < b.right() && a.right() > b.x && a.y < b.y + b.height && a.y + a.height > b.y
-}
-
-fn overlap(a: Rect, b: Rect) -> Option<Rect> {
-	if !is_overlapping(a, b) {
-		return None;
-	}
-
-	let x = a.x.max(b.x);
-	let y = a.y.max(b.y);
-	let width = a.right().min(b.right()) - x;
-	let height = (a.y + a.height).min(b.y + b.height) - y;
-	Some(Rect { x, y, width, height })
-}
diff --git a/yazi-widgets/src/clear/clear.rs b/yazi-widgets/src/clear/clear.rs
new file mode 100644
index 00000000..cd944655
--- /dev/null
+++ b/yazi-widgets/src/clear/clear.rs
@@ -0,0 +1,58 @@
+use mlua::{AnyUserData, IntoLua, Lua, MetaMethod, Table, UserData, UserDataMethods, Value};
+use ratatui_core::{buffer::{Buffer, CellDiffOption}, layout::Rect, widgets::Widget};
+use yazi_binding::{elements::{Area, Spatial}, impl_area_method};
+
+use crate::clear::ClearInventory;
+
+#[derive(Clone, Copy, Debug, Default)]
+pub struct Clear {
+	area: Area,
+}
+
+impl Clear {
+	pub fn compose(lua: &Lua) -> mlua::Result<Value> {
+		let new = lua.create_function(|_, (_, area): (Table, Area)| Ok(Self { area }))?;
+
+		let clear = lua.create_table()?;
+		clear.set_metatable(Some(lua.create_table_from([(MetaMethod::Call.name(), new)])?))?;
+
+		clear.into_lua(lua)
+	}
+}
+
+impl TryFrom<&AnyUserData> for Clear {
+	type Error = mlua::Error;
+
+	fn try_from(value: &AnyUserData) -> Result<Self, Self::Error> { Ok(*value.borrow()?) }
+}
+
+impl Spatial for Clear {
+	fn area(&self) -> Area { self.area }
+
+	fn set_area(&mut self, area: Area) { self.area = area; }
+}
+
+impl Widget for Clear {
+	fn render(self, area: Rect, buf: &mut Buffer)
+	where
+		Self: Sized,
+	{
+		ratatui_widgets::clear::Clear.render(area, buf);
+
+		for inv in inventory::iter::<ClearInventory> {
+			if let Some(overlap) = (inv.clear)(area) {
+				for y in overlap.top()..overlap.bottom() {
+					for x in overlap.left()..overlap.right() {
+						buf[(x, y)].set_diff_option(CellDiffOption::AlwaysUpdate);
+					}
+				}
+			}
+		}
+	}
+}
+
+impl UserData for Clear {
+	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
+		impl_area_method!(methods);
+	}
+}
diff --git a/yazi-widgets/src/clear/inventory.rs b/yazi-widgets/src/clear/inventory.rs
new file mode 100644
index 00000000..d6b7d62a
--- /dev/null
+++ b/yazi-widgets/src/clear/inventory.rs
@@ -0,0 +1,7 @@
+use ratatui_core::layout::Rect;
+
+pub struct ClearInventory {
+	pub clear: fn(Rect) -> Option<Rect>,
+}
+
+inventory::collect!(ClearInventory);
diff --git a/yazi-widgets/src/clear/mod.rs b/yazi-widgets/src/clear/mod.rs
new file mode 100644
index 00000000..5d411270
--- /dev/null
+++ b/yazi-widgets/src/clear/mod.rs
@@ -0,0 +1 @@
+yazi_macro::mod_flat!(clear inventory);
diff --git a/yazi-widgets/src/clipboard.rs b/yazi-widgets/src/clipboard.rs
index 7365b003..a6f11d96 100644
--- a/yazi-widgets/src/clipboard.rs
+++ b/yazi-widgets/src/clipboard.rs
@@ -55,8 +55,7 @@ impl Clipboard {
 
 		use tokio::{io::AsyncWriteExt, process::Command};
 		use yazi_macro::writef;
-		use yazi_term::sequence::SetClipboard;
-		use yazi_tty::TTY;
+		use yazi_tty::{TTY, sequence::SetClipboard};
 
 		s.as_ref().clone_into(&mut self.content.lock());
 		writef!(TTY.writer(), "{}", SetClipboard::new(s.as_ref())).ok();
diff --git a/yazi-widgets/src/input/actor/backward.rs b/yazi-widgets/src/input/actor/backward.rs
index b3b0ea09..de43d488 100644
--- a/yazi-widgets/src/input/actor/backward.rs
+++ b/yazi-widgets/src/input/actor/backward.rs
@@ -1,8 +1,8 @@
 use anyhow::Result;
-use yazi_macro::{act, succ};
-use yazi_shared::{CharKind, data::Data};
+use yazi_macro::act;
+use yazi_shared::data::Data;
 
-use crate::input::{Input, parser::BackwardOpt};
+use crate::input::{CharKind, Input, parser::BackwardOpt};
 
 impl Input {
 	pub fn backward(&mut self, opt: BackwardOpt) -> Result<Data> {
@@ -16,15 +16,12 @@ impl Input {
 		let mut prev = CharKind::new(it.next().unwrap().1);
 		for (i, c) in it {
 			let k = CharKind::new(c);
-			if prev != CharKind::Space && prev.vary(k, opt.far) {
+			if prev != CharKind::Space && prev.vary(k, opt.gait) {
 				return act!(r#move, self, -(i as isize));
 			}
 			prev = k;
 		}
 
-		if prev != CharKind::Space {
-			act!(r#move, self, -(snap.len() as isize))?;
-		}
-		succ!();
+		act!(r#move, self, -(snap.len() as isize))
 	}
 }
diff --git a/yazi-widgets/src/input/actor/casefy.rs b/yazi-widgets/src/input/actor/casefy.rs
index 317162f6..3db1ce00 100644
--- a/yazi-widgets/src/input/actor/casefy.rs
+++ b/yazi-widgets/src/input/actor/casefy.rs
@@ -22,7 +22,7 @@ impl Input {
 		snap.value.replace_range(start..end, &casefied);
 		snap.op = InputOp::None;
 		snap.cursor = range.start;
-		self.snaps.tag(self.limit).then(|| self.flush_type());
+		self.snaps.tag(self.size.width as usize).then(|| self.flush_type());
 
 		act!(r#move, self)?;
 		succ!(render!());
diff --git a/yazi-widgets/src/input/actor/escape.rs b/yazi-widgets/src/input/actor/escape.rs
index b2e90a04..e083571a 100644
--- a/yazi-widgets/src/input/actor/escape.rs
+++ b/yazi-widgets/src/input/actor/escape.rs
@@ -19,7 +19,7 @@ impl Input {
 				snap.mode = InputMode::Normal;
 			}
 		}
-		self.snaps.tag(self.limit);
+		self.snaps.tag(self.size.width as usize);
 		succ!();
 	}
 }
diff --git a/yazi-widgets/src/input/actor/forward.rs b/yazi-widgets/src/input/actor/forward.rs
index 846dfc60..d34d8d2e 100644
--- a/yazi-widgets/src/input/actor/forward.rs
+++ b/yazi-widgets/src/input/actor/forward.rs
@@ -1,8 +1,8 @@
 use anyhow::Result;
 use yazi_macro::act;
-use yazi_shared::{CharKind, data::Data};
+use yazi_shared::data::Data;
 
-use crate::input::{Input, op::InputOp, parser::ForwardOpt};
+use crate::input::{CharKind, Input, op::InputOp, parser::ForwardOpt};
 
 impl Input {
 	pub fn forward(&mut self, opt: ForwardOpt) -> Result<Data> {
@@ -16,9 +16,9 @@ impl Input {
 		for (i, c) in it {
 			let k = CharKind::new(c);
 			let b = if opt.end_of_word {
-				prev != CharKind::Space && prev.vary(k, opt.far) && i != 1
+				prev != CharKind::Space && prev.vary(k, opt.gait) && i != 1
 			} else {
-				k != CharKind::Space && k.vary(prev, opt.far)
+				k != CharKind::Space && k.vary(prev, opt.gait)
 			};
 			if b && !matches!(snap.op, InputOp::None | InputOp::Select(_)) {
 				return act!(r#move, self, i as isize);
diff --git a/yazi-widgets/src/input/actor/kill.rs b/yazi-widgets/src/input/actor/kill.rs
index 36bd1b2d..c2f44931 100644
--- a/yazi-widgets/src/input/actor/kill.rs
+++ b/yazi-widgets/src/input/actor/kill.rs
@@ -2,9 +2,9 @@ use std::ops::RangeBounds;
 
 use anyhow::Result;
 use yazi_macro::{act, render, succ};
-use yazi_shared::{CharKind, data::Data};
+use yazi_shared::data::Data;
 
-use crate::input::{Input, parser::KillOpt};
+use crate::input::{CharKind, Input, parser::KillOpt};
 
 impl Input {
 	pub fn kill(&mut self, opt: KillOpt) -> Result<Data> {
diff --git a/yazi-widgets/src/input/actor/move.rs b/yazi-widgets/src/input/actor/move.rs
index 3b817006..0e9545cc 100644
--- a/yazi-widgets/src/input/actor/move.rs
+++ b/yazi-widgets/src/input/actor/move.rs
@@ -15,7 +15,7 @@ impl Input {
 		render!(self.handle_op(opt.step.add(&snap.value, snap.cursor), false));
 		let n_cur = self.snap().cursor;
 
-		let (limit, snap) = (self.limit, self.snap_mut());
+		let (limit, snap) = (self.size.width as usize, self.snap_mut());
 		if snap.value.is_empty() {
 			succ!(snap.offset = 0);
 		}
diff --git a/yazi-widgets/src/input/actor/replace.rs b/yazi-widgets/src/input/actor/replace.rs
index 652b7563..39a47d4f 100644
--- a/yazi-widgets/src/input/actor/replace.rs
+++ b/yazi-widgets/src/input/actor/replace.rs
@@ -29,7 +29,7 @@ impl Input {
 			(Some(_), Some((len, _))) => snap.value.replace_range(start..start + len, &s),
 		}
 
-		self.snaps.tag(self.limit).then(|| self.flush_type());
+		self.snaps.tag(self.size.width as usize).then(|| self.flush_type());
 		succ!(render!());
 	}
 }
diff --git a/yazi-widgets/src/input/actor/type.rs b/yazi-widgets/src/input/actor/type.rs
index 93006a27..90d1390c 100644
--- a/yazi-widgets/src/input/actor/type.rs
+++ b/yazi-widgets/src/input/actor/type.rs
@@ -1,12 +1,12 @@
 use anyhow::Result;
-use yazi_config::keymap::Key;
 use yazi_macro::{act, render, succ};
 use yazi_shared::{data::Data, replace_cow};
+use yazi_term::event::KeyEvent;
 
 use crate::input::{Input, InputMode};
 
 impl Input {
-	pub fn r#type(&mut self, key: &Key) -> Result<bool> {
+	pub fn r#type(&mut self, key: KeyEvent) -> Result<bool> {
 		let Some(c) = key.plain() else { return Ok(false) };
 
 		if self.mode() == InputMode::Insert {
diff --git a/yazi-widgets/src/input/callback.rs b/yazi-widgets/src/input/callback.rs
new file mode 100644
index 00000000..157124be
--- /dev/null
+++ b/yazi-widgets/src/input/callback.rs
@@ -0,0 +1,22 @@
+use std::fmt;
+
+use dyn_clone::DynClone;
+use yazi_macro::impl_data_any;
+
+use crate::input::InputEvent;
+
+pub trait InputCallback: Fn(InputEvent) + Send + Sync + DynClone + 'static {}
+
+impl<T: Fn(InputEvent) + Send + Sync + Clone + 'static> InputCallback for T {}
+
+impl Clone for Box<dyn InputCallback> {
+	fn clone(&self) -> Self { dyn_clone::clone_box(&**self) }
+}
+
+impl fmt::Debug for dyn InputCallback {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		f.debug_struct("InputCallback").finish_non_exhaustive()
+	}
+}
+
+impl_data_any!(Box<dyn InputCallback>);
diff --git a/yazi-widgets/src/input/chars.rs b/yazi-widgets/src/input/chars.rs
new file mode 100644
index 00000000..88dab060
--- /dev/null
+++ b/yazi-widgets/src/input/chars.rs
@@ -0,0 +1,37 @@
+use crate::input::Gait;
+
+#[derive(Clone, Copy, Eq, PartialEq)]
+pub(crate) enum CharKind {
+	Space,
+	Punct,
+	Other,
+}
+
+impl CharKind {
+	pub(crate) fn new(c: char) -> Self {
+		if c.is_whitespace() {
+			Self::Space
+		} else if Self::is_punct(c) {
+			Self::Punct
+		} else {
+			Self::Other
+		}
+	}
+
+	pub(crate) fn vary(self, other: Self, gait: Gait) -> bool {
+		match gait {
+			Gait::Fine => self != other,
+			Gait::Lean => self == Self::Other && other != Self::Other,
+			Gait::Wide => (self == Self::Space) != (other == Self::Space),
+		}
+	}
+
+	const fn is_punct(c: char) -> bool {
+		match c {
+			'_' => false,
+			c if c.is_ascii_punctuation() => true,
+			'！' | '，' | '；' | '？' => true,
+			_ => false,
+		}
+	}
+}
diff --git a/yazi-widgets/src/input/event.rs b/yazi-widgets/src/input/event.rs
index fc1fefb1..52f77d0d 100644
--- a/yazi-widgets/src/input/event.rs
+++ b/yazi-widgets/src/input/event.rs
@@ -1,6 +1,7 @@
-use yazi_shared::Id;
+use strum::IntoStaticStr;
+use yazi_shared::id::Id;
 
-#[derive(Debug)]
+#[derive(Debug, IntoStaticStr)]
 pub enum InputEvent {
 	Submit(String),
 	Cancel(String),
@@ -10,5 +11,11 @@ pub enum InputEvent {
 }
 
 impl InputEvent {
+	pub fn value(&self) -> &str {
+		match self {
+			Self::Submit(v) | Self::Cancel(v) | Self::Type(v) | Self::Trigger(v, _) => v.as_str(),
+		}
+	}
+
 	pub fn is_submit(&self) -> bool { matches!(self, Self::Submit(_)) }
 }
diff --git a/yazi-widgets/src/input/gait.rs b/yazi-widgets/src/input/gait.rs
new file mode 100644
index 00000000..0cff9263
--- /dev/null
+++ b/yazi-widgets/src/input/gait.rs
@@ -0,0 +1,10 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Copy, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub enum Gait {
+	#[default]
+	Fine,
+	Lean,
+	Wide,
+}
diff --git a/yazi-widgets/src/input/input.rs b/yazi-widgets/src/input/input.rs
index 22269482..b4f9591e 100644
--- a/yazi-widgets/src/input/input.rs
+++ b/yazi-widgets/src/input/input.rs
@@ -1,43 +1,44 @@
 use std::{borrow::Cow, ops::Range};
 
 use anyhow::Result;
-use tokio::sync::mpsc;
-use yazi_config::YAZI;
+use ratatui_core::layout::{Rect, Size};
 use yazi_macro::act;
-use yazi_shared::Ids;
+use yazi_shared::id::Ids;
 use yazi_shim::path::CROSS_SEPARATOR;
-use yazi_term::CursorStyle;
+use yazi_tty::sequence::SetCursorStyle;
 
 use super::{InputSnap, InputSnaps, mode::InputMode, op::InputOp};
-use crate::{CLIPBOARD, input::{InputEvent, InputOpt}};
+use crate::{CLIPBOARD, input::{InputCallback, InputEvent, InputOpt, InputStyles}};
 
-#[derive(Default)]
+#[derive(Debug, Default)]
 pub struct Input {
+	pub size:       Size,
 	pub snaps:      InputSnaps,
-	pub limit:      usize,
+	pub styles:     InputStyles,
 	pub obscure:    bool,
+	pub blinking:   bool,
 	pub realtime:   bool,
 	pub completion: bool,
 
-	pub tx:     Option<mpsc::UnboundedSender<InputEvent>>,
+	pub cb:     Option<Box<dyn InputCallback>>,
 	pub ticket: Ids,
 }
 
 impl Input {
 	pub fn new(opt: InputOpt) -> Result<Self> {
-		let limit = opt.cfg.position.offset.width.saturating_sub(YAZI.input.border()) as usize;
 		let mut input = Self {
-			snaps: InputSnaps::new(opt.cfg.value, opt.cfg.obscure, limit),
-			limit,
-			obscure: opt.cfg.obscure,
-			realtime: opt.cfg.realtime,
-			completion: opt.cfg.completion,
+			snaps: InputSnaps::new(opt.value, opt.obscure),
+			styles: opt.styles,
+			obscure: opt.obscure,
+			blinking: opt.blinking,
+			realtime: opt.realtime,
+			completion: opt.completion,
 
-			tx: Some(opt.tx),
+			cb: opt.cb,
 			..Default::default()
 		};
 
-		if let Some(cursor) = opt.cfg.cursor {
+		if let Some(cursor) = opt.cursor {
 			input.snap_mut().cursor = cursor;
 			act!(r#move, input)?;
 		}
@@ -45,6 +46,15 @@ impl Input {
 		Ok(input)
 	}
 
+	pub fn repos(&mut self, area: Rect) {
+		let size = area.into();
+
+		if self.size != size {
+			self.size = size;
+			self.snap_mut().resize(size.width as usize);
+		}
+	}
+
 	pub(super) fn handle_op(&mut self, cursor: usize, include: bool) -> bool {
 		let old = self.snap().clone();
 		let snap = self.snap_mut();
@@ -81,27 +91,26 @@ impl Input {
 			return false;
 		}
 		if !matches!(old.op, InputOp::None | InputOp::Select(_)) {
-			self.snaps.tag(self.limit).then(|| self.flush_type());
+			self.snaps.tag(self.size.width as usize).then(|| self.flush_type());
 		}
 		true
 	}
 
 	pub(super) fn flush_type(&mut self) {
 		self.ticket.next();
-		if let Some(tx) = self.tx.as_ref().filter(|_| self.realtime) {
-			tx.send(InputEvent::Type(self.value().to_owned())).ok();
+		if let Some(cb) = self.cb.as_ref().filter(|_| self.realtime) {
+			cb(InputEvent::Type(self.value().to_owned()));
 		}
 
 		self.flush_trigger(true);
 	}
 
 	pub(super) fn flush_trigger(&self, force: bool) {
-		if let Some(tx) = self.tx.as_ref().filter(|_| self.completion) {
-			tx.send(InputEvent::Trigger(
+		if let Some(cb) = self.cb.as_ref().filter(|_| self.completion) {
+			cb(InputEvent::Trigger(
 				self.partition().0.to_owned(),
 				(!force).then_some(self.ticket.current()),
-			))
-			.ok();
+			));
 		}
 	}
 }
@@ -111,9 +120,9 @@ impl Input {
 
 	pub fn display(&self) -> Cow<'_, str> {
 		if self.obscure {
-			"•".repeat(self.snap().window(self.limit).len()).into()
+			"•".repeat(self.snap().window(self.size.width as usize).len()).into()
 		} else {
-			self.snap().slice(self.snap().window(self.limit)).into()
+			self.snap().slice(self.snap().window(self.size.width as usize)).into()
 		}
 	}
 
@@ -121,16 +130,16 @@ impl Input {
 
 	pub fn cursor(&self) -> u16 { self.snap().width(self.snap().offset..self.snap().cursor) }
 
-	pub fn cursor_shape(&self) -> CursorStyle {
+	pub fn cursor_shape(&self) -> SetCursorStyle {
 		use InputMode as M;
 
 		match self.mode() {
-			M::Normal if YAZI.input.cursor_blink => CursorStyle::BlinkingBlock,
-			M::Normal if !YAZI.input.cursor_blink => CursorStyle::SteadyBlock,
-			M::Insert if YAZI.input.cursor_blink => CursorStyle::BlinkingBar,
-			M::Insert if !YAZI.input.cursor_blink => CursorStyle::SteadyBar,
-			M::Replace if YAZI.input.cursor_blink => CursorStyle::BlinkingUnderline,
-			M::Replace if !YAZI.input.cursor_blink => CursorStyle::SteadyUnderline,
+			M::Normal if self.blinking => SetCursorStyle::BlinkingBlock,
+			M::Normal if !self.blinking => SetCursorStyle::SteadyBlock,
+			M::Insert if self.blinking => SetCursorStyle::BlinkingBar,
+			M::Insert if !self.blinking => SetCursorStyle::SteadyBar,
+			M::Replace if self.blinking => SetCursorStyle::BlinkingUnderline,
+			M::Replace if !self.blinking => SetCursorStyle::SteadyUnderline,
 			M::Normal | M::Insert | M::Replace => unreachable!(),
 		}
 	}
@@ -142,7 +151,7 @@ impl Input {
 		let (start, end) =
 			if start < snap.cursor { (start, snap.cursor) } else { (snap.cursor + 1, start + 1) };
 
-		let win = snap.window(self.limit);
+		let win = snap.window(self.size.width as usize);
 		let Range { start, end } = start.max(win.start)..end.min(win.end);
 
 		let s = snap.width(snap.offset..start);
diff --git a/yazi-widgets/src/input/input_arc.rs b/yazi-widgets/src/input/input_arc.rs
new file mode 100644
index 00000000..ae0b48ad
--- /dev/null
+++ b/yazi-widgets/src/input/input_arc.rs
@@ -0,0 +1,86 @@
+use std::{ops::Deref, sync::Arc};
+
+use mlua::{AnyUserData, IntoLua, Lua, MetaMethod, Table, UserData, UserDataMethods, Value};
+use parking_lot::Mutex;
+use ratatui_core::widgets::Widget;
+use yazi_binding::{elements::{Area, Spatial}, impl_area_method};
+use yazi_dds::Pubsub;
+use yazi_macro::err;
+use yazi_shim::strum::IntoStr;
+
+use crate::input::{Input, InputOpt, InputStyles};
+
+#[derive(Clone, Debug, Default)]
+pub struct InputArc {
+	area:  Area,
+	inner: Arc<Mutex<Input>>,
+
+	pub focus: bool,
+}
+
+impl Deref for InputArc {
+	type Target = Arc<Mutex<Input>>;
+
+	fn deref(&self) -> &Self::Target { &self.inner }
+}
+
+impl InputArc {
+	pub fn compose(lua: &Lua, styles: InputStyles) -> mlua::Result<Value> {
+		let new = lua.create_function(move |_, (_, mut opt): (Table, InputOpt)| {
+			opt.styles.normal = opt.styles.normal.or(styles.normal);
+			opt.styles.selected = opt.styles.selected.or(styles.selected);
+			opt = opt.with_cb(|e| err!(Pubsub::pub_after_input((&e).into_str(), e.value())));
+			Ok(Self::from(Input::new(opt)?))
+		})?;
+
+		let input = lua.create_table()?;
+		input.set_metatable(Some(lua.create_table_from([(MetaMethod::Call.name(), new)])?))?;
+		input.into_lua(lua)
+	}
+}
+
+impl From<Input> for InputArc {
+	fn from(input: Input) -> Self {
+		Self { inner: Arc::new(Mutex::new(input)), ..Default::default() }
+	}
+}
+
+impl From<&InputArc> for Arc<Mutex<Input>> {
+	fn from(input: &InputArc) -> Self { input.inner.clone() }
+}
+
+impl TryFrom<&AnyUserData> for InputArc {
+	type Error = mlua::Error;
+
+	fn try_from(value: &AnyUserData) -> Result<Self, Self::Error> {
+		Ok(value.borrow::<Self>()?.clone())
+	}
+}
+
+impl Spatial for InputArc {
+	fn area(&self) -> Area { self.area }
+
+	fn set_area(&mut self, area: Area) { self.area = area; }
+}
+
+impl Widget for &InputArc {
+	fn render(self, rect: ratatui_core::layout::Rect, buf: &mut ratatui_core::buffer::Buffer)
+	where
+		Self: Sized,
+	{
+		let mut guard = self.inner.lock();
+		guard.repos(rect);
+		guard.render(rect, buf)
+	}
+}
+
+impl UserData for InputArc {
+	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
+		impl_area_method!(methods);
+
+		methods.add_function("focus", |lua, (ud, focus): (AnyUserData, bool)| {
+			ud.borrow_mut::<Self>()?.focus = focus;
+			ud.into_lua(lua)
+		});
+	}
+}
diff --git a/yazi-widgets/src/input/mod.rs b/yazi-widgets/src/input/mod.rs
index dde2b4e8..57b06015 100644
--- a/yazi-widgets/src/input/mod.rs
+++ b/yazi-widgets/src/input/mod.rs
@@ -1,3 +1,3 @@
 yazi_macro::mod_pub!(actor parser);
 
-yazi_macro::mod_flat!(event input mode op option snap snaps widget);
+yazi_macro::mod_flat!(callback chars event gait input input_arc mode op option snap snaps stream styles widget);
diff --git a/yazi-widgets/src/input/option.rs b/yazi-widgets/src/input/option.rs
index 4e6f1dd7..3cb3c1c5 100644
--- a/yazi-widgets/src/input/option.rs
+++ b/yazi-widgets/src/input/option.rs
@@ -1,37 +1,66 @@
-use anyhow::bail;
-use mlua::{ExternalError, FromLua, IntoLua, Lua, Value};
-use tokio::sync::mpsc;
-use yazi_config::popup::InputCfg;
-use yazi_shared::event::ActionCow;
+use mlua::{ExternalError, FromLua, Lua, Table, Value};
+use yazi_binding::position::Position;
+use yazi_macro::impl_data_any;
 
-use crate::input::InputEvent;
+use crate::input::{InputCallback, InputStyles};
 
-#[derive(Debug)]
+#[derive(Clone, Debug, Default)]
 pub struct InputOpt {
-	pub cfg: InputCfg,
-	pub tx:  mpsc::UnboundedSender<InputEvent>,
+	pub title:      String,
+	pub value:      String,
+	pub styles:     InputStyles,
+	pub cursor:     Option<usize>,
+	pub obscure:    bool,
+	pub blinking:   bool,
+	pub position:   Position,
+	pub realtime:   bool,
+	pub completion: bool,
+	pub cb:         Option<Box<dyn InputCallback>>,
 }
 
-impl TryFrom<ActionCow> for InputOpt {
-	type Error = anyhow::Error;
+impl_data_any!(InputOpt);
 
-	fn try_from(mut a: ActionCow) -> Result<Self, Self::Error> {
-		let Some(cfg) = a.take_any("cfg") else {
-			bail!("Invalid 'cfg' in InputOpt");
-		};
+impl InputOpt {
+	pub fn with_value(mut self, value: impl Into<String>) -> Self {
+		self.value = value.into();
+		self
+	}
 
-		let Some(tx) = a.take_any("tx") else {
-			bail!("Invalid 'tx' in InputOpt");
-		};
+	pub fn with_cursor(mut self, cursor: Option<usize>) -> Self {
+		self.cursor = cursor;
+		self
+	}
 
-		Ok(Self { cfg, tx })
+	pub fn with_cb(mut self, cb: impl InputCallback) -> Self {
+		self.cb = Some(Box::new(cb));
+		self
+	}
+}
+
+impl TryFrom<&Table> for InputOpt {
+	type Error = mlua::Error;
+
+	fn try_from(t: &Table) -> Result<Self, Self::Error> {
+		Ok(Self {
+			title:      t.raw_get("title").unwrap_or_default(),
+			value:      t.raw_get("value").unwrap_or_default(),
+			styles:     t.raw_get("styles")?,
+			cursor:     None,
+			obscure:    t.raw_get("obscure")?,
+			blinking:   false,
+			position:   t.raw_get::<Position>("pos").unwrap_or_default().with_height(3),
+			realtime:   t.raw_get("realtime")?,
+			completion: false,
+			cb:         None,
+		})
 	}
 }
 
 impl FromLua for InputOpt {
-	fn from_lua(_: Value, _: &Lua) -> mlua::Result<Self> { Err("unsupported".into_lua_err()) }
-}
-
-impl IntoLua for InputOpt {
-	fn into_lua(self, _: &Lua) -> mlua::Result<Value> { Err("unsupported".into_lua_err()) }
+	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
+		match value {
+			Value::Table(tb) => Self::try_from(&tb),
+			_ => Err("expected a table".into_lua_err()),
+		}
+	}
 }
diff --git a/yazi-widgets/src/input/parser/backward.rs b/yazi-widgets/src/input/parser/backward.rs
index b26c8fca..abba7aac 100644
--- a/yazi-widgets/src/input/parser/backward.rs
+++ b/yazi-widgets/src/input/parser/backward.rs
@@ -1,13 +1,33 @@
 use mlua::{ExternalError, FromLua, IntoLua, Lua, Value};
+use serde::Deserialize;
 use yazi_shared::event::ActionCow;
 
-#[derive(Debug)]
+use crate::input::Gait;
+
+#[derive(Debug, Deserialize)]
 pub struct BackwardOpt {
-	pub far: bool,
+	#[serde(alias = "0", default)]
+	pub gait: Gait,
 }
 
-impl From<ActionCow> for BackwardOpt {
-	fn from(a: ActionCow) -> Self { Self { far: a.bool("far") } }
+impl TryFrom<ActionCow> for BackwardOpt {
+	type Error = anyhow::Error;
+
+	fn try_from(a: ActionCow) -> Result<Self, Self::Error> {
+		// TODO: remove
+		if a.bool("far") {
+			static WARNED: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
+			if !WARNED.swap(true, std::sync::atomic::Ordering::Relaxed) {
+				yazi_macro::emit!(Call(yazi_shared::event::Action::new_relay("app:deprecate").with(
+					"content",
+					"`backward --far` is deprecated, use `backward wide` under `[input]` instead".to_string()
+				)));
+			}
+
+			return Ok(Self { gait: Gait::Wide });
+		}
+		Ok(a.deserialize()?)
+	}
 }
 
 impl FromLua for BackwardOpt {
diff --git a/yazi-widgets/src/input/parser/complete.rs b/yazi-widgets/src/input/parser/complete.rs
index 318f0b38..cc0dea15 100644
--- a/yazi-widgets/src/input/parser/complete.rs
+++ b/yazi-widgets/src/input/parser/complete.rs
@@ -1,7 +1,7 @@
 use std::path::MAIN_SEPARATOR_STR;
 
 use mlua::{ExternalError, FromLua, IntoLua, Lua, Value};
-use yazi_shared::{Id, event::ActionCow, strand::{StrandBuf, StrandLike}};
+use yazi_shared::{event::ActionCow, id::Id, strand::{StrandBuf, StrandLike}};
 
 #[derive(Debug)]
 pub struct CompleteOpt {
diff --git a/yazi-widgets/src/input/parser/forward.rs b/yazi-widgets/src/input/parser/forward.rs
index 13415988..be01b94c 100644
--- a/yazi-widgets/src/input/parser/forward.rs
+++ b/yazi-widgets/src/input/parser/forward.rs
@@ -1,14 +1,36 @@
 use mlua::{ExternalError, FromLua, IntoLua, Lua, Value};
+use serde::Deserialize;
 use yazi_shared::event::ActionCow;
 
-#[derive(Debug)]
+use crate::input::Gait;
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "kebab-case")]
 pub struct ForwardOpt {
-	pub far:         bool,
+	#[serde(alias = "0", default)]
+	pub gait:        Gait,
+	#[serde(default)]
 	pub end_of_word: bool,
 }
 
-impl From<ActionCow> for ForwardOpt {
-	fn from(a: ActionCow) -> Self { Self { far: a.bool("far"), end_of_word: a.bool("end-of-word") } }
+impl TryFrom<ActionCow> for ForwardOpt {
+	type Error = anyhow::Error;
+
+	fn try_from(a: ActionCow) -> Result<Self, Self::Error> {
+		// TODO: remove
+		if a.bool("far") {
+			static WARNED: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
+			if !WARNED.swap(true, std::sync::atomic::Ordering::Relaxed) {
+				yazi_macro::emit!(Call(yazi_shared::event::Action::new_relay("app:deprecate").with(
+					"content",
+					"`forward --far` is deprecated, use `forward wide` under `[input]` instead".to_string()
+				)));
+			}
+
+			return Ok(Self { gait: Gait::Wide, end_of_word: a.bool("end-of-word") });
+		}
+		Ok(a.deserialize()?)
+	}
 }
 
 impl FromLua for ForwardOpt {
diff --git a/yazi-widgets/src/input/parser/kill.rs b/yazi-widgets/src/input/parser/kill.rs
index 2b955864..6ff35dcf 100644
--- a/yazi-widgets/src/input/parser/kill.rs
+++ b/yazi-widgets/src/input/parser/kill.rs
@@ -1,5 +1,6 @@
 use mlua::{ExternalError, FromLua, IntoLua, Lua, Value};
-use yazi_shared::{SStr, event::ActionCow};
+use yazi_shared::event::ActionCow;
+use yazi_shim::SStr;
 
 #[derive(Debug)]
 pub struct KillOpt {
diff --git a/yazi-widgets/src/input/snap.rs b/yazi-widgets/src/input/snap.rs
index 0ae7228f..03954be9 100644
--- a/yazi-widgets/src/input/snap.rs
+++ b/yazi-widgets/src/input/snap.rs
@@ -18,7 +18,7 @@ pub struct InputSnap {
 }
 
 impl InputSnap {
-	pub(super) fn new(value: String, obscure: bool, limit: usize) -> Self {
+	pub(super) fn new(value: String, obscure: bool) -> Self {
 		let mut snap = Self {
 			value,
 
@@ -30,11 +30,10 @@ impl InputSnap {
 			offset: 0,
 			cursor: usize::MAX,
 		};
-		snap.resize(limit);
+		snap.resize(0);
 		snap
 	}
 
-	#[inline]
 	pub(super) fn resize(&mut self, limit: usize) {
 		let count = self.count();
 		let limit = if self.obscure {
diff --git a/yazi-widgets/src/input/snaps.rs b/yazi-widgets/src/input/snaps.rs
index 0bfbd539..b14cf7fa 100644
--- a/yazi-widgets/src/input/snaps.rs
+++ b/yazi-widgets/src/input/snaps.rs
@@ -2,7 +2,7 @@ use std::mem;
 
 use super::InputSnap;
 
-#[derive(PartialEq, Eq)]
+#[derive(Debug, Eq, PartialEq)]
 pub struct InputSnaps {
 	idx:      usize,
 	versions: Vec<InputSnap>,
@@ -13,15 +13,15 @@ impl Default for InputSnaps {
 	fn default() -> Self {
 		Self {
 			idx:      0,
-			versions: vec![InputSnap::new(String::new(), false, 0)],
-			current:  InputSnap::new(String::new(), false, 0),
+			versions: vec![InputSnap::new(String::new(), false)],
+			current:  InputSnap::new(String::new(), false),
 		}
 	}
 }
 
 impl InputSnaps {
-	pub fn new(value: String, obscure: bool, limit: usize) -> Self {
-		let current = InputSnap::new(value, obscure, limit);
+	pub fn new(value: String, obscure: bool) -> Self {
+		let current = InputSnap::new(value, obscure);
 		Self { idx: 0, versions: vec![current.clone()], current }
 	}
 
diff --git a/yazi-binding/src/input.rs b/yazi-widgets/src/input/stream.rs
similarity index 84%
rename from yazi-binding/src/input.rs
rename to yazi-widgets/src/input/stream.rs
index 860c2697..c1ccdc43 100644
--- a/yazi-binding/src/input.rs
+++ b/yazi-widgets/src/input/stream.rs
@@ -3,13 +3,14 @@ use std::pin::Pin;
 use mlua::{UserData, UserDataMethods};
 use tokio::pin;
 use tokio_stream::StreamExt;
-use yazi_widgets::input::InputEvent;
 
-pub struct InputRx<T: StreamExt<Item = InputEvent>> {
+use crate::input::InputEvent;
+
+pub struct InputStream<T: StreamExt<Item = InputEvent>> {
 	inner: T,
 }
 
-impl<T: StreamExt<Item = InputEvent>> InputRx<T> {
+impl<T: StreamExt<Item = InputEvent>> InputStream<T> {
 	pub fn new(inner: T) -> Self { Self { inner } }
 
 	pub async fn consume(inner: T) -> (Option<String>, u8) {
@@ -27,7 +28,7 @@ impl<T: StreamExt<Item = InputEvent>> InputRx<T> {
 	}
 }
 
-impl<T: StreamExt<Item = InputEvent> + 'static> UserData for InputRx<T> {
+impl<T: StreamExt<Item = InputEvent> + 'static> UserData for InputStream<T> {
 	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
 		methods.add_async_method_mut("recv", |_, mut me, ()| async move {
 			let mut inner = unsafe { Pin::new_unchecked(&mut me.inner) };
diff --git a/yazi-widgets/src/input/styles.rs b/yazi-widgets/src/input/styles.rs
new file mode 100644
index 00000000..c402bdcd
--- /dev/null
+++ b/yazi-widgets/src/input/styles.rs
@@ -0,0 +1,29 @@
+use mlua::{ExternalError, FromLua, Lua, Table, Value};
+use ratatui_core::style::Style;
+
+#[derive(Clone, Debug, Default)]
+pub struct InputStyles {
+	pub normal:   Option<Style>,
+	pub selected: Option<Style>,
+}
+
+impl TryFrom<Table> for InputStyles {
+	type Error = mlua::Error;
+
+	fn try_from(t: Table) -> Result<Self, Self::Error> {
+		Ok(Self {
+			normal:   t.raw_get::<Option<yazi_binding::style::Style>>("normal")?.map(Into::into),
+			selected: t.raw_get::<Option<yazi_binding::style::Style>>("selected")?.map(Into::into),
+		})
+	}
+}
+
+impl FromLua for InputStyles {
+	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
+		match value {
+			Value::Nil => Ok(Self::default()),
+			Value::Table(t) => Self::try_from(t),
+			_ => Err("expected a table for InputStyles".into_lua_err()),
+		}
+	}
+}
diff --git a/yazi-widgets/src/input/widget.rs b/yazi-widgets/src/input/widget.rs
index b05741f9..405fe148 100644
--- a/yazi-widgets/src/input/widget.rs
+++ b/yazi-widgets/src/input/widget.rs
@@ -1,18 +1,18 @@
 use std::ops::Range;
 
-use ratatui::{layout::Rect, text::Line, widgets::Widget};
-use yazi_config::THEME;
+use ratatui_core::{buffer::Buffer, layout::Rect, text::Line, widgets::Widget};
 
 use super::Input;
 
 impl Widget for &Input {
-	fn render(self, area: ratatui::layout::Rect, buf: &mut ratatui::buffer::Buffer)
+	fn render(self, area: Rect, buf: &mut Buffer)
 	where
 		Self: Sized,
 	{
-		crate::Clear.render(area, buf);
+		let normal = self.styles.normal.unwrap_or_default();
+		let selected = self.styles.selected.unwrap_or_default();
 
-		Line::styled(self.display(), THEME.input.value.get()).render(area, buf);
+		Line::styled(self.display(), normal).render(area, buf);
 
 		if let Some(Range { start, end }) = self.selected() {
 			let s = start.min(area.width);
@@ -23,7 +23,7 @@ impl Widget for &Input {
 					width:  (end - start).min(area.width - s),
 					height: area.height.min(1),
 				},
-				THEME.input.selected.get(),
+				selected,
 			);
 		}
 	}
diff --git a/yazi-widgets/src/lib.rs b/yazi-widgets/src/lib.rs
index 521bc999..677a3c94 100644
--- a/yazi-widgets/src/lib.rs
+++ b/yazi-widgets/src/lib.rs
@@ -1,5 +1,5 @@
-yazi_macro::mod_pub!(input);
+yazi_macro::mod_pub!(clear input);
 
-yazi_macro::mod_flat!(clear clipboard scrollable step);
+yazi_macro::mod_flat!(clipboard renderable renderables scrollable step);
 
 pub fn init() { CLIPBOARD.with(<_>::default); }
diff --git a/yazi-widgets/src/renderable.rs b/yazi-widgets/src/renderable.rs
new file mode 100644
index 00000000..91f93363
--- /dev/null
+++ b/yazi-widgets/src/renderable.rs
@@ -0,0 +1,145 @@
+use std::any::TypeId;
+
+use mlua::{AnyUserData, ExternalError, FromLua, Lua, Value};
+use ratatui_core::widgets::Widget;
+use yazi_binding::{Error, elements::{Area, Bar, Border, Fill, Gauge, Line, List, Spatial, Table, Text}, position::Position};
+
+use crate::{clear::Clear, input::InputArc};
+
+#[derive(Clone, Debug)]
+pub enum Renderable {
+	Line(Line),
+	Text(Text),
+	List(Box<List>),
+	Bar(Bar),
+	Clear(Clear),
+	Fill(Fill),
+	Border(Border),
+	Input(InputArc),
+	Gauge(Box<Gauge>),
+	Table(Box<Table>),
+}
+
+impl Renderable {
+	pub fn with_area(mut self, area: impl Into<Area>) -> Self {
+		self.set_area(area.into());
+		self
+	}
+
+	pub fn render_with<T>(self, buf: &mut ratatui_core::buffer::Buffer, trans: T)
+	where
+		T: FnOnce(Position) -> ratatui_core::layout::Rect,
+	{
+		let rect = self.area().transform(trans);
+		self.render(rect, buf);
+	}
+}
+
+impl TryFrom<&AnyUserData> for Renderable {
+	type Error = mlua::Error;
+
+	fn try_from(ud: &AnyUserData) -> Result<Self, Self::Error> {
+		Ok(match ud.type_id() {
+			Some(t) if t == TypeId::of::<Line>() => Self::Line(ud.try_into()?),
+			Some(t) if t == TypeId::of::<Text>() => Self::Text(ud.try_into()?),
+			Some(t) if t == TypeId::of::<List>() => Self::List(Box::new(ud.try_into()?)),
+			Some(t) if t == TypeId::of::<Bar>() => Self::Bar(ud.try_into()?),
+			Some(t) if t == TypeId::of::<Clear>() => Self::Clear(ud.try_into()?),
+			Some(t) if t == TypeId::of::<Fill>() => Self::Fill(ud.try_into()?),
+			Some(t) if t == TypeId::of::<Border>() => Self::Border(ud.try_into()?),
+			Some(t) if t == TypeId::of::<InputArc>() => Self::Input(ud.try_into()?),
+			Some(t) if t == TypeId::of::<Gauge>() => Self::Gauge(Box::new(ud.try_into()?)),
+			Some(t) if t == TypeId::of::<Table>() => Self::Table(Box::new(ud.try_into()?)),
+			_ => Err(format!("expected a renderable userdata, not: {ud:#?}").into_lua_err())?,
+		})
+	}
+}
+
+impl From<yazi_binding::Error> for Renderable {
+	fn from(error: Error) -> Self {
+		Self::Text(
+			Text::from(error.into_string()).wrap(ratatui_widgets::paragraph::Wrap { trim: false }),
+		)
+	}
+}
+
+impl Spatial for Renderable {
+	fn area(&self) -> Area {
+		match self {
+			Self::Line(line) => line.area(),
+			Self::Text(text) => text.area(),
+			Self::List(list) => list.area(),
+			Self::Bar(bar) => bar.area(),
+			Self::Clear(clear) => clear.area(),
+			Self::Fill(fill) => fill.area(),
+			Self::Border(border) => border.area(),
+			Self::Input(input) => input.area(),
+			Self::Gauge(gauge) => gauge.area(),
+			Self::Table(table) => table.area(),
+		}
+	}
+
+	fn set_area(&mut self, area: Area) {
+		match self {
+			Self::Line(line) => line.set_area(area),
+			Self::Text(text) => text.set_area(area),
+			Self::List(list) => list.set_area(area),
+			Self::Bar(bar) => bar.set_area(area),
+			Self::Clear(clear) => clear.set_area(area),
+			Self::Fill(fill) => fill.set_area(area),
+			Self::Border(border) => border.set_area(area),
+			Self::Input(input) => input.set_area(area),
+			Self::Gauge(gauge) => gauge.set_area(area),
+			Self::Table(table) => table.set_area(area),
+		}
+	}
+}
+
+impl Widget for Renderable {
+	fn render(self, rect: ratatui_core::layout::Rect, buf: &mut ratatui_core::buffer::Buffer)
+	where
+		Self: Sized,
+	{
+		match self {
+			Self::Line(line) => line.render(rect, buf),
+			Self::Text(text) => text.render(rect, buf),
+			Self::List(list) => list.render(rect, buf),
+			Self::Bar(bar) => bar.render(rect, buf),
+			Self::Clear(clear) => clear.render(rect, buf),
+			Self::Fill(fill) => fill.render(rect, buf),
+			Self::Border(border) => border.render(rect, buf),
+			Self::Input(input) => input.render(rect, buf),
+			Self::Gauge(gauge) => gauge.render(rect, buf),
+			Self::Table(table) => table.render(rect, buf),
+		}
+	}
+}
+
+impl Widget for &Renderable {
+	fn render(self, rect: ratatui_core::layout::Rect, buf: &mut ratatui_core::buffer::Buffer)
+	where
+		Self: Sized,
+	{
+		match self {
+			Renderable::Line(line) => line.render(rect, buf),
+			Renderable::Text(text) => text.render(rect, buf),
+			Renderable::List(list) => (&**list).render(rect, buf),
+			Renderable::Bar(bar) => bar.render(rect, buf),
+			Renderable::Clear(clear) => clear.render(rect, buf),
+			Renderable::Fill(fill) => fill.render(rect, buf),
+			Renderable::Border(border) => border.render(rect, buf),
+			Renderable::Input(input) => input.render(rect, buf),
+			Renderable::Gauge(gauge) => (&**gauge).render(rect, buf),
+			Renderable::Table(table) => (&**table).render(rect, buf),
+		}
+	}
+}
+
+impl FromLua for Renderable {
+	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
+		match value {
+			Value::UserData(ud) => Self::try_from(&ud),
+			_ => Err(format!("expected a renderable userdata, not: {value:#?}").into_lua_err()),
+		}
+	}
+}
diff --git a/yazi-widgets/src/renderables.rs b/yazi-widgets/src/renderables.rs
new file mode 100644
index 00000000..daf45f3a
--- /dev/null
+++ b/yazi-widgets/src/renderables.rs
@@ -0,0 +1,29 @@
+use mlua::Value;
+use tracing::error;
+
+use crate::Renderable;
+
+pub struct Renderables;
+
+impl Renderables {
+	pub fn reduce<F>(value: Value, mut reducer: F)
+	where
+		F: FnMut(Renderable),
+	{
+		match value {
+			Value::Table(tbl) => {
+				for element in tbl.sequence_values::<Renderable>() {
+					match element {
+						Ok(r) => reducer(r),
+						Err(e) => error!("Failed to convert to renderable elements: {e}"),
+					}
+				}
+			}
+			Value::UserData(ud) => match Renderable::try_from(&ud) {
+				Ok(w) => reducer(w),
+				Err(e) => error!("Failed to convert to renderable element: {e}"),
+			},
+			_ => error!("Expected a renderable element, or a table of them, got: {value:?}"),
+		}
+	}
+}