diff --git a/.envrc b/.envrc
index 935a201a2..7ddb34ddb 100644
--- a/.envrc
+++ b/.envrc
@@ -1,7 +1,8 @@
 watch_file shell.nix
+watch_file default.nix
 watch_file flake.lock
 watch_file rust-toolchain.toml
 
 # try to use flakes, if it fails use normal nix (ie. shell.nix)
 use flake || use nix
-eval "$shellHook"
\ No newline at end of file
+eval "$shellHook"
diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
index 9a25cbe45..1fed41ed6 100644
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -14,10 +14,10 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Install nix
-      uses: cachix/install-nix-action@v30
+      uses: cachix/install-nix-action@v31
 
     - name: Authenticate with Cachix
-      uses: cachix/cachix-action@v15
+      uses: cachix/cachix-action@v16
       with:
         name: helix
         authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
diff --git a/Cargo.lock b/Cargo.lock
index d20f1e4db..5f8204c2c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -68,9 +68,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.95"
+version = "1.0.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
+checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
 
 [[package]]
 name = "arc-swap"
@@ -101,9 +101,9 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "2.8.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
+checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
 
 [[package]]
 name = "bstr"
@@ -136,9 +136,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
 
 [[package]]
 name = "cc"
-version = "1.2.14"
+version = "1.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c3d1b2e905a3a7b00a6141adb0e4c0bb941d11caf55349d863942a1cc44e3c9"
+checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
 dependencies = [
  "shlex",
 ]
@@ -162,14 +162,14 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.39"
+version = "0.4.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
+checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "num-traits",
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
@@ -249,7 +249,7 @@ dependencies = [
  "libc",
  "mio",
  "parking_lot",
- "rustix",
+ "rustix 0.38.44",
  "signal-hook",
  "signal-hook-mio",
  "winapi",
@@ -349,13 +349,13 @@ checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b"
 
 [[package]]
 name = "etcetera"
-version = "0.8.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
+checksum = "26c7b13d0780cb82722fd59f6f57f925e143427e4a75313a6c77243bf5326ae6"
 dependencies = [
  "cfg-if",
  "home",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -492,7 +492,7 @@ dependencies = [
  "cfg-if",
  "libc",
  "wasi 0.13.3+wasi-0.2.2",
- "windows-targets 0.52.6",
+ "windows-targets",
 ]
 
 [[package]]
@@ -548,7 +548,7 @@ dependencies = [
  "gix-worktree",
  "once_cell",
  "smallvec",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -561,7 +561,7 @@ dependencies = [
  "gix-date",
  "gix-utils",
  "itoa",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
  "winnow 0.6.18",
 ]
 
@@ -578,7 +578,7 @@ dependencies = [
  "gix-trace",
  "kstring",
  "smallvec",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
  "unicode-bom",
 ]
 
@@ -588,7 +588,7 @@ version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1db9765c69502650da68f0804e3dc2b5f8ccc6a2d104ca6c85bc40700d37540"
 dependencies = [
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -597,7 +597,7 @@ version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b1f1d8764958699dc764e3f727cef280ff4d1bd92c107bbf8acd85b30c1bd6f"
 dependencies = [
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -623,7 +623,7 @@ dependencies = [
  "gix-features",
  "gix-hash",
  "memmap2",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -642,7 +642,7 @@ dependencies = [
  "memchr",
  "once_cell",
  "smallvec",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
  "unicode-bom",
  "winnow 0.6.18",
 ]
@@ -657,7 +657,7 @@ dependencies = [
  "bstr",
  "gix-path",
  "libc",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -669,7 +669,7 @@ dependencies = [
  "bstr",
  "itoa",
  "jiff",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -693,7 +693,7 @@ dependencies = [
  "gix-traverse",
  "gix-worktree",
  "imara-diff",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -713,7 +713,7 @@ dependencies = [
  "gix-trace",
  "gix-utils",
  "gix-worktree",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -729,7 +729,7 @@ dependencies = [
  "gix-path",
  "gix-ref",
  "gix-sec",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -747,7 +747,7 @@ dependencies = [
  "once_cell",
  "prodash",
  "sha1_smol",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
  "walkdir",
 ]
 
@@ -769,7 +769,7 @@ dependencies = [
  "gix-trace",
  "gix-utils",
  "smallvec",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -802,7 +802,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e81c5ec48649b1821b3ed066a44efb95f1a268b35c1d91295e61252539fbe9f8"
 dependencies = [
  "faster-hex",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -852,9 +852,9 @@ dependencies = [
  "itoa",
  "libc",
  "memmap2",
- "rustix",
+ "rustix 0.38.44",
  "smallvec",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -865,7 +865,7 @@ checksum = "9739815270ff6940968441824d162df9433db19211ca9ba8c3fc1b50b849c642"
 dependencies = [
  "gix-tempfile",
  "gix-utils",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -885,7 +885,7 @@ dependencies = [
  "gix-validate",
  "itoa",
  "smallvec",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
  "winnow 0.6.18",
 ]
 
@@ -907,7 +907,7 @@ dependencies = [
  "gix-quote",
  "parking_lot",
  "tempfile",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -925,7 +925,7 @@ dependencies = [
  "gix-path",
  "memmap2",
  "smallvec",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -937,7 +937,7 @@ dependencies = [
  "bstr",
  "faster-hex",
  "gix-trace",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -949,7 +949,7 @@ dependencies = [
  "bstr",
  "faster-hex",
  "gix-trace",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -962,7 +962,7 @@ dependencies = [
  "gix-trace",
  "home",
  "once_cell",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -977,7 +977,7 @@ dependencies = [
  "gix-config-value",
  "gix-glob",
  "gix-path",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -995,7 +995,7 @@ dependencies = [
  "gix-transport",
  "gix-utils",
  "maybe-async",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
  "winnow 0.6.18",
 ]
 
@@ -1007,7 +1007,7 @@ checksum = "e49357fccdb0c85c0d3a3292a9f6db32d9b3535959b5471bb9624908f4a066c6"
 dependencies = [
  "bstr",
  "gix-utils",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -1027,7 +1027,7 @@ dependencies = [
  "gix-utils",
  "gix-validate",
  "memmap2",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
  "winnow 0.6.18",
 ]
 
@@ -1042,7 +1042,7 @@ dependencies = [
  "gix-revision",
  "gix-validate",
  "smallvec",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -1057,7 +1057,7 @@ dependencies = [
  "gix-hash",
  "gix-object",
  "gix-revwalk",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -1072,7 +1072,7 @@ dependencies = [
  "gix-hashtable",
  "gix-object",
  "smallvec",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -1096,7 +1096,7 @@ dependencies = [
  "bstr",
  "gix-hash",
  "gix-lock",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -1119,7 +1119,7 @@ dependencies = [
  "gix-pathspec",
  "gix-worktree",
  "portable-atomic",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -1134,7 +1134,7 @@ dependencies = [
  "gix-pathspec",
  "gix-refspec",
  "gix-url",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -1170,7 +1170,7 @@ dependencies = [
  "gix-quote",
  "gix-sec",
  "gix-url",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -1187,7 +1187,7 @@ dependencies = [
  "gix-object",
  "gix-revwalk",
  "smallvec",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -1200,7 +1200,7 @@ dependencies = [
  "gix-features",
  "gix-path",
  "percent-encoding",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
  "url",
 ]
 
@@ -1222,7 +1222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9eaa01c3337d885617c0a42e92823922a2aea71f4caeace6fe87002bdcadbd90"
 dependencies = [
  "bstr",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -1246,9 +1246,9 @@ dependencies = [
 
 [[package]]
 name = "globset"
-version = "0.4.15"
+version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"
+checksum = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5"
 dependencies = [
  "aho-corasick",
  "bstr",
@@ -1350,7 +1350,7 @@ dependencies = [
  "tree-sitter",
  "unicode-general-category",
  "unicode-segmentation",
- "unicode-width",
+ "unicode-width 0.1.12",
  "url",
 ]
 
@@ -1365,7 +1365,7 @@ dependencies = [
  "log",
  "serde",
  "serde_json",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
  "tokio",
 ]
 
@@ -1419,7 +1419,7 @@ dependencies = [
  "serde",
  "serde_json",
  "slotmap",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
  "tokio",
  "tokio-stream",
 ]
@@ -1449,7 +1449,7 @@ dependencies = [
  "regex-automata",
  "regex-cursor",
  "ropey",
- "rustix",
+ "rustix 1.0.2",
  "tempfile",
  "unicode-segmentation",
  "which",
@@ -1495,7 +1495,7 @@ dependencies = [
  "smallvec",
  "tempfile",
  "termini",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
  "tokio",
  "tokio-stream",
  "toml",
@@ -1556,12 +1556,12 @@ dependencies = [
  "log",
  "once_cell",
  "parking_lot",
- "rustix",
+ "rustix 1.0.2",
  "serde",
  "serde_json",
  "slotmap",
  "tempfile",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
  "tokio",
  "tokio-stream",
  "toml",
@@ -1772,9 +1772,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.7.1"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
+checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
 dependencies = [
  "equivalent",
  "hashbrown 0.15.2",
@@ -1782,9 +1782,9 @@ dependencies = [
 
 [[package]]
 name = "indoc"
-version = "2.0.5"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
+checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
 
 [[package]]
 name = "is-docker"
@@ -1856,9 +1856,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.169"
+version = "0.2.170"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
 
 [[package]]
 name = "libloading"
@@ -1867,7 +1867,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets",
 ]
 
 [[package]]
@@ -1887,6 +1887,12 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db9c683daf087dc577b7506e9695b3d556a9f3849903fa28186283afd6809e9"
+
 [[package]]
 name = "litemap"
 version = "0.7.3"
@@ -1905,9 +1911,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.25"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
+checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
 
 [[package]]
 name = "maybe-async"
@@ -2017,9 +2023,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.3"
+version = "1.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
+checksum = "cde51589ab56b20a6f686b2c68f7a0bd6add753d697abf720d63f8db3ab7b1ad"
 
 [[package]]
 name = "open"
@@ -2052,7 +2058,7 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets 0.52.6",
+ "windows-targets",
 ]
 
 [[package]]
@@ -2205,9 +2211,9 @@ dependencies = [
 
 [[package]]
 name = "regex-cursor"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae4327b5fde3ae6fda0152128d3d59b95a5aad7be91c405869300091720f7169"
+checksum = "0497c781d2f982ae8284d2932aee6a877e58a4541daa5e8fadc18cc75c23a61d"
 dependencies = [
  "log",
  "memchr",
@@ -2247,7 +2253,20 @@ dependencies = [
  "bitflags",
  "errno",
  "libc",
- "linux-raw-sys",
+ "linux-raw-sys 0.4.14",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustix"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7178faa4b75a30e269c71e61c353ce2748cf3d76f0c44c393f4e60abf49b825"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.9.2",
  "windows-sys 0.59.0",
 ]
 
@@ -2274,18 +2293,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.217"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.217"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2294,9 +2313,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.138"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
  "itoa",
  "memchr",
@@ -2466,15 +2485,15 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.17.1"
+version = "3.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230"
+checksum = "2c317e0a526ee6120d8dabad239c8dadca62b24b6f168914bbbc8e2fb1f0e567"
 dependencies = [
  "cfg-if",
  "fastrand",
  "getrandom 0.3.1",
  "once_cell",
- "rustix",
+ "rustix 1.0.2",
  "windows-sys 0.59.0",
 ]
 
@@ -2489,13 +2508,13 @@ dependencies = [
 
 [[package]]
 name = "textwrap"
-version = "0.16.1"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
+checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057"
 dependencies = [
  "smawk",
  "unicode-linebreak",
- "unicode-width",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
@@ -2509,11 +2528,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.11"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
 dependencies = [
- "thiserror-impl 2.0.11",
+ "thiserror-impl 2.0.12",
 ]
 
 [[package]]
@@ -2529,9 +2548,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.11"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2574,9 +2593,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.43.0"
+version = "1.44.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
+checksum = "9975ea0f48b5aa3972bf2d888c238182458437cc2a19374b81b25cdf1023fb3a"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2710,6 +2729,12 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
 
+[[package]]
+name = "unicode-width"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+
 [[package]]
 name = "url"
 version = "2.5.4"
@@ -2828,7 +2853,7 @@ checksum = "2774c861e1f072b3aadc02f8ba886c26ad6321567ecc294c935434cad06f1283"
 dependencies = [
  "either",
  "env_home",
- "rustix",
+ "rustix 0.38.44",
  "winsafe",
 ]
 
@@ -2869,17 +2894,14 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-targets",
 ]
 
 [[package]]
-name = "windows-sys"
-version = "0.48.0"
+name = "windows-link"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
+checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
 
 [[package]]
 name = "windows-sys"
@@ -2887,7 +2909,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-targets",
 ]
 
 [[package]]
@@ -2896,22 +2918,7 @@ version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
+ "windows-targets",
 ]
 
 [[package]]
@@ -2920,46 +2927,28 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.6",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
  "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.6",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
@@ -2972,48 +2961,24 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
diff --git a/Cargo.toml b/Cargo.toml
index da53c192e..52a52070a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,11 +41,12 @@ tree-sitter = { version = "0.22" }
 nucleo = "0.5.0"
 slotmap = "1.0.7"
 thiserror = "2.0"
-tempfile = "3.17.1"
-bitflags = "2.8"
+tempfile = "3.18.0"
+bitflags = "2.9"
 unicode-segmentation = "1.2"
 ropey = { version = "1.6.1", default-features = false, features = ["simd"] }
 foldhash = "0.1"
+parking_lot = "0.12"
 
 [workspace.package]
 version = "25.1.1"
diff --git a/book/src/SUMMARY.md b/book/src/SUMMARY.md
index e6be2ebc0..0aa705675 100644
--- a/book/src/SUMMARY.md
+++ b/book/src/SUMMARY.md
@@ -12,6 +12,7 @@
   - [Syntax aware motions](./syntax-aware-motions.md)
   - [Pickers](./pickers.md)
   - [Keymap](./keymap.md)
+  - [Command line](./command-line.md)
   - [Commands](./commands.md)
   - [Language support](./lang-support.md)
 - [Migrating from Vim](./from-vim.md)
diff --git a/book/src/command-line.md b/book/src/command-line.md
new file mode 100644
index 000000000..7bf32bbda
--- /dev/null
+++ b/book/src/command-line.md
@@ -0,0 +1,82 @@
+# Command line
+
+- [Quoting](#quoting)
+- [Flags](#flags)
+- [Expansions](#expansions)
+- [Exceptions](#exceptions)
+
+The command line is used for executing [typable commands](./commands.md#typable-commands) like `:write` or `:quit`. Press `:` to activate the command line.
+
+Typable commands optionally accept arguments. `:write` for example accepts an optional path to write the file contents. The command line also supports a quoting syntax for arguments, flags to modify command behaviors, and _expansions_ - a way to insert values from the editor. Most commands support these features but some have custom parsing rules (see the [exceptions](#exceptions) below).
+
+## Quoting
+
+By default, command arguments are split on tabs and space characters. `:open README.md CHANGELOG.md` for example should open two files, `README.md` and `CHANGELOG.md`. Arguments that contain spaces can be surrounded in single quotes (`'`) or backticks (`` ` ``) to prevent the space from separating the argument, like `:open 'a b.txt'`.
+
+Double quotes may be used the same way, but double quotes _expand_ their inner content. `:echo "%{cursor_line}"` for example may print `1` because of the expansion for the `cursor_line` variable. `:echo '%{cursor_line}'` though prints `%{cursor_line}` literally: content within single quotes or backticks is interpreted as-is.
+
+On Unix systems the backslash character may be used to escape certain characters depending on where it is used. Within an argument which isn't surround in quotes, the backslash can be used to escape the space or tab characters: `:open a\ b.txt` is equivalent to `:open 'a b.txt'`. The backslash may also be used to escape quote characters (`'`, `` ` ``, `"`) or the percent token (`%`) when used at the beginning of an argument. `:echo \%%sh{foo}` for example prints `%sh{foo}` instead of invoking a `foo` shell command and `:echo \"quote` prints `"quote`. The backslash character is treated literally in any other situation on Unix systems and always on Windows: `:echo \n` always prints `\n`.
+
+## Flags
+
+Command flags are optional switches that can be used to alter the behavior of a command. For example the `:sort` command accepts an optional `--reverse` (or `-r` for short) flag which causes the sort command to reverse the sorting direction. Typing the `-` character shows completions for the current command's flags, if any.
+
+The `--` flag specifies the end of flags. All arguments after `--` are treated as positional arguments: `:open -- -a.txt` opens a file called `-a.txt`.
+
+## Expansions
+
+Expansions are patterns that Helix recognizes and replaces within the command line. Helix recognizes anything starting with a percent token (`%`) as an expansion, for example `%sh{echo hi!}`. Expansions are particularly useful when used in commands like `:echo` or `:noop` for executing simple scripts. For example:
+
+```toml
+[keys.normal]
+# Print the current line's git blame information to the statusline.
+space.B = ":echo %sh{git blame -L %{cursor_line},+1 %{buffer_name}}"
+```
+
+Expansions take the form `%[<kind>]<open><contents><close>`. In `%sh{echo hi!}`, for example, the kind is `sh` - the shell expansion - and the contents are "echo hi!", with `{` and `}` acting as opening and closing delimiters. The following open/close characters are recognized as expansion delimiter pairs: `(`/`)`, `[`/`]`, `{`/`}` and `<`/`>`. Plus the single characters `'`, `"` or `|` may be used instead: `%{cursor_line}` is equivalent to `%<cursor_line>`, `%[cursor_line]` or `%|cursor_line|`.
+
+To escape a percent character instead of treating it as an expansion, use two percent characters consecutively. To execute a shell command like `date -u +'%Y-%m-%d'`, double the percent characters: `:echo %sh{date -u +'%%Y-%%m-%%d'}`.
+
+When no `<kind>` is provided, Helix will expand a **variable**. For example `%{cursor_line}` can be used as in argument to insert the line number. `:echo %{cursor_line}` for instance may print `1` to the statusline.
+
+The following variables are supported:
+
+| Name | Description |
+|---   |---          |
+| `cursor_line` | The line number of the primary cursor in the currently focused document, starting at 1. |
+| `cursor_column` | The column number of the primary cursor in the currently focused document, starting at 1. This is counted as the number of grapheme clusters from the start of the line rather than bytes or codepoints. |
+| `buffer_name` | The relative path of the currently focused document. `[scratch]` is expanded instead for scratch buffers. |
+| `line_ending` | A string containing the line ending of the currently focused document. For example on Unix systems this is usually a line-feed character (`\n`) but on Windows systems this may be a carriage-return plus a line-feed (`\r\n`). The line ending kind of the currently focused document can be inspected with the `:line-ending` command. |
+
+Aside from editor variables, the following expansions may be used:
+
+* Unicode `%u{..}`. The contents may contain up to six hexadecimal numbers corresponding to a Unicode codepoint value. For example `:echo %u{25CF}` prints `●` to the statusline.
+* Shell `%sh{..}`. The contents are passed to the configured shell command. For example `:echo %sh{echo "20 * 5" | bc}` may print `100` on the statusline on when using a shell with `echo` and the `bc` calculator installed. Shell expansions are evaluated recursively. `%sh{echo '%{buffer_name}:%{cursor_line}'}` for example executes a command like `echo 'README.md:1'`: the variables within the `%sh{..}` expansion are evaluated before executing the shell command.
+
+As mentioned above, double quotes can be used to surround arguments containing spaces but also support expansions within the quoted content unlike singe quotes or backticks. For example `:echo "circle: %u{25CF}"` prints `circle: ●` to the statusline while `:echo 'circle: %u{25CF}'` prints `circle: %u{25CF}`.
+
+Note that expansions are only evaluated once the Enter key is pressed in command mode.
+
+## Exceptions
+
+The following commands support expansions but otherwise pass the given argument directly to the shell program without interpreting quotes:
+
+* `:insert-output`
+* `:append-output`
+* `:pipe`
+* `:pipe-to`
+* `:run-shell-command`
+
+For example executing `:sh echo "%{buffer_name}:%{cursor_column}"` would pass text like `echo "README.md:1"` as an argument to the shell program: the expansions are evaluated but not the quotes. As mentioned above, percent characters can be used in shell commands by doubling the percent character. To insert the output of a command like `date -u +'%Y-%m-%d'` use `:insert-output date -u +'%%Y-%%m-%%d'`.
+
+The `:set-option` and `:toggle-option` commands use regular parsing for the first argument - the config option name - and parse the rest depending on the config option's type. `:set-option` interprets the second argument as a string for string config options and parses everything else as JSON.
+
+`:toggle-option`'s behavior depends on the JSON type of the config option supplied as the first argument:
+
+* Booleans: only the config option name should be provided. For example `:toggle-option auto-format` will flip the `auto-format` option.
+* Strings: the rest of the command line is parsed with regular quoting rules. For example `:toggle-option indent-heuristic hybrid tree-sitter simple` cycles through "hybrid", "tree-sitter" and "simple" values on each invocation of the command.
+* Numbers, arrays and objects: the rest of the command line is parsed as a stream of JSON values. For example `:toggle-option rulers [81] [51, 73]` cycles through `[81]` and `[51, 73]`.
+
+When providing multiple values to `:toggle-option` there should be no duplicates. `:toggle-option indent-heuristic hybrid simple tree-sitter simple` for example would only toggle between "hybrid" and "tree-sitter" values.
+
+`:lsp-workspace-command` works similarly to `:toggle-option`. The first argument (if present) is parsed according to normal rules. The rest of the line is parsed as JSON values. Unlike `:toggle-option`, string arguments for a command must be quoted. For example `:lsp-workspace-command lsp.Command "foo" "bar"`.
diff --git a/book/src/editor.md b/book/src/editor.md
index 2baa907f9..79f7284ce 100644
--- a/book/src/editor.md
+++ b/book/src/editor.md
@@ -53,6 +53,8 @@
 | `workspace-lsp-roots` | Directories relative to the workspace root that are treated as LSP roots. Should only be set in `.helix/config.toml` | `[]` |
 | `default-line-ending` | The line ending to use for new documents. Can be `native`, `lf`, `crlf`, `ff`, `cr` or `nel`. `native` uses the platform's native line ending (`crlf` on Windows, otherwise `lf`). | `native` |
 | `insert-final-newline` | Whether to automatically insert a trailing line-ending on write if missing | `true` |
+| `trim-final-newlines` | Whether to automatically remove line-endings after the final one on write | `false` |
+| `trim-trailing-whitespace` | Whether to automatically remove whitespace preceding line endings on write | `false` |
 | `popup-border` | Draw border around `popup`, `menu`, `all`, or `none` | `none` |
 | `indent-heuristic` | How the indentation for a newly inserted line is computed: `simple` just copies the indentation level from the previous line, `tree-sitter` computes the indentation based on the syntax tree and `hybrid` combines both approaches. If the chosen heuristic is not available, a different one will be used as a fallback (the fallback order being `hybrid` -> `tree-sitter` -> `simple`). | `hybrid`
 | `jump-label-alphabet` | The characters that are used to generate two character jump labels. Characters at the start of the alphabet are used first. | `"abcdefghijklmnopqrstuvwxyz"`
diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 833196b6b..b44faf9d1 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -4,7 +4,7 @@
 | adl | ✓ | ✓ | ✓ |  |
 | agda | ✓ |  |  |  |
 | amber | ✓ |  |  |  |
-| astro | ✓ |  |  |  |
+| astro | ✓ |  |  | `astro-ls` |
 | awk | ✓ | ✓ |  | `awk-language-server` |
 | bash | ✓ | ✓ | ✓ | `bash-language-server` |
 | bass | ✓ |  |  | `bass` |
@@ -134,6 +134,7 @@
 | log | ✓ |  |  |  |
 | lpf | ✓ |  |  |  |
 | lua | ✓ | ✓ | ✓ | `lua-language-server` |
+| mail | ✓ | ✓ |  |  |
 | make | ✓ |  | ✓ |  |
 | markdoc | ✓ |  |  | `markdoc-ls` |
 | markdown | ✓ |  |  | `marksman`, `markdown-oxide` |
@@ -168,14 +169,14 @@
 | php | ✓ | ✓ | ✓ | `intelephense` |
 | php-only | ✓ |  |  |  |
 | pkgbuild | ✓ | ✓ | ✓ | `termux-language-server`, `bash-language-server` |
-| pkl | ✓ |  | ✓ |  |
+| pkl | ✓ |  | ✓ | `pkl-lsp` |
 | po | ✓ | ✓ |  |  |
 | pod | ✓ |  |  |  |
 | ponylang | ✓ | ✓ | ✓ |  |
 | powershell | ✓ |  |  |  |
 | prisma | ✓ | ✓ |  | `prisma-language-server` |
 | prolog |  |  |  | `swipl` |
-| protobuf | ✓ | ✓ | ✓ | `bufls`, `pb` |
+| protobuf | ✓ | ✓ | ✓ | `buf`, `pb`, `protols` |
 | prql | ✓ |  |  |  |
 | purescript | ✓ | ✓ |  | `purescript-language-server` |
 | python | ✓ | ✓ | ✓ | `ruff`, `jedi-language-server`, `pylsp` |
@@ -202,11 +203,12 @@
 | sml | ✓ |  |  |  |
 | snakemake | ✓ |  | ✓ | `pylsp` |
 | solidity | ✓ | ✓ |  | `solc` |
+| sourcepawn | ✓ | ✓ |  | `sourcepawn-studio` |
 | spade | ✓ |  | ✓ | `spade-language-server` |
 | spicedb | ✓ |  |  |  |
 | sql | ✓ | ✓ |  |  |
 | sshclientconfig | ✓ |  |  |  |
-| starlark | ✓ | ✓ |  |  |
+| starlark | ✓ | ✓ |  | `starpls` |
 | strace | ✓ |  |  |  |
 | supercollider | ✓ |  |  |  |
 | svelte | ✓ |  | ✓ | `svelteserver` |
@@ -223,6 +225,7 @@
 | textproto | ✓ | ✓ | ✓ |  |
 | tfvars | ✓ |  | ✓ | `terraform-ls` |
 | thrift | ✓ |  |  |  |
+| tlaplus | ✓ |  |  |  |
 | todotxt | ✓ |  |  |  |
 | toml | ✓ | ✓ |  | `taplo` |
 | tsq | ✓ |  |  | `ts_query_ls` |
@@ -244,7 +247,7 @@
 | wast | ✓ |  |  |  |
 | wat | ✓ |  |  | `wat_server` |
 | webc | ✓ |  |  |  |
-| wgsl | ✓ |  |  | `wgsl_analyzer` |
+| wgsl | ✓ |  |  | `wgsl-analyzer` |
 | wit | ✓ |  | ✓ |  |
 | wren | ✓ | ✓ | ✓ |  |
 | xit | ✓ |  |  |  |
diff --git a/book/src/generated/typable-cmd.md b/book/src/generated/typable-cmd.md
index 55820e08b..dc5a6d08a 100644
--- a/book/src/generated/typable-cmd.md
+++ b/book/src/generated/typable-cmd.md
@@ -67,10 +67,9 @@
 | `:goto`, `:g` | Goto line number. |
 | `:set-language`, `:lang` | Set the language of current buffer (show current language if no value specified). |
 | `:set-option`, `:set` | Set a config option at runtime.<br>For example to disable smart case search, use `:set search.smart-case false`. |
-| `:toggle-option`, `:toggle` | Toggle a boolean config option at runtime.<br>For example to toggle smart case search, use `:toggle search.smart-case`. |
+| `:toggle-option`, `:toggle` | Toggle a config option at runtime.<br>For example to toggle smart case search, use `:toggle search.smart-case`. |
 | `:get-option`, `:get` | Get the current value of a config option. |
 | `:sort` | Sort ranges in selection. |
-| `:rsort` | Sort ranges in selection in reverse order. |
 | `:reflow` | Hard-wrap the current selection of lines to a given width. |
 | `:tree-sitter-subtree`, `:ts-subtree` | Display the smallest tree-sitter subtree that spans the primary selection, primarily for debugging queries. |
 | `:config-reload` | Refresh user config. |
@@ -88,3 +87,5 @@
 | `:move`, `:mv` | Move the current buffer and its corresponding file to a different path |
 | `:yank-diagnostic` | Yank diagnostic(s) under primary cursor to register, or clipboard by default |
 | `:read`, `:r` | Load a file into buffer |
+| `:echo` | Prints the given arguments to the statusline. |
+| `:noop` | Does nothing. |
diff --git a/book/src/install.md b/book/src/install.md
index 6c536a881..021feceb2 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -1,6 +1,7 @@
 # Installing Helix
 
-To install Helix, follow the instructions specific to your operating system.
+The typical way to install Helix is via [your operating system's package manager](./package-managers.md).
+
 Note that:
 
 - To get the latest nightly version of Helix, you need to
diff --git a/default.nix b/default.nix
index d2c51ec3a..d94e707d3 100644
--- a/default.nix
+++ b/default.nix
@@ -1,8 +1,84 @@
-# Flake's default package for non-flake-enabled nix instances
-let
-  compat = builtins.fetchTarball {
-    url = "https://github.com/edolstra/flake-compat/archive/b4a34015c698c7793d592d66adbab377907a2be8.tar.gz";
-    sha256 = "sha256:1qc703yg0babixi6wshn5wm2kgl5y1drcswgszh4xxzbrwkk9sv7";
-  };
+{
+  lib,
+  rustPlatform,
+  callPackage,
+  runCommand,
+  installShellFiles,
+  git,
+  gitRev ? null,
+  ...
+}: let
+  fs = lib.fileset;
+
+  src = fs.difference (fs.gitTracked ./.) (fs.unions [
+    ./.envrc
+    ./rustfmt.toml
+    ./screenshot.png
+    ./book
+    ./docs
+    ./runtime
+    ./flake.lock
+    (fs.fileFilter (file: lib.strings.hasInfix ".git" file.name) ./.)
+    (fs.fileFilter (file: file.hasExt "svg") ./.)
+    (fs.fileFilter (file: file.hasExt "md") ./.)
+    (fs.fileFilter (file: file.hasExt "nix") ./.)
+  ]);
+
+  # Next we actually need to build the grammars and the runtime directory
+  # that they reside in. It is built by calling the derivation in the
+  # grammars.nix file, then taking the runtime directory in the git repo
+  # and hooking symlinks up to it.
+  grammars = callPackage ./grammars.nix {};
+  runtimeDir = runCommand "helix-runtime" {} ''
+    mkdir -p $out
+    ln -s ${./runtime}/* $out
+    rm -r $out/grammars
+    ln -s ${grammars} $out/grammars
+  '';
 in
-  (import compat {src = ./.;}).defaultNix
+  rustPlatform.buildRustPackage (self: {
+    cargoLock = {
+      lockFile = ./Cargo.lock;
+      # This is not allowed in nixpkgs but is very convenient here: it allows us to
+      # avoid specifying `outputHashes` here for any git dependencies we might take
+      # on temporarily.
+      allowBuiltinFetchGit = true;
+    };
+
+    nativeBuildInputs = [
+      installShellFiles
+      git
+    ];
+
+    buildType = "release";
+
+    name = with builtins; (fromTOML (readFile ./helix-term/Cargo.toml)).package.name;
+    src = fs.toSource {
+      root = ./.;
+      fileset = src;
+    };
+
+    # Helix attempts to reach out to the network and get the grammars. Nix doesn't allow this.
+    HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
+
+    # So Helix knows what rev it is.
+    HELIX_NIX_BUILD_REV = gitRev;
+
+    doCheck = false;
+    strictDeps = true;
+
+    # Sets the Helix runtime dir to the grammars
+    env.HELIX_DEFAULT_RUNTIME = "${runtimeDir}";
+
+    # Get all the application stuff in the output directory.
+    postInstall = ''
+      mkdir -p $out/lib
+      installShellCompletion ${./contrib/completion}/hx.{bash,fish,zsh}
+      mkdir -p $out/share/{applications,icons/hicolor/{256x256,scalable}/apps}
+      cp ${./contrib/Helix.desktop} $out/share/applications
+      cp ${./logo.svg} $out/share/icons/hicolor/scalable/apps/helix.svg
+      cp ${./contrib/helix.png} $out/share/icons/hicolor/256x256/apps
+    '';
+
+    meta.mainProgram = "hx";
+  })
diff --git a/flake.lock b/flake.lock
index 62ff34477..7e3d5bd3c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,20 +1,5 @@
 {
   "nodes": {
-    "crane": {
-      "locked": {
-        "lastModified": 1737563566,
-        "narHash": "sha256-GLJvkOG29XCynQm8XWPyykMRqIhxKcBARVu7Ydrz02M=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "849376434956794ebc7a6b487d31aace395392ba",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "repo": "crane",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -35,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1728018373,
-        "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
+        "lastModified": 1740560979,
+        "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
+        "rev": "5135c59491985879812717f4c9fea69604e7f26f",
         "type": "github"
       },
       "original": {
@@ -51,7 +36,6 @@
     },
     "root": {
       "inputs": {
-        "crane": "crane",
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs",
         "rust-overlay": "rust-overlay"
@@ -64,11 +48,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737599167,
-        "narHash": "sha256-S2rHCrQWCDVp63XxL/AQbGr1g5M8Zx14C7Jooa4oM8o=",
+        "lastModified": 1740623427,
+        "narHash": "sha256-3SdPQrZoa4odlScFDUHd4CUPQ/R1gtH4Mq9u8CBiK8M=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "38374302ae9edf819eac666d1f276d62c712dd06",
+        "rev": "d342e8b5fd88421ff982f383c853f0fc78a847ab",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 1fda3fa94..a334a345d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,183 +8,79 @@
       url = "github:oxalica/rust-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    crane.url = "github:ipetkov/crane";
   };
 
   outputs = {
     self,
     nixpkgs,
-    crane,
     flake-utils,
     rust-overlay,
     ...
-  }:
+  }: let
+    gitRev = self.rev or self.dirtyRev or null;
+  in
     flake-utils.lib.eachDefaultSystem (system: let
       pkgs = import nixpkgs {
         inherit system;
         overlays = [(import rust-overlay)];
       };
-      mkRootPath = rel:
-        builtins.path {
-          path = "${toString ./.}/${rel}";
-          name = rel;
-        };
-      filteredSource = let
-        pathsToIgnore = [
-          ".envrc"
-          ".ignore"
-          ".github"
-          ".gitignore"
-          "logo_dark.svg"
-          "logo_light.svg"
-          "rust-toolchain.toml"
-          "rustfmt.toml"
-          "runtime"
-          "screenshot.png"
-          "book"
-          "docs"
-          "README.md"
-          "CHANGELOG.md"
-          "shell.nix"
-          "default.nix"
-          "grammars.nix"
-          "flake.nix"
-          "flake.lock"
-        ];
-        ignorePaths = path: type: let
-          inherit (nixpkgs) lib;
-          # split the nix store path into its components
-          components = lib.splitString "/" path;
-          # drop off the `/nix/hash-source` section from the path
-          relPathComponents = lib.drop 4 components;
-          # reassemble the path components
-          relPath = lib.concatStringsSep "/" relPathComponents;
-        in
-          lib.all (p: ! (lib.hasPrefix p relPath)) pathsToIgnore;
-      in
-        builtins.path {
-          name = "helix-source";
-          path = toString ./.;
-          # filter out unnecessary paths
-          filter = ignorePaths;
-        };
-      makeOverridableHelix = old: config: let
-        grammars = pkgs.callPackage ./grammars.nix config;
-        runtimeDir = pkgs.runCommand "helix-runtime" {} ''
-          mkdir -p $out
-          ln -s ${mkRootPath "runtime"}/* $out
-          rm -r $out/grammars
-          ln -s ${grammars} $out/grammars
-        '';
-        helix-wrapped =
-          pkgs.runCommand
-          old.name
-          {
-            inherit (old) pname version;
-            meta = old.meta or {};
-            passthru =
-              (old.passthru or {})
-              // {
-                unwrapped = old;
-              };
-            nativeBuildInputs = [pkgs.makeWrapper];
-            makeWrapperArgs = config.makeWrapperArgs or [];
-          }
-          ''
-            cp -rs --no-preserve=mode,ownership ${old} $out
-            wrapProgram "$out/bin/hx" ''${makeWrapperArgs[@]} --set HELIX_RUNTIME "${runtimeDir}"
-          '';
-      in
-        helix-wrapped
-        // {
-          override = makeOverridableHelix old;
-          passthru =
-            helix-wrapped.passthru
-            // {
-              wrapper = old: makeOverridableHelix old config;
-            };
-        };
-      stdenv =
-        if pkgs.stdenv.isLinux
-        then pkgs.stdenv
-        else pkgs.clangStdenv;
-      rustFlagsEnv = pkgs.lib.optionalString stdenv.isLinux "-C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment --cfg tokio_unstable";
-      rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
-      craneLibMSRV = (crane.mkLib pkgs).overrideToolchain rustToolchain;
-      craneLibStable = (crane.mkLib pkgs).overrideToolchain pkgs.pkgsBuildHost.rust-bin.stable.latest.default;
-      commonArgs = {
-        inherit stdenv;
-        inherit (craneLibMSRV.crateNameFromCargoToml {cargoToml = ./helix-term/Cargo.toml;}) pname;
-        inherit (craneLibMSRV.crateNameFromCargoToml {cargoToml = ./Cargo.toml;}) version;
-        src = filteredSource;
-        # disable fetching and building of tree-sitter grammars in the helix-term build.rs
-        HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
-        buildInputs = [stdenv.cc.cc.lib];
-        nativeBuildInputs = [pkgs.installShellFiles];
-        # disable tests
-        doCheck = false;
-        meta.mainProgram = "hx";
+
+      # Get Helix's MSRV toolchain to build with by default.
+      msrvToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
+      msrvPlatform = pkgs.makeRustPlatform {
+        cargo = msrvToolchain;
+        rustc = msrvToolchain;
       };
-      cargoArtifacts = craneLibMSRV.buildDepsOnly commonArgs;
     in {
-      packages = {
-        helix-unwrapped = craneLibStable.buildPackage (commonArgs
-          // {
-            cargoArtifacts = craneLibStable.buildDepsOnly commonArgs;
-            postInstall = ''
-              mkdir -p $out/share/applications $out/share/icons/hicolor/scalable/apps $out/share/icons/hicolor/256x256/apps
-              cp contrib/Helix.desktop $out/share/applications
-              cp logo.svg $out/share/icons/hicolor/scalable/apps/helix.svg
-              cp contrib/helix.png $out/share/icons/hicolor/256x256/apps
-              installShellCompletion contrib/completion/hx.{bash,fish,zsh}
-            '';
-            # set git revision for nix flake builds, see 'git_hash' in helix-loader/build.rs
-            HELIX_NIX_BUILD_REV = self.rev or self.dirtyRev or null;
-          });
-        helix = makeOverridableHelix self.packages.${system}.helix-unwrapped {};
-        default = self.packages.${system}.helix;
+      packages = rec {
+        helix = pkgs.callPackage ./default.nix {inherit gitRev;};
+
+        /**
+        The default Helix build. Uses the latest stable Rust toolchain, and unstable
+        nixpkgs.
+        
+        The build inputs can be overriden with the following:
+         
+        packages.${system}.default.override { rustPlatform = newPlatform; };
+         
+        Overriding a derivation attribute can be done as well:
+        
+        packages.${system}.default.overrideAttrs { buildType = "debug"; };
+        */ 
+        default = helix;
       };
 
-      checks = {
-        # Build the crate itself
-        inherit (self.packages.${system}) helix;
-
-        clippy = craneLibMSRV.cargoClippy (commonArgs
-          // {
-            inherit cargoArtifacts;
-            cargoClippyExtraArgs = "--all-targets -- --deny warnings";
-          });
-
-        fmt = craneLibMSRV.cargoFmt commonArgs;
-
-        doc = craneLibMSRV.cargoDoc (commonArgs
-          // {
-            inherit cargoArtifacts;
-          });
-
-        test = craneLibMSRV.cargoTest (commonArgs
-          // {
-            inherit cargoArtifacts;
-          });
+      checks.helix = self.outputs.packages.${system}.helix.override {
+        buildType = "debug";
+        rustPlatform = msrvPlatform;
       };
 
-      devShells.default = pkgs.mkShell {
-        inputsFrom = builtins.attrValues self.checks.${system};
-        nativeBuildInputs = with pkgs;
-          [lld_13 cargo-flamegraph rust-analyzer]
-          ++ (lib.optional (stdenv.isx86_64 && stdenv.isLinux) pkgs.cargo-tarpaulin)
-          ++ (lib.optional stdenv.isLinux pkgs.lldb)
-          ++ (lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.CoreFoundation);
-        shellHook = ''
-          export HELIX_RUNTIME="$PWD/runtime"
-          export RUST_BACKTRACE="1"
-          export RUSTFLAGS="''${RUSTFLAGS:-""} ${rustFlagsEnv}"
-        '';
-      };
+      # Devshell behavior is preserved.
+      devShells.default = let
+        commonRustFlagsEnv = "-C link-arg=-fuse-ld=lld -C target-cpu=native --cfg tokio_unstable";
+        platformRustFlagsEnv = pkgs.lib.optionalString pkgs.stdenv.isLinux "-Clink-arg=-Wl,--no-rosegment";
+      in
+        pkgs.mkShell
+        {
+          inputsFrom = [self.checks.${system}.helix];
+          nativeBuildInputs = with pkgs;
+            [
+              lld
+              cargo-flamegraph
+              rust-bin.nightly.latest.rust-analyzer
+            ]
+            ++ (lib.optional (stdenv.isx86_64 && stdenv.isLinux) cargo-tarpaulin)
+            ++ (lib.optional stdenv.isLinux lldb)
+            ++ (lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation);
+          shellHook = ''
+            export RUST_BACKTRACE="1"
+            export RUSTFLAGS="''${RUSTFLAGS:-""} ${commonRustFlagsEnv} ${platformRustFlagsEnv}"
+          '';
+        };
     })
     // {
       overlays.default = final: prev: {
-        inherit (self.packages.${final.system}) helix;
+        helix = final.callPackage ./default.nix {inherit gitRev;};
       };
     };
 
diff --git a/grammars.nix b/grammars.nix
index 967b1b136..bc99d21df 100644
--- a/grammars.nix
+++ b/grammars.nix
@@ -32,10 +32,10 @@
   # If `use-grammars.except` is set, use all other grammars.
   # Otherwise use all grammars.
   useGrammar = grammar:
-    if languagesConfig?use-grammars.only then
-      builtins.elem grammar.name languagesConfig.use-grammars.only
-    else if languagesConfig?use-grammars.except then
-      !(builtins.elem grammar.name languagesConfig.use-grammars.except)
+    if languagesConfig ? use-grammars.only
+    then builtins.elem grammar.name languagesConfig.use-grammars.only
+    else if languagesConfig ? use-grammars.except
+    then !(builtins.elem grammar.name languagesConfig.use-grammars.except)
     else true;
   grammarsToUse = builtins.filter useGrammar languagesConfig.grammar;
   gitGrammars = builtins.filter isGitGrammar grammarsToUse;
@@ -66,10 +66,10 @@
       version = grammar.source.rev;
 
       src = source;
-      sourceRoot = if builtins.hasAttr "subpath" grammar.source then
-        "source/${grammar.source.subpath}"
-      else
-        "source";
+      sourceRoot =
+        if builtins.hasAttr "subpath" grammar.source
+        then "source/${grammar.source.subpath}"
+        else "source";
 
       dontConfigure = true;
 
@@ -116,15 +116,19 @@
       '';
     };
   grammarsToBuild = builtins.filter includeGrammarIf gitGrammars;
-  builtGrammars = builtins.map (grammar: {
-    inherit (grammar) name;
-    value = buildGrammar grammar;
-  }) grammarsToBuild;
+  builtGrammars =
+    builtins.map (grammar: {
+      inherit (grammar) name;
+      value = buildGrammar grammar;
+    })
+    grammarsToBuild;
   extensibleGrammars =
     lib.makeExtensible (self: builtins.listToAttrs builtGrammars);
-  overlaidGrammars = lib.pipe extensibleGrammars
+  overlaidGrammars =
+    lib.pipe extensibleGrammars
     (builtins.map (overlay: grammar: grammar.extend overlay) grammarOverlays);
-  grammarLinks = lib.mapAttrsToList
+  grammarLinks =
+    lib.mapAttrsToList
     (name: artifact: "ln -s ${artifact}/${name}.so $out/${name}.so")
     (lib.filterAttrs (n: v: lib.isDerivation v) overlaidGrammars);
 in
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 4f9cfd86c..10fb5a52c 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -33,7 +33,7 @@ unicode-width = "=0.1.12"
 unicode-general-category = "1.0"
 slotmap.workspace = true
 tree-sitter.workspace = true
-once_cell = "1.20"
+once_cell = "1.21"
 arc-swap = "1"
 regex = "1"
 bitflags.workspace = true
@@ -53,13 +53,13 @@ encoding_rs = "0.8"
 
 chrono = { version = "0.4", default-features = false, features = ["alloc", "std"] }
 
-textwrap = "0.16.1"
+textwrap = "0.16.2"
 
 nucleo.workspace = true
-parking_lot = "0.12"
-globset = "0.4.15"
-regex-cursor = "0.1.4"
+parking_lot.workspace = true
+globset = "0.4.16"
+regex-cursor = "0.1.5"
 
 [dev-dependencies]
 quickcheck = { version = "1", default-features = false }
-indoc = "2.0.5"
+indoc = "2.0.6"
diff --git a/helix-core/src/command_line.rs b/helix-core/src/command_line.rs
new file mode 100644
index 000000000..960b247df
--- /dev/null
+++ b/helix-core/src/command_line.rs
@@ -0,0 +1,1270 @@
+//! Types and parsing code for command mode (`:`) input.
+//!
+//! Command line parsing is done in steps:
+//!
+//! * The `Tokenizer` iterator returns `Token`s from the command line input naively - without
+//!   accounting for a command's signature.
+//! * When executing a command (pressing `<ret>` in command mode), tokens are expanded with
+//!   information from the editor like the current cursor line or column. Otherwise the tokens
+//!   are unwrapped to their inner content.
+//! * `Args` interprets the contents (potentially expanded) as flags or positional arguments.
+//!   When executing a command, `Args` performs validations like checking the number of positional
+//!   arguments supplied and whether duplicate or unknown flags were supplied.
+//!
+//! `Args` is the interface used by typable command implementations. `Args` may be treated as a
+//! slice of `Cow<str>` or `&str` to access positional arguments, for example `for arg in args`
+//! iterates over positional args (never flags) and `&args[0]` always corresponds to the first
+//! positional. Use `Args::has_flag` and `Args::get_flag` to read any specified flags.
+//!
+//! `Args` and `Tokenizer` are intertwined. `Args` may ask the `Tokenizer` for the rest of the
+//! command line as a single token after the configured number of positionals has been reached
+//! (according to `raw_after`). This is used for the custom parsing in `:set-option` and
+//! `:toggle-option` for example. Outside of executing commands, the `Tokenizer` can be used
+//! directly to interpret a string according to the regular tokenization rules.
+//!
+//! This module also defines structs for configuring the parsing of the command line for a
+//! command. See `Flag` and `Signature`.
+
+use std::{borrow::Cow, collections::HashMap, error::Error, fmt, ops, slice, vec};
+
+/// Splits a command line into the command and arguments parts.
+///
+/// The third tuple member describes whether the command part is finished. When this boolean is
+/// true the completion code for the command line should complete command names, otherwise
+/// command arguments.
+pub fn split(line: &str) -> (&str, &str, bool) {
+    const SEPARATOR_PATTERN: [char; 2] = [' ', '\t'];
+
+    let (command, rest) = line.split_once(SEPARATOR_PATTERN).unwrap_or((line, ""));
+
+    let complete_command =
+        command.is_empty() || (rest.trim().is_empty() && !line.ends_with(SEPARATOR_PATTERN));
+
+    (command, rest, complete_command)
+}
+
+/// A Unix-like flag that a command may accept.
+///
+/// For example the `:sort` command accepts a `--reverse` (or `-r` for shorthand) boolean flag
+/// which controls the direction of sorting. Flags may accept an argument by setting the
+/// `completions` field to `Some`.
+#[derive(Debug, Clone, Copy)]
+pub struct Flag {
+    /// The name of the flag.
+    ///
+    /// This value is also used to construct the "longhand" version of the flag. For example a
+    /// flag with a name "reverse" has a longhand `--reverse`.
+    ///
+    /// This value should be supplied when reading a flag out of the [Args] with [Args::get_flag]
+    /// and [Args::has_flag]. The `:sort` command implementation for example should ask for
+    /// `args.has_flag("reverse")`.
+    pub name: &'static str,
+    /// The character that can be used as a shorthand for the flag, optionally.
+    ///
+    /// For example a flag like "reverse" mentioned above might take an alias `Some('r')` to
+    /// allow specifying the flag as `-r`.
+    pub alias: Option<char>,
+    pub doc: &'static str,
+    /// The completion values to use when specifying an argument for a flag.
+    ///
+    /// This should be set to `None` for boolean flags and `Some(&["foo", "bar", "baz"])` for
+    /// example for flags which accept options, with the strings corresponding to values that
+    /// should be shown in completion.
+    pub completions: Option<&'static [&'static str]>,
+}
+
+impl Flag {
+    // This allows defining flags with the `..Flag::DEFAULT` shorthand. The `name` and `doc`
+    // fields should always be overwritten.
+    pub const DEFAULT: Self = Self {
+        name: "",
+        doc: "",
+        alias: None,
+        completions: None,
+    };
+}
+
+/// A description of how a command's input should be handled.
+///
+/// Each typable command defines a signature (with the help of `Signature::DEFAULT`) at least to
+/// declare how many positional arguments it accepts. Command flags are also declared in this
+/// struct. The `raw_after` option may be set optionally to avoid evaluating quotes in parts of
+/// the command line (useful for shell commands for example).
+#[derive(Debug, Clone, Copy)]
+#[allow(clippy::manual_non_exhaustive)]
+pub struct Signature {
+    /// The minimum and (optionally) maximum number of positional arguments a command may take.
+    ///
+    /// For example accepting exactly one positional can be specified with `(1, Some(1))` while
+    /// accepting zero-or-more positionals can be specified as `(0, None)`.
+    ///
+    /// The number of positionals is checked when hitting `<ret>` in command mode. If the actual
+    /// number of positionals is outside the declared range then the command is not executed and
+    /// an error is shown instead. For example `:write` accepts zero or one positional arguments
+    /// (`(0, Some(1))`). A command line like `:write a.txt b.txt` is outside the declared range
+    /// and is not accepted.
+    pub positionals: (usize, Option<usize>),
+    /// The number of **positional** arguments for the parser to read with normal quoting rules.
+    ///
+    /// Once the number has been exceeded then the tokenizer returns the rest of the input as a
+    /// `TokenKind::Expand` token (see `Tokenizer::rest`), meaning that quoting rules do not apply
+    /// and none of the remaining text may be treated as a flag.
+    ///
+    /// If this is set to `None` then the entire command line is parsed with normal quoting and
+    /// flag rules.
+    ///
+    /// A good example use-case for this option is `:toggle-option` which sets `Some(1)`.
+    /// Everything up to the first positional argument is interpreted according to normal rules
+    /// and the rest of the input is parsed "raw". This allows `:toggle-option` to perform custom
+    /// parsing on the rest of the input - namely parsing complicated values as a JSON stream.
+    /// `:toggle-option` could accept a flag in the future. If so, the flag would need to come
+    /// before the first positional argument.
+    ///
+    /// Consider these lines for `:toggle-option` which sets `Some(1)`:
+    ///
+    /// * `:toggle foo` has one positional "foo" and no flags.
+    /// * `:toggle foo bar` has two positionals. Expansions for `bar` are evaluated but quotes
+    ///   and anything that looks like a flag are treated literally.
+    /// * `:toggle foo --bar` has two positionals: `["foo", "--bar"]`. `--bar` is not considered
+    ///   to be a flag because it comes after the first positional.
+    /// * `:toggle --bar foo` has one positional "foo" and one flag "--bar".
+    /// * `:toggle --bar foo --baz` has two positionals `["foo", "--baz"]` and one flag "--bar".
+    pub raw_after: Option<u8>,
+    /// A set of flags that a command may accept.
+    ///
+    /// See the `Flag` struct for more info.
+    pub flags: &'static [Flag],
+    /// Do not set this field. Use `..Signature::DEFAULT` to construct a `Signature` instead.
+    // This field allows adding new fields later with minimal code changes. This works like a
+    // `#[non_exhaustive]` annotation except that it supports the `..Signature::DEFAULT`
+    // shorthand.
+    pub _dummy: (),
+}
+
+impl Signature {
+    // This allows defining signatures with the `..Signature::DEFAULT` shorthand. The
+    // `positionals` field should always be overwritten.
+    pub const DEFAULT: Self = Self {
+        positionals: (0, None),
+        raw_after: None,
+        flags: &[],
+        _dummy: (),
+    };
+
+    fn check_positional_count(&self, actual: usize) -> Result<(), ParseArgsError<'static>> {
+        let (min, max) = self.positionals;
+        if min <= actual && max.unwrap_or(usize::MAX) >= actual {
+            Ok(())
+        } else {
+            Err(ParseArgsError::WrongPositionalCount { min, max, actual })
+        }
+    }
+}
+
+#[derive(Debug, PartialEq, Eq)]
+pub enum ParseArgsError<'a> {
+    WrongPositionalCount {
+        min: usize,
+        max: Option<usize>,
+        actual: usize,
+    },
+    UnterminatedToken {
+        token: Token<'a>,
+    },
+    DuplicatedFlag {
+        flag: &'static str,
+    },
+    UnknownFlag {
+        text: Cow<'a, str>,
+    },
+    FlagMissingArgument {
+        flag: &'static str,
+    },
+    MissingExpansionDelimiter {
+        expansion: &'a str,
+    },
+    UnknownExpansion {
+        kind: &'a str,
+    },
+}
+
+impl fmt::Display for ParseArgsError<'_> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::WrongPositionalCount { min, max, actual } => {
+                write!(f, "expected ")?;
+                let maybe_plural = |n| if n == 1 { "" } else { "s" };
+                match (min, max) {
+                    (0, Some(0)) => write!(f, "no arguments")?,
+                    (min, Some(max)) if min == max => {
+                        write!(f, "exactly {min} argument{}", maybe_plural(*min))?
+                    }
+                    (min, _) if actual < min => {
+                        write!(f, "at least {min} argument{}", maybe_plural(*min))?
+                    }
+                    (_, Some(max)) if actual > max => {
+                        write!(f, "at most {max} argument{}", maybe_plural(*max))?
+                    }
+                    // `actual` must be either less than `min` or greater than `max` for this type
+                    // to be constructed.
+                    _ => unreachable!(),
+                }
+
+                write!(f, ", got {actual}")
+            }
+            Self::UnterminatedToken { token } => {
+                write!(f, "unterminated token {}", token.content)
+            }
+            Self::DuplicatedFlag { flag } => {
+                write!(f, "flag '--{flag}' specified more than once")
+            }
+            Self::UnknownFlag { text } => write!(f, "unknown flag '{text}'"),
+            Self::FlagMissingArgument { flag } => {
+                write!(f, "flag '--{flag}' missing an argument")
+            }
+            Self::MissingExpansionDelimiter { expansion } => {
+                if expansion.is_empty() {
+                    write!(f, "'%' was not properly escaped. Please use '%%'")
+                } else {
+                    write!(f, "missing a string delimiter after '%{expansion}'")
+                }
+            }
+            Self::UnknownExpansion { kind } => {
+                write!(f, "unknown expansion '{kind}'")
+            }
+        }
+    }
+}
+
+impl Error for ParseArgsError<'_> {}
+
+/// The kind of expansion to use on the token's content.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum ExpansionKind {
+    /// Expand variables from the editor's state.
+    ///
+    /// For example `%{cursor_line}`.
+    Variable,
+    /// Treat the token contents as hexadecimal corresponding to a Unicode codepoint value.
+    ///
+    /// For example `%u{25CF}`.
+    Unicode,
+    /// Run the token's contents via the configured shell program.
+    ///
+    /// For example `%sh{echo hello}`.
+    Shell,
+}
+
+impl ExpansionKind {
+    pub const VARIANTS: &'static [Self] = &[Self::Variable, Self::Unicode, Self::Shell];
+
+    pub const fn as_str(&self) -> &'static str {
+        match self {
+            Self::Variable => "",
+            Self::Unicode => "u",
+            Self::Shell => "sh",
+        }
+    }
+
+    pub fn from_kind(name: &str) -> Option<Self> {
+        match name {
+            "" => Some(Self::Variable),
+            "u" => Some(Self::Unicode),
+            "sh" => Some(Self::Shell),
+            _ => None,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Quote {
+    Single,
+    Backtick,
+}
+
+impl Quote {
+    pub const fn char(&self) -> char {
+        match self {
+            Self::Single => '\'',
+            Self::Backtick => '`',
+        }
+    }
+
+    // Quotes can be escaped by doubling them: `'hello '' world'` becomes `hello ' world`.
+    pub const fn escape(&self) -> &'static str {
+        match self {
+            Self::Single => "''",
+            Self::Backtick => "``",
+        }
+    }
+}
+
+/// The type of argument being written.
+///
+/// The token kind decides how an argument in the command line will be expanded upon hitting
+/// `<ret>` in command mode.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum TokenKind {
+    /// Unquoted text.
+    ///
+    /// For example in `:echo hello world`, "hello" and "world" are raw tokens.
+    Unquoted,
+    /// Quoted text which is interpreted literally.
+    ///
+    /// The purpose of this kind is to avoid splitting arguments on whitespace. For example
+    /// `:open 'a b.txt'` will result in opening a file with a single argument `"a b.txt"`.
+    ///
+    /// Using expansions within single quotes or backticks will result in the expansion text
+    /// being shown literally. For example `:echo '%u{0020}'` will print `"%u{0020}"` to the
+    /// statusline.
+    Quoted(Quote),
+    /// Text within double quote delimiters (`"`).
+    ///
+    /// The inner text of a double quoted argument can be further expanded. For example
+    /// `:echo "line: #%{cursor_line}"` could print `"line: #1"` to the statusline.
+    Expand,
+    /// An expansion / "percent token".
+    ///
+    /// These take the form `%[<kind>]<open><contents><close>`. See `ExpansionKind`.
+    Expansion(ExpansionKind),
+    /// A token kind that exists for the sake of completion.
+    ///
+    /// In input like `%foo` this token contains the text `"%foo"`. The content start is the byte
+    /// after the percent token.
+    ///
+    /// When `Tokenizer` is passed `true` for its `validate` parameter this token cannot be
+    /// returned: inputs that would return this token get a validation error instead.
+    ExpansionKind,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct Token<'a> {
+    pub kind: TokenKind,
+    /// The byte index into the input where the token's content starts.
+    ///
+    /// For quoted text this means the byte after the quote. For expansions this means the byte
+    /// after the opening delimiter.
+    pub content_start: usize,
+    /// The inner content of the token.
+    ///
+    /// Usually this content borrows from the input but an owned value may be used in cases of
+    /// escaping. On Unix systems a raw token like `a\ b` has the contents `"a b"`.
+    pub content: Cow<'a, str>,
+    /// Whether the token's opening delimiter is closed.
+    ///
+    /// For example a quote `"foo"` is closed but not `"foo` or an expansion `%sh{..}` is closed
+    /// but not `%sh{echo {}`.
+    pub is_terminated: bool,
+}
+
+impl Token<'_> {
+    pub fn empty_at(content_start: usize) -> Self {
+        Self {
+            kind: TokenKind::Unquoted,
+            content_start,
+            content: Cow::Borrowed(""),
+            is_terminated: false,
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Tokenizer<'a> {
+    input: &'a str,
+    /// Whether to return errors in the iterator for failed validations like unterminated strings
+    /// or expansions. When this is set to `false` the iterator will never return `Err`.
+    validate: bool,
+    /// The current byte index of the input being considered.
+    pos: usize,
+}
+
+impl<'a> Tokenizer<'a> {
+    pub fn new(input: &'a str, validate: bool) -> Self {
+        Self {
+            input,
+            validate,
+            pos: 0,
+        }
+    }
+
+    /// Returns the current byte index position of the parser in the input.
+    pub fn pos(&self) -> usize {
+        self.pos
+    }
+
+    /// Returns the rest of the input as a single `TokenKind::Expand` token literally.
+    ///
+    /// Returns `None` if the tokenizer is already at the end of the input or advances the
+    /// tokenizer to the end of the input otherwise. Leading whitespace characters are skipped.
+    /// Quoting is not interpreted.
+    pub fn rest(&mut self) -> Option<Token<'a>> {
+        self.skip_blanks();
+
+        if self.pos == self.input.len() {
+            return None;
+        }
+
+        let content_start = self.pos;
+        self.pos = self.input.len();
+        Some(Token {
+            kind: TokenKind::Expand,
+            content_start,
+            content: Cow::Borrowed(&self.input[content_start..]),
+            is_terminated: false,
+        })
+    }
+
+    fn byte(&self) -> Option<u8> {
+        self.input.as_bytes().get(self.pos).copied()
+    }
+
+    fn peek_byte(&self) -> Option<u8> {
+        self.input.as_bytes().get(self.pos + 1).copied()
+    }
+
+    fn prev_byte(&self) -> Option<u8> {
+        self.pos
+            .checked_sub(1)
+            .map(|idx| self.input.as_bytes()[idx])
+    }
+
+    fn skip_blanks(&mut self) {
+        while let Some(b' ' | b'\t') = self.byte() {
+            self.pos += 1;
+        }
+    }
+
+    fn parse_unquoted(&mut self) -> Cow<'a, str> {
+        // Note that `String::new` starts with no allocation. We only allocate if we see a
+        // backslash escape (on Unix only).
+        let mut escaped = String::new();
+        let mut start = self.pos;
+
+        while let Some(byte) = self.byte() {
+            if matches!(byte, b' ' | b'\t') {
+                if cfg!(unix) && self.prev_byte() == Some(b'\\') {
+                    // Push everything up to but not including the backslash and then this
+                    // whitespace character.
+                    escaped.push_str(&self.input[start..self.pos - 1]);
+                    escaped.push(byte as char);
+                    start = self.pos + 1;
+                } else if escaped.is_empty() {
+                    return Cow::Borrowed(&self.input[start..self.pos]);
+                } else {
+                    break;
+                }
+            }
+
+            self.pos += 1;
+        }
+
+        // Special case for a trailing backslash on Unix: exclude the backslash from the content.
+        // This improves the behavior of completions like `":open a\\"` (trailing backslash).
+        let end = if cfg!(unix) && self.prev_byte() == Some(b'\\') {
+            self.pos - 1
+        } else {
+            self.pos
+        };
+
+        if escaped.is_empty() {
+            assert_eq!(self.pos, self.input.len());
+            Cow::Borrowed(&self.input[start..end])
+        } else {
+            escaped.push_str(&self.input[start..end]);
+            Cow::Owned(escaped)
+        }
+    }
+
+    /// Parses a string quoted by the given grapheme cluster.
+    ///
+    /// The position of the tokenizer is asserted to be immediately after the quote grapheme
+    /// cluster.
+    fn parse_quoted(&mut self, quote: u8) -> (Cow<'a, str>, bool) {
+        assert_eq!(self.byte(), Some(quote));
+        self.pos += 1;
+
+        let mut escaped = String::new();
+        while let Some(offset) = self.input[self.pos..].find(quote as char) {
+            let idx = self.pos + offset;
+            if self.input.as_bytes().get(idx + 1) == Some(&quote) {
+                // Treat two quotes in a row as an escape.
+                escaped.push_str(&self.input[self.pos..idx + 1]);
+                // Advance past the escaped quote.
+                self.pos = idx + 2;
+            } else {
+                // Otherwise this quote string is finished.
+                let quoted = if escaped.is_empty() {
+                    Cow::Borrowed(&self.input[self.pos..idx])
+                } else {
+                    escaped.push_str(&self.input[self.pos..idx]);
+                    Cow::Owned(escaped)
+                };
+                // Advance past the closing quote.
+                self.pos = idx + 1;
+                return (quoted, true);
+            }
+        }
+
+        let quoted = if escaped.is_empty() {
+            Cow::Borrowed(&self.input[self.pos..])
+        } else {
+            escaped.push_str(&self.input[self.pos..]);
+            Cow::Owned(escaped)
+        };
+        self.pos = self.input.len();
+
+        (quoted, false)
+    }
+
+    /// Parses the percent token expansion under the tokenizer's cursor.
+    ///
+    /// This function should only be called when the tokenizer's cursor is on a non-escaped
+    /// percent token.
+    pub fn parse_percent_token(&mut self) -> Option<Result<Token<'a>, ParseArgsError<'a>>> {
+        assert_eq!(self.byte(), Some(b'%'));
+
+        self.pos += 1;
+        let kind_start = self.pos;
+        self.pos += self.input[self.pos..]
+            .bytes()
+            .take_while(|b| b.is_ascii_lowercase())
+            .count();
+        let kind = &self.input[kind_start..self.pos];
+
+        let (open, close) = match self.byte() {
+            // We support a couple of hard-coded chars only to make sure we can provide more
+            // useful errors and avoid weird behavior in case of typos. These should cover
+            // practical cases.
+            Some(b'(') => (b'(', b')'),
+            Some(b'[') => (b'[', b']'),
+            Some(b'{') => (b'{', b'}'),
+            Some(b'<') => (b'<', b'>'),
+            Some(b'\'') => (b'\'', b'\''),
+            Some(b'\"') => (b'\"', b'\"'),
+            Some(b'|') => (b'|', b'|'),
+            Some(_) | None => {
+                return Some(if self.validate {
+                    Err(ParseArgsError::MissingExpansionDelimiter { expansion: kind })
+                } else {
+                    Ok(Token {
+                        kind: TokenKind::ExpansionKind,
+                        content_start: kind_start,
+                        content: Cow::Borrowed(kind),
+                        is_terminated: false,
+                    })
+                });
+            }
+        };
+        // The content start for expansions is the start of the content - after the opening
+        // delimiter grapheme.
+        let content_start = self.pos + 1;
+        let kind = match ExpansionKind::from_kind(kind) {
+            Some(kind) => TokenKind::Expansion(kind),
+            None if self.validate => {
+                return Some(Err(ParseArgsError::UnknownExpansion { kind }));
+            }
+            None => TokenKind::Expand,
+        };
+
+        let (content, is_terminated) = if open == close {
+            self.parse_quoted(open)
+        } else {
+            self.parse_quoted_balanced(open, close)
+        };
+
+        let token = Token {
+            kind,
+            content_start,
+            content,
+            is_terminated,
+        };
+
+        if self.validate && !is_terminated {
+            return Some(Err(ParseArgsError::UnterminatedToken { token }));
+        }
+
+        Some(Ok(token))
+    }
+
+    /// Parse the next string under the cursor given an open and closing pair.
+    ///
+    /// The open and closing pair are different ASCII characters. The cursor is asserted to be
+    /// immediately after the opening delimiter.
+    ///
+    /// This function parses with nesting support. `%sh{echo {hello}}` for example should consume
+    /// the entire input and not quit after the first '}' character is found.
+    fn parse_quoted_balanced(&mut self, open: u8, close: u8) -> (Cow<'a, str>, bool) {
+        assert_eq!(self.byte(), Some(open));
+        self.pos += 1;
+        let start = self.pos;
+        let mut level = 1;
+
+        while let Some(offset) = self.input[self.pos..].find([open as char, close as char]) {
+            let idx = self.pos + offset;
+            // Move past the delimiter.
+            self.pos = idx + 1;
+
+            let byte = self.input.as_bytes()[idx];
+            if byte == open {
+                level += 1;
+            } else if byte == close {
+                level -= 1;
+                if level == 0 {
+                    break;
+                }
+            } else {
+                unreachable!()
+            }
+        }
+
+        let is_terminated = level == 0;
+        let end = if is_terminated {
+            // Exclude the closing delimiter from the token's content.
+            self.pos - 1
+        } else {
+            // When the token is not closed, advance to the end of the input.
+            self.pos = self.input.len();
+            self.pos
+        };
+
+        (Cow::Borrowed(&self.input[start..end]), is_terminated)
+    }
+}
+
+impl<'a> Iterator for Tokenizer<'a> {
+    type Item = Result<Token<'a>, ParseArgsError<'a>>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.skip_blanks();
+
+        let byte = self.byte()?;
+        match byte {
+            b'"' | b'\'' | b'`' => {
+                let content_start = self.pos + 1;
+                let (content, is_terminated) = self.parse_quoted(byte);
+                let token = Token {
+                    kind: match byte {
+                        b'"' => TokenKind::Expand,
+                        b'\'' => TokenKind::Quoted(Quote::Single),
+                        b'`' => TokenKind::Quoted(Quote::Backtick),
+                        _ => unreachable!(),
+                    },
+                    content_start,
+                    content,
+                    is_terminated,
+                };
+
+                Some(if self.validate && !is_terminated {
+                    Err(ParseArgsError::UnterminatedToken { token })
+                } else {
+                    Ok(token)
+                })
+            }
+            b'%' => self.parse_percent_token(),
+            _ => {
+                let content_start = self.pos;
+
+                // Allow backslash escaping on Unix for quotes or expansions
+                if cfg!(unix)
+                    && byte == b'\\'
+                    && matches!(self.peek_byte(), Some(b'"' | b'\'' | b'`' | b'%'))
+                {
+                    self.pos += 1;
+                }
+
+                Some(Ok(Token {
+                    kind: TokenKind::Unquoted,
+                    content_start,
+                    content: self.parse_unquoted(),
+                    is_terminated: false,
+                }))
+            }
+        }
+    }
+}
+
+#[derive(Debug, Default, Clone, Copy)]
+pub enum CompletionState {
+    #[default]
+    Positional,
+    Flag(Option<Flag>),
+    FlagArgument(Flag),
+}
+
+/// A set of arguments provided to a command on the command line.
+///
+/// Regular arguments are called "positional" arguments (or "positionals" for short). Command line
+/// input might also specify "flags" which can modify a command's behavior.
+///
+/// ```rust,ignore
+/// // Say that the command accepts a "bar" flag which doesn't accept an argument itself.
+/// // This input has two positionals, "foo" and "baz" and one flag "--bar".
+/// let args = Args::parse("foo --bar baz", /* .. */);
+/// // `Args` may be treated like a slice to access positionals.
+/// assert_eq!(args.len(), 2);
+/// assert_eq!(&args[0], "foo");
+/// assert_eq!(&args[1], "baz");
+/// // Use `has_flag` or `get_flag` to access flags.
+/// assert!(args.has_flag("bar"));
+/// ```
+///
+/// The `Args` type can be treated mostly the same as a slice when accessing positional arguments.
+/// Common slice methods like `len`, `get`, `first` and `join` only expose positional arguments.
+/// Additionally, common syntax like `for arg in args` or `&args[idx]` is supported for accessing
+/// positional arguments.
+///
+/// To look up flags, use `Args::get_flag` for flags which should accept an argument or
+/// `Args::has_flag` for boolean flags.
+///
+/// The way that `Args` is parsed from the input depends on a command's `Signature`. See the
+/// `Signature` type for more details.
+#[derive(Debug)]
+pub struct Args<'a> {
+    signature: Signature,
+    /// Whether to validate the arguments.
+    /// See the `ParseArgsError` type for the validations.
+    validate: bool,
+    /// Whether args pushed with `Self::push` should be treated as positionals even if they
+    /// start with '-'.
+    only_positionals: bool,
+    state: CompletionState,
+    positionals: Vec<Cow<'a, str>>,
+    flags: HashMap<&'static str, Cow<'a, str>>,
+}
+
+impl Default for Args<'_> {
+    fn default() -> Self {
+        Self {
+            signature: Signature::DEFAULT,
+            validate: Default::default(),
+            only_positionals: Default::default(),
+            state: CompletionState::default(),
+            positionals: Default::default(),
+            flags: Default::default(),
+        }
+    }
+}
+
+impl<'a> Args<'a> {
+    pub fn new(signature: Signature, validate: bool) -> Self {
+        Self {
+            signature,
+            validate,
+            only_positionals: false,
+            positionals: Vec::new(),
+            flags: HashMap::new(),
+            state: CompletionState::default(),
+        }
+    }
+
+    /// Reads the next token out of the given parser.
+    ///
+    /// If the command's signature sets a maximum number of positionals (via `raw_after`) then
+    /// the token may contain the rest of the parser's input.
+    pub fn read_token<'p>(
+        &mut self,
+        parser: &mut Tokenizer<'p>,
+    ) -> Result<Option<Token<'p>>, ParseArgsError<'p>> {
+        if self
+            .signature
+            .raw_after
+            .is_some_and(|max| self.len() >= max as usize)
+        {
+            self.only_positionals = true;
+            Ok(parser.rest())
+        } else {
+            parser.next().transpose()
+        }
+    }
+
+    /// Parses the given command line according to a command's signature.
+    ///
+    /// The `try_map_fn` function can be used to try changing each token before it is considered
+    /// as an argument - this is used for variable expansion.
+    pub fn parse<M>(
+        line: &'a str,
+        signature: Signature,
+        validate: bool,
+        mut try_map_fn: M,
+    ) -> Result<Self, Box<dyn Error + 'a>>
+    where
+        // Note: this is a `FnMut` in case we decide to allow caching expansions in the future.
+        // The `mut` is not currently used.
+        M: FnMut(Token<'a>) -> Result<Cow<'a, str>, Box<dyn Error>>,
+    {
+        let mut tokenizer = Tokenizer::new(line, validate);
+        let mut args = Self::new(signature, validate);
+
+        while let Some(token) = args.read_token(&mut tokenizer)? {
+            let arg = try_map_fn(token)?;
+            args.push(arg)?;
+        }
+
+        args.finish()?;
+
+        Ok(args)
+    }
+
+    /// Adds the given argument token.
+    ///
+    /// Once all arguments have been added, `Self::finish` should be called to perform any
+    /// closing validations.
+    pub fn push(&mut self, arg: Cow<'a, str>) -> Result<(), ParseArgsError<'a>> {
+        if !self.only_positionals && arg == "--" {
+            // "--" marks the end of flags, everything after is a positional even if it starts
+            // with '-'.
+            self.only_positionals = true;
+            self.state = CompletionState::Flag(None);
+        } else if let Some(flag) = self.flag_awaiting_argument() {
+            // If the last token was a flag which accepts an argument, treat this token as a flag
+            // argument.
+            self.flags.insert(flag.name, arg);
+            self.state = CompletionState::FlagArgument(flag);
+        } else if !self.only_positionals && arg.starts_with('-') {
+            // If the token starts with '-' and we are not only accepting positional arguments,
+            // treat this token as a flag.
+            let flag = if let Some(longhand) = arg.strip_prefix("--") {
+                self.signature
+                    .flags
+                    .iter()
+                    .find(|flag| flag.name == longhand)
+            } else {
+                let shorthand = arg.strip_prefix('-').unwrap();
+                self.signature.flags.iter().find(|flag| {
+                    flag.alias
+                        .is_some_and(|ch| shorthand == ch.encode_utf8(&mut [0; 4]))
+                })
+            };
+
+            let Some(flag) = flag else {
+                if self.validate {
+                    return Err(ParseArgsError::UnknownFlag { text: arg });
+                }
+
+                self.positionals.push(arg);
+                self.state = CompletionState::Flag(None);
+                return Ok(());
+            };
+
+            if self.validate && self.flags.contains_key(flag.name) {
+                return Err(ParseArgsError::DuplicatedFlag { flag: flag.name });
+            }
+
+            self.flags.insert(flag.name, Cow::Borrowed(""));
+            self.state = CompletionState::Flag(Some(*flag));
+        } else {
+            // Otherwise this token is a positional argument.
+            self.positionals.push(arg);
+            self.state = CompletionState::Positional;
+        }
+
+        Ok(())
+    }
+
+    /// Performs any validations that must be done after the input args are finished being pushed
+    /// with `Self::push`.
+    fn finish(&self) -> Result<(), ParseArgsError<'a>> {
+        if !self.validate {
+            return Ok(());
+        };
+
+        if let Some(flag) = self.flag_awaiting_argument() {
+            return Err(ParseArgsError::FlagMissingArgument { flag: flag.name });
+        }
+        self.signature
+            .check_positional_count(self.positionals.len())?;
+
+        Ok(())
+    }
+
+    fn flag_awaiting_argument(&self) -> Option<Flag> {
+        match self.state {
+            CompletionState::Flag(flag) => flag.filter(|f| f.completions.is_some()),
+            _ => None,
+        }
+    }
+
+    /// Returns the kind of argument the last token is considered to be.
+    ///
+    /// For example if the last argument in the command line is `--foo` then the argument may be
+    /// considered to be a flag.
+    pub fn completion_state(&self) -> CompletionState {
+        self.state
+    }
+
+    /// Returns the number of positionals supplied in the input.
+    ///
+    /// This number does not account for any flags passed in the input.
+    pub fn len(&self) -> usize {
+        self.positionals.len()
+    }
+
+    /// Checks whether the arguments contain no positionals.
+    ///
+    /// Note that this function returns `true` if there are no positional arguments even if the
+    /// input contained flags.
+    pub fn is_empty(&self) -> bool {
+        self.positionals.is_empty()
+    }
+
+    /// Gets the first positional argument, if one exists.
+    pub fn first(&'a self) -> Option<&'a str> {
+        self.positionals.first().map(AsRef::as_ref)
+    }
+
+    /// Gets the positional argument at the given index, if one exists.
+    pub fn get(&'a self, index: usize) -> Option<&'a str> {
+        self.positionals.get(index).map(AsRef::as_ref)
+    }
+
+    /// Flattens all positional arguments together with the given separator between each
+    /// positional.
+    pub fn join(&self, sep: &str) -> String {
+        self.positionals.join(sep)
+    }
+
+    /// Returns an iterator over all positional arguments.
+    pub fn iter(&self) -> slice::Iter<'_, Cow<'_, str>> {
+        self.positionals.iter()
+    }
+
+    /// Gets the value associated with a flag's long name if the flag was provided.
+    ///
+    /// This function should be preferred over [Self::has_flag] when the flag accepts an argument.
+    pub fn get_flag(&'a self, name: &'static str) -> Option<&'a str> {
+        debug_assert!(
+            self.signature.flags.iter().any(|flag| flag.name == name),
+            "flag '--{name}' does not belong to the command's signature"
+        );
+        debug_assert!(
+            self.signature
+                .flags
+                .iter()
+                .any(|flag| flag.name == name && flag.completions.is_some()),
+            "Args::get_flag was used for '--{name}' but should only be used for flags with arguments, use Args::has_flag instead"
+        );
+
+        self.flags.get(name).map(AsRef::as_ref)
+    }
+
+    /// Checks if a flag was provided in the arguments.
+    ///
+    /// This function should be preferred over [Self::get_flag] for boolean flags - flags that
+    /// either are present or not.
+    pub fn has_flag(&self, name: &'static str) -> bool {
+        debug_assert!(
+            self.signature.flags.iter().any(|flag| flag.name == name),
+            "flag '--{name}' does not belong to the command's signature"
+        );
+        debug_assert!(
+            self.signature
+                .flags
+                .iter()
+                .any(|flag| flag.name == name && flag.completions.is_none()),
+            "Args::has_flag was used for '--{name}' but should only be used for flags without arguments, use Args::get_flag instead"
+        );
+
+        self.flags.contains_key(name)
+    }
+}
+
+// `arg[n]`
+impl ops::Index<usize> for Args<'_> {
+    type Output = str;
+
+    fn index(&self, index: usize) -> &Self::Output {
+        self.positionals[index].as_ref()
+    }
+}
+
+// `for arg in args { .. }`
+impl<'a> IntoIterator for Args<'a> {
+    type Item = Cow<'a, str>;
+    type IntoIter = vec::IntoIter<Cow<'a, str>>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.positionals.into_iter()
+    }
+}
+
+// `for arg in &args { .. }`
+impl<'i, 'a> IntoIterator for &'i Args<'a> {
+    type Item = &'i Cow<'a, str>;
+    type IntoIter = slice::Iter<'i, Cow<'a, str>>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.positionals.iter()
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[track_caller]
+    fn assert_tokens(input: &str, expected: &[&str]) {
+        let actual: Vec<_> = Tokenizer::new(input, true)
+            .map(|arg| arg.unwrap().content)
+            .collect();
+        let actual: Vec<_> = actual.iter().map(|c| c.as_ref()).collect();
+
+        assert_eq!(actual.as_slice(), expected);
+    }
+
+    #[track_caller]
+    fn assert_incomplete_tokens(input: &str, expected: &[&str]) {
+        assert!(
+            Tokenizer::new(input, true).collect::<Result<Vec<_>, _>>().is_err(),
+            "`assert_incomplete_tokens` only accepts input that fails validation, consider using `assert_tokens` instead"
+        );
+
+        let actual: Vec<_> = Tokenizer::new(input, false)
+            .map(|arg| arg.unwrap().content)
+            .collect();
+        let actual: Vec<_> = actual.iter().map(|c| c.as_ref()).collect();
+
+        assert_eq!(actual.as_slice(), expected);
+    }
+
+    #[test]
+    fn tokenize_unquoted() {
+        assert_tokens("", &[]);
+        assert_tokens("hello", &["hello"]);
+        assert_tokens("hello world", &["hello", "world"]);
+        // Any amount of whitespace is considered a separator.
+        assert_tokens("hello\t \tworld", &["hello", "world"]);
+    }
+
+    // This escaping behavior is specific to Unix systems.
+    #[cfg(unix)]
+    #[test]
+    fn tokenize_backslash_unix() {
+        assert_tokens(r#"hello\ world"#, &["hello world"]);
+        assert_tokens(r#"one\ two three"#, &["one two", "three"]);
+        assert_tokens(r#"one two\ three"#, &["one", "two three"]);
+        // Trailing backslash is ignored - this improves completions.
+        assert_tokens(r#"hello\"#, &["hello"]);
+        // The backslash at the start of the double quote makes the quote be treated as raw.
+        // For the backslash before the ending quote the token is already considered raw so the
+        // backslash and quote are treated literally.
+        assert_tokens(
+            r#"echo \"hello        world\""#,
+            &["echo", r#""hello"#, r#"world\""#],
+        );
+    }
+
+    #[test]
+    fn tokenize_backslash() {
+        assert_tokens(r#"\n"#, &["\\n"]);
+        assert_tokens(r#"'\'"#, &["\\"]);
+    }
+
+    #[test]
+    fn tokenize_quoting() {
+        // Using a quote character twice escapes it.
+        assert_tokens(r#"''"#, &[""]);
+        assert_tokens(r#""""#, &[""]);
+        assert_tokens(r#"``"#, &[""]);
+        assert_tokens(r#"echo """#, &["echo", ""]);
+
+        assert_tokens(r#"'hello'"#, &["hello"]);
+        assert_tokens(r#"'hello world'"#, &["hello world"]);
+
+        assert_tokens(r#""hello "" world""#, &["hello \" world"]);
+    }
+
+    #[test]
+    fn tokenize_percent() {
+        // Pair delimiters:
+        assert_tokens(r#"echo %{hello world}"#, &["echo", "hello world"]);
+        assert_tokens(r#"echo %[hello world]"#, &["echo", "hello world"]);
+        assert_tokens(r#"echo %(hello world)"#, &["echo", "hello world"]);
+        assert_tokens(r#"echo %<hello world>"#, &["echo", "hello world"]);
+        assert_tokens(r#"echo %|hello world|"#, &["echo", "hello world"]);
+        assert_tokens(r#"echo %'hello world'"#, &["echo", "hello world"]);
+        assert_tokens(r#"echo %"hello world""#, &["echo", "hello world"]);
+        // When invoking a command, double percents can be used within a string as an escape for
+        // the percent. This is done in the expansion code though, not in the parser here.
+        assert_tokens(r#"echo "%%hello world""#, &["echo", "%%hello world"]);
+        // Different kinds of quotes nested:
+        assert_tokens(
+            r#"echo "%sh{echo 'hello world'}""#,
+            &["echo", r#"%sh{echo 'hello world'}"#],
+        );
+        // Nesting of the expansion delimiter:
+        assert_tokens(r#"echo %{hello {x} world}"#, &["echo", "hello {x} world"]);
+        assert_tokens(
+            r#"echo %{hello {{😎}} world}"#,
+            &["echo", "hello {{😎}} world"],
+        );
+
+        // Balanced nesting:
+        assert_tokens(
+            r#"echo %{hello {}} world}"#,
+            &["echo", "hello {}", "world}"],
+        );
+
+        // Recursive expansions:
+        assert_tokens(
+            r#"echo %sh{echo "%{cursor_line}"}"#,
+            &["echo", r#"echo "%{cursor_line}""#],
+        );
+        // Completion should provide variable names here. (Unbalanced nesting)
+        assert_incomplete_tokens(r#"echo %sh{echo "%{c"#, &["echo", r#"echo "%{c"#]);
+        assert_incomplete_tokens(r#"echo %{hello {{} world}"#, &["echo", "hello {{} world}"]);
+    }
+
+    fn parse_signature<'a>(
+        input: &'a str,
+        signature: Signature,
+    ) -> Result<Args<'a>, Box<dyn std::error::Error + 'a>> {
+        Args::parse(input, signature, true, |token| Ok(token.content))
+    }
+
+    #[test]
+    fn signature_validation_positionals() {
+        let signature = Signature {
+            positionals: (2, Some(3)),
+            ..Signature::DEFAULT
+        };
+
+        assert!(parse_signature("hello world", signature).is_ok());
+        assert!(parse_signature("foo bar baz", signature).is_ok());
+        assert!(parse_signature(r#"a "b c" d"#, signature).is_ok());
+
+        assert!(parse_signature("hello", signature).is_err());
+        assert!(parse_signature("foo bar baz quiz", signature).is_err());
+
+        let signature = Signature {
+            positionals: (1, None),
+            ..Signature::DEFAULT
+        };
+
+        assert!(parse_signature("a", signature).is_ok());
+        assert!(parse_signature("a b", signature).is_ok());
+        assert!(parse_signature(r#"a "b c" d"#, signature).is_ok());
+
+        assert!(parse_signature("", signature).is_err());
+    }
+
+    #[test]
+    fn flags() {
+        let signature = Signature {
+            positionals: (1, Some(2)),
+            flags: &[
+                Flag {
+                    name: "foo",
+                    alias: Some('f'),
+                    doc: "",
+                    completions: None,
+                },
+                Flag {
+                    name: "bar",
+                    alias: Some('b'),
+                    doc: "",
+                    completions: Some(&[]),
+                },
+            ],
+            ..Signature::DEFAULT
+        };
+
+        let args = parse_signature("hello", signature).unwrap();
+        assert_eq!(args.len(), 1);
+        assert_eq!(&args[0], "hello");
+        assert!(!args.has_flag("foo"));
+        assert!(args.get_flag("bar").is_none());
+
+        let args = parse_signature("--bar abcd hello world --foo", signature).unwrap();
+        assert_eq!(args.len(), 2);
+        assert_eq!(&args[0], "hello");
+        assert_eq!(&args[1], "world");
+        assert!(args.has_flag("foo"));
+        assert_eq!(args.get_flag("bar"), Some("abcd"));
+
+        let args = parse_signature("hello -f -b abcd world", signature).unwrap();
+        assert_eq!(args.len(), 2);
+        assert_eq!(&args[0], "hello");
+        assert_eq!(&args[1], "world");
+        assert!(args.has_flag("foo"));
+        assert_eq!(args.get_flag("bar"), Some("abcd"));
+
+        // The signature requires at least one positional.
+        assert!(parse_signature("--foo", signature).is_err());
+        // And at most two.
+        assert!(parse_signature("abc --bar baz def efg", signature).is_err());
+
+        let args = parse_signature(r#"abc -b "xyz 123" def"#, signature).unwrap();
+        assert_eq!(args.len(), 2);
+        assert_eq!(&args[0], "abc");
+        assert_eq!(&args[1], "def");
+        assert_eq!(args.get_flag("bar"), Some("xyz 123"));
+
+        // Unknown flags are validation errors.
+        assert!(parse_signature(r#"foo --quiz"#, signature).is_err());
+        // Duplicated flags are parsing errors.
+        assert!(parse_signature(r#"--foo bar --foo"#, signature).is_err());
+        assert!(parse_signature(r#"-f bar --foo"#, signature).is_err());
+
+        // "--" can be used to mark the end of flags. Everything after is considered a positional.
+        let args = parse_signature(r#"hello --bar baz -- --foo"#, signature).unwrap();
+        assert_eq!(args.len(), 2);
+        assert_eq!(&args[0], "hello");
+        assert_eq!(&args[1], "--foo");
+        assert_eq!(args.get_flag("bar"), Some("baz"));
+        assert!(!args.has_flag("foo"));
+    }
+
+    #[test]
+    fn raw_after() {
+        let signature = Signature {
+            positionals: (1, Some(1)),
+            raw_after: Some(0),
+            ..Signature::DEFAULT
+        };
+
+        // All quoting and escaping is treated literally in raw mode.
+        let args = parse_signature(r#"'\'"#, signature).unwrap();
+        assert_eq!(args.len(), 1);
+        assert_eq!(&args[0], "'\\'");
+        let args = parse_signature(r#"\''"#, signature).unwrap();
+        assert_eq!(args.len(), 1);
+        assert_eq!(&args[0], "\\''");
+
+        // Leading space is trimmed.
+        let args = parse_signature(r#"   %sh{foo}"#, signature).unwrap();
+        assert_eq!(args.len(), 1);
+        assert_eq!(&args[0], "%sh{foo}");
+
+        let signature = Signature {
+            positionals: (1, Some(2)),
+            raw_after: Some(1),
+            ..Signature::DEFAULT
+        };
+
+        let args = parse_signature("foo", signature).unwrap();
+        assert_eq!(args.len(), 1);
+        assert_eq!(&args[0], "foo");
+
+        // "--bar" is treated as a positional.
+        let args = parse_signature("foo --bar", signature).unwrap();
+        assert_eq!(args.len(), 2);
+        assert_eq!(&args[0], "foo");
+        assert_eq!(&args[1], "--bar");
+
+        let args = parse_signature("abc def ghi", signature).unwrap();
+        assert_eq!(args.len(), 2);
+        assert_eq!(&args[0], "abc");
+        assert_eq!(&args[1], "def ghi");
+
+        let args = parse_signature("rulers [20, 30]", signature).unwrap();
+        assert_eq!(args.len(), 2);
+        assert_eq!(&args[0], "rulers");
+        assert_eq!(&args[1], "[20, 30]");
+
+        let args =
+            parse_signature(r#"gutters ["diff"] ["diff", "diagnostics"]"#, signature).unwrap();
+        assert_eq!(args.len(), 2);
+        assert_eq!(&args[0], "gutters");
+        assert_eq!(&args[1], r#"["diff"] ["diff", "diagnostics"]"#);
+    }
+}
diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs
index 89c960ed5..02107b33f 100644
--- a/helix-core/src/lib.rs
+++ b/helix-core/src/lib.rs
@@ -3,6 +3,7 @@ pub use encoding_rs as encoding;
 pub mod auto_pairs;
 pub mod case_conversion;
 pub mod chars;
+pub mod command_line;
 pub mod comment;
 pub mod completion;
 pub mod config;
@@ -22,7 +23,6 @@ pub mod object;
 mod position;
 pub mod search;
 pub mod selection;
-pub mod shellwords;
 pub mod snippets;
 pub mod surround;
 pub mod syntax;
diff --git a/helix-core/src/shellwords.rs b/helix-core/src/shellwords.rs
deleted file mode 100644
index 9d873c366..000000000
--- a/helix-core/src/shellwords.rs
+++ /dev/null
@@ -1,350 +0,0 @@
-use std::borrow::Cow;
-
-/// Auto escape for shellwords usage.
-pub fn escape(input: Cow<str>) -> Cow<str> {
-    if !input.chars().any(|x| x.is_ascii_whitespace()) {
-        input
-    } else if cfg!(unix) {
-        Cow::Owned(input.chars().fold(String::new(), |mut buf, c| {
-            if c.is_ascii_whitespace() {
-                buf.push('\\');
-            }
-            buf.push(c);
-            buf
-        }))
-    } else {
-        Cow::Owned(format!("\"{}\"", input))
-    }
-}
-
-enum State {
-    OnWhitespace,
-    Unquoted,
-    UnquotedEscaped,
-    Quoted,
-    QuoteEscaped,
-    Dquoted,
-    DquoteEscaped,
-}
-
-pub struct Shellwords<'a> {
-    state: State,
-    /// Shellwords where whitespace and escapes has been resolved.
-    words: Vec<Cow<'a, str>>,
-    /// The parts of the input that are divided into shellwords. This can be
-    /// used to retrieve the original text for a given word by looking up the
-    /// same index in the Vec as the word in `words`.
-    parts: Vec<&'a str>,
-}
-
-impl<'a> From<&'a str> for Shellwords<'a> {
-    fn from(input: &'a str) -> Self {
-        use State::*;
-
-        let mut state = Unquoted;
-        let mut words = Vec::new();
-        let mut parts = Vec::new();
-        let mut escaped = String::with_capacity(input.len());
-
-        let mut part_start = 0;
-        let mut unescaped_start = 0;
-        let mut end = 0;
-
-        for (i, c) in input.char_indices() {
-            state = match state {
-                OnWhitespace => match c {
-                    '"' => {
-                        end = i;
-                        Dquoted
-                    }
-                    '\'' => {
-                        end = i;
-                        Quoted
-                    }
-                    '\\' => {
-                        if cfg!(unix) {
-                            escaped.push_str(&input[unescaped_start..i]);
-                            unescaped_start = i + 1;
-                            UnquotedEscaped
-                        } else {
-                            OnWhitespace
-                        }
-                    }
-                    c if c.is_ascii_whitespace() => {
-                        end = i;
-                        OnWhitespace
-                    }
-                    _ => Unquoted,
-                },
-                Unquoted => match c {
-                    '\\' => {
-                        if cfg!(unix) {
-                            escaped.push_str(&input[unescaped_start..i]);
-                            unescaped_start = i + 1;
-                            UnquotedEscaped
-                        } else {
-                            Unquoted
-                        }
-                    }
-                    c if c.is_ascii_whitespace() => {
-                        end = i;
-                        OnWhitespace
-                    }
-                    _ => Unquoted,
-                },
-                UnquotedEscaped => Unquoted,
-                Quoted => match c {
-                    '\\' => {
-                        if cfg!(unix) {
-                            escaped.push_str(&input[unescaped_start..i]);
-                            unescaped_start = i + 1;
-                            QuoteEscaped
-                        } else {
-                            Quoted
-                        }
-                    }
-                    '\'' => {
-                        end = i;
-                        OnWhitespace
-                    }
-                    _ => Quoted,
-                },
-                QuoteEscaped => Quoted,
-                Dquoted => match c {
-                    '\\' => {
-                        if cfg!(unix) {
-                            escaped.push_str(&input[unescaped_start..i]);
-                            unescaped_start = i + 1;
-                            DquoteEscaped
-                        } else {
-                            Dquoted
-                        }
-                    }
-                    '"' => {
-                        end = i;
-                        OnWhitespace
-                    }
-                    _ => Dquoted,
-                },
-                DquoteEscaped => Dquoted,
-            };
-
-            let c_len = c.len_utf8();
-            if i == input.len() - c_len && end == 0 {
-                end = i + c_len;
-            }
-
-            if end > 0 {
-                let esc_trim = escaped.trim();
-                let inp = &input[unescaped_start..end];
-
-                if !(esc_trim.is_empty() && inp.trim().is_empty()) {
-                    if esc_trim.is_empty() {
-                        words.push(inp.into());
-                        parts.push(inp);
-                    } else {
-                        words.push([escaped, inp.into()].concat().into());
-                        parts.push(&input[part_start..end]);
-                        escaped = "".to_string();
-                    }
-                }
-                unescaped_start = i + 1;
-                part_start = i + 1;
-                end = 0;
-            }
-        }
-
-        debug_assert!(words.len() == parts.len());
-
-        Self {
-            state,
-            words,
-            parts,
-        }
-    }
-}
-
-impl<'a> Shellwords<'a> {
-    /// Checks that the input ends with a whitespace character which is not escaped.
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// use helix_core::shellwords::Shellwords;
-    /// assert_eq!(Shellwords::from(" ").ends_with_whitespace(), true);
-    /// assert_eq!(Shellwords::from(":open ").ends_with_whitespace(), true);
-    /// assert_eq!(Shellwords::from(":open foo.txt ").ends_with_whitespace(), true);
-    /// assert_eq!(Shellwords::from(":open").ends_with_whitespace(), false);
-    /// #[cfg(unix)]
-    /// assert_eq!(Shellwords::from(":open a\\ ").ends_with_whitespace(), false);
-    /// #[cfg(unix)]
-    /// assert_eq!(Shellwords::from(":open a\\ b.txt").ends_with_whitespace(), false);
-    /// ```
-    pub fn ends_with_whitespace(&self) -> bool {
-        matches!(self.state, State::OnWhitespace)
-    }
-
-    /// Returns the list of shellwords calculated from the input string.
-    pub fn words(&self) -> &[Cow<'a, str>] {
-        &self.words
-    }
-
-    /// Returns a list of strings which correspond to [`Self::words`] but represent the original
-    /// text in the input string - including escape characters - without separating whitespace.
-    pub fn parts(&self) -> &[&'a str] {
-        &self.parts
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    #[cfg(windows)]
-    fn test_normal() {
-        let input = r#":o single_word twó wörds \three\ \"with\ escaping\\"#;
-        let shellwords = Shellwords::from(input);
-        let result = shellwords.words().to_vec();
-        let expected = vec![
-            Cow::from(":o"),
-            Cow::from("single_word"),
-            Cow::from("twó"),
-            Cow::from("wörds"),
-            Cow::from("\\three\\"),
-            Cow::from("\\"),
-            Cow::from("with\\ escaping\\\\"),
-        ];
-        // TODO test is_owned and is_borrowed, once they get stabilized.
-        assert_eq!(expected, result);
-    }
-
-    #[test]
-    #[cfg(unix)]
-    fn test_normal() {
-        let input = r#":o single_word twó wörds \three\ \"with\ escaping\\"#;
-        let shellwords = Shellwords::from(input);
-        let result = shellwords.words().to_vec();
-        let expected = vec![
-            Cow::from(":o"),
-            Cow::from("single_word"),
-            Cow::from("twó"),
-            Cow::from("wörds"),
-            Cow::from(r#"three "with escaping\"#),
-        ];
-        // TODO test is_owned and is_borrowed, once they get stabilized.
-        assert_eq!(expected, result);
-    }
-
-    #[test]
-    #[cfg(unix)]
-    fn test_quoted() {
-        let quoted =
-            r#":o 'single_word' 'twó wörds' '' ' ''\three\' \"with\ escaping\\' 'quote incomplete"#;
-        let shellwords = Shellwords::from(quoted);
-        let result = shellwords.words().to_vec();
-        let expected = vec![
-            Cow::from(":o"),
-            Cow::from("single_word"),
-            Cow::from("twó wörds"),
-            Cow::from(r#"three' "with escaping\"#),
-            Cow::from("quote incomplete"),
-        ];
-        assert_eq!(expected, result);
-    }
-
-    #[test]
-    #[cfg(unix)]
-    fn test_dquoted() {
-        let dquoted = r#":o "single_word" "twó wörds" "" "  ""\three\' \"with\ escaping\\" "dquote incomplete"#;
-        let shellwords = Shellwords::from(dquoted);
-        let result = shellwords.words().to_vec();
-        let expected = vec![
-            Cow::from(":o"),
-            Cow::from("single_word"),
-            Cow::from("twó wörds"),
-            Cow::from(r#"three' "with escaping\"#),
-            Cow::from("dquote incomplete"),
-        ];
-        assert_eq!(expected, result);
-    }
-
-    #[test]
-    #[cfg(unix)]
-    fn test_mixed() {
-        let dquoted = r#":o single_word 'twó wörds' "\three\' \"with\ escaping\\""no space before"'and after' $#%^@ "%^&(%^" ')(*&^%''a\\\\\b' '"#;
-        let shellwords = Shellwords::from(dquoted);
-        let result = shellwords.words().to_vec();
-        let expected = vec![
-            Cow::from(":o"),
-            Cow::from("single_word"),
-            Cow::from("twó wörds"),
-            Cow::from("three' \"with escaping\\"),
-            Cow::from("no space before"),
-            Cow::from("and after"),
-            Cow::from("$#%^@"),
-            Cow::from("%^&(%^"),
-            Cow::from(")(*&^%"),
-            Cow::from(r#"a\\b"#),
-            //last ' just changes to quoted but since we dont have anything after it, it should be ignored
-        ];
-        assert_eq!(expected, result);
-    }
-
-    #[test]
-    fn test_lists() {
-        let input =
-            r#":set statusline.center ["file-type","file-encoding"] '["list", "in", "quotes"]'"#;
-        let shellwords = Shellwords::from(input);
-        let result = shellwords.words().to_vec();
-        let expected = vec![
-            Cow::from(":set"),
-            Cow::from("statusline.center"),
-            Cow::from(r#"["file-type","file-encoding"]"#),
-            Cow::from(r#"["list", "in", "quotes"]"#),
-        ];
-        assert_eq!(expected, result);
-    }
-
-    #[test]
-    #[cfg(unix)]
-    fn test_escaping_unix() {
-        assert_eq!(escape("foobar".into()), Cow::Borrowed("foobar"));
-        assert_eq!(escape("foo bar".into()), Cow::Borrowed("foo\\ bar"));
-        assert_eq!(escape("foo\tbar".into()), Cow::Borrowed("foo\\\tbar"));
-    }
-
-    #[test]
-    #[cfg(windows)]
-    fn test_escaping_windows() {
-        assert_eq!(escape("foobar".into()), Cow::Borrowed("foobar"));
-        assert_eq!(escape("foo bar".into()), Cow::Borrowed("\"foo bar\""));
-    }
-
-    #[test]
-    #[cfg(unix)]
-    fn test_parts() {
-        assert_eq!(Shellwords::from(":o a").parts(), &[":o", "a"]);
-        assert_eq!(Shellwords::from(":o a\\ ").parts(), &[":o", "a\\ "]);
-    }
-
-    #[test]
-    #[cfg(windows)]
-    fn test_parts() {
-        assert_eq!(Shellwords::from(":o a").parts(), &[":o", "a"]);
-        assert_eq!(Shellwords::from(":o a\\ ").parts(), &[":o", "a\\"]);
-    }
-
-    #[test]
-    fn test_multibyte_at_end() {
-        assert_eq!(Shellwords::from("𒀀").parts(), &["𒀀"]);
-        assert_eq!(
-            Shellwords::from(":sh echo 𒀀").parts(),
-            &[":sh", "echo", "𒀀"]
-        );
-        assert_eq!(
-            Shellwords::from(":sh echo 𒀀 hello world𒀀").parts(),
-            &[":sh", "echo", "𒀀", "hello", "world𒀀"]
-        );
-    }
-}
diff --git a/helix-event/Cargo.toml b/helix-event/Cargo.toml
index c6ab11c6b..41f3b4836 100644
--- a/helix-event/Cargo.toml
+++ b/helix-event/Cargo.toml
@@ -18,8 +18,8 @@ tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "p
 # the event registry is essentially read only but must be an rwlock so we can
 # setup new events on initialization, hardware-lock-elision hugely benefits this case
 # as it essentially makes the lock entirely free as long as there is no writes 
-parking_lot = { version = "0.12", features = ["hardware-lock-elision"] }
-once_cell = "1.20"
+parking_lot = { workspace = true, features = ["hardware-lock-elision"] }
+once_cell = "1.21"
 
 anyhow = "1"
 log = "0.4"
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index 0b57bc5a6..493d8b30e 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -20,9 +20,9 @@ helix-stdx = { path = "../helix-stdx" }
 anyhow = "1"
 serde = { version = "1.0", features = ["derive"] }
 toml = "0.8"
-etcetera = "0.8"
+etcetera = "0.10"
 tree-sitter.workspace = true
-once_cell = "1.20"
+once_cell = "1.21"
 log = "0.4"
 
 # TODO: these two should be on !wasm32 only
diff --git a/helix-lsp-types/Cargo.toml b/helix-lsp-types/Cargo.toml
index 3672d99c6..b7033d154 100644
--- a/helix-lsp-types/Cargo.toml
+++ b/helix-lsp-types/Cargo.toml
@@ -22,8 +22,8 @@ license = "MIT"
 
 [dependencies]
 bitflags.workspace = true
-serde = { version = "1.0.217", features = ["derive"] }
-serde_json = "1.0.138"
+serde = { version = "1.0.219", features = ["derive"] }
+serde_json = "1.0.140"
 url = {version = "2.5.4", features = ["serde"]}
 
 [features]
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index f520d6ad7..09fd1b9f0 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -21,13 +21,13 @@ helix-lsp-types = { path = "../helix-lsp-types" }
 anyhow = "1.0"
 futures-executor = "0.3"
 futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
-globset = "0.4.15"
+globset = "0.4.16"
 log = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-tokio = { version = "1.43", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
+tokio = { version = "1.44", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
 tokio-stream = "0.1.17"
-parking_lot = "0.12.3"
+parking_lot.workspace = true
 arc-swap = "1"
 slotmap.workspace = true
 thiserror.workspace = true
diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index d63089973..bf8a86952 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -1119,7 +1119,7 @@ impl Client {
         text_document: lsp::TextDocumentIdentifier,
         position: lsp::Position,
         work_done_token: Option<lsp::ProgressToken>,
-    ) -> Option<impl Future<Output = Result<Value>>> {
+    ) -> Option<impl Future<Output = Result<Option<lsp::Hover>>>> {
         let capabilities = self.capabilities.get().unwrap();
 
         // Return early if the server does not support hover.
@@ -1140,7 +1140,8 @@ impl Client {
             // lsp::SignatureHelpContext
         };
 
-        Some(self.call::<lsp::request::HoverRequest>(params))
+        let res = self.call::<lsp::request::HoverRequest>(params);
+        Some(async move { Ok(serde_json::from_value(res.await?)?) })
     }
 
     // formatting
diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index df57bbe8c..ba41cbc5a 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -1032,7 +1032,8 @@ mod tests {
 
         let mut source = Rope::from_str("[\n\"🇺🇸\",\n\"🎄\",\n]");
 
-        let transaction = generate_transaction_from_edits(&source, edits, OffsetEncoding::Utf8);
+        let transaction = generate_transaction_from_edits(&source, edits, OffsetEncoding::Utf16);
         assert!(transaction.apply(&mut source));
+        assert_eq!(source, "[\n  \"🇺🇸\",\n  \"🎄\",\n]");
     }
 }
diff --git a/helix-lsp/src/transport.rs b/helix-lsp/src/transport.rs
index 1bded598d..a7399955c 100644
--- a/helix-lsp/src/transport.rs
+++ b/helix-lsp/src/transport.rs
@@ -223,10 +223,7 @@ impl Transport {
         language_server_name: &str,
     ) -> Result<()> {
         let (id, result) = match output {
-            jsonrpc::Output::Success(jsonrpc::Success { id, result, .. }) => {
-                info!("{language_server_name} <- {}", result);
-                (id, Ok(result))
-            }
+            jsonrpc::Output::Success(jsonrpc::Success { id, result, .. }) => (id, Ok(result)),
             jsonrpc::Output::Failure(jsonrpc::Failure { id, error, .. }) => {
                 error!("{language_server_name} <- {error}");
                 (id, Err(error.into()))
diff --git a/helix-stdx/Cargo.toml b/helix-stdx/Cargo.toml
index b2adaddb5..a41dee839 100644
--- a/helix-stdx/Cargo.toml
+++ b/helix-stdx/Cargo.toml
@@ -13,12 +13,12 @@ homepage.workspace = true
 
 [dependencies]
 dunce = "1.0"
-etcetera = "0.8"
+etcetera = "0.10"
 ropey.workspace = true
 which = "7.0"
-regex-cursor = "0.1.4"
+regex-cursor = "0.1.5"
 bitflags.workspace = true
-once_cell = "1.20"
+once_cell = "1.21"
 regex-automata = "0.4.9"
 unicode-segmentation.workspace = true
 
@@ -26,7 +26,7 @@ unicode-segmentation.workspace = true
 windows-sys = { version = "0.59", features = ["Win32_Foundation", "Win32_Security", "Win32_Security_Authorization", "Win32_Storage_FileSystem", "Win32_System_Threading"] }
 
 [target.'cfg(unix)'.dependencies]
-rustix = { version = "0.38", features = ["fs"] }
+rustix = { version = "1.0", features = ["fs"] }
 
 [dev-dependencies]
 tempfile.workspace = true
diff --git a/helix-stdx/src/faccess.rs b/helix-stdx/src/faccess.rs
index e4c3daf25..80b668b14 100644
--- a/helix-stdx/src/faccess.rs
+++ b/helix-stdx/src/faccess.rs
@@ -51,8 +51,8 @@ mod imp {
     }
 
     fn chown(p: &Path, uid: Option<u32>, gid: Option<u32>) -> io::Result<()> {
-        let uid = uid.map(|n| unsafe { rustix::fs::Uid::from_raw(n) });
-        let gid = gid.map(|n| unsafe { rustix::fs::Gid::from_raw(n) });
+        let uid = uid.map(rustix::fs::Uid::from_raw);
+        let gid = gid.map(rustix::fs::Gid::from_raw);
         rustix::fs::chown(p, uid, gid)?;
         Ok(())
     }
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 43066354d..7f7ffb6a1 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -51,7 +51,7 @@ helix-vcs = { path = "../helix-vcs" }
 helix-loader = { path = "../helix-loader" }
 
 anyhow = "1"
-once_cell = "1.20"
+once_cell = "1.21"
 
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot"] }
 tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = ["crossterm"] }
@@ -61,7 +61,7 @@ tokio-stream = "0.1"
 futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
 arc-swap = { version = "1.7.1" }
 termini = "1"
-indexmap = "2.7"
+indexmap = "2.8"
 
 # Logging
 fern = "0.7"
@@ -93,7 +93,7 @@ grep-searcher = "0.1.14"
 
 [target.'cfg(not(windows))'.dependencies]  # https://github.com/vorner/signal-hook/issues/100
 signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
-libc = "0.2.169"
+libc = "0.2.170"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 crossterm = { version = "0.28", features = ["event-stream", "use-dev-tty", "libc"] }
@@ -103,6 +103,6 @@ helix-loader = { path = "../helix-loader" }
 
 [dev-dependencies]
 smallvec = "1.14"
-indoc = "2.0.5"
+indoc = "2.0.6"
 tempfile.workspace = true
 same-file = "1.0.1"
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 2a4bea655..cb270b86e 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -103,22 +103,6 @@ impl Application {
         theme_parent_dirs.extend(helix_loader::runtime_dirs().iter().cloned());
         let theme_loader = theme::Loader::new(&theme_parent_dirs);
 
-        let true_color = config.editor.true_color || crate::true_color();
-        let theme = config
-            .theme
-            .as_ref()
-            .and_then(|theme| {
-                theme_loader
-                    .load(theme)
-                    .map_err(|e| {
-                        log::warn!("failed to load theme `{}` - {}", theme, e);
-                        e
-                    })
-                    .ok()
-                    .filter(|theme| (true_color || theme.is_16_color()))
-            })
-            .unwrap_or_else(|| theme_loader.default_theme(true_color));
-
         #[cfg(not(feature = "integration"))]
         let backend = CrosstermBackend::new(stdout(), &config.editor);
 
@@ -139,6 +123,7 @@ impl Application {
             })),
             handlers,
         );
+        Self::load_configured_theme(&mut editor, &config.load());
 
         let keys = Box::new(Map::new(Arc::clone(&config), |config: &Config| {
             &config.keys
@@ -156,7 +141,7 @@ impl Application {
 
             // If the first file is a directory, skip it and open a picker
             if let Some((first, _)) = files_it.next_if(|(p, _)| p.is_dir()) {
-                let picker = ui::file_picker(first, &config.load().editor);
+                let picker = ui::file_picker(&editor, first);
                 compositor.push(Box::new(overlaid(picker)));
             }
 
@@ -237,8 +222,6 @@ impl Application {
                 .unwrap_or_else(|_| editor.new_file(Action::VerticalSplit));
         }
 
-        editor.set_theme(theme);
-
         #[cfg(windows)]
         let signals = futures_util::stream::empty();
         #[cfg(not(windows))]
@@ -419,35 +402,13 @@ impl Application {
         Ok(())
     }
 
-    /// Refresh theme after config change
-    fn refresh_theme(&mut self, config: &Config) -> Result<(), Error> {
-        let true_color = config.editor.true_color || crate::true_color();
-        let theme = config
-            .theme
-            .as_ref()
-            .and_then(|theme| {
-                self.editor
-                    .theme_loader
-                    .load(theme)
-                    .map_err(|e| {
-                        log::warn!("failed to load theme `{}` - {}", theme, e);
-                        e
-                    })
-                    .ok()
-                    .filter(|theme| (true_color || theme.is_16_color()))
-            })
-            .unwrap_or_else(|| self.editor.theme_loader.default_theme(true_color));
-
-        self.editor.set_theme(theme);
-        Ok(())
-    }
-
     fn refresh_config(&mut self) {
         let mut refresh_config = || -> Result<(), Error> {
             let default_config = Config::load_default()
                 .map_err(|err| anyhow::anyhow!("Failed to load config: {}", err))?;
             self.refresh_language_config()?;
-            self.refresh_theme(&default_config)?;
+            // Refresh theme after config change
+            Self::load_configured_theme(&mut self.editor, &default_config);
             self.terminal
                 .reconfigure(default_config.editor.clone().into())?;
             // Store new config
@@ -465,6 +426,37 @@ impl Application {
         }
     }
 
+    /// Load the theme set in configuration
+    fn load_configured_theme(editor: &mut Editor, config: &Config) {
+        let true_color = config.editor.true_color || crate::true_color();
+        let theme = config
+            .theme
+            .as_ref()
+            .and_then(|theme| {
+                editor
+                    .theme_loader
+                    .load(theme)
+                    .map_err(|e| {
+                        log::warn!("failed to load theme `{}` - {}", theme, e);
+                        e
+                    })
+                    .ok()
+                    .filter(|theme| {
+                        let colors_ok = true_color || theme.is_16_color();
+                        if !colors_ok {
+                            log::warn!(
+                                "loaded theme `{}` but cannot use it because true color \
+                                support is not enabled",
+                                theme.name()
+                            );
+                        }
+                        colors_ok
+                    })
+            })
+            .unwrap_or_else(|| editor.theme_loader.default_theme(true_color));
+        editor.set_theme(theme);
+    }
+
     #[cfg(windows)]
     // no signal handling available on windows
     pub async fn handle_signals(&mut self, _signal: ()) -> bool {
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index f37537685..a197792ef 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -11,13 +11,16 @@ use helix_stdx::{
 };
 use helix_vcs::{FileChange, Hunk};
 pub use lsp::*;
-use tui::text::Span;
+use tui::{
+    text::{Span, Spans},
+    widgets::Cell,
+};
 pub use typed::*;
 
 use helix_core::{
     char_idx_at_visual_offset,
     chars::char_is_word,
-    comment,
+    command_line, comment,
     doc_formatter::TextFormat,
     encoding, find_workspace,
     graphemes::{self, next_grapheme_boundary},
@@ -30,7 +33,7 @@ use helix_core::{
     object, pos_at_coords,
     regex::{self, Regex},
     search::{self, CharMatcher},
-    selection, shellwords, surround,
+    selection, surround,
     syntax::{BlockCommentToken, LanguageServerFeature},
     text_annotations::{Overlay, TextAnnotations},
     textobject,
@@ -55,7 +58,6 @@ use insert::*;
 use movement::Movement;
 
 use crate::{
-    args,
     compositor::{self, Component, Compositor},
     filter_picker_entry,
     job::Callback,
@@ -64,6 +66,7 @@ use crate::{
 
 use crate::job::{self, Jobs};
 use std::{
+    char::{ToLowercase, ToUppercase},
     cmp::Ordering,
     collections::{HashMap, HashSet},
     error::Error,
@@ -207,7 +210,7 @@ use helix_view::{align_view, Align};
 pub enum MappableCommand {
     Typable {
         name: String,
-        args: Vec<String>,
+        args: String,
         doc: String,
     },
     Static {
@@ -242,16 +245,19 @@ impl MappableCommand {
     pub fn execute(&self, cx: &mut Context) {
         match &self {
             Self::Typable { name, args, doc: _ } => {
-                let args: Vec<Cow<str>> = args.iter().map(Cow::from).collect();
                 if let Some(command) = typed::TYPABLE_COMMAND_MAP.get(name.as_str()) {
                     let mut cx = compositor::Context {
                         editor: cx.editor,
                         jobs: cx.jobs,
                         scroll: None,
                     };
-                    if let Err(e) = (command.fun)(&mut cx, &args[..], PromptEvent::Validate) {
+                    if let Err(e) =
+                        typed::execute_command(&mut cx, command, args, PromptEvent::Validate)
+                    {
                         cx.editor.set_error(format!("{}", e));
                     }
+                } else {
+                    cx.editor.set_error(format!("no such command: '{name}'"));
                 }
             }
             Self::Static { fun, .. } => (fun)(cx),
@@ -625,13 +631,8 @@ impl std::str::FromStr for MappableCommand {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         if let Some(suffix) = s.strip_prefix(':') {
-            let mut typable_command = suffix.split(' ').map(|arg| arg.trim());
-            let name = typable_command
-                .next()
-                .ok_or_else(|| anyhow!("Expected typable command name"))?;
-            let args = typable_command
-                .map(|s| s.to_owned())
-                .collect::<Vec<String>>();
+            let (name, args, _) = command_line::split(suffix);
+            ensure!(!name.is_empty(), "Expected typable command name");
             typed::TYPABLE_COMMAND_MAP
                 .get(name)
                 .map(|cmd| {
@@ -643,7 +644,7 @@ impl std::str::FromStr for MappableCommand {
                     MappableCommand::Typable {
                         name: cmd.name.to_owned(),
                         doc,
-                        args,
+                        args: args.to_string(),
                     }
                 })
                 .ok_or_else(|| anyhow!("No TypableCommand named '{}'", s))
@@ -1341,7 +1342,7 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
         let path = path::expand(&sel);
         let path = &rel_path.join(path);
         if path.is_dir() {
-            let picker = ui::file_picker(path.into(), &cx.editor.config());
+            let picker = ui::file_picker(cx.editor, path.into());
             cx.push_layer(Box::new(overlaid(picker)));
         } else if let Err(e) = cx.editor.open(path, action) {
             cx.editor.set_error(format!("Open file failed: {:?}", e));
@@ -1378,7 +1379,7 @@ fn open_url(cx: &mut Context, url: Url, action: Action) {
         Ok(_) | Err(_) => {
             let path = &rel_path.join(url.path());
             if path.is_dir() {
-                let picker = ui::file_picker(path.into(), &cx.editor.config());
+                let picker = ui::file_picker(cx.editor, path.into());
                 cx.push_layer(Box::new(overlaid(picker)));
             } else if let Err(e) = cx.editor.open(path, action) {
                 cx.editor.set_error(format!("Open file failed: {:?}", e));
@@ -1724,17 +1725,48 @@ where
     exit_select_mode(cx);
 }
 
+enum CaseSwitcher {
+    Upper(ToUppercase),
+    Lower(ToLowercase),
+    Keep(Option<char>),
+}
+
+impl Iterator for CaseSwitcher {
+    type Item = char;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        match self {
+            CaseSwitcher::Upper(upper) => upper.next(),
+            CaseSwitcher::Lower(lower) => lower.next(),
+            CaseSwitcher::Keep(ch) => ch.take(),
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        match self {
+            CaseSwitcher::Upper(upper) => upper.size_hint(),
+            CaseSwitcher::Lower(lower) => lower.size_hint(),
+            CaseSwitcher::Keep(ch) => {
+                let n = if ch.is_some() { 1 } else { 0 };
+                (n, Some(n))
+            }
+        }
+    }
+}
+
+impl ExactSizeIterator for CaseSwitcher {}
+
 fn switch_case(cx: &mut Context) {
     switch_case_impl(cx, |string| {
         string
             .chars()
             .flat_map(|ch| {
                 if ch.is_lowercase() {
-                    ch.to_uppercase().collect()
+                    CaseSwitcher::Upper(ch.to_uppercase())
                 } else if ch.is_uppercase() {
-                    ch.to_lowercase().collect()
+                    CaseSwitcher::Lower(ch.to_lowercase())
                 } else {
-                    vec![ch]
+                    CaseSwitcher::Keep(Some(ch))
                 }
             })
             .collect()
@@ -2404,18 +2436,42 @@ fn global_search(cx: &mut Context) {
     struct GlobalSearchConfig {
         smart_case: bool,
         file_picker_config: helix_view::editor::FilePickerConfig,
+        directory_style: Style,
+        number_style: Style,
+        colon_style: Style,
     }
 
     let config = cx.editor.config();
     let config = GlobalSearchConfig {
         smart_case: config.search.smart_case,
         file_picker_config: config.file_picker.clone(),
+        directory_style: cx.editor.theme.get("ui.text.directory"),
+        number_style: cx.editor.theme.get("constant.numeric.integer"),
+        colon_style: cx.editor.theme.get("punctuation"),
     };
 
     let columns = [
-        PickerColumn::new("path", |item: &FileResult, _| {
+        PickerColumn::new("path", |item: &FileResult, config: &GlobalSearchConfig| {
             let path = helix_stdx::path::get_relative_path(&item.path);
-            format!("{}:{}", path.to_string_lossy(), item.line_num + 1).into()
+
+            let directories = path
+                .parent()
+                .filter(|p| !p.as_os_str().is_empty())
+                .map(|p| format!("{}{}", p.display(), std::path::MAIN_SEPARATOR))
+                .unwrap_or_default();
+
+            let filename = item
+                .path
+                .file_name()
+                .expect("global search paths are normalized (can't end in `..`)")
+                .to_string_lossy();
+
+            Cell::from(Spans::from(vec![
+                Span::styled(directories, config.directory_style),
+                Span::raw(filename),
+                Span::styled(":", config.colon_style),
+                Span::styled((item.line_num + 1).to_string(), config.number_style),
+            ]))
         }),
         PickerColumn::hidden("contents"),
     ];
@@ -2974,7 +3030,7 @@ fn file_picker(cx: &mut Context) {
         cx.editor.set_error("Workspace directory does not exist");
         return;
     }
-    let picker = ui::file_picker(root, &cx.editor.config());
+    let picker = ui::file_picker(cx.editor, root);
     cx.push_layer(Box::new(overlaid(picker)));
 }
 
@@ -2991,7 +3047,7 @@ fn file_picker_in_current_buffer_directory(cx: &mut Context) {
         }
     };
 
-    let picker = ui::file_picker(path, &cx.editor.config());
+    let picker = ui::file_picker(cx.editor, path);
     cx.push_layer(Box::new(overlaid(picker)));
 }
 
@@ -3002,7 +3058,7 @@ fn file_picker_in_current_directory(cx: &mut Context) {
             .set_error("Current working directory does not exist");
         return;
     }
-    let picker = ui::file_picker(cwd, &cx.editor.config());
+    let picker = ui::file_picker(cx.editor, cwd);
     cx.push_layer(Box::new(overlaid(picker)));
 }
 
@@ -3325,7 +3381,7 @@ pub fn command_palette(cx: &mut Context) {
                     .iter()
                     .map(|cmd| MappableCommand::Typable {
                         name: cmd.name.to_owned(),
-                        args: Vec::new(),
+                        args: String::new(),
                         doc: cmd.doc.to_owned(),
                     }),
             );
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 130428d4d..c54429241 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -407,6 +407,13 @@ pub fn symbol_picker(cx: &mut Context) {
                 ui::PickerColumn::new("name", |item: &SymbolInformationItem, _| {
                     item.symbol.name.as_str().into()
                 }),
+                ui::PickerColumn::new("container", |item: &SymbolInformationItem, _| {
+                    item.symbol
+                        .container_name
+                        .as_deref()
+                        .unwrap_or_default()
+                        .into()
+                }),
             ];
 
             let picker = Picker::new(
@@ -508,6 +515,13 @@ pub fn workspace_symbol_picker(cx: &mut Context) {
             item.symbol.name.as_str().into()
         })
         .without_filtering(),
+        ui::PickerColumn::new("container", |item: &SymbolInformationItem, _| {
+            item.symbol
+                .container_name
+                .as_deref()
+                .unwrap_or_default()
+                .into()
+        }),
         ui::PickerColumn::new("path", |item: &SymbolInformationItem, _| {
             if let Some(path) = item.location.uri.as_path() {
                 path::get_relative_path(path)
@@ -1062,11 +1076,7 @@ pub fn hover(cx: &mut Context) {
                 .text_document_hover(doc.identifier(), pos, None)
                 .unwrap();
 
-            async move {
-                let json = request.await?;
-                let response = serde_json::from_value::<Option<lsp::Hover>>(json)?;
-                anyhow::Ok((server_name, response))
-            }
+            async move { anyhow::Ok((server_name, request.await?)) }
         })
         .collect();
 
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 7ec594874..9661689cf 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1,17 +1,19 @@
 use std::fmt::Write;
 use std::io::BufReader;
-use std::ops::Deref;
+use std::ops::{self, Deref};
 
 use crate::job::Job;
 
 use super::*;
 
+use helix_core::command_line::{Args, Flag, Signature, Token, TokenKind};
 use helix_core::fuzzy::fuzzy_match;
 use helix_core::indent::MAX_INDENT;
-use helix_core::{line_ending, shellwords::Shellwords};
+use helix_core::line_ending;
 use helix_stdx::path::home_dir;
 use helix_view::document::{read_to_string, DEFAULT_LANGUAGE_NAME};
 use helix_view::editor::{CloseError, ConfigEvent};
+use helix_view::expansion;
 use serde_json::Value;
 use ui::completers::{self, Completer};
 
@@ -21,22 +23,23 @@ pub struct TypableCommand {
     pub aliases: &'static [&'static str],
     pub doc: &'static str,
     // params, flags, helper, completer
-    pub fun: fn(&mut compositor::Context, &[Cow<str>], PromptEvent) -> anyhow::Result<()>,
+    pub fun: fn(&mut compositor::Context, Args, PromptEvent) -> anyhow::Result<()>,
     /// What completion methods, if any, does this command have?
-    pub signature: CommandSignature,
+    pub completer: CommandCompleter,
+    pub signature: Signature,
 }
 
 impl TypableCommand {
     fn completer_for_argument_number(&self, n: usize) -> &Completer {
-        match self.signature.positional_args.get(n) {
+        match self.completer.positional_args.get(n) {
             Some(completer) => completer,
-            _ => &self.signature.var_args,
+            _ => &self.completer.var_args,
         }
     }
 }
 
 #[derive(Clone)]
-pub struct CommandSignature {
+pub struct CommandCompleter {
     // Arguments with specific completion methods based on their position.
     positional_args: &'static [Completer],
 
@@ -44,7 +47,7 @@ pub struct CommandSignature {
     var_args: Completer,
 }
 
-impl CommandSignature {
+impl CommandCompleter {
     const fn none() -> Self {
         Self {
             positional_args: &[],
@@ -67,15 +70,13 @@ impl CommandSignature {
     }
 }
 
-fn quit(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) -> anyhow::Result<()> {
+fn quit(cx: &mut compositor::Context, _args: Args, event: PromptEvent) -> anyhow::Result<()> {
     log::debug!("quitting...");
 
     if event != PromptEvent::Validate {
         return Ok(());
     }
 
-    ensure!(args.is_empty(), ":quit takes no arguments");
-
     // last view and we have unsaved changes
     if cx.editor.tree.views().count() == 1 {
         buffers_remaining_impl(cx.editor)?
@@ -87,31 +88,24 @@ fn quit(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) ->
     Ok(())
 }
 
-fn force_quit(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn force_quit(cx: &mut compositor::Context, _args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
 
-    ensure!(args.is_empty(), ":quit! takes no arguments");
-
     cx.block_try_flush_writes()?;
     cx.editor.close(view!(cx.editor).id);
 
     Ok(())
 }
 
-fn open(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) -> anyhow::Result<()> {
+fn open(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
 
-    ensure!(!args.is_empty(), "wrong argument count");
     for arg in args {
-        let (path, pos) = args::parse_file(arg);
+        let (path, pos) = crate::args::parse_file(&arg);
         let path = helix_stdx::path::expand_tilde(path);
         // If the path is a directory, open a file picker on that directory and update the status
         // message
@@ -119,7 +113,7 @@ fn open(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) ->
             let callback = async move {
                 let call: job::Callback = job::Callback::EditorCompositor(Box::new(
                     move |editor: &mut Editor, compositor: &mut Compositor| {
-                        let picker = ui::file_picker(path.into_owned(), &editor.config());
+                        let picker = ui::file_picker(editor, path.into_owned());
                         compositor.push(Box::new(overlaid(picker)));
                     },
                 ));
@@ -175,7 +169,7 @@ fn buffer_close_by_ids_impl(
     Ok(())
 }
 
-fn buffer_gather_paths_impl(editor: &mut Editor, args: &[Cow<str>]) -> Vec<DocumentId> {
+fn buffer_gather_paths_impl(editor: &mut Editor, args: Args) -> Vec<DocumentId> {
     // No arguments implies current document
     if args.is_empty() {
         let doc_id = view!(editor).doc;
@@ -212,7 +206,7 @@ fn buffer_gather_paths_impl(editor: &mut Editor, args: &[Cow<str>]) -> Vec<Docum
 
 fn buffer_close(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -225,7 +219,7 @@ fn buffer_close(
 
 fn force_buffer_close(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -247,7 +241,7 @@ fn buffer_gather_others_impl(editor: &mut Editor) -> Vec<DocumentId> {
 
 fn buffer_close_others(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -260,7 +254,7 @@ fn buffer_close_others(
 
 fn force_buffer_close_others(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -277,7 +271,7 @@ fn buffer_gather_all_impl(editor: &mut Editor) -> Vec<DocumentId> {
 
 fn buffer_close_all(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -290,7 +284,7 @@ fn buffer_close_all(
 
 fn force_buffer_close_all(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -303,7 +297,7 @@ fn force_buffer_close_all(
 
 fn buffer_next(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -316,7 +310,7 @@ fn buffer_next(
 
 fn buffer_previous(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -327,16 +321,17 @@ fn buffer_previous(
     Ok(())
 }
 
-fn write_impl(
-    cx: &mut compositor::Context,
-    path: Option<&Cow<str>>,
-    force: bool,
-) -> anyhow::Result<()> {
+fn write_impl(cx: &mut compositor::Context, path: Option<&str>, force: bool) -> anyhow::Result<()> {
     let config = cx.editor.config();
     let jobs = &mut cx.jobs;
     let (view, doc) = current!(cx.editor);
-    let path = path.map(AsRef::as_ref);
 
+    if config.trim_trailing_whitespace {
+        trim_trailing_whitespace(doc, view.id);
+    }
+    if config.trim_final_newlines {
+        trim_final_newlines(doc, view.id);
+    }
     if config.insert_final_newline {
         insert_final_newline(doc, view.id);
     }
@@ -368,20 +363,66 @@ fn write_impl(
     Ok(())
 }
 
+/// Trim all whitespace preceding line-endings in a document.
+fn trim_trailing_whitespace(doc: &mut Document, view_id: ViewId) {
+    let text = doc.text();
+    let mut pos = 0;
+    let transaction = Transaction::delete(
+        text,
+        text.lines().filter_map(|line| {
+            let line_end_len_chars = line_ending::get_line_ending(&line)
+                .map(|le| le.len_chars())
+                .unwrap_or_default();
+            // Char after the last non-whitespace character or the beginning of the line if the
+            // line is all whitespace:
+            let first_trailing_whitespace =
+                pos + line.last_non_whitespace_char().map_or(0, |idx| idx + 1);
+            pos += line.len_chars();
+            // Char before the line ending character(s), or the final char in the text if there
+            // is no line-ending on this line:
+            let line_end = pos - line_end_len_chars;
+            if first_trailing_whitespace != line_end {
+                Some((first_trailing_whitespace, line_end))
+            } else {
+                None
+            }
+        }),
+    );
+    doc.apply(&transaction, view_id);
+}
+
+/// Trim any extra line-endings after the final line-ending.
+fn trim_final_newlines(doc: &mut Document, view_id: ViewId) {
+    let rope = doc.text();
+    let mut text = rope.slice(..);
+    let mut total_char_len = 0;
+    let mut final_char_len = 0;
+    while let Some(line_ending) = line_ending::get_line_ending(&text) {
+        total_char_len += line_ending.len_chars();
+        final_char_len = line_ending.len_chars();
+        text = text.slice(..text.len_chars() - line_ending.len_chars());
+    }
+    let chars_to_delete = total_char_len - final_char_len;
+    if chars_to_delete != 0 {
+        let transaction = Transaction::delete(
+            rope,
+            [(rope.len_chars() - chars_to_delete, rope.len_chars())].into_iter(),
+        );
+        doc.apply(&transaction, view_id);
+    }
+}
+
+/// Ensure that the document is terminated with a line ending.
 fn insert_final_newline(doc: &mut Document, view_id: ViewId) {
     let text = doc.text();
-    if line_ending::get_line_ending(&text.slice(..)).is_none() {
+    if text.len_chars() > 0 && line_ending::get_line_ending(&text.slice(..)).is_none() {
         let eof = Selection::point(text.len_chars());
         let insert = Transaction::insert(text, &eof, doc.line_ending.as_str().into());
         doc.apply(&insert, view_id);
     }
 }
 
-fn write(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn write(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -389,11 +430,7 @@ fn write(
     write_impl(cx, args.first(), false)
 }
 
-fn force_write(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn force_write(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -403,7 +440,7 @@ fn force_write(
 
 fn write_buffer_close(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -418,7 +455,7 @@ fn write_buffer_close(
 
 fn force_write_buffer_close(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -431,11 +468,7 @@ fn force_write_buffer_close(
     buffer_close_by_ids_impl(cx, &document_ids, false)
 }
 
-fn new_file(
-    cx: &mut compositor::Context,
-    _args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn new_file(cx: &mut compositor::Context, _args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -445,11 +478,7 @@ fn new_file(
     Ok(())
 }
 
-fn format(
-    cx: &mut compositor::Context,
-    _args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn format(cx: &mut compositor::Context, _args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -466,7 +495,7 @@ fn format(
 
 fn set_indent_style(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -489,7 +518,7 @@ fn set_indent_style(
     // Attempt to parse argument as an indent style.
     let style = match args.first() {
         Some(arg) if "tabs".starts_with(&arg.to_lowercase()) => Some(Tabs),
-        Some(Cow::Borrowed("0")) => Some(Tabs),
+        Some("0") => Some(Tabs),
         Some(arg) => arg
             .parse::<u8>()
             .ok()
@@ -508,7 +537,7 @@ fn set_indent_style(
 /// Sets or reports the current document's line ending setting.
 fn set_line_ending(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -578,11 +607,7 @@ fn set_line_ending(
 
     Ok(())
 }
-fn earlier(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn earlier(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -598,11 +623,7 @@ fn earlier(
     Ok(())
 }
 
-fn later(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn later(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -617,23 +638,19 @@ fn later(
     Ok(())
 }
 
-fn write_quit(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn write_quit(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
 
     write_impl(cx, args.first(), false)?;
     cx.block_try_flush_writes()?;
-    quit(cx, &[], event)
+    quit(cx, Args::default(), event)
 }
 
 fn force_write_quit(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -642,7 +659,7 @@ fn force_write_quit(
 
     write_impl(cx, args.first(), true)?;
     cx.block_try_flush_writes()?;
-    force_quit(cx, &[], event)
+    force_quit(cx, Args::default(), event)
 }
 
 /// Results in an error if there are modified buffers remaining and sets editor
@@ -721,6 +738,12 @@ pub fn write_all_impl(
         let doc = doc_mut!(cx.editor, &doc_id);
         let view = view_mut!(cx.editor, target_view);
 
+        if config.trim_trailing_whitespace {
+            trim_trailing_whitespace(doc, target_view);
+        }
+        if config.trim_final_newlines {
+            trim_final_newlines(doc, target_view);
+        }
         if config.insert_final_newline {
             insert_final_newline(doc, target_view);
         }
@@ -755,11 +778,7 @@ pub fn write_all_impl(
     Ok(())
 }
 
-fn write_all(
-    cx: &mut compositor::Context,
-    _args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn write_all(cx: &mut compositor::Context, _args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -776,7 +795,7 @@ fn write_all(
 
 fn force_write_all(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -795,7 +814,7 @@ fn force_write_all(
 
 fn write_all_quit(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -814,7 +833,7 @@ fn write_all_quit(
 
 fn force_write_all_quit(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -846,11 +865,7 @@ fn quit_all_impl(cx: &mut compositor::Context, force: bool) -> anyhow::Result<()
     Ok(())
 }
 
-fn quit_all(
-    cx: &mut compositor::Context,
-    _args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn quit_all(cx: &mut compositor::Context, _args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -860,7 +875,7 @@ fn quit_all(
 
 fn force_quit_all(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -870,11 +885,7 @@ fn force_quit_all(
     quit_all_impl(cx, true)
 }
 
-fn cquit(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn cquit(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -888,11 +899,7 @@ fn cquit(
     quit_all_impl(cx, false)
 }
 
-fn force_cquit(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn force_cquit(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -906,11 +913,7 @@ fn force_cquit(
     quit_all_impl(cx, true)
 }
 
-fn theme(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn theme(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     let true_color = cx.editor.config.load().true_color || crate::true_color();
     match event {
         PromptEvent::Abort => {
@@ -953,7 +956,7 @@ fn theme(
 
 fn yank_main_selection_to_clipboard(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -964,17 +967,11 @@ fn yank_main_selection_to_clipboard(
     Ok(())
 }
 
-fn yank_joined(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn yank_joined(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
 
-    ensure!(args.len() <= 1, ":yank-join takes at most 1 argument");
-
     let doc = doc!(cx.editor);
     let default_sep = Cow::Borrowed(doc.line_ending.as_str());
     let separator = args.first().unwrap_or(&default_sep);
@@ -988,7 +985,7 @@ fn yank_joined(
 
 fn yank_joined_to_clipboard(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -1004,7 +1001,7 @@ fn yank_joined_to_clipboard(
 
 fn yank_main_selection_to_primary_clipboard(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -1017,7 +1014,7 @@ fn yank_main_selection_to_primary_clipboard(
 
 fn yank_joined_to_primary_clipboard(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -1033,7 +1030,7 @@ fn yank_joined_to_primary_clipboard(
 
 fn paste_clipboard_after(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -1046,7 +1043,7 @@ fn paste_clipboard_after(
 
 fn paste_clipboard_before(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -1059,7 +1056,7 @@ fn paste_clipboard_before(
 
 fn paste_primary_clipboard_after(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -1072,7 +1069,7 @@ fn paste_primary_clipboard_after(
 
 fn paste_primary_clipboard_before(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -1085,7 +1082,7 @@ fn paste_primary_clipboard_before(
 
 fn replace_selections_with_clipboard(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -1098,7 +1095,7 @@ fn replace_selections_with_clipboard(
 
 fn replace_selections_with_primary_clipboard(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -1111,7 +1108,7 @@ fn replace_selections_with_primary_clipboard(
 
 fn show_clipboard_provider(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -1125,7 +1122,7 @@ fn show_clipboard_provider(
 
 fn change_current_directory(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -1159,7 +1156,7 @@ fn change_current_directory(
 
 fn show_current_directory(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -1180,7 +1177,7 @@ fn show_current_directory(
 /// Sets the [`Document`]'s encoding..
 fn set_encoding(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -1200,7 +1197,7 @@ fn set_encoding(
 /// Shows info about the character under the primary cursor.
 fn get_character_info(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -1323,11 +1320,7 @@ fn get_character_info(
 }
 
 /// Reload the [`Document`] from its source file.
-fn reload(
-    cx: &mut compositor::Context,
-    _args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn reload(cx: &mut compositor::Context, _args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -1346,11 +1339,7 @@ fn reload(
     Ok(())
 }
 
-fn reload_all(
-    cx: &mut compositor::Context,
-    _args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn reload_all(cx: &mut compositor::Context, _args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -1406,11 +1395,7 @@ fn reload_all(
 }
 
 /// Update the [`Document`] if it has been modified.
-fn update(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn update(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -1425,7 +1410,7 @@ fn update(
 
 fn lsp_workspace_command(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -1481,19 +1466,30 @@ fn lsp_workspace_command(
         };
         cx.jobs.callback(callback);
     } else {
-        let command = args.join(" ");
+        let command = args[0].to_string();
         let matches: Vec<_> = ls_id_commands
             .filter(|(_ls_id, c)| *c == &command)
             .collect();
 
         match matches.as_slice() {
             [(ls_id, _command)] => {
+                let arguments = args
+                    .get(1)
+                    .map(|rest| {
+                        serde_json::Deserializer::from_str(rest)
+                            .into_iter()
+                            .collect::<Result<Vec<Value>, _>>()
+                            .map_err(|err| anyhow!("failed to parse arguments: {err}"))
+                    })
+                    .transpose()?
+                    .filter(|args| !args.is_empty());
+
                 execute_lsp_command(
                     cx.editor,
                     *ls_id,
                     helix_lsp::lsp::Command {
                         title: command.clone(),
-                        arguments: None,
+                        arguments,
                         command,
                     },
                 );
@@ -1513,11 +1509,7 @@ fn lsp_workspace_command(
     Ok(())
 }
 
-fn lsp_restart(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn lsp_restart(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -1602,11 +1594,7 @@ fn lsp_restart(
     }
 }
 
-fn lsp_stop(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn lsp_stop(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -1647,7 +1635,7 @@ fn lsp_stop(
 
 fn tree_sitter_scopes(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -1680,7 +1668,7 @@ fn tree_sitter_scopes(
 
 fn tree_sitter_highlight_name(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     fn find_highlight_at_cursor(
@@ -1753,11 +1741,7 @@ fn tree_sitter_highlight_name(
     Ok(())
 }
 
-fn vsplit(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn vsplit(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -1774,11 +1758,7 @@ fn vsplit(
     Ok(())
 }
 
-fn hsplit(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn hsplit(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -1795,11 +1775,7 @@ fn hsplit(
     Ok(())
 }
 
-fn vsplit_new(
-    cx: &mut compositor::Context,
-    _args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn vsplit_new(cx: &mut compositor::Context, _args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -1809,11 +1785,7 @@ fn vsplit_new(
     Ok(())
 }
 
-fn hsplit_new(
-    cx: &mut compositor::Context,
-    _args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn hsplit_new(cx: &mut compositor::Context, _args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -1823,11 +1795,7 @@ fn hsplit_new(
     Ok(())
 }
 
-fn debug_eval(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn debug_eval(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -1849,16 +1817,12 @@ fn debug_eval(
     Ok(())
 }
 
-fn debug_start(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn debug_start(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
 
-    let mut args = args.to_owned();
+    let mut args: Vec<_> = args.into_iter().collect();
     let name = match args.len() {
         0 => None,
         _ => Some(args.remove(0)),
@@ -1868,14 +1832,14 @@ fn debug_start(
 
 fn debug_remote(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
 
-    let mut args = args.to_owned();
+    let mut args: Vec<_> = args.into_iter().collect();
     let address = match args.len() {
         0 => None,
         _ => Some(args.remove(0).parse()?),
@@ -1887,11 +1851,7 @@ fn debug_remote(
     dap_start_impl(cx, name.as_deref(), address, Some(args))
 }
 
-fn tutor(
-    cx: &mut compositor::Context,
-    _args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn tutor(cx: &mut compositor::Context, _args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -1913,10 +1873,7 @@ fn abort_goto_line_number_preview(cx: &mut compositor::Context) {
     }
 }
 
-fn update_goto_line_number_preview(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-) -> anyhow::Result<()> {
+fn update_goto_line_number_preview(cx: &mut compositor::Context, args: Args) -> anyhow::Result<()> {
     cx.editor.last_selection.get_or_insert_with(|| {
         let (view, doc) = current!(cx.editor);
         doc.selection(view.id).clone()
@@ -1934,14 +1891,12 @@ fn update_goto_line_number_preview(
 
 pub(super) fn goto_line_number(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     match event {
         PromptEvent::Abort => abort_goto_line_number_preview(cx),
         PromptEvent::Validate => {
-            ensure!(!args.is_empty(), "Line number required");
-
             // If we are invoked directly via a keybinding, Validate is
             // sent without any prior Update events. Ensure the cursor
             // is moved to the appropriate location.
@@ -1968,19 +1923,11 @@ pub(super) fn goto_line_number(
 }
 
 // Fetch the current value of a config option and output as status.
-fn get_option(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn get_option(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
 
-    if args.len() != 1 {
-        anyhow::bail!("Bad arguments. Usage: `:get key`");
-    }
-
     let key = &args[0].to_lowercase();
     let key_error = || anyhow::anyhow!("Unknown key `{}`", key);
 
@@ -1994,19 +1941,12 @@ fn get_option(
 
 /// Change config at runtime. Access nested values by dot syntax, for
 /// example to disable smart case search, use `:set search.smart-case false`.
-fn set_option(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn set_option(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
 
-    if args.len() != 2 {
-        anyhow::bail!("Bad arguments. Usage: `:set key field`");
-    }
-    let (key, arg) = (&args[0].to_lowercase(), &args[1]);
+    let (key, arg) = (&args[0].to_lowercase(), args[1].trim());
 
     let key_error = || anyhow::anyhow!("Unknown key `{}`", key);
     let field_error = |_| anyhow::anyhow!("Could not parse field `{}`", arg);
@@ -2035,16 +1975,13 @@ fn set_option(
 /// case`.
 fn toggle_option(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
 
-    if args.is_empty() {
-        anyhow::bail!("Bad arguments. Usage: `:toggle key [values]?`");
-    }
     let key = &args[0].to_lowercase();
 
     let key_error = || anyhow::anyhow!("Unknown key `{}`", key);
@@ -2057,48 +1994,69 @@ fn toggle_option(
         Value::Bool(ref value) => {
             ensure!(
                 args.len() == 1,
-                "Bad arguments. For boolean configurations use: `:toggle key`"
+                "Bad arguments. For boolean configurations use: `:toggle {key}`"
             );
             Value::Bool(!value)
         }
         Value::String(ref value) => {
             ensure!(
-                args.len() > 2,
-                "Bad arguments. For string configurations use: `:toggle key val1 val2 ...`",
+                args.len() == 2,
+                "Bad arguments. For string configurations use: `:toggle {key} val1 val2 ...`",
             );
+            // For string values, parse the input according to normal command line rules.
+            let values: Vec<_> = command_line::Tokenizer::new(&args[1], true)
+                .map(|res| res.map(|token| token.content))
+                .collect::<Result<_, _>>()
+                .map_err(|err| anyhow!("failed to parse values: {err}"))?;
 
             Value::String(
-                args[1..]
+                values
                     .iter()
                     .skip_while(|e| *e != value)
                     .nth(1)
-                    .unwrap_or_else(|| &args[1])
+                    .map(AsRef::as_ref)
+                    .unwrap_or_else(|| &values[0])
                     .to_string(),
             )
         }
-        Value::Number(ref value) => {
+        Value::Null => bail!("Configuration {key} cannot be toggled"),
+        Value::Number(_) | Value::Array(_) | Value::Object(_) => {
             ensure!(
-                args.len() > 2,
-                "Bad arguments. For number configurations use: `:toggle key val1 val2 ...`",
+                args.len() == 2,
+                "Bad arguments. For {kind} configurations use: `:toggle {key} val1 val2 ...`",
+                kind = match value {
+                    Value::Number(_) => "number",
+                    Value::Array(_) => "array",
+                    Value::Object(_) => "object",
+                    _ => unreachable!(),
+                }
             );
+            // For numbers, arrays and objects, parse each argument with
+            // `serde_json::StreamDeserializer`.
+            let values: Vec<Value> = serde_json::Deserializer::from_str(&args[1])
+                .into_iter()
+                .collect::<Result<_, _>>()
+                .map_err(|err| anyhow!("failed to parse value: {err}"))?;
 
-            Value::Number(
-                args[1..]
-                    .iter()
-                    .skip_while(|&e| value.to_string() != *e.to_string())
-                    .nth(1)
-                    .unwrap_or_else(|| &args[1])
-                    .parse()?,
-            )
-        }
-        Value::Null | Value::Object(_) | Value::Array(_) => {
-            anyhow::bail!("Configuration {key} does not support toggle yet")
+            if let Some(wrongly_typed_value) = values
+                .iter()
+                .find(|v| std::mem::discriminant(*v) != std::mem::discriminant(&*value))
+            {
+                bail!("value '{wrongly_typed_value}' has a different type than '{value}'");
+            }
+
+            values
+                .iter()
+                .skip_while(|e| *e != value)
+                .nth(1)
+                .unwrap_or(&values[0])
+                .clone()
         }
     };
 
     let status = format!("'{key}' is now set to {value}");
     let config = serde_json::from_value(config)
-        .map_err(|err| anyhow::anyhow!("Cannot parse `{:?}`, {}", &args, err))?;
+        .map_err(|err| anyhow::anyhow!("Failed to parse config: {err}"))?;
 
     cx.editor
         .config_events
@@ -2109,11 +2067,7 @@ fn toggle_option(
 }
 
 /// Change the language of the current buffer at runtime.
-fn language(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn language(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -2125,13 +2079,9 @@ fn language(
         return Ok(());
     }
 
-    if args.len() != 1 {
-        anyhow::bail!("Bad arguments. Usage: `:set-language language`");
-    }
-
     let doc = doc_mut!(cx.editor);
 
-    if args[0] == DEFAULT_LANGUAGE_NAME {
+    if &args[0] == DEFAULT_LANGUAGE_NAME {
         doc.set_language(None, None)
     } else {
         doc.set_language_by_language_id(&args[0], cx.editor.syn_loader.clone())?;
@@ -2147,31 +2097,15 @@ fn language(
     Ok(())
 }
 
-fn sort(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) -> anyhow::Result<()> {
+fn sort(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
 
-    sort_impl(cx, args, false)
+    sort_impl(cx, args.has_flag("reverse"))
 }
 
-fn sort_reverse(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
-    if event != PromptEvent::Validate {
-        return Ok(());
-    }
-
-    sort_impl(cx, args, true)
-}
-
-fn sort_impl(
-    cx: &mut compositor::Context,
-    _args: &[Cow<str>],
-    reverse: bool,
-) -> anyhow::Result<()> {
+fn sort_impl(cx: &mut compositor::Context, reverse: bool) -> anyhow::Result<()> {
     let scrolloff = cx.editor.config().scrolloff;
     let (view, doc) = current!(cx.editor);
     let text = doc.text().slice(..);
@@ -2207,11 +2141,7 @@ fn sort_impl(
     Ok(())
 }
 
-fn reflow(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn reflow(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -2250,7 +2180,7 @@ fn reflow(
 
 fn tree_sitter_subtree(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -2289,7 +2219,7 @@ fn tree_sitter_subtree(
 
 fn open_config(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -2303,7 +2233,7 @@ fn open_config(
 
 fn open_workspace_config(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -2315,11 +2245,7 @@ fn open_workspace_config(
     Ok(())
 }
 
-fn open_log(
-    cx: &mut compositor::Context,
-    _args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn open_log(cx: &mut compositor::Context, _args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -2330,7 +2256,7 @@ fn open_log(
 
 fn refresh_config(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -2343,47 +2269,41 @@ fn refresh_config(
 
 fn append_output(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
 
-    ensure!(!args.is_empty(), "Shell command required");
     shell(cx, &args.join(" "), &ShellBehavior::Append);
     Ok(())
 }
 
 fn insert_output(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
 
-    ensure!(!args.is_empty(), "Shell command required");
     shell(cx, &args.join(" "), &ShellBehavior::Insert);
     Ok(())
 }
 
-fn pipe_to(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn pipe_to(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     pipe_impl(cx, args, event, &ShellBehavior::Ignore)
 }
 
-fn pipe(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) -> anyhow::Result<()> {
+fn pipe(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     pipe_impl(cx, args, event, &ShellBehavior::Replace)
 }
 
 fn pipe_impl(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    args: Args,
     event: PromptEvent,
     behavior: &ShellBehavior,
 ) -> anyhow::Result<()> {
@@ -2391,14 +2311,13 @@ fn pipe_impl(
         return Ok(());
     }
 
-    ensure!(!args.is_empty(), "Shell command required");
     shell(cx, &args.join(" "), behavior);
     Ok(())
 }
 
 fn run_shell_command(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -2434,13 +2353,12 @@ fn run_shell_command(
 
 fn reset_diff_change(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    _args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
-    ensure!(args.is_empty(), ":reset-diff-change takes no arguments");
 
     let editor = &mut cx.editor;
     let scrolloff = editor.config().scrolloff;
@@ -2487,14 +2405,13 @@ fn reset_diff_change(
 
 fn clear_register(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
 
-    ensure!(args.len() <= 1, ":clear-register takes at most 1 argument");
     if args.is_empty() {
         cx.editor.registers.clear();
         cx.editor.set_status("All registers cleared");
@@ -2503,7 +2420,7 @@ fn clear_register(
 
     ensure!(
         args[0].chars().count() == 1,
-        format!("Invalid register {}", args[0])
+        format!("Invalid register {}", &args[0])
     );
     let register = args[0].chars().next().unwrap_or_default();
     if cx.editor.registers.remove(register) {
@@ -2516,11 +2433,7 @@ fn clear_register(
     Ok(())
 }
 
-fn redraw(
-    cx: &mut compositor::Context,
-    _args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn redraw(cx: &mut compositor::Context, _args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -2539,16 +2452,11 @@ fn redraw(
     Ok(())
 }
 
-fn move_buffer(
-    cx: &mut compositor::Context,
-    args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
+fn move_buffer(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
 
-    ensure!(args.len() == 1, format!(":move takes one argument"));
     let doc = doc!(cx.editor);
     let old_path = doc
         .path()
@@ -2563,7 +2471,7 @@ fn move_buffer(
 
 fn yank_diagnostic(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    args: Args,
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
@@ -2601,7 +2509,7 @@ fn yank_diagnostic(
     Ok(())
 }
 
-fn read(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) -> anyhow::Result<()> {
+fn read(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -2609,9 +2517,6 @@ fn read(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) ->
     let scrolloff = cx.editor.config().scrolloff;
     let (view, doc) = current!(cx.editor);
 
-    ensure!(!args.is_empty(), "file name is expected");
-    ensure!(args.len() == 1, "only the file name is expected");
-
     let filename = args.first().unwrap();
     let path = helix_stdx::path::expand_tilde(PathBuf::from(filename.to_string()));
 
@@ -2635,132 +2540,239 @@ fn read(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) ->
     Ok(())
 }
 
+fn echo(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyhow::Result<()> {
+    if event != PromptEvent::Validate {
+        return Ok(());
+    }
+
+    let output = args.into_iter().fold(String::new(), |mut acc, arg| {
+        if !acc.is_empty() {
+            acc.push(' ');
+        }
+        acc.push_str(&arg);
+        acc
+    });
+    cx.editor.set_status(output);
+
+    Ok(())
+}
+
+fn noop(_cx: &mut compositor::Context, _args: Args, _event: PromptEvent) -> anyhow::Result<()> {
+    Ok(())
+}
+
+/// This command handles all of its input as-is with no quoting or flags.
+const SHELL_SIGNATURE: Signature = Signature {
+    positionals: (1, Some(2)),
+    raw_after: Some(1),
+    ..Signature::DEFAULT
+};
+
+const SHELL_COMPLETER: CommandCompleter = CommandCompleter::positional(&[
+    // Command name (TODO: consider a command completer - Kakoune has prior art)
+    completers::none,
+    // Shell argument(s)
+    completers::filename,
+]);
+
 pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
     TypableCommand {
         name: "quit",
         aliases: &["q"],
         doc: "Close the current view.",
         fun: quit,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "quit!",
         aliases: &["q!"],
         doc: "Force close the current view, ignoring unsaved changes.",
         fun: force_quit,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "open",
         aliases: &["o", "edit", "e"],
         doc: "Open a file from disk into the current view.",
         fun: open,
-        signature: CommandSignature::all(completers::filename),
+        completer: CommandCompleter::all(completers::filename),
+        signature: Signature {
+            positionals: (1, None),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "buffer-close",
         aliases: &["bc", "bclose"],
         doc: "Close the current buffer.",
         fun: buffer_close,
-        signature: CommandSignature::all(completers::buffer),
+        completer: CommandCompleter::all(completers::buffer),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "buffer-close!",
         aliases: &["bc!", "bclose!"],
         doc: "Close the current buffer forcefully, ignoring unsaved changes.",
         fun: force_buffer_close,
-        signature: CommandSignature::all(completers::buffer)
+        completer: CommandCompleter::all(completers::buffer),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "buffer-close-others",
         aliases: &["bco", "bcloseother"],
         doc: "Close all buffers but the currently focused one.",
         fun: buffer_close_others,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "buffer-close-others!",
         aliases: &["bco!", "bcloseother!"],
         doc: "Force close all buffers but the currently focused one.",
         fun: force_buffer_close_others,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "buffer-close-all",
         aliases: &["bca", "bcloseall"],
         doc: "Close all buffers without quitting.",
         fun: buffer_close_all,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "buffer-close-all!",
         aliases: &["bca!", "bcloseall!"],
         doc: "Force close all buffers ignoring unsaved changes without quitting.",
         fun: force_buffer_close_all,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "buffer-next",
         aliases: &["bn", "bnext"],
         doc: "Goto next buffer.",
         fun: buffer_next,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "buffer-previous",
         aliases: &["bp", "bprev"],
         doc: "Goto previous buffer.",
         fun: buffer_previous,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "write",
         aliases: &["w"],
         doc: "Write changes to disk. Accepts an optional path (:write some/path.txt)",
         fun: write,
-        signature: CommandSignature::positional(&[completers::filename]),
+        completer: CommandCompleter::positional(&[completers::filename]),
+        signature: Signature {
+            positionals: (0, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "write!",
         aliases: &["w!"],
         doc: "Force write changes to disk creating necessary subdirectories. Accepts an optional path (:write! some/path.txt)",
         fun: force_write,
-        signature: CommandSignature::positional(&[completers::filename]),
+        completer: CommandCompleter::positional(&[completers::filename]),
+        signature: Signature {
+            positionals: (0, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "write-buffer-close",
         aliases: &["wbc"],
         doc: "Write changes to disk and closes the buffer. Accepts an optional path (:write-buffer-close some/path.txt)",
         fun: write_buffer_close,
-        signature: CommandSignature::positional(&[completers::filename]),
+        completer: CommandCompleter::positional(&[completers::filename]),
+        signature: Signature {
+            positionals: (0, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "write-buffer-close!",
         aliases: &["wbc!"],
         doc: "Force write changes to disk creating necessary subdirectories and closes the buffer. Accepts an optional path (:write-buffer-close! some/path.txt)",
         fun: force_write_buffer_close,
-        signature: CommandSignature::positional(&[completers::filename]),
+        completer: CommandCompleter::positional(&[completers::filename]),
+        signature: Signature {
+            positionals: (0, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "new",
         aliases: &["n"],
         doc: "Create a new scratch buffer.",
         fun: new_file,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "format",
         aliases: &["fmt"],
         doc: "Format the file using an external formatter or language server.",
         fun: format,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "indent-style",
         aliases: &[],
         doc: "Set the indentation style for editing. ('t' for tabs or 1-16 for number of spaces.)",
         fun: set_indent_style,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "line-ending",
@@ -2770,336 +2782,529 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
         #[cfg(feature = "unicode-lines")]
         doc: "Set the document's default line ending. Options: crlf, lf, cr, ff, nel.",
         fun: set_line_ending,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "earlier",
         aliases: &["ear"],
         doc: "Jump back to an earlier point in edit history. Accepts a number of steps or a time span.",
         fun: earlier,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "later",
         aliases: &["lat"],
         doc: "Jump to a later point in edit history. Accepts a number of steps or a time span.",
         fun: later,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "write-quit",
         aliases: &["wq", "x"],
         doc: "Write changes to disk and close the current view. Accepts an optional path (:wq some/path.txt)",
         fun: write_quit,
-        signature: CommandSignature::positional(&[completers::filename]),
+        completer: CommandCompleter::positional(&[completers::filename]),
+        signature: Signature {
+            positionals: (0, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "write-quit!",
         aliases: &["wq!", "x!"],
         doc: "Write changes to disk and close the current view forcefully. Accepts an optional path (:wq! some/path.txt)",
         fun: force_write_quit,
-        signature: CommandSignature::positional(&[completers::filename]),
+        completer: CommandCompleter::positional(&[completers::filename]),
+        signature: Signature {
+            positionals: (0, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "write-all",
         aliases: &["wa"],
         doc: "Write changes from all buffers to disk.",
         fun: write_all,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "write-all!",
         aliases: &["wa!"],
         doc: "Forcefully write changes from all buffers to disk creating necessary subdirectories.",
         fun: force_write_all,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "write-quit-all",
         aliases: &["wqa", "xa"],
         doc: "Write changes from all buffers to disk and close all views.",
         fun: write_all_quit,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "write-quit-all!",
         aliases: &["wqa!", "xa!"],
         doc: "Write changes from all buffers to disk and close all views forcefully (ignoring unsaved changes).",
         fun: force_write_all_quit,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "quit-all",
         aliases: &["qa"],
         doc: "Close all views.",
         fun: quit_all,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "quit-all!",
         aliases: &["qa!"],
         doc: "Force close all views ignoring unsaved changes.",
         fun: force_quit_all,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "cquit",
         aliases: &["cq"],
         doc: "Quit with exit code (default 1). Accepts an optional integer exit code (:cq 2).",
         fun: cquit,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "cquit!",
         aliases: &["cq!"],
         doc: "Force quit with exit code (default 1) ignoring unsaved changes. Accepts an optional integer exit code (:cq! 2).",
         fun: force_cquit,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "theme",
         aliases: &[],
         doc: "Change the editor theme (show current theme if no name specified).",
         fun: theme,
-        signature: CommandSignature::positional(&[completers::theme]),
+        completer: CommandCompleter::positional(&[completers::theme]),
+        signature: Signature {
+            positionals: (1, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "yank-join",
         aliases: &[],
         doc: "Yank joined selections. A separator can be provided as first argument. Default value is newline.",
         fun: yank_joined,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "clipboard-yank",
         aliases: &[],
         doc: "Yank main selection into system clipboard.",
         fun: yank_main_selection_to_clipboard,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "clipboard-yank-join",
         aliases: &[],
         doc: "Yank joined selections into system clipboard. A separator can be provided as first argument. Default value is newline.", // FIXME: current UI can't display long doc.
         fun: yank_joined_to_clipboard,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "primary-clipboard-yank",
         aliases: &[],
         doc: "Yank main selection into system primary clipboard.",
         fun: yank_main_selection_to_primary_clipboard,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "primary-clipboard-yank-join",
         aliases: &[],
         doc: "Yank joined selections into system primary clipboard. A separator can be provided as first argument. Default value is newline.", // FIXME: current UI can't display long doc.
         fun: yank_joined_to_primary_clipboard,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "clipboard-paste-after",
         aliases: &[],
         doc: "Paste system clipboard after selections.",
         fun: paste_clipboard_after,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "clipboard-paste-before",
         aliases: &[],
         doc: "Paste system clipboard before selections.",
         fun: paste_clipboard_before,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "clipboard-paste-replace",
         aliases: &[],
         doc: "Replace selections with content of system clipboard.",
         fun: replace_selections_with_clipboard,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "primary-clipboard-paste-after",
         aliases: &[],
         doc: "Paste primary clipboard after selections.",
         fun: paste_primary_clipboard_after,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "primary-clipboard-paste-before",
         aliases: &[],
         doc: "Paste primary clipboard before selections.",
         fun: paste_primary_clipboard_before,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "primary-clipboard-paste-replace",
         aliases: &[],
         doc: "Replace selections with content of system primary clipboard.",
         fun: replace_selections_with_primary_clipboard,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "show-clipboard-provider",
         aliases: &[],
         doc: "Show clipboard provider name in status bar.",
         fun: show_clipboard_provider,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "change-current-directory",
         aliases: &["cd"],
         doc: "Change the current working directory.",
         fun: change_current_directory,
-        signature: CommandSignature::positional(&[completers::directory]),
+        completer: CommandCompleter::positional(&[completers::directory]),
+        signature: Signature {
+            positionals: (1, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "show-directory",
         aliases: &["pwd"],
         doc: "Show the current working directory.",
         fun: show_current_directory,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "encoding",
         aliases: &[],
         doc: "Set encoding. Based on `https://encoding.spec.whatwg.org`.",
         fun: set_encoding,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "character-info",
         aliases: &["char"],
         doc: "Get info about the character under the primary cursor.",
         fun: get_character_info,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "reload",
         aliases: &["rl"],
         doc: "Discard changes and reload from the source file.",
         fun: reload,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "reload-all",
         aliases: &["rla"],
         doc: "Discard changes and reload all documents from the source files.",
         fun: reload_all,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "update",
         aliases: &["u"],
         doc: "Write changes only if the file has been modified.",
         fun: update,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "lsp-workspace-command",
         aliases: &[],
         doc: "Open workspace command picker",
         fun: lsp_workspace_command,
-        signature: CommandSignature::positional(&[completers::lsp_workspace_command]),
+        completer: CommandCompleter::positional(&[completers::lsp_workspace_command]),
+        signature: Signature {
+            positionals: (0, None),
+            raw_after: Some(1),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "lsp-restart",
         aliases: &[],
         doc: "Restarts the given language servers, or all language servers that are used by the current file if no arguments are supplied",
         fun: lsp_restart,
-        signature: CommandSignature::all(completers::configured_language_servers),
+        completer: CommandCompleter::all(completers::configured_language_servers),
+        signature: Signature {
+            positionals: (0, None),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "lsp-stop",
         aliases: &[],
         doc: "Stops the given language servers, or all language servers that are used by the current file if no arguments are supplied",
         fun: lsp_stop,
-        signature: CommandSignature::all(completers::active_language_servers),
+        completer: CommandCompleter::all(completers::active_language_servers),
+        signature: Signature {
+            positionals: (0, None),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "tree-sitter-scopes",
         aliases: &[],
         doc: "Display tree sitter scopes, primarily for theming and development.",
         fun: tree_sitter_scopes,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "tree-sitter-highlight-name",
         aliases: &[],
         doc: "Display name of tree-sitter highlight scope under the cursor.",
         fun: tree_sitter_highlight_name,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "debug-start",
         aliases: &["dbg"],
         doc: "Start a debug session from a given template with given parameters.",
         fun: debug_start,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, None),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "debug-remote",
         aliases: &["dbg-tcp"],
         doc: "Connect to a debug adapter by TCP address and start a debugging session from a given template with given parameters.",
         fun: debug_remote,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, None),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "debug-eval",
         aliases: &[],
         doc: "Evaluate expression in current debug context.",
         fun: debug_eval,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (1, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "vsplit",
         aliases: &["vs"],
         doc: "Open the file in a vertical split.",
         fun: vsplit,
-        signature: CommandSignature::all(completers::filename)
+        completer: CommandCompleter::all(completers::filename),
+        signature: Signature {
+            positionals: (0, None),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "vsplit-new",
         aliases: &["vnew"],
         doc: "Open a scratch buffer in a vertical split.",
         fun: vsplit_new,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "hsplit",
         aliases: &["hs", "sp"],
         doc: "Open the file in a horizontal split.",
         fun: hsplit,
-        signature: CommandSignature::all(completers::filename)
+        completer: CommandCompleter::all(completers::filename),
+        signature: Signature {
+            positionals: (0, None),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "hsplit-new",
         aliases: &["hnew"],
         doc: "Open a scratch buffer in a horizontal split.",
         fun: hsplit_new,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "tutor",
         aliases: &[],
         doc: "Open the tutorial.",
         fun: tutor,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "goto",
         aliases: &["g"],
         doc: "Goto line number.",
         fun: goto_line_number,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (1, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "set-language",
         aliases: &["lang"],
         doc: "Set the language of current buffer (show current language if no value specified).",
         fun: language,
-        signature: CommandSignature::positional(&[completers::language]),
+        completer: CommandCompleter::positional(&[completers::language]),
+        signature: Signature {
+            positionals: (0, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "set-option",
@@ -3107,154 +3312,248 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
         doc: "Set a config option at runtime.\nFor example to disable smart case search, use `:set search.smart-case false`.",
         fun: set_option,
         // TODO: Add support for completion of the options value(s), when appropriate.
-        signature: CommandSignature::positional(&[completers::setting]),
+        completer: CommandCompleter::positional(&[completers::setting]),
+        signature: Signature {
+            positionals: (2, Some(2)),
+            raw_after: Some(1),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "toggle-option",
         aliases: &["toggle"],
-        doc: "Toggle a boolean config option at runtime.\nFor example to toggle smart case search, use `:toggle search.smart-case`.",
+        doc: "Toggle a config option at runtime.\nFor example to toggle smart case search, use `:toggle search.smart-case`.",
         fun: toggle_option,
-        signature: CommandSignature::positional(&[completers::setting]),
+        completer: CommandCompleter::positional(&[completers::setting]),
+        signature: Signature {
+            positionals: (1, None),
+            raw_after: Some(1),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "get-option",
         aliases: &["get"],
         doc: "Get the current value of a config option.",
         fun: get_option,
-        signature: CommandSignature::positional(&[completers::setting]),
+        completer: CommandCompleter::positional(&[completers::setting]),
+        signature: Signature {
+            positionals: (1, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "sort",
         aliases: &[],
         doc: "Sort ranges in selection.",
         fun: sort,
-        signature: CommandSignature::none(),
-    },
-    TypableCommand {
-        name: "rsort",
-        aliases: &[],
-        doc: "Sort ranges in selection in reverse order.",
-        fun: sort_reverse,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            flags: &[
+                Flag {
+                    name: "reverse",
+                    alias: Some('r'),
+                    doc: "sort ranges in reverse order",
+                    ..Flag::DEFAULT
+                },
+            ],
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "reflow",
         aliases: &[],
         doc: "Hard-wrap the current selection of lines to a given width.",
         fun: reflow,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "tree-sitter-subtree",
         aliases: &["ts-subtree"],
         doc: "Display the smallest tree-sitter subtree that spans the primary selection, primarily for debugging queries.",
         fun: tree_sitter_subtree,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "config-reload",
         aliases: &[],
         doc: "Refresh user config.",
         fun: refresh_config,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "config-open",
         aliases: &[],
         doc: "Open the user config.toml file.",
         fun: open_config,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "config-open-workspace",
         aliases: &[],
         doc: "Open the workspace config.toml file.",
         fun: open_workspace_config,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "log-open",
         aliases: &[],
         doc: "Open the helix log file.",
         fun: open_log,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "insert-output",
         aliases: &[],
         doc: "Run shell command, inserting output before each selection.",
         fun: insert_output,
-        signature: CommandSignature::none(),
+        completer: SHELL_COMPLETER,
+        signature: SHELL_SIGNATURE,
     },
     TypableCommand {
         name: "append-output",
         aliases: &[],
         doc: "Run shell command, appending output after each selection.",
         fun: append_output,
-        signature: CommandSignature::none(),
+        completer: SHELL_COMPLETER,
+        signature: SHELL_SIGNATURE,
     },
     TypableCommand {
         name: "pipe",
         aliases: &[],
         doc: "Pipe each selection to the shell command.",
         fun: pipe,
-        signature: CommandSignature::none(),
+        completer: SHELL_COMPLETER,
+        signature: SHELL_SIGNATURE,
     },
     TypableCommand {
         name: "pipe-to",
         aliases: &[],
         doc: "Pipe each selection to the shell command, ignoring output.",
         fun: pipe_to,
-        signature: CommandSignature::none(),
+        completer: SHELL_COMPLETER,
+        signature: SHELL_SIGNATURE,
     },
     TypableCommand {
         name: "run-shell-command",
         aliases: &["sh"],
         doc: "Run a shell command",
         fun: run_shell_command,
-        signature: CommandSignature::all(completers::filename)
+        completer: SHELL_COMPLETER,
+        signature: SHELL_SIGNATURE,
     },
     TypableCommand {
         name: "reset-diff-change",
         aliases: &["diffget", "diffg"],
         doc: "Reset the diff change at the cursor position.",
         fun: reset_diff_change,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "clear-register",
         aliases: &[],
         doc: "Clear given register. If no argument is provided, clear all registers.",
         fun: clear_register,
-        signature: CommandSignature::all(completers::register),
+        completer: CommandCompleter::all(completers::register),
+        signature: Signature {
+            positionals: (0, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "redraw",
         aliases: &[],
         doc: "Clear and re-render the whole UI",
         fun: redraw,
-        signature: CommandSignature::none(),
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, Some(0)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "move",
         aliases: &["mv"],
         doc: "Move the current buffer and its corresponding file to a different path",
         fun: move_buffer,
-        signature: CommandSignature::positional(&[completers::filename]),
+        completer: CommandCompleter::positional(&[completers::filename]),
+        signature: Signature {
+            positionals: (1, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "yank-diagnostic",
         aliases: &[],
         doc: "Yank diagnostic(s) under primary cursor to register, or clipboard by default",
         fun: yank_diagnostic,
-        signature: CommandSignature::all(completers::register),
+        completer: CommandCompleter::all(completers::register),
+        signature: Signature {
+            positionals: (0, Some(1)),
+            ..Signature::DEFAULT
+        },
     },
     TypableCommand {
         name: "read",
         aliases: &["r"],
         doc: "Load a file into buffer",
         fun: read,
-        signature: CommandSignature::positional(&[completers::filename]),
+        completer: CommandCompleter::positional(&[completers::filename]),
+        signature: Signature {
+            positionals: (1, Some(1)),
+            ..Signature::DEFAULT
+        },
+    },
+    TypableCommand {
+        name: "echo",
+        aliases: &[],
+        doc: "Prints the given arguments to the statusline.",
+        fun: echo,
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (1, None),
+            ..Signature::DEFAULT
+        },
+    },
+    TypableCommand {
+        name: "noop",
+        aliases: &[],
+        doc: "Does nothing.",
+        fun: noop,
+        completer: CommandCompleter::none(),
+        signature: Signature {
+            positionals: (0, None),
+            ..Signature::DEFAULT
+        },
     },
 ];
 
@@ -3269,125 +3568,397 @@ pub static TYPABLE_COMMAND_MAP: Lazy<HashMap<&'static str, &'static TypableComma
             .collect()
     });
 
+fn execute_command_line(
+    cx: &mut compositor::Context,
+    input: &str,
+    event: PromptEvent,
+) -> anyhow::Result<()> {
+    let (command, rest, _) = command_line::split(input);
+    if command.is_empty() {
+        return Ok(());
+    }
+
+    // If command is numeric, interpret as line number and go there.
+    if command.parse::<usize>().is_ok() && rest.trim().is_empty() {
+        let cmd = TYPABLE_COMMAND_MAP.get("goto").unwrap();
+        return execute_command(cx, cmd, command, event);
+    }
+
+    match typed::TYPABLE_COMMAND_MAP.get(command) {
+        Some(cmd) => execute_command(cx, cmd, rest, event),
+        None if event == PromptEvent::Validate => Err(anyhow!("no such command: '{command}'")),
+        None => Ok(()),
+    }
+}
+
+pub(super) fn execute_command(
+    cx: &mut compositor::Context,
+    cmd: &TypableCommand,
+    args: &str,
+    event: PromptEvent,
+) -> anyhow::Result<()> {
+    let args = if event == PromptEvent::Validate {
+        Args::parse(args, cmd.signature, true, |token| {
+            expansion::expand(cx.editor, token).map_err(|err| err.into())
+        })
+        .map_err(|err| anyhow!("'{}': {err}", cmd.name))?
+    } else {
+        Args::parse(args, cmd.signature, false, |token| Ok(token.content))
+            .expect("arg parsing cannot fail when validation is turned off")
+    };
+
+    (cmd.fun)(cx, args, event).map_err(|err| anyhow!("'{}': {err}", cmd.name))
+}
+
 #[allow(clippy::unnecessary_unwrap)]
 pub(super) fn command_mode(cx: &mut Context) {
     let mut prompt = Prompt::new(
         ":".into(),
         Some(':'),
-        |editor: &Editor, input: &str| {
-            let shellwords = Shellwords::from(input);
-            let words = shellwords.words();
-
-            if words.is_empty() || (words.len() == 1 && !shellwords.ends_with_whitespace()) {
-                fuzzy_match(
-                    input,
-                    TYPABLE_COMMAND_LIST.iter().map(|command| command.name),
-                    false,
-                )
-                .into_iter()
-                .map(|(name, _)| (0.., name.into()))
-                .collect()
-            } else {
-                // Otherwise, use the command's completer and the last shellword
-                // as completion input.
-                let (word, word_len) = if words.len() == 1 || shellwords.ends_with_whitespace() {
-                    (&Cow::Borrowed(""), 0)
-                } else {
-                    (words.last().unwrap(), words.last().unwrap().len())
-                };
-
-                let argument_number = argument_number_of(&shellwords);
-
-                if let Some(completer) = TYPABLE_COMMAND_MAP
-                    .get(&words[0] as &str)
-                    .map(|tc| tc.completer_for_argument_number(argument_number))
-                {
-                    completer(editor, word)
-                        .into_iter()
-                        .map(|(range, mut file)| {
-                            file.content = shellwords::escape(file.content);
-
-                            // offset ranges to input
-                            let offset = input.len() - word_len;
-                            let range = (range.start + offset)..;
-                            (range, file)
-                        })
-                        .collect()
-                } else {
-                    Vec::new()
-                }
-            }
-        }, // completion
+        complete_command_line,
         move |cx: &mut compositor::Context, input: &str, event: PromptEvent| {
-            let parts = input.split_whitespace().collect::<Vec<&str>>();
-            if parts.is_empty() {
-                return;
-            }
-
-            // If command is numeric, interpret as line number and go there.
-            if parts.len() == 1 && parts[0].parse::<usize>().ok().is_some() {
-                if let Err(e) = typed::goto_line_number(cx, &[Cow::from(parts[0])], event) {
-                    cx.editor.set_error(format!("{}", e));
-                }
-                return;
-            }
-
-            // Handle typable commands
-            if let Some(cmd) = typed::TYPABLE_COMMAND_MAP.get(parts[0]) {
-                let shellwords = Shellwords::from(input);
-                let args = shellwords.words();
-
-                if let Err(e) = (cmd.fun)(cx, &args[1..], event) {
-                    cx.editor.set_error(format!("{}", e));
-                }
-            } else if event == PromptEvent::Validate {
-                cx.editor
-                    .set_error(format!("no such command: '{}'", parts[0]));
+            if let Err(err) = execute_command_line(cx, input, event) {
+                cx.editor.set_error(err.to_string());
             }
         },
     );
-    prompt.doc_fn = Box::new(|input: &str| {
-        let part = input.split(' ').next().unwrap_or_default();
-
-        if let Some(typed::TypableCommand { doc, aliases, .. }) =
-            typed::TYPABLE_COMMAND_MAP.get(part)
-        {
-            if aliases.is_empty() {
-                return Some((*doc).into());
-            }
-            return Some(format!("{}\nAliases: {}", doc, aliases.join(", ")).into());
-        }
-
-        None
-    });
+    prompt.doc_fn = Box::new(command_line_doc);
 
     // Calculate initial completion
     prompt.recalculate_completion(cx.editor);
     cx.push_layer(Box::new(prompt));
 }
 
-fn argument_number_of(shellwords: &Shellwords) -> usize {
-    if shellwords.ends_with_whitespace() {
-        shellwords.words().len().saturating_sub(1)
+fn command_line_doc(input: &str) -> Option<Cow<str>> {
+    let (command, _, _) = command_line::split(input);
+    let command = TYPABLE_COMMAND_MAP.get(command)?;
+
+    if command.aliases.is_empty() && command.signature.flags.is_empty() {
+        return Some(Cow::Borrowed(command.doc));
+    }
+
+    let mut doc = command.doc.to_string();
+
+    if !command.aliases.is_empty() {
+        write!(doc, "\nAliases: {}", command.aliases.join(", ")).unwrap();
+    }
+
+    if !command.signature.flags.is_empty() {
+        const ARG_PLACEHOLDER: &str = " <arg>";
+
+        fn flag_len(flag: &Flag) -> usize {
+            let name_len = flag.name.len();
+            let alias_len = if let Some(alias) = flag.alias {
+                "/-".len() + alias.len_utf8()
+            } else {
+                0
+            };
+            let arg_len = if flag.completions.is_some() {
+                ARG_PLACEHOLDER.len()
+            } else {
+                0
+            };
+            name_len + alias_len + arg_len
+        }
+
+        doc.push_str("\nFlags:");
+
+        let max_flag_len = command.signature.flags.iter().map(flag_len).max().unwrap();
+
+        for flag in command.signature.flags {
+            let mut buf = [0u8; 4];
+            let this_flag_len = flag_len(flag);
+            write!(
+                doc,
+                "\n  --{flag_text}{spacer:spacing$}  {doc}",
+                doc = flag.doc,
+                // `fmt::Arguments` does not respect width controls so we must place the spacers
+                // explicitly:
+                spacer = "",
+                spacing = max_flag_len - this_flag_len,
+                flag_text = format_args!(
+                    "{}{}{}{}",
+                    flag.name,
+                    // Ideally this would be written as a `format_args!` too but the borrow
+                    // checker is not yet smart enough.
+                    if flag.alias.is_some() { "/-" } else { "" },
+                    if let Some(alias) = flag.alias {
+                        alias.encode_utf8(&mut buf)
+                    } else {
+                        ""
+                    },
+                    if flag.completions.is_some() {
+                        ARG_PLACEHOLDER
+                    } else {
+                        ""
+                    }
+                ),
+            )
+            .unwrap();
+        }
+    }
+
+    Some(Cow::Owned(doc))
+}
+
+fn complete_command_line(editor: &Editor, input: &str) -> Vec<ui::prompt::Completion> {
+    let (command, rest, complete_command) = command_line::split(input);
+
+    if complete_command {
+        fuzzy_match(
+            input,
+            TYPABLE_COMMAND_LIST.iter().map(|command| command.name),
+            false,
+        )
+        .into_iter()
+        .map(|(name, _)| (0.., name.into()))
+        .collect()
     } else {
-        shellwords.words().len().saturating_sub(2)
+        TYPABLE_COMMAND_MAP
+            .get(command)
+            .map_or_else(Vec::new, |cmd| {
+                let args_offset = command.len() + 1;
+                complete_command_args(editor, cmd, rest, args_offset)
+            })
     }
 }
 
-#[test]
-fn test_argument_number_of() {
-    let cases = vec![
-        ("set-option", 0),
-        ("set-option ", 0),
-        ("set-option a", 0),
-        ("set-option asdf", 0),
-        ("set-option asdf ", 1),
-        ("set-option asdf xyz", 1),
-        ("set-option asdf xyz abc", 2),
-        ("set-option asdf xyz abc ", 3),
-    ];
+fn complete_command_args(
+    editor: &Editor,
+    command: &TypableCommand,
+    input: &str,
+    offset: usize,
+) -> Vec<ui::prompt::Completion> {
+    use command_line::{CompletionState, ExpansionKind, Tokenizer};
 
-    for case in cases {
-        assert_eq!(case.1, argument_number_of(&Shellwords::from(case.0)));
+    // TODO: completion should depend on the location of the cursor instead of the end of the
+    // string. This refactor is left for the future but the below completion code should respect
+    // the cursor position if it becomes a parameter.
+    let cursor = input.len();
+    let prefix = &input[..cursor];
+    let mut tokenizer = Tokenizer::new(prefix, false);
+    let mut args = Args::new(command.signature, false);
+    let mut final_token = None;
+    let mut is_last_token = true;
+
+    while let Some(token) = args
+        .read_token(&mut tokenizer)
+        .expect("arg parsing cannot fail when validation is turned off")
+    {
+        final_token = Some(token.clone());
+        args.push(token.content)
+            .expect("arg parsing cannot fail when validation is turned off");
+        if tokenizer.pos() >= cursor {
+            is_last_token = false;
+        }
+    }
+
+    // Use a fake final token when the input is not terminated with a token. This simulates an
+    // empty argument, causing completion on an empty value whenever you type space/tab. For
+    // example if you say `":open README.md "` (with that trailing space) you should see the
+    // files in the current dir - completing `""` rather than completions for `"README.md"` or
+    // `"README.md "`.
+    let token = if is_last_token {
+        let token = Token::empty_at(prefix.len());
+        args.push(token.content.clone()).unwrap();
+        token
+    } else {
+        final_token.unwrap()
+    };
+
+    // Don't complete on closed tokens, for example after writing a closing double quote.
+    if token.is_terminated {
+        return Vec::new();
+    }
+
+    match token.kind {
+        TokenKind::Unquoted | TokenKind::Quoted(_) => {
+            match args.completion_state() {
+                CompletionState::Positional => {
+                    // If the completion state is positional there must be at least one positional
+                    // in `args`.
+                    let n = args
+                        .len()
+                        .checked_sub(1)
+                        .expect("completion state to be positional");
+                    let completer = command.completer_for_argument_number(n);
+
+                    completer(editor, &token.content)
+                        .into_iter()
+                        .map(|(range, span)| quote_completion(&token, range, span, offset))
+                        .collect()
+                }
+                CompletionState::Flag(_) => fuzzy_match(
+                    token.content.trim_start_matches('-'),
+                    command.signature.flags.iter().map(|flag| flag.name),
+                    false,
+                )
+                .into_iter()
+                .map(|(name, _)| ((offset + token.content_start).., format!("--{name}").into()))
+                .collect(),
+                CompletionState::FlagArgument(flag) => fuzzy_match(
+                    &token.content,
+                    flag.completions
+                        .expect("flags in FlagArgument always have completions"),
+                    false,
+                )
+                .into_iter()
+                .map(|(value, _)| ((offset + token.content_start).., (*value).into()))
+                .collect(),
+            }
+        }
+        TokenKind::Expand | TokenKind::Expansion(ExpansionKind::Shell) => {
+            // See the comment about the checked sub expect above.
+            let arg_completer = matches!(args.completion_state(), CompletionState::Positional)
+                .then(|| {
+                    let n = args
+                        .len()
+                        .checked_sub(1)
+                        .expect("completion state to be positional");
+                    command.completer_for_argument_number(n)
+                });
+            complete_expand(editor, &token, arg_completer, offset + token.content_start)
+        }
+        TokenKind::Expansion(ExpansionKind::Variable) => {
+            complete_variable_expansion(&token.content, offset + token.content_start)
+        }
+        TokenKind::Expansion(ExpansionKind::Unicode) => Vec::new(),
+        TokenKind::ExpansionKind => {
+            complete_expansion_kind(&token.content, offset + token.content_start)
+        }
     }
 }
+
+/// Replace the content and optionally update the range of a positional's completion to account
+/// for quoting.
+///
+/// This is used to handle completions of file or directory names for example. When completing a
+/// file with a space, tab or percent character in the name, the space should be escaped by
+/// quoting the entire token. If the token being completed is already quoted, any quotes within
+/// the completion text should be escaped by doubling them.
+fn quote_completion<'a>(
+    token: &Token,
+    range: ops::RangeFrom<usize>,
+    mut span: Span<'a>,
+    offset: usize,
+) -> (ops::RangeFrom<usize>, Span<'a>) {
+    fn replace<'a>(text: Cow<'a, str>, from: char, to: &str) -> Cow<'a, str> {
+        if text.contains(from) {
+            Cow::Owned(text.replace(from, to))
+        } else {
+            text
+        }
+    }
+
+    match token.kind {
+        TokenKind::Unquoted if span.content.contains([' ', '\t', '%']) => {
+            span.content = Cow::Owned(format!(
+                "'{}{}'",
+                // Escape any inner single quotes by doubling them.
+                replace(token.content.as_ref().into(), '\'', "''"),
+                replace(span.content, '\'', "''")
+            ));
+            // Ignore `range.start` here since we're replacing the entire token.
+            ((offset + token.content_start).., span)
+        }
+        TokenKind::Quoted(quote) => {
+            span.content = replace(span.content, quote.char(), quote.escape());
+            ((range.start + offset + token.content_start).., span)
+        }
+        TokenKind::Expand => {
+            // NOTE: `token.content_start` is already accounted for in `offset` for `Expand`
+            // tokens.
+            span.content = replace(span.content, '"', "\"\"");
+            ((range.start + offset).., span)
+        }
+        _ => ((range.start + offset + token.content_start).., span),
+    }
+}
+
+fn complete_expand(
+    editor: &Editor,
+    token: &Token,
+    completer: Option<&Completer>,
+    offset: usize,
+) -> Vec<ui::prompt::Completion> {
+    use command_line::{ExpansionKind, Tokenizer};
+
+    let mut start = 0;
+
+    // If the expand token contains expansions, complete those.
+    while let Some(idx) = token.content[start..].find('%') {
+        let idx = start + idx;
+        if token.content.as_bytes().get(idx + '%'.len_utf8()).copied() == Some(b'%') {
+            // Two percents together are skipped.
+            start = idx + ('%'.len_utf8() * 2);
+        } else {
+            let mut tokenizer = Tokenizer::new(&token.content[idx..], false);
+            let token = tokenizer
+                .parse_percent_token()
+                .map(|token| token.expect("arg parser cannot fail when validation is disabled"));
+            start = idx + tokenizer.pos();
+
+            // Like closing quote characters in `complete_command_args` above, don't provide
+            // completions if the token is already terminated. This also skips expansions
+            // which have already been fully written, for example
+            // `"%{cursor_line}:%{cursor_col` should complete `cursor_column` instead of
+            // `cursor_line`.
+            let Some(token) = token.filter(|t| !t.is_terminated) else {
+                continue;
+            };
+
+            let local_offset = offset + idx + token.content_start;
+            match token.kind {
+                TokenKind::Expansion(ExpansionKind::Variable) => {
+                    return complete_variable_expansion(&token.content, local_offset);
+                }
+                TokenKind::Expansion(ExpansionKind::Shell) => {
+                    return complete_expand(editor, &token, None, local_offset);
+                }
+                TokenKind::ExpansionKind => {
+                    return complete_expansion_kind(&token.content, local_offset);
+                }
+                _ => continue,
+            }
+        }
+    }
+
+    match completer {
+        // If no expansions were found and an argument is being completed,
+        Some(completer) if start == 0 => completer(editor, &token.content)
+            .into_iter()
+            .map(|(range, span)| quote_completion(token, range, span, offset))
+            .collect(),
+        _ => Vec::new(),
+    }
+}
+
+fn complete_variable_expansion(content: &str, offset: usize) -> Vec<ui::prompt::Completion> {
+    use expansion::Variable;
+
+    fuzzy_match(
+        content,
+        Variable::VARIANTS.iter().map(Variable::as_str),
+        false,
+    )
+    .into_iter()
+    .map(|(name, _)| (offset.., (*name).into()))
+    .collect()
+}
+
+fn complete_expansion_kind(content: &str, offset: usize) -> Vec<ui::prompt::Completion> {
+    use command_line::ExpansionKind;
+
+    fuzzy_match(
+        content,
+        // Skip `ExpansionKind::Variable` since its kind string is empty.
+        ExpansionKind::VARIANTS
+            .iter()
+            .skip(1)
+            .map(ExpansionKind::as_str),
+        false,
+    )
+    .into_iter()
+    .map(|(name, _)| (offset.., (*name).into()))
+    .collect()
+}
diff --git a/helix-term/src/handlers/completion.rs b/helix-term/src/handlers/completion.rs
index 046cfab79..20fac514e 100644
--- a/helix-term/src/handlers/completion.rs
+++ b/helix-term/src/handlers/completion.rs
@@ -57,7 +57,7 @@ async fn replace_completions(
                 return;
             };
             if handle.is_canceled() {
-                log::error!("dropping outdated completion response");
+                log::info!("dropping outdated completion response");
                 return;
             }
 
diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index 2385d460d..d8227b500 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -601,11 +601,7 @@ mod tests {
                     MappableCommand::select_all,
                     MappableCommand::Typable {
                         name: "pipe".to_string(),
-                        args: vec!{
-                            "sed".to_string(),
-                            "-E".to_string(),
-                            "'s/\\s+$//g'".to_string()
-                        },
+                        args: "sed -E 's/\\s+$//g'".to_string(),
                         doc: "".to_string(),
                     },
                 })
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index d8500ed4d..6be565747 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -176,6 +176,8 @@ impl EditorView {
             );
         }
 
+        Self::render_rulers(editor, doc, view, inner, surface, theme);
+
         let primary_cursor = doc
             .selection(view.id)
             .primary()
@@ -210,7 +212,6 @@ impl EditorView {
             theme,
             decorations,
         );
-        Self::render_rulers(editor, doc, view, inner, surface, theme);
 
         // if we're not at the edge of the screen, draw a right border
         if viewport.right() != view.area.right() {
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 21a68d7f8..a76adbe21 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -30,7 +30,7 @@ pub use spinner::{ProgressSpinners, Spinner};
 pub use text::Text;
 
 use helix_view::Editor;
-use tui::text::Span;
+use tui::text::{Span, Spans};
 
 use std::path::Path;
 use std::{error::Error, path::PathBuf};
@@ -185,12 +185,23 @@ pub fn raw_regex_prompt(
     cx.push_layer(Box::new(prompt));
 }
 
-type FilePicker = Picker<PathBuf, PathBuf>;
+#[derive(Debug)]
+pub struct FilePickerData {
+    root: PathBuf,
+    directory_style: Style,
+}
+type FilePicker = Picker<PathBuf, FilePickerData>;
 
-pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePicker {
+pub fn file_picker(editor: &Editor, root: PathBuf) -> FilePicker {
     use ignore::{types::TypesBuilder, WalkBuilder};
     use std::time::Instant;
 
+    let config = editor.config();
+    let data = FilePickerData {
+        root: root.clone(),
+        directory_style: editor.theme.get("ui.text.directory"),
+    };
+
     let now = Instant::now();
 
     let dedup_symlinks = config.file_picker.deduplicate_links;
@@ -236,14 +247,24 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePi
 
     let columns = [PickerColumn::new(
         "path",
-        |item: &PathBuf, root: &PathBuf| {
-            item.strip_prefix(root)
-                .unwrap_or(item)
-                .to_string_lossy()
-                .into()
+        |item: &PathBuf, data: &FilePickerData| {
+            let path = item.strip_prefix(&data.root).unwrap_or(item);
+            let mut spans = Vec::with_capacity(3);
+            if let Some(dirs) = path.parent().filter(|p| !p.as_os_str().is_empty()) {
+                spans.extend([
+                    Span::styled(dirs.to_string_lossy(), data.directory_style),
+                    Span::styled(std::path::MAIN_SEPARATOR_STR, data.directory_style),
+                ]);
+            }
+            let filename = path
+                .file_name()
+                .expect("normalized paths can't end in `..`")
+                .to_string_lossy();
+            spans.push(Span::raw(filename));
+            Spans::from(spans).into()
         },
     )];
-    let picker = Picker::new(columns, 0, [], root, move |cx, path: &PathBuf, action| {
+    let picker = Picker::new(columns, 0, [], data, move |cx, path: &PathBuf, action| {
         if let Err(e) = cx.editor.open(path, action) {
             let err = if let Some(err) = e.source() {
                 format!("{}", err)
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 954bacd07..82f2e5800 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -1191,7 +1191,15 @@ impl<I: 'static + Send + Sync, D: 'static + Send + Sync> Component for Picker<I,
                     .first_history_completion(ctx.editor)
                     .filter(|_| self.prompt.line().is_empty())
                 {
-                    self.prompt.set_line(completion.to_string(), ctx.editor);
+                    // The percent character is used by the query language and needs to be
+                    // escaped with a backslash.
+                    let completion = if completion.contains('%') {
+                        completion.replace('%', "\\%")
+                    } else {
+                        completion.into_owned()
+                    };
+                    self.prompt.set_line(completion, ctx.editor);
+
                     // Inserting from the history register is a paste.
                     self.handle_prompt_change(true);
                 } else {
diff --git a/helix-term/tests/integration.rs b/helix-term/tests/integration.rs
index 35214bcb8..5e418cebd 100644
--- a/helix-term/tests/integration.rs
+++ b/helix-term/tests/integration.rs
@@ -17,9 +17,9 @@ mod test {
 
     mod auto_indent;
     mod auto_pairs;
+    mod command_line;
     mod commands;
     mod languages;
     mod movement;
-    mod prompt;
     mod splits;
 }
diff --git a/helix-term/tests/test/command_line.rs b/helix-term/tests/test/command_line.rs
new file mode 100644
index 000000000..0e2270060
--- /dev/null
+++ b/helix-term/tests/test/command_line.rs
@@ -0,0 +1,103 @@
+use super::*;
+
+use helix_core::diagnostic::Severity;
+
+#[tokio::test(flavor = "multi_thread")]
+async fn history_completion() -> anyhow::Result<()> {
+    test_key_sequence(
+        &mut AppBuilder::new().build()?,
+        Some(":asdf<ret>:theme d<C-n><tab>"),
+        Some(&|app| {
+            assert!(!app.editor.is_err());
+        }),
+        false,
+    )
+    .await?;
+
+    Ok(())
+}
+
+async fn test_statusline(
+    line: &str,
+    expected_status: &str,
+    expected_severity: Severity,
+) -> anyhow::Result<()> {
+    test_key_sequence(
+        &mut AppBuilder::new().build()?,
+        Some(&format!("{line}<ret>")),
+        Some(&|app| {
+            let (status, &severity) = app.editor.get_status().unwrap();
+            assert_eq!(
+                severity, expected_severity,
+                "'{line}' printed {severity:?}: {status}"
+            );
+            assert_eq!(status.as_ref(), expected_status);
+        }),
+        false,
+    )
+    .await
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn variable_expansion() -> anyhow::Result<()> {
+    test_statusline(r#":echo %{cursor_line}"#, "1", Severity::Info).await?;
+    // Double quotes can be used with expansions:
+    test_statusline(
+        r#":echo "line%{cursor_line}line""#,
+        "line1line",
+        Severity::Info,
+    )
+    .await?;
+    // Within double quotes you can escape the percent token for an expansion by doubling it.
+    test_statusline(
+        r#":echo "%%{cursor_line}""#,
+        "%{cursor_line}",
+        Severity::Info,
+    )
+    .await?;
+
+    Ok(())
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn unicode_expansion() -> anyhow::Result<()> {
+    test_statusline(r#":echo %u{20}"#, " ", Severity::Info).await?;
+    test_statusline(r#":echo %u{0020}"#, " ", Severity::Info).await?;
+    test_statusline(r#":echo %u{25CF}"#, "●", Severity::Info).await?;
+    // Not a valid Unicode codepoint:
+    test_statusline(
+        r#":echo %u{deadbeef}"#,
+        "'echo': could not interpret 'deadbeef' as a Unicode character code",
+        Severity::Error,
+    )
+    .await?;
+
+    Ok(())
+}
+
+#[cfg(unix)]
+#[tokio::test(flavor = "multi_thread")]
+async fn shell_expansion() -> anyhow::Result<()> {
+    test_statusline(
+        r#":echo %sh{echo "hello world"}"#,
+        "hello world",
+        Severity::Info,
+    )
+    .await?;
+
+    // Shell expansion is recursive.
+    test_statusline(":echo %sh{echo '%{cursor_line}'}", "1", Severity::Info).await?;
+
+    Ok(())
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn percent_escaping() -> anyhow::Result<()> {
+    test_statusline(
+        r#":sh echo hello 10%"#,
+        "'run-shell-command': '%' was not properly escaped. Please use '%%'",
+        Severity::Error,
+    )
+    .await?;
+    Ok(())
+}
diff --git a/helix-term/tests/test/commands/write.rs b/helix-term/tests/test/commands/write.rs
index aba101e9f..4b78e14c4 100644
--- a/helix-term/tests/test/commands/write.rs
+++ b/helix-term/tests/test/commands/write.rs
@@ -420,6 +420,50 @@ async fn test_write_utf_bom_file() -> anyhow::Result<()> {
     Ok(())
 }
 
+#[tokio::test(flavor = "multi_thread")]
+async fn test_write_trim_trailing_whitespace() -> anyhow::Result<()> {
+    let mut file = tempfile::NamedTempFile::new()?;
+    let mut app = helpers::AppBuilder::new()
+        .with_config(Config {
+            editor: helix_view::editor::Config {
+                trim_trailing_whitespace: true,
+                ..Default::default()
+            },
+            ..Default::default()
+        })
+        .with_file(file.path(), None)
+        .with_input_text(LineFeedHandling::Native.apply("#[f|]#oo      \n\n \nbar      "))
+        .build()?;
+
+    test_key_sequence(&mut app, Some(":w<ret>"), None, false).await?;
+
+    helpers::assert_file_has_content(&mut file, &LineFeedHandling::Native.apply("foo\n\n\nbar"))?;
+
+    Ok(())
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_write_trim_final_newlines() -> anyhow::Result<()> {
+    let mut file = tempfile::NamedTempFile::new()?;
+    let mut app = helpers::AppBuilder::new()
+        .with_config(Config {
+            editor: helix_view::editor::Config {
+                trim_final_newlines: true,
+                ..Default::default()
+            },
+            ..Default::default()
+        })
+        .with_file(file.path(), None)
+        .with_input_text(LineFeedHandling::Native.apply("#[f|]#oo\n \n\n\n"))
+        .build()?;
+
+    test_key_sequence(&mut app, Some(":w<ret>"), None, false).await?;
+
+    helpers::assert_file_has_content(&mut file, &LineFeedHandling::Native.apply("foo\n \n"))?;
+
+    Ok(())
+}
+
 #[tokio::test(flavor = "multi_thread")]
 async fn test_write_insert_final_newline_added_if_missing() -> anyhow::Result<()> {
     let mut file = tempfile::NamedTempFile::new()?;
@@ -438,6 +482,21 @@ async fn test_write_insert_final_newline_added_if_missing() -> anyhow::Result<()
     Ok(())
 }
 
+#[tokio::test(flavor = "multi_thread")]
+async fn test_write_insert_final_newline_unchanged_if_empty() -> anyhow::Result<()> {
+    let mut file = tempfile::NamedTempFile::new()?;
+    let mut app = helpers::AppBuilder::new()
+        .with_file(file.path(), None)
+        .with_input_text("#[|]#")
+        .build()?;
+
+    test_key_sequence(&mut app, Some(":w<ret>"), None, false).await?;
+
+    helpers::assert_file_has_content(&mut file, "")?;
+
+    Ok(())
+}
+
 #[tokio::test(flavor = "multi_thread")]
 async fn test_write_insert_final_newline_unchanged_if_not_missing() -> anyhow::Result<()> {
     let mut file = tempfile::NamedTempFile::new()?;
diff --git a/helix-term/tests/test/prompt.rs b/helix-term/tests/test/prompt.rs
deleted file mode 100644
index 4f3bf7632..000000000
--- a/helix-term/tests/test/prompt.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use super::*;
-
-#[tokio::test(flavor = "multi_thread")]
-async fn test_history_completion() -> anyhow::Result<()> {
-    test_key_sequence(
-        &mut AppBuilder::new().build()?,
-        Some(":asdf<ret>:theme d<C-n><tab>"),
-        Some(&|app| {
-            assert!(!app.editor.is_err());
-        }),
-        false,
-    )
-    .await?;
-
-    Ok(())
-}
diff --git a/helix-tui/Cargo.toml b/helix-tui/Cargo.toml
index 92d852518..2b5767a58 100644
--- a/helix-tui/Cargo.toml
+++ b/helix-tui/Cargo.toml
@@ -23,5 +23,5 @@ cassowary = "0.3"
 unicode-segmentation.workspace = true
 crossterm = { version = "0.28", optional = true }
 termini = "1.0"
-once_cell = "1.20"
+once_cell = "1.21"
 log = "~0.4"
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index 289c334ad..c08122421 100644
--- a/helix-vcs/Cargo.toml
+++ b/helix-vcs/Cargo.toml
@@ -16,7 +16,7 @@ helix-core = { path = "../helix-core" }
 helix-event = { path = "../helix-event" }
 
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot", "macros"] }
-parking_lot = "0.12"
+parking_lot.workspace = true
 arc-swap = { version = "1.7.1" }
 
 gix = { version = "0.70.0", features = ["attributes", "status"], default-features = false, optional = true }
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index da9f52a21..bcee1a0a7 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -31,7 +31,7 @@ crossterm = { version = "0.28", optional = true }
 tempfile.workspace = true
 
 # Conversion traits
-once_cell = "1.20"
+once_cell = "1.21"
 url = "2.5.4"
 
 arc-swap = { version = "1.7.1" }
@@ -49,7 +49,7 @@ serde_json = "1.0"
 toml = "0.8"
 log = "~0.4"
 
-parking_lot = "0.12.3"
+parking_lot.workspace = true
 thiserror.workspace = true
 
 [target.'cfg(windows)'.dependencies]
@@ -57,7 +57,7 @@ clipboard-win = { version = "5.4", features = ["std"] }
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"
-rustix = { version = "0.38", features = ["fs"] }
+rustix = { version = "1.0", features = ["fs"] }
 
 [dev-dependencies]
 helix-tui = { path = "../helix-tui" }
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 739dcfb49..cdc48a545 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -342,6 +342,12 @@ pub struct Config {
     pub default_line_ending: LineEndingConfig,
     /// Whether to automatically insert a trailing line-ending on write if missing. Defaults to `true`.
     pub insert_final_newline: bool,
+    /// Whether to automatically remove all trailing line-endings after the final one on write.
+    /// Defaults to `false`.
+    pub trim_final_newlines: bool,
+    /// Whether to automatically remove all whitespace characters preceding line-endings on write.
+    /// Defaults to `false`.
+    pub trim_trailing_whitespace: bool,
     /// Enables smart tab
     pub smart_tab: Option<SmartTabConfig>,
     /// Draw border around popups.
@@ -994,6 +1000,8 @@ impl Default for Config {
             workspace_lsp_roots: Vec::new(),
             default_line_ending: LineEndingConfig::default(),
             insert_final_newline: true,
+            trim_final_newlines: false,
+            trim_trailing_whitespace: false,
             smart_tab: Some(SmartTabConfig::default()),
             popup_border: PopupBorderConfig::None,
             indent_heuristic: IndentationHeuristic::default(),
diff --git a/helix-view/src/expansion.rs b/helix-view/src/expansion.rs
new file mode 100644
index 000000000..96a71b8e5
--- /dev/null
+++ b/helix-view/src/expansion.rs
@@ -0,0 +1,219 @@
+use std::borrow::Cow;
+
+use helix_core::command_line::{ExpansionKind, Token, TokenKind, Tokenizer};
+
+use anyhow::{anyhow, bail, Result};
+
+use crate::Editor;
+
+/// Variables that can be expanded in the command mode (`:`) via the expansion syntax.
+///
+/// For example `%{cursor_line}`.
+//
+// To add a new variable follow these steps:
+//
+// * Add the new enum member to `Variable` below.
+// * Add an item to the `VARIANTS` constant - this enables completion.
+// * Add a branch in `Variable::as_str`, converting the name from TitleCase to snake_case.
+// * Add a branch in `Variable::from_name` with the reverse association.
+// * Add a branch in the `expand_variable` function to read the value from the editor.
+// * Add the new variable to the documentation in `book/src/command-line.md`.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Variable {
+    /// The one-indexed line number of the primary cursor in the currently focused document.
+    CursorLine,
+    /// The one-indexed column number of the primary cursor in the currently focused document.
+    ///
+    /// Note that this is the count of grapheme clusters from the start of the line (regardless of
+    /// softwrap) - the same as the `position` element in the statusline.
+    CursorColumn,
+    /// The display name of the currently focused document.
+    ///
+    /// This corresponds to `crate::Document::display_name`.
+    BufferName,
+    /// A string containing the line-ending of the currently focused document.
+    LineEnding,
+}
+
+impl Variable {
+    pub const VARIANTS: &'static [Self] = &[
+        Self::CursorLine,
+        Self::CursorColumn,
+        Self::BufferName,
+        Self::LineEnding,
+    ];
+
+    pub const fn as_str(&self) -> &'static str {
+        match self {
+            Self::CursorLine => "cursor_line",
+            Self::CursorColumn => "cursor_column",
+            Self::BufferName => "buffer_name",
+            Self::LineEnding => "line_ending",
+        }
+    }
+
+    pub fn from_name(s: &str) -> Option<Self> {
+        match s {
+            "cursor_line" => Some(Self::CursorLine),
+            "cursor_column" => Some(Self::CursorColumn),
+            "buffer_name" => Some(Self::BufferName),
+            "line_ending" => Some(Self::LineEnding),
+            _ => None,
+        }
+    }
+}
+
+/// Expands the given command line token.
+///
+/// Note that the lifetime of the expanded variable is only bound to the input token and not the
+/// `Editor`. See `expand_variable` below for more discussion of lifetimes.
+pub fn expand<'a>(editor: &Editor, token: Token<'a>) -> Result<Cow<'a, str>> {
+    // Note: see the `TokenKind` documentation for more details on how each branch should expand.
+    match token.kind {
+        TokenKind::Unquoted | TokenKind::Quoted(_) => Ok(token.content),
+        TokenKind::Expansion(ExpansionKind::Variable) => {
+            let var = Variable::from_name(&token.content)
+                .ok_or_else(|| anyhow!("unknown variable '{}'", token.content))?;
+
+            expand_variable(editor, var)
+        }
+        TokenKind::Expansion(ExpansionKind::Unicode) => {
+            if let Some(ch) = u32::from_str_radix(token.content.as_ref(), 16)
+                .ok()
+                .and_then(char::from_u32)
+            {
+                Ok(Cow::Owned(ch.to_string()))
+            } else {
+                Err(anyhow!(
+                    "could not interpret '{}' as a Unicode character code",
+                    token.content
+                ))
+            }
+        }
+        TokenKind::Expand => expand_inner(editor, token.content),
+        TokenKind::Expansion(ExpansionKind::Shell) => expand_shell(editor, token.content),
+        // Note: see the docs for this variant.
+        TokenKind::ExpansionKind => unreachable!(
+            "expansion name tokens cannot be emitted when command line validation is enabled"
+        ),
+    }
+}
+
+/// Expand a shell command.
+pub fn expand_shell<'a>(editor: &Editor, content: Cow<'a, str>) -> Result<Cow<'a, str>> {
+    use std::process::{Command, Stdio};
+
+    // Recursively expand the expansion's content before executing the shell command.
+    let content = expand_inner(editor, content)?;
+
+    let config = editor.config();
+    let shell = &config.shell;
+    let mut process = Command::new(&shell[0]);
+    process
+        .args(&shell[1..])
+        .arg(content.as_ref())
+        .stdin(Stdio::null())
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped());
+
+    // TODO: there is no protection here against a shell command taking a long time.
+    // Ideally you should be able to hit `<ret>` in command mode and then be able to
+    // cancel the invocation (for example with `<C-c>`) if it takes longer than you'd
+    // like.
+    let output = match process.spawn() {
+        Ok(process) => process.wait_with_output()?,
+        Err(err) => {
+            bail!("Failed to start shell: {err}");
+        }
+    };
+
+    let mut text = String::from_utf8_lossy(&output.stdout).into_owned();
+
+    if !output.stderr.is_empty() {
+        log::warn!(
+            "Shell expansion command `{content}` failed: {}",
+            String::from_utf8_lossy(&output.stderr)
+        );
+    }
+
+    // Trim exactly one trailing line ending if it exists.
+    if text.ends_with('\n') {
+        text.pop();
+        if text.ends_with('\r') {
+            text.pop();
+        }
+    }
+
+    Ok(Cow::Owned(text))
+}
+
+/// Expand a token's contents recursively.
+fn expand_inner<'a>(editor: &Editor, content: Cow<'a, str>) -> Result<Cow<'a, str>> {
+    let mut escaped = String::new();
+    let mut start = 0;
+
+    while let Some(offset) = content[start..].find('%') {
+        let idx = start + offset;
+        if content.as_bytes().get(idx + '%'.len_utf8()).copied() == Some(b'%') {
+            // Treat two percents in a row as an escaped percent.
+            escaped.push_str(&content[start..=idx]);
+            // Skip over both percents.
+            start = idx + ('%'.len_utf8() * 2);
+        } else {
+            // Otherwise interpret the percent as an expansion. Push up to (but not
+            // including) the percent token.
+            escaped.push_str(&content[start..idx]);
+            // Then parse the expansion,
+            let mut tokenizer = Tokenizer::new(&content[idx..], true);
+            let token = tokenizer
+                .parse_percent_token()
+                .unwrap()
+                .map_err(|err| anyhow!("{err}"))?;
+            // expand it (this is the recursive part),
+            let expanded = expand(editor, token)?;
+            escaped.push_str(expanded.as_ref());
+            // and move forward to the end of the expansion.
+            start = idx + tokenizer.pos();
+        }
+    }
+
+    if escaped.is_empty() {
+        Ok(content)
+    } else {
+        escaped.push_str(&content[start..]);
+        Ok(Cow::Owned(escaped))
+    }
+}
+
+// Note: the lifetime of the expanded variable (the `Cow`) must not be tied to the lifetime of
+// the borrow of `Editor`. That would prevent commands from mutating the `Editor` until the
+// command consumed or cloned all arguments - this is poor ergonomics. A sensible thing for this
+// function to return then, instead, would normally be a `String`. We can return some statically
+// known strings like the scratch buffer name or line ending strings though, so this function
+// returns a `Cow<'static, str>` instead.
+fn expand_variable(editor: &Editor, variable: Variable) -> Result<Cow<'static, str>> {
+    let (view, doc) = current_ref!(editor);
+    let text = doc.text().slice(..);
+
+    match variable {
+        Variable::CursorLine => {
+            let cursor_line = doc.selection(view.id).primary().cursor_line(text);
+            Ok(Cow::Owned((cursor_line + 1).to_string()))
+        }
+        Variable::CursorColumn => {
+            let cursor = doc.selection(view.id).primary().cursor(text);
+            let position = helix_core::coords_at_pos(text, cursor);
+            Ok(Cow::Owned((position.col + 1).to_string()))
+        }
+        Variable::BufferName => {
+            // Note: usually we would use `Document::display_name` but we can statically borrow
+            // the scratch buffer name by partially reimplementing `display_name`.
+            if let Some(path) = doc.relative_path() {
+                Ok(Cow::Owned(path.to_string_lossy().into_owned()))
+            } else {
+                Ok(Cow::Borrowed(crate::document::SCRATCH_BUFFER_NAME))
+            }
+        }
+        Variable::LineEnding => Ok(Cow::Borrowed(doc.line_ending.as_str())),
+    }
+}
diff --git a/helix-view/src/lib.rs b/helix-view/src/lib.rs
index d54b49ef5..e30a23381 100644
--- a/helix-view/src/lib.rs
+++ b/helix-view/src/lib.rs
@@ -7,6 +7,7 @@ pub mod clipboard;
 pub mod document;
 pub mod editor;
 pub mod events;
+pub mod expansion;
 pub mod graphics;
 pub mod gutter;
 pub mod handlers;
diff --git a/languages.toml b/languages.toml
index 321f1864b..8eae5a513 100644
--- a/languages.toml
+++ b/languages.toml
@@ -16,7 +16,7 @@ bass = { command = "bass", args = ["--lsp"] }
 beancount-language-server = { command = "beancount-language-server" }
 bicep-langserver = { command = "bicep-langserver" }
 bitbake-language-server = { command = "bitbake-language-server" }
-bufls = { command = "bufls", args = ["serve"] }
+buf = { command = "buf", args = ["beta", "lsp", "--timeout", "0"] }
 cairo-language-server = { command = "cairo-language-server", args = [] }
 circom-lsp = { command = "circom-lsp" }
 cl-lsp = { command = "cl-lsp" }
@@ -47,6 +47,7 @@ fsharp-ls = { command = "fsautocomplete", config = { AutomaticWorkspaceInit = tr
 gleam = { command = "gleam", args = ["lsp"] }
 glsl_analyzer = { command = "glsl_analyzer" }
 graphql-language-service = { command = "graphql-lsp", args = ["server", "-m", "stream"] }
+harper-ls = { command = "harper-ls", args = ["--stdio"] }
 haskell-language-server = { command = "haskell-language-server-wrapper", args = ["--lsp"] }
 hyprls = { command = "hyprls" }
 idris2-lsp = { command = "idris2-lsp" }
@@ -83,10 +84,12 @@ pasls = { command = "pasls", args = [] }
 pbkit = { command = "pb", args = [ "lsp" ] }
 perlnavigator = { command = "perlnavigator", args= ["--stdio"] }
 pest-language-server = { command = "pest-language-server" }
+pkl-lsp = { command = "pkl-lsp" }
 prisma-language-server = { command = "prisma-language-server", args = ["--stdio"] }
 purescript-language-server = { command = "purescript-language-server", args = ["--stdio"] }
 pylsp = { command = "pylsp" }
 pyright = { command = "pyright-langserver", args = ["--stdio"], config = {} }
+protols = { command = "protols", args = [] }
 basedpyright = { command = "basedpyright-langserver", args = ["--stdio"], config = {} }
 pylyzer = { command = "pylyzer", args = ["--server"] }
 qmlls = { command = "qmlls" }
@@ -104,6 +107,7 @@ solargraph = { command = "solargraph", args = ["stdio"] }
 solc = { command = "solc", args = ["--lsp"] }
 sourcekit-lsp = { command = "sourcekit-lsp" }
 spade-language-server = {command = "spade-language-server"}
+starpls = {command = "starpls"}
 svlangserver = { command = "svlangserver", args = [] }
 swipl = { command = "swipl", args = [ "-g", "use_module(library(lsp_server))", "-g", "lsp_server:main", "-t", "halt", "--", "stdio" ] }
 superhtml = {  command = "superhtml", args = ["lsp"]}
@@ -121,7 +125,7 @@ vscode-css-language-server = { command = "vscode-css-language-server", args = ["
 vscode-html-language-server = { command = "vscode-html-language-server", args = ["--stdio"], config = { provideFormatter = true } }
 vscode-json-language-server = { command = "vscode-json-language-server", args = ["--stdio"], config = { provideFormatter = true, json = { validate = { enable = true } } } }
 vuels = { command = "vue-language-server", args = ["--stdio"], config = { typescript = { tsdk = "node_modules/typescript/lib/" } } }
-wgsl_analyzer = { command = "wgsl_analyzer" }
+wgsl-analyzer = { command = "wgsl-analyzer" }
 yaml-language-server = { command = "yaml-language-server", args = ["--stdio"] }
 yls = { command = "yls", args = ["-vv"] }
 zls = { command = "zls" }
@@ -133,11 +137,17 @@ helm_ls = { command = "helm_ls", args = ["serve"] }
 ember-language-server = { command = "ember-language-server", args = ["--stdio"] }
 teal-language-server = { command = "teal-language-server" }
 wasm-language-tools = { command = "wat_server" }
+sourcepawn-studio = { command = "sourcepawn-studio" }
 
 [language-server.ansible-language-server]
 command = "ansible-language-server"
 args = ["--stdio"]
 
+[language-server.astro-ls]
+command = "astro-ls"
+args = [ "--stdio" ]
+config = { typescript = { tsdk = "node_modules/typescript/lib" } }
+
 [language-server.lua-language-server]
 command = "lua-language-server"
 
@@ -348,7 +358,7 @@ name = "protobuf"
 scope = "source.proto"
 injection-regex = "proto"
 file-types = ["proto"]
-language-servers = [ "bufls", "pbkit" ]
+language-servers = [ "buf", "pbkit", "protols" ]
 comment-token = "//"
 block-comment-tokens = { start = "/*", end = "*/" }
 indent = { tab-width = 2, unit = "  " }
@@ -643,7 +653,7 @@ args = { processId = "{0}" }
 
 [[grammar]]
 name = "c-sharp"
-source = { git = "https://github.com/tree-sitter/tree-sitter-c-sharp", rev = "5b60f99545fea00a33bbfae5be956f684c4c69e2" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-c-sharp", rev = "b5eb5742f6a7e9438bee22ce8026d6b927be2cd7" }
 
 [[language]]
 name = "cel"
@@ -903,7 +913,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-html", rev = "29f53
 name = "python"
 scope = "source.python"
 injection-regex = "py(thon)?"
-file-types = ["py", "pyi", "py3", "pyw", "ptl", "rpy", "cpy", "ipy", "pyt", { glob = ".python_history" }, { glob = ".pythonstartup" }, { glob = ".pythonrc" }, { glob = "SConstruct" }, { glob = "SConscript" }]
+file-types = ["py", "pyi", "py3", "pyw", "ptl", "rpy", "cpy", "ipy", "pyt", { glob = ".python_history" }, { glob = ".pythonstartup" }, { glob = ".pythonrc" }, { glob = "*SConstruct" }, { glob = "*SConscript" }, { glob = "*sconstruct" }]
 shebangs = ["python", "uv"]
 roots = ["pyproject.toml", "setup.py", "poetry.lock", "pyrightconfig.json"]
 comment-token = "#"
@@ -1616,7 +1626,7 @@ scope = "source.wgsl"
 file-types = ["wgsl"]
 comment-token = "//"
 block-comment-tokens = { start = "/*", end = "*/" }
-language-servers = [ "wgsl_analyzer" ]
+language-servers = [ "wgsl-analyzer" ]
 indent = { tab-width = 4, unit = "    " }
 
 [[grammar]]
@@ -1670,6 +1680,16 @@ injection-regex = "tablegen"
 name = "tablegen"
 source = { git = "https://github.com/Flakebi/tree-sitter-tablegen", rev = "3e9c4822ab5cdcccf4f8aa9dcd42117f736d51d9" }
 
+[[language]]
+name = "mail"
+scope = "text.mail"
+file-types = ["eml"]
+injection-regex = "mail|eml|email"
+
+[[grammar]]
+name = "mail"
+source = { git = "https://github.com/ficcdaf/tree-sitter-mail", rev = "8e60f38efbae1cc5f22833ae13c5500dd0f3b12f" }
+
 [[language]]
 name = "markdown"
 scope = "source.md"
@@ -2394,7 +2414,7 @@ indent = { tab-width = 2, unit = "\t" }
 
 [[grammar]]
 name = "openscad"
-source = { git = "https://github.com/bollian/tree-sitter-openscad", rev = "5c3ce93df0ac1da7197cf6ae125aade26d6b8972" }
+source = { git = "https://github.com/openscad/tree-sitter-openscad", rev = "acc196e969a169cadd8b7f8d9f81ff2d30e3e253" }
 
 [[language]]
 name = "prisma"
@@ -2431,6 +2451,7 @@ injection-regex = "(starlark|bzl|bazel)"
 file-types = ["bzl", "bazel", "star", { glob = "BUILD" }, { glob = "BUILD.*" }, { glob = "Tiltfile" }, { glob = "WORKSPACE" }, { glob = "WORKSPACE.bzlmod" }]
 comment-token = "#"
 indent = { tab-width = 4, unit = "    " }
+language-servers = [ "starpls" ]
 grammar = "python"
 
 [[language]]
@@ -2631,6 +2652,7 @@ injection-regex = "astro"
 file-types = ["astro"]
 block-comment-tokens = { start = "<!--", end = "-->" }
 indent = { tab-width = 2, unit = "  " }
+language-servers = [ "astro-ls" ]
 
 [[grammar]]
 name = "astro"
@@ -2706,6 +2728,7 @@ file-types = ["kdl"]
 comment-token = "//"
 block-comment-tokens = { start = "/*", end = "*/" }
 injection-regex = "kdl"
+formatter = { command = "kdlfmt", args = ["format", "-"] }
 
 [[grammar]]
 name = "kdl"
@@ -2881,7 +2904,7 @@ indent = { tab-width = 4, unit = "\t" }
 
 [[grammar]]
 name = "ini"
-source = { git = "https://github.com/justinmk/tree-sitter-ini", rev = "1b0498a89a1a4c0a3705846699f0b0bad887dd04" }
+source = { git = "https://github.com/justinmk/tree-sitter-ini", rev = "32b31863f222bf22eb43b07d4e9be8017e36fb31" }
 
 [[language]]
 name = "inko"
@@ -3154,7 +3177,7 @@ injection-regex = "vhdl"
 
 [[grammar]]
 name = "vhdl"
-source = { git = "https://github.com/teburd/tree-sitter-vhdl", rev = "c57313adee2231100db0a7880033f6865deeadb2" }
+source = { git = "https://github.com/jpt13653903/tree-sitter-vhdl", rev = "32d3e3daa745bf9f1665676f323be968444619e1" }
 
 [[language]]
 name = "rego"
@@ -3596,6 +3619,7 @@ scope = "source.pkl"
 injection-regex = "pkl"
 file-types = ["pkl", "pcf"]
 comment-token = "//"
+language-servers = ["pkl-lsp"]
 indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
@@ -4008,12 +4032,12 @@ block-comment-tokens = [
 language-servers = [ "spade-language-server" ]
 indent = { tab-width = 4, unit = "    " }
 
-[language.auto-pairs] 
-'(' = ')' 
-'{' = '}' 
-'[' = ']' 
-'"' = '"' 
-'<' = '>' 
+[language.auto-pairs]
+'(' = ')'
+'{' = '}'
+'[' = ']'
+'"' = '"'
+'<' = '>'
 
 [[grammar]]
 name = "spade"
@@ -4077,7 +4101,7 @@ file-types = [
   { glob = "sites-available/*.conf" },
   { glob = "sites-enabled/*.conf" },
   { glob = "nginx.conf" },
-  { glob = "conf.d/*.conf" } 
+  { glob = "conf.d/*.conf" }
 ]
 roots = ["nginx.conf"]
 comment-token = "#"
@@ -4190,3 +4214,30 @@ soft-wrap = { enable = true }
 [[grammar]]
 name = "ink"
 source = { git = "https://github.com/rhizoome/tree-sitter-ink", rev = "8486e9b1627b0bc6b2deb9ee8102277a7c1281ac" }
+
+[[language]]
+name = "sourcepawn"
+scope = "source.sourcepawn"
+file-types = ["sp", "inc"]
+comment-token = "//"
+indent = {tab-width = 4, unit = "  "}
+language-servers = ["sourcepawn-studio"]
+
+[[grammar]]
+name = "sourcepawn"
+source = { git = "https://github.com/nilshelmig/tree-sitter-sourcepawn", rev = "f2af8d0dc14c6790130cceb2a20027eb41a8297c" }
+
+[[language]]
+name = "tlaplus"
+scope = "scope.tlaplus"
+injection-regex = "tla"
+file-types = ["tla"]
+comment-tokens = "\\*"
+block-comment-tokens = {start = "(*", end="*)"}
+indent = {tab-width = 4, unit = " "}
+formatter = {command = "tlafmt", args = ["--stdin"]}
+
+[[grammar]]
+name = "tlaplus"
+source = { git = "https://github.com/tlaplus-community/tree-sitter-tlaplus", rev = "4ba91b07b97741a67f61221d0d50e6d962e4987e"}
+
diff --git a/runtime/queries/c-sharp/highlights.scm b/runtime/queries/c-sharp/highlights.scm
index 383948626..07c3bfc32 100644
--- a/runtime/queries/c-sharp/highlights.scm
+++ b/runtime/queries/c-sharp/highlights.scm
@@ -1,116 +1,63 @@
+(identifier) @variable
+
 ;; Methods
-(method_declaration
-  name: (identifier) @function)
 
-(method_declaration
-  type: [(identifier) (qualified_name)] @type)
-
-(invocation_expression
-  (member_access_expression
-    name: (identifier) @function))
-
-(invocation_expression
-  function: (conditional_access_expression
-    (member_binding_expression
-      name: (identifier) @function)))
-
-(invocation_expression
-  [(identifier) (qualified_name)] @function)
-
-(local_function_statement
-  name: (identifier) @function)
-
-; Generic Method invocation with generic type
-(invocation_expression
-  function: (generic_name
-    . (identifier) @function))
-
-;; Namespaces
-(namespace_declaration
-  name: [(identifier) (qualified_name)] @namespace)
+(method_declaration name: (identifier) @function)
+(local_function_statement name: (identifier) @function)
 
 ;; Types
+
 (interface_declaration name: (identifier) @type)
 (class_declaration name: (identifier) @type)
 (enum_declaration name: (identifier) @type)
 (struct_declaration (identifier) @type)
 (record_declaration (identifier) @type)
-(namespace_declaration name: (identifier) @type)
-(using_directive (_) @namespace)
-(constructor_declaration name: (identifier) @type)
-(destructor_declaration name: (identifier) @type)
-(object_creation_expression [(identifier) (qualified_name)] @type)
-(type_parameter_list (type_parameter) @type)
-(array_type (identifier) @type)
-(for_each_statement type: (identifier) @type)
+(namespace_declaration name: (identifier) @namespace)
 
-[
-  (implicit_type)
-  (nullable_type)
-  (pointer_type)
-  (function_pointer_type)
-  (predefined_type)
-] @type.builtin
+(generic_name (identifier) @type)
+(type_parameter (identifier) @type.parameter)
+(parameter type: (identifier) @type)
+(type_argument_list (identifier) @type)
+(as_expression right: (identifier) @type)
+(is_expression right: (identifier) @type)
 
-;; Generic Types
-(type_of_expression
-  (generic_name
-    (identifier) @type))
+(constructor_declaration name: (identifier) @constructor)
+(destructor_declaration name: (identifier) @constructor)
 
-(base_list
-  (generic_name
-    (identifier) @type))
+(_ type: (identifier) @type)
 
-(type_constraint
-  (generic_name
-    (identifier) @type))
+(base_list (identifier) @type)
 
-(object_creation_expression
-  (generic_name
-    (identifier) @type))
-
-(property_declaration
-  (generic_name
-    (identifier) @type))
-
-(_
-  type: (generic_name
-    (identifier) @type))
+(predefined_type) @type.builtin
 
 ;; Enum
-(enum_member_declaration (identifier) @variable.other.member)
+(enum_member_declaration (identifier) @type.enum.variant)
 
 ;; Literals
-[
-  (real_literal)
-  (integer_literal)
-] @constant.numeric.integer
 
+(real_literal) @constant.numeric.float
+(integer_literal) @constant.numeric.integer
 (character_literal) @constant.character
+
 [
   (string_literal)
+  (raw_string_literal)
   (verbatim_string_literal)
-  (interpolated_string_text)
-  (interpolated_verbatim_string_text)
-  (interpolation_format_clause)
-  "\""
-  "$\""
-  "@$\""
-  "$@\""
+  (interpolated_string_expression)
+  (interpolation_start)
+  (interpolation_quote)
  ] @string
 
+(escape_sequence) @constant.character.escape
+
 (boolean_literal) @constant.builtin.boolean
-[
-  (null_literal)
-  (void_keyword)
-] @constant.builtin
+(null_literal) @constant.builtin
 
 ;; Comments
+
 (comment) @comment
 
 ;; Tokens
-(type_argument_list ["<" ">"] @punctuation.bracket)
-(type_parameter_list ["<" ">"] @punctuation.bracket)
 
 [
   ";"
@@ -123,6 +70,7 @@
   "-"
   "-="
   "&"
+  "&="
   "&&"
   "+"
   "++"
@@ -140,11 +88,14 @@
   ">="
   ">>"
   ">>="
+  ">>>"
+  ">>>="
   "|"
-  "||"
   "|="
+  "||"
   "?"
   "??"
+  "??="
   "^"
   "^="
   "~"
@@ -155,224 +106,103 @@
   "%"
   "%="
   ":"
-  "::"
-  ".."
-  "&="
-  "->"
-  "??="
 ] @operator
 
-["(" ")" "[" "]" "{" "}"] @punctuation.bracket
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+  (interpolation_brace)
+]  @punctuation.bracket
 
 ;; Keywords
-(modifier) @keyword.storage.modifier
-(this_expression) @keyword
-(escape_sequence) @constant.character.escape
 
 [
-  "as"
-  "await"
-  "base"
-  "checked"
-  "from"
-  "get"
-  "in"
-  "init"
-  "is"
-  "let"
-  "lock"
-  "new"
-  "operator"
-  "out"
-  "params"
-  "ref"
-  "select"
-  "set"
-  "sizeof"
-  "stackalloc"
-  "typeof"
-  "unchecked"
-  "using"
-  "when"
-  "where"
-  "with"
-  "yield"
+  (modifier)
+  "this"
+  (implicit_type)
 ] @keyword
 
 [
+  "add"
+  "alias"
+  "as"
+  "base"
+  "break"
+  "case"
+  "catch"
+  "checked"
   "class"
+  "continue"
+  "default"
   "delegate"
+  "do"
+  "else"
   "enum"
   "event"
-  "interface"
-  "namespace"
-  "struct"
-  "record"
-] @keyword.storage.type
-
-[
   "explicit"
-  "implicit"
-  "static"
-] @keyword.storage.modifier
-
-[
-  "break"
-  "continue"
-  "goto"
-] @keyword.control
-
-[
-  "catch"
+  "extern"
   "finally"
-  "throw"
-  "try"
-] @keyword.control.exception
-
-[
-  "do"
   "for"
   "foreach"
-  "while"
-] @keyword.control.repeat
-
-[
-  "case"
-  "default"
-  "else"
+  "global"
+  "goto"
   "if"
+  "implicit"
+  "interface"
+  "is"
+  "lock"
+  "namespace"
+  "notnull"
+  "operator"
+  "params"
+  "return"
+  "remove"
+  "sizeof"
+  "stackalloc"
+  "static"
+  "struct"
   "switch"
-] @keyword.control.conditional
-
-"return" @keyword.control.return
-
-[
-  (nullable_directive)
-  (define_directive)
-  (undef_directive)
-  (if_directive)
-  (else_directive)
-  (elif_directive)
-  (endif_directive)
-  (region_directive)
-  (endregion_directive)
-  (error_directive)
-  (warning_directive)
-  (line_directive)
-  (pragma_directive)
-] @keyword.directive
-
-;; Linq
-(from_clause (identifier) @variable)
-(group_clause)
-(order_by_clause)
-(select_clause (identifier) @variable)
-(query_continuation (identifier) @variable) @keyword
-
-;; Record
-(with_expression
-  (with_initializer_expression
-    (simple_assignment_expression
-      (identifier) @variable)))
-
-;; Exprs
-(binary_expression [(identifier) (qualified_name)] @variable [(identifier) (qualified_name)] @variable)
-(binary_expression [(identifier) (qualified_name)]* @variable)
-(conditional_expression [(identifier) (qualified_name)] @variable)
-(conditional_access_expression [(identifier) (qualified_name)] @variable)
-(prefix_unary_expression [(identifier) (qualified_name)] @variable)
-(postfix_unary_expression [(identifier) (qualified_name)]* @variable)
-(assignment_expression [(identifier) (qualified_name)] @variable)
-(cast_expression [(identifier) (qualified_name)] @type [(identifier) (qualified_name)] @variable)
-(element_access_expression (identifier) @variable)
-(member_access_expression
-  expression: ([(identifier) (qualified_name)] @type
-    (#match? @type "^[A-Z]")))
-(member_access_expression [(identifier) (qualified_name)] @variable)
-
-;; Class
-(base_list (identifier) @type)
-(property_declaration (generic_name))
-(property_declaration
-  type: (nullable_type) @type
-  name: (identifier) @variable)
-(property_declaration
-  type: (predefined_type) @type
-  name: (identifier) @variable)
-(property_declaration
-  type: (identifier) @type
-  name: (identifier) @variable)
-  
-;; Delegate
-(delegate_declaration (identifier) @type)
-
-;; Lambda
-(lambda_expression) @variable
+  "throw"
+  "try"
+  "typeof"
+  "unchecked"
+  "using"
+  "while"
+  "new"
+  "await"
+  "in"
+  "yield"
+  "get"
+  "set"
+  "when"
+  "out"
+  "ref"
+  "from"
+  "where"
+  "select"
+  "record"
+  "init"
+  "with"
+  "let"
+] @keyword
 
 ;; Attribute
-(attribute) @type
 
-;; Parameter
+(attribute name: (identifier) @attribute)
+
+;; Parameters
+
 (parameter
-  type: (identifier) @type
   name: (identifier) @variable.parameter)
-(parameter (identifier) @variable.parameter)
-(parameter_modifier) @keyword
-
-(parameter_list
-  (parameter
-    name: (identifier) @parameter))
-
-(parameter_list
-  (parameter
-    type: [(identifier) (qualified_name)] @type))
-
-;; Typeof
-(type_of_expression [(identifier) (qualified_name)] @type)
-
-;; Variable
-(variable_declaration [(identifier) (qualified_name)] @type)
-(variable_declarator [(identifier) (qualified_name)] @variable)
-
-;; Return
-(return_statement (identifier) @variable)
-(yield_statement (identifier) @variable)
-
-;; Type
-(generic_name (identifier) @type)
-(type_parameter [(identifier) (qualified_name)] @type)
-(type_argument_list [(identifier) (qualified_name)] @type)
 
 ;; Type constraints
-(type_parameter_constraints_clause (identifier) @variable.parameter)
-(type_constraint (identifier) @type)
 
-;; Exception
-(catch_declaration (identifier) @type (identifier) @variable)
-(catch_declaration (identifier) @type)
+(type_parameter_constraints_clause (identifier) @type.parameter)
 
-;; Switch
-(switch_statement (identifier) @variable)
-(switch_expression (identifier) @variable)
+;; Method calls
 
-;; Lock statement
-(lock_statement (identifier) @variable)
-
-;; Declaration expression
-(declaration_expression
-  type: (identifier) @type
-  name: (identifier) @variable)
-
-;; Rest
-(argument (identifier) @variable)
-(name_colon (identifier) @variable)
-(if_statement (identifier) @variable)
-(for_statement (identifier) @variable)
-(for_each_statement (identifier) @variable)
-(expression_statement (identifier) @variable)
-(array_rank_specifier (identifier) @variable)
-(equals_value_clause (identifier) @variable)
-(interpolation (identifier) @variable)
-(cast_expression (identifier) @variable)
-((identifier) @comment.unused
-  (#eq? @comment.unused "_"))
+(invocation_expression (member_access_expression name: (identifier) @function))
diff --git a/runtime/queries/c-sharp/tags.scm b/runtime/queries/c-sharp/tags.scm
new file mode 100644
index 000000000..ffb2dd239
--- /dev/null
+++ b/runtime/queries/c-sharp/tags.scm
@@ -0,0 +1,23 @@
+(class_declaration name: (identifier) @name) @definition.class
+
+(class_declaration (base_list (_) @name)) @reference.class
+
+(interface_declaration name: (identifier) @name) @definition.interface
+
+(interface_declaration (base_list (_) @name)) @reference.interface
+
+(method_declaration name: (identifier) @name) @definition.method
+
+(object_creation_expression type: (identifier) @name) @reference.class
+
+(type_parameter_constraints_clause (identifier) @name) @reference.class
+
+(type_parameter_constraint (type type: (identifier) @name)) @reference.class
+
+(variable_declaration type: (identifier) @name) @reference.class
+
+(invocation_expression function: (member_access_expression name: (identifier) @name)) @reference.send
+
+(namespace_declaration name: (identifier) @name) @definition.module
+
+(namespace_declaration name: (identifier) @name) @module
diff --git a/runtime/queries/c-sharp/textobjects.scm b/runtime/queries/c-sharp/textobjects.scm
index c5afe5f4e..b101051d1 100644
--- a/runtime/queries/c-sharp/textobjects.scm
+++ b/runtime/queries/c-sharp/textobjects.scm
@@ -5,7 +5,6 @@
   (enum_declaration body: (_) @class.inside)
   (delegate_declaration)
   (record_declaration body: (_) @class.inside)
-  (record_struct_declaration body: (_) @class.inside)
 ] @class.around
 
 (constructor_declaration body: (_) @function.inside) @function.around
diff --git a/runtime/queries/css/highlights.scm b/runtime/queries/css/highlights.scm
index ee85d1414..74958457e 100644
--- a/runtime/queries/css/highlights.scm
+++ b/runtime/queries/css/highlights.scm
@@ -54,6 +54,9 @@
  (from)
  (important)
  (to)
+ (keyword_query)
+ (keyframes_name)
+ (unit)
 ] @keyword
 
 [
diff --git a/runtime/queries/erlang/highlights.scm b/runtime/queries/erlang/highlights.scm
index 041fb021b..76c2ddd89 100644
--- a/runtime/queries/erlang/highlights.scm
+++ b/runtime/queries/erlang/highlights.scm
@@ -5,9 +5,9 @@
 
 ; Basic types
 (variable) @variable
+(atom) @string.special.symbol
 ((atom) @constant.builtin.boolean
  (#match? @constant.builtin.boolean "^(true|false)$"))
-(atom) @string.special.symbol
 [(string) (sigil)] @string
 (character) @constant.character
 (escape_sequence) @constant.character.escape
@@ -20,6 +20,10 @@
 ["(" ")" "#" "{" "}" "[" "]" "<<" ">>"] @punctuation.bracket
 
 ; Operators
+(binary_operator operator: _ @operator)
+(unary_operator operator: _ @operator)
+["/" ":" "->"] @operator
+
 (binary_operator
   left: (atom) @function
   operator: "/"
@@ -30,10 +34,13 @@
 ((unary_operator operator: _ @keyword.operator)
  (#match? @keyword.operator "^\\w+$"))
 
-(binary_operator operator: _ @operator)
-(unary_operator operator: _ @operator)
-["/" ":" "->"] @operator
-
+; Functions
+(function_clause name: (atom) @function)
+(call module: (atom) @namespace)
+(call function: (atom) @function)
+(stab_clause name: (atom) @function)
+(function_capture module: (atom) @namespace)
+(function_capture function: (atom) @function)
 
 ; Keywords
 (attribute name: (atom) @keyword)
@@ -107,13 +114,9 @@
   ] @comment.block.documentation)
  (#any-of? @keyword "doc" "moduledoc"))
 
-; Functions
-(function_clause name: (atom) @function)
-(call module: (atom) @namespace)
-(call function: (atom) @function)
-(stab_clause name: (atom) @function)
-(function_capture module: (atom) @namespace)
-(function_capture function: (atom) @function)
+; Ignored variables
+((variable) @comment.discard
+ (#match? @comment.discard "^_"))
 
 ; Macros
 (macro
@@ -125,10 +128,6 @@
   "?"+ @keyword.directive
   name: (_) @keyword.directive)
 
-; Ignored variables
-((variable) @comment.discard
- (#match? @comment.discard "^_"))
-
 ; Parameters
 ; specs
 ((attribute
diff --git a/runtime/queries/json/highlights.scm b/runtime/queries/json/highlights.scm
index 69005074d..554d3b2b8 100644
--- a/runtime/queries/json/highlights.scm
+++ b/runtime/queries/json/highlights.scm
@@ -5,12 +5,12 @@
 (null) @constant.builtin
 (number) @constant.numeric
 
-(pair
-  key: (_) @variable.other.member)
-
 (string) @string
 (escape_sequence) @constant.character.escape
 
+(pair
+  key: (_) @variable.other.member)
+
 "," @punctuation.delimiter
 [
   "["
diff --git a/runtime/queries/json5/highlights.scm b/runtime/queries/json5/highlights.scm
index 3ec4ee296..a19b30722 100644
--- a/runtime/queries/json5/highlights.scm
+++ b/runtime/queries/json5/highlights.scm
@@ -5,12 +5,12 @@
 (null) @constant.builtin
 (number) @constant.numeric
 
-(member
-  name: (_) @variable.other.member)
-
 (string) @string
 (comment) @comment
 
+(member
+  name: (_) @variable.other.member)
+
 "," @punctuation.delimiter
 [
   "["
diff --git a/runtime/queries/mail/highlights.scm b/runtime/queries/mail/highlights.scm
new file mode 100644
index 000000000..ed06b568f
--- /dev/null
+++ b/runtime/queries/mail/highlights.scm
@@ -0,0 +1,28 @@
+; header fields
+[
+  (header_field_email)
+  (header_field_subject)
+  (header_field)
+] @keyword
+
+; delimited punctuation
+(header_separator) @punctuation.delimiter
+(email_delimiter) @punctuation.delimiter
+
+; email subject contents
+(header_subject
+  (subject) @markup.bold)
+; extra metadata headers
+(header_other
+  (header_unstructured) @comment)
+
+; Addressee Name (Firstname, Lastname, etc.)
+(atom) @variable
+
+; Email Address
+(email) @string
+
+; Quoted Reply
+(quote_marker) @punctuation.special
+(quote_contents) @markup.quote
+
diff --git a/runtime/queries/mail/textobjects.scm b/runtime/queries/mail/textobjects.scm
new file mode 100644
index 000000000..07191dc69
--- /dev/null
+++ b/runtime/queries/mail/textobjects.scm
@@ -0,0 +1,13 @@
+(atom_block
+  (atom) @entry.inside) @entry.around
+
+(email_address) @entry.around
+(header_other
+  (header_unstructured) @entry.around)
+
+(quoted_block)+ @comment.around
+
+(body_block)+ @function.around
+
+(header_subject
+  (subject) @function.around)
diff --git a/runtime/queries/openscad/highlights.scm b/runtime/queries/openscad/highlights.scm
index 90d5ac59d..a79dc41e6 100644
--- a/runtime/queries/openscad/highlights.scm
+++ b/runtime/queries/openscad/highlights.scm
@@ -1,40 +1,68 @@
-(number) @constant.numeric
-(string) @string
-(boolean) @constant.builtin.boolean
-(include_path) @string.special.path
-
+; Includes
 (identifier) @variable
 
-(parameters_declaration (identifier) @variable.parameter)
-(function_declaration name: (identifier) @function)
+"include" @keyword.control.import
 
-(function_call function: (identifier) @function)
-(module_call name: (identifier) @function)
+(include_path) @string.special.path
 
+; Functions
+
+(function_item
+  (identifier) @function
+)
+(function_item
+  parameters: (parameters (parameter (assignment value: (_) @constant)))
+)
+(function_call name: (identifier) @function)
+(function_call
+  arguments: (arguments (assignment name: _ @variable.parameter))
+)
+; for the puroposes of distintion since modules are "coloured" impure functions, we will treat them as methods
+(module_item (identifier) @function.method)
+(module_item
+  parameters: (parameters (parameter (assignment value: (_) @constant)))
+)
+(module_call name: (identifier) @function.method)
+(module_call
+  arguments: (arguments (assignment name: _ @variable.parameter))
+)
+
+; assertion statements/expression arguments behave similar to function calls
+(assert_expression
+  arguments: (arguments (assignment name: _ @variable.parameter))
+)
+(assert_statement
+  arguments: (arguments (assignment name: _ @variable.parameter))
+)
+
+(echo_expression
+  arguments: (arguments (assignment name: _ @variable.parameter))
+)
+(echo_expression "echo" @function.builtin)
+
+; Variables
+(parameter
+  [_ @variable.parameter (assignment name: _ @variable.parameter)]
+)
 (special_variable) @variable.builtin
+(undef) @constant.builtin
 
+; Types/Properties/
+(dot_index_expression index: (_) @variable.other.member)
+
+; Keywords
 [
+  "module"
   "function"
   "let"
   "assign"
+  "use"
+  "each"
+  (assert_statement "assert")
+  (assert_expression "assert")
 ] @keyword
 
-[
-  "for"
-  "each"
-  "intersection_for"
-] @keyword.control.repeat
-
-[
-  "if"
-] @keyword.control.conditional
-
-[
-  "module"
-  "use"
-  "include"
-] @keyword.control.import
-
+; Operators
 [
   "||"
   "&&"
@@ -50,15 +78,87 @@
   "/"
   "%"
   "^"
-  "?"
   "!"
   ":"
+  "="
 ] @operator
 
+; Builtin modules
+(module_call
+  name: (identifier) @function.builtin
+  (#any-of? @function.builtin
+    "circle"
+    "color"
+    "cube"
+    "cylinder"
+    "difference"
+    "hull"
+    "intersection"
+    "linear_extrude"
+    "minkowski"
+    "mirror"
+    "multmatrix"
+    "offset"
+    "polygon"
+    "polyhedron"
+    "projection"
+    "resize"
+    "rotate"
+    "rotate_extrude"
+    "scale"
+    "sphere"
+    "square"
+    "surface"
+    "text"
+    "translate"
+    "union"
+    "echo"
+  )
+)
+(
+  (identifier) @identifier
+  (#eq? @identifier "PI")
+) @constant.builtin
+
+; Conditionals
+[
+  "if"
+  "else"
+] @keyword.control.conditional
+(ternary_expression
+  ["?" ":"] @keyword.control.conditional
+)
+
+; Repeats
+[
+  "for"
+  "intersection_for"
+] @keyword.control.repeat
+
+; Literals
+(integer) @constant.numeric.integer
+(float) @constant.numeric.float
+(string) @string
+(escape_sequence) @constant.character.escape
+(boolean) @constant.builtin.boolean
+
+; Misc
+(modifier
+  [
+    "*"
+    "!"
+    "#"
+    "%"
+  ] @keyword.storage.modifier
+)
+["{" "}"] @punctuation.bracket
+["(" ")"] @punctuation.bracket
+["[" "]"] @punctuation.bracket
 [
   ";"
   ","
   "."
 ] @punctuation.delimiter
 
-(comment) @comment
+; Comments
+[(line_comment) (block_comment)] @comment
diff --git a/runtime/queries/ruby/highlights.scm b/runtime/queries/ruby/highlights.scm
index 35babfe32..cd6f1723e 100644
--- a/runtime/queries/ruby/highlights.scm
+++ b/runtime/queries/ruby/highlights.scm
@@ -39,19 +39,60 @@
   "%i("
 ] @punctuation.bracket
 
+; Literals
+
+[
+  (string)
+  (bare_string)
+  (subshell)
+  (heredoc_body)
+  (heredoc_beginning)
+] @string
+
+[
+  (simple_symbol)
+  (delimited_symbol)
+  (bare_symbol)
+] @string.special.symbol
+
+(pair key: ((_)":" @string.special.symbol) @string.special.symbol)
+
+(regex) @string.regexp
+(escape_sequence) @constant.character.escape
+
+[
+  (integer)
+  (float)
+] @constant.numeric.integer
+
+[
+  (nil)
+  (true)
+  (false)
+] @constant.builtin
+
+(interpolation
+  "#{" @punctuation.special
+  "}" @punctuation.special) @embedded
+
+(comment) @comment
+
 ; Identifiers
 
+((identifier) @function.method
+ (#is-not? local))
+
 [
   (identifier)
 ] @variable
-((identifier) @function.method
- (#is-not? local))
 
 [
   (class_variable)
   (instance_variable)
 ] @variable.other.member
 
+(constant) @constructor
+
 ((identifier) @constant.builtin
  (#match? @constant.builtin "^(__FILE__|__LINE__|__ENCODING__)$"))
 
@@ -61,8 +102,6 @@
 ((constant) @constant
  (#match? @constant "^[A-Z\\d_]+$"))
 
-(constant) @constructor
-
 (self) @variable.builtin
 (super) @function.builtin
 
@@ -76,6 +115,23 @@
 (block_parameter (identifier) @variable.parameter)
 (block_parameters (identifier) @variable.parameter)
 
+; Function definitions
+
+(alias (identifier) @function.method)
+(setter (identifier) @function.method)
+(method name: [(identifier) (constant)] @function.method)
+(singleton_method name: [(identifier) (constant)] @function.method)
+
+; Function calls
+
+(call
+  method: [(identifier) (constant)] @function.method)
+
+((identifier) @function.builtin
+ (#match? @function.builtin "^(attr|attr_accessor|attr_reader|attr_writer|include|prepend|refine|private|protected|public)$"))
+
+"defined?" @function.builtin
+
 ; Keywords
 
 [
@@ -133,58 +189,3 @@
 
 ((identifier) @keyword.control.exception
  (#match? @keyword.control.exception "^(raise|fail)$"))
-
-; Function calls
-
-((identifier) @function.builtin
- (#match? @function.builtin "^(attr|attr_accessor|attr_reader|attr_writer|include|prepend|refine|private|protected|public)$"))
-
-"defined?" @function.builtin
-
-(call
-  method: [(identifier) (constant)] @function.method)
-
-; Function definitions
-
-(alias (identifier) @function.method)
-(setter (identifier) @function.method)
-(method name: [(identifier) (constant)] @function.method)
-(singleton_method name: [(identifier) (constant)] @function.method)
-
-; Literals
-
-[
-  (string)
-  (bare_string)
-  (subshell)
-  (heredoc_body)
-  (heredoc_beginning)
-] @string
-
-[
-  (simple_symbol)
-  (delimited_symbol)
-  (bare_symbol)
-] @string.special.symbol
-
-(pair key: ((_)":" @string.special.symbol) @string.special.symbol)
-
-(regex) @string.regexp
-(escape_sequence) @constant.character.escape
-
-[
-  (integer)
-  (float)
-] @constant.numeric.integer
-
-[
-  (nil)
-  (true)
-  (false)
-] @constant.builtin
-
-(interpolation
-  "#{" @punctuation.special
-  "}" @punctuation.special) @embedded
-
-(comment) @comment
diff --git a/runtime/queries/rust/injections.scm b/runtime/queries/rust/injections.scm
index b05b9d975..964eec0f8 100644
--- a/runtime/queries/rust/injections.scm
+++ b/runtime/queries/rust/injections.scm
@@ -35,18 +35,30 @@
  (#set! injection.language "rust")
  (#set! injection.include-children))
 
+((macro_invocation
+   macro:
+     [
+       (scoped_identifier name: (_) @_macro_name)
+       (identifier) @_macro_name
+     ]
+   (token_tree
+     (token_tree . "{" "}" .) @injection.content))
+ (#eq? @_macro_name "json")
+ (#set! injection.language "json")
+ (#set! injection.include-children))
+
 (call_expression
   function: (scoped_identifier
-    path: (identifier) @_regex (#eq? @_regex "Regex")
+    path: (identifier) @_regex (#any-of? @_regex "Regex" "RegexBuilder")
     name: (identifier) @_new (#eq? @_new "new"))
-  arguments: (arguments (raw_string_literal) @injection.content)
+  arguments: (arguments (raw_string_literal (string_content) @injection.content))
   (#set! injection.language "regex"))
 
 (call_expression
   function: (scoped_identifier
-    path: (scoped_identifier (identifier) @_regex (#eq? @_regex "Regex") .)
+    path: (scoped_identifier (identifier) @_regex (#any-of? @_regex "Regex" "RegexBuilder") .)
     name: (identifier) @_new (#eq? @_new "new"))
-  arguments: (arguments (raw_string_literal) @injection.content)
+  arguments: (arguments (raw_string_literal (string_content) @injection.content))
   (#set! injection.language "regex"))
 
 ; Highlight SQL in `sqlx::query!()`, `sqlx::query_scalar!()`, and `sqlx::query_scalar_unchecked!()`
@@ -57,7 +69,10 @@
   (token_tree
     ; Only the first argument is SQL
     .
-    [(string_literal) (raw_string_literal)] @injection.content
+    [
+      (string_literal (string_content) @injection.content)
+      (raw_string_literal (string_content) @injection.content)
+    ]
   )
   (#set! injection.language "sql"))
 
@@ -72,6 +87,9 @@
     ; Allow anything as the first argument in case the user has lower case type
     ; names for some reason
     (_)
-    [(string_literal) (raw_string_literal)] @injection.content
+    [
+      (string_literal (string_content) @injection.content)
+      (raw_string_literal (string_content) @injection.content)
+    ]
   )
   (#set! injection.language "sql"))
diff --git a/runtime/queries/sourcepawn/highlights.scm b/runtime/queries/sourcepawn/highlights.scm
new file mode 100644
index 000000000..64c89e7d6
--- /dev/null
+++ b/runtime/queries/sourcepawn/highlights.scm
@@ -0,0 +1,255 @@
+; Assume all-caps names are constants
+((identifier) @constant
+ (#match? @constant "^[A-Z][A-Z\\d_]+$'"))
+
+; Function definitions/declarations
+(function_definition
+  name: (identifier) @function)
+(function_declaration
+  name: (identifier) @function)
+(parameter_declaration
+  name: (identifier) @variable.parameter)
+
+; Methods / Properties
+(field_access
+  field: (identifier) @variable.other.member)
+
+; Function calls
+(call_expression
+  function: (identifier) @function)
+(call_expression
+  function: (field_access
+    field: (identifier) @function))
+
+; Types
+(builtin_type) @type.builtin
+(type (identifier) @type)
+(any_type) @type
+
+; Variables
+(variable_storage_class) @keyword.storage
+(variable_declaration
+  name: (identifier) @variable)
+(old_variable_declaration
+  name: (identifier) @variable)
+
+; Preprocessor
+(preproc_include) @keyword.control.import
+(preproc_tryinclude) @keyword.control.import
+(system_lib_string) @string
+(string_literal) @string
+
+(preproc_assert) @keyword.directive
+(preproc_pragma) @keyword.directive
+(preproc_arg) @constant
+(preproc_macro) @function.macro
+(macro_param) @variable.parameter
+(preproc_if) @keyword.directive
+(preproc_else) @keyword.directive
+(preproc_elseif) @keyword.directive
+(preproc_endif) @keyword.directive
+(preproc_endinput) @keyword.directive
+(preproc_define) @keyword.directive
+(preproc_define
+  name: (identifier) @constant)
+(preproc_undefine) @keyword.directive
+(preproc_undefine
+  name: (identifier) @constant)
+(preproc_error) @function.macro ; Wrong color?
+(preproc_warning) @function.macro ; Wrong color?
+
+; Statements
+(for_statement) @keyword.control.repeat
+(condition_statement) @keyword.control.conditional
+(while_statement) @keyword.control.repeat
+(do_while_statement) @keyword.control.repeat
+(switch_statement) @keyword.control.conditional
+(switch_case) @keyword.control.conditional
+(ternary_expression) @conditional.ternary
+
+; Expressions
+(view_as) @function.builtin
+(sizeof_expression) @function.macro
+(this) @variable.builtin
+
+; https://github.com/alliedmodders/sourcemod/blob/5c0ae11a4619e9cba93478683c7737253ea93ba6/plugins/include/handles.inc#L78
+(hardcoded_symbol) @variable.builtin
+
+; Comments
+(comment) @comment
+
+; General
+(parameter_declaration
+  defaultValue: (identifier) @constant)
+(fixed_dimension) @punctuation.bracket ; the [3] in var[3]
+(dimension) @punctuation.bracket
+(array_indexed_access) @punctuation.bracket
+(escape_sequence) @constant.character.escape
+
+; Constructors
+(new_expression
+  class: (identifier) @type
+  arguments: (call_arguments) @constructor)
+
+; Methodmaps
+(methodmap) @type.definition
+(methodmap
+  name: (identifier) @type)
+(methodmap
+  inherits: (identifier) @type)
+(methodmap_method_constructor
+  name: (identifier) @constructor)
+(methodmap_method
+  name: (identifier) @function.method)
+(methodmap_native
+  name: (identifier) @function.method)
+(methodmap_property
+  name: (identifier) @variable.other.member)
+(methodmap_property_getter) @function.method
+(methodmap_property_setter) @function.method
+
+; Enum structs
+(enum_struct) @type.enum.variant
+(enum_struct
+  name: (identifier) @type)
+(enum_struct_field
+  name: (identifier) @variable.other.member)
+(enum_struct_method
+  name: (identifier) @function.method)
+
+; Non-type Keywords
+(variable_storage_class) @keyword.storage
+(visibility) @keyword.storage
+(visibility) @keyword.storage
+(assertion) @function.builtin
+(function_declaration_kind) @keyword.function
+[
+  "new"
+  "delete"
+] @keyword.operator
+[
+  "."
+  ","
+] @punctuation.delimiter
+
+; Operators
+[
+  "+"
+  "-"
+  "..."
+  "*"
+  "/"
+  "%"
+  "++"
+  "--"
+  "="
+  "+="
+  "-="
+  "*="
+  "/="
+  "=="
+  "!="
+  "<"
+  ">"
+  ">="
+  "<="
+  "!"
+  "&&"
+  "||"
+  "&"
+  "|"
+  "~"
+  "^"
+  "<<"
+  ">>"
+  ">>>"
+  "|="
+  "&="
+  "^="
+  "~="
+  "<<="
+  ">>="
+] @operator
+(ignore_argument) @operator
+(scope_access) @operator
+(rest_operator) @operator
+
+; public Plugin myinfo
+(struct_declaration
+  name: (identifier) @variable.builtin)
+
+; Typedef/Typedef
+(typeset) @type.builtin
+(typedef) @type.builtin
+(functag) @type.builtin
+(funcenum) @type.builtin
+(typedef_expression) @keyword.function ; function void(int x)
+
+; Enums
+(enum) @type.enum
+(enum
+  name: (identifier) @type)
+(enum_entry
+  name: (identifier) @constant)
+(enum_entry
+  value: (_) @constant)
+
+; Literals
+(int_literal) @constant.numeric.integer
+(char_literal) @constant.character
+(float_literal) @constant.numeric.float
+(string_literal) @string
+(array_literal) @punctuation.bracket
+[
+  (bool_literal)
+  (null)
+] @constant.builtin
+((identifier) @constant
+  (#match? @constant "INVALID_HANDLE"))
+
+; Comment specialisations (must be after comment)
+; These might be unnecessary and/or used incorrectly, since they're intended
+; for markup languages
+((comment) @diff.plus
+  (#match? @diff.plus "^\/[\/\*][\t ]TODO"))
+((comment) @diff.plus
+  (#match? @diff.plus "^\/[\/\*][\t ]NOTE"))
+((comment) @diff.minus
+  (#match? @diff.minus "^\/[\/\*][\t ]WARNING"))
+
+; Keywords
+[
+  "__nullable__"
+  "break"
+  "case"
+  "const"
+  "continue"
+  "default"
+  "delete"
+  "do"
+  "else"
+  "enum"
+  "for"
+  "forward"
+  "funcenum"
+  "functag"
+  "get"
+  "if"
+  "methodmap"
+  "native"
+  "new"
+  "property"
+  "public"
+  "return"
+  "set"
+  "static"
+  "stock"
+  "struct"
+  "switch"
+  "typedef"
+  "typeset"
+  "void"
+  "while"
+] @keyword
+
+(identifier) @variable
diff --git a/runtime/queries/sourcepawn/injections.scm b/runtime/queries/sourcepawn/injections.scm
new file mode 100644
index 000000000..0e7d5d8e3
--- /dev/null
+++ b/runtime/queries/sourcepawn/injections.scm
@@ -0,0 +1,4 @@
+; Parse JSDoc annotations in comments
+
+((comment) @injection.content
+ (#set! injection.language "jsdoc"))
diff --git a/runtime/queries/sourcepawn/textobjects.scm b/runtime/queries/sourcepawn/textobjects.scm
new file mode 100644
index 000000000..5c9442984
--- /dev/null
+++ b/runtime/queries/sourcepawn/textobjects.scm
@@ -0,0 +1,29 @@
+(function_definition
+  body: (_) @function.inside) @function.around
+
+(alias_declaration
+  body: (_) @function.inside) @function.around
+
+(enum_struct_method
+  body: (_) @function.inside) @function.around
+
+(methodmap_method
+  body: (_) @function.inside) @function.around
+
+(methodmap_method_constructor
+  body: (_) @function.inside) @function.around
+
+(methodmap_method_destructor
+  body: (_) @function.inside) @function.around
+
+(methodmap_property_method
+  body: (_) @function.inside) @function.around
+
+(enum_struct) @class.around
+
+(methodmap) @class.around
+
+(parameter_declarations 
+  ((parameter_declaration) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(comment) @comment.around
diff --git a/runtime/queries/tlaplus/highlights.scm b/runtime/queries/tlaplus/highlights.scm
new file mode 100644
index 000000000..f9eaa79d9
--- /dev/null
+++ b/runtime/queries/tlaplus/highlights.scm
@@ -0,0 +1,225 @@
+; ; Intended for consumption by GitHub and the tree-sitter highlight command
+; ; Default capture names found here:
+; ; https://github.com/tree-sitter/tree-sitter/blob/f5d1c0b8609f8697861eab352ead44916c068c74/cli/src/highlight.rs#L150-L171
+; ; In this file, captures defined earlier take precedence over captures defined later.
+
+; TLA⁺ Keywords
+[
+  "ACTION"
+  "ASSUME"
+  "ASSUMPTION"
+  "AXIOM"
+  "BY"
+  "CASE"
+  "CHOOSE"
+  "CONSTANT"
+  "CONSTANTS"
+  "COROLLARY"
+  "DEF"
+  "DEFINE"
+  "DEFS"
+  "ELSE"
+  "EXCEPT"
+  "EXTENDS"
+  "HAVE"
+  "HIDE"
+  "IF"
+  "IN"
+  "INSTANCE"
+  "LAMBDA"
+  "LEMMA"
+  "LET"
+  "LOCAL"
+  "MODULE"
+  "NEW"
+  "OBVIOUS"
+  "OMITTED"
+  "ONLY"
+  "OTHER"
+  "PICK"
+  "PROOF"
+  "PROPOSITION"
+  "PROVE"
+  "QED"
+  "RECURSIVE"
+  "SF_"
+  "STATE"
+  "SUFFICES"
+  "TAKE"
+  "TEMPORAL"
+  "THEN"
+  "THEOREM"
+  "USE"
+  "VARIABLE"
+  "VARIABLES"
+  "WF_"
+  "WITH"
+  "WITNESS"
+  (address)
+  (all_map_to)
+  (assign)
+  (case_arrow)
+  (case_box)
+  (def_eq)
+  (exists)
+  (forall)
+  (gets)
+  (label_as)
+  (maps_to)
+  (set_in)
+  (temporal_exists)
+  (temporal_forall)
+] @keyword
+
+;  PlusCal keywords
+[
+  "algorithm"
+  "assert"
+  "await"
+  "begin"
+  "call"
+  "define"
+  "either"
+  "else"
+  "elsif"
+  "end"
+  "fair"
+  "goto"
+  "if"
+  "macro"
+  "or"
+  "print"
+  "procedure"
+  "process"
+  "variable"
+  "variables"
+  "when"
+  "with"
+  "then"
+  (pcal_algorithm_start)
+  (pcal_end_either)
+  (pcal_end_if)
+  (pcal_return)
+  (pcal_skip)
+  (pcal_process ("="))
+  (pcal_with ("="))
+] @keyword
+
+; Literals
+(binary_number (format) @keyword)
+(binary_number (value) @constant.numeric)
+(boolean) @constant.builtin.boolean
+(boolean_set) @type
+(hex_number (format) @keyword)
+(hex_number (value) @constant.numeric)
+(int_number_set) @type
+(nat_number) @constant.numeric.integer
+(nat_number_set) @type
+(octal_number (format) @keyword)
+(octal_number (value) @constant.numeric)
+(real_number) @constant.numeric.integer
+(real_number_set) @type
+(string) @string
+(escape_char) @string.special.symbol
+(string_set) @type
+
+; Namespaces and includes
+(extends (identifier_ref) @namespace)
+(instance (identifier_ref) @namespace)
+(module name: (_) @namespace)
+(pcal_algorithm name: (identifier) @namespace)
+
+; Constants and variables
+(constant_declaration (identifier) @constant)
+(constant_declaration (operator_declaration name: (_) @constant))
+(pcal_var_decl (identifier) @variable.builtin)
+(pcal_with (identifier) @variable.parameter)
+((".") . (identifier) @attribute)
+(record_literal (identifier) @attribute)
+(set_of_records (identifier) @attribute)
+(variable_declaration (identifier) @variable.builtin)
+
+; Parameters
+(choose (identifier) @variable.parameter)
+(choose (tuple_of_identifiers (identifier) @variable.parameter))
+(lambda (identifier) @variable.parameter)
+(module_definition (operator_declaration name: (_) @variable.parameter))
+(module_definition parameter: (identifier) @variable.parameter)
+(operator_definition (operator_declaration name: (_) @variable.parameter))
+(operator_definition parameter: (identifier) @variable.parameter)
+(pcal_macro_decl parameter: (identifier) @variable.parameter)
+(pcal_proc_var_decl (identifier) @variable.parameter)
+(quantifier_bound (identifier) @variable.parameter)
+(quantifier_bound (tuple_of_identifiers (identifier) @variable.parameter))
+(unbounded_quantification (identifier) @variable.parameter)
+
+; Operators, functions, and macros
+(function_definition name: (identifier) @function)
+(module_definition name: (_) @namespace)
+(operator_definition name: (_) @operator)
+(pcal_macro_decl name: (identifier) @function)
+(pcal_macro_call name: (identifier) @function)
+(pcal_proc_decl name: (identifier) @function)
+(pcal_process name: (identifier) @function)
+(recursive_declaration (identifier) @operator)
+(recursive_declaration (operator_declaration name: (_) @operator))
+
+; Delimiters
+[
+  (langle_bracket)
+  (rangle_bracket)
+  (rangle_bracket_sub)
+  "{"
+  "}"
+  "["
+  "]"
+  "]_"
+  "("
+  ")"
+] @punctuation.bracket
+[
+  ","
+  ":"
+  "."
+  "!"
+  ";"
+  (bullet_conj)
+  (bullet_disj)
+  (prev_func_val)
+  (placeholder)
+] @punctuation.delimiter
+
+; Proofs
+(assume_prove (new (identifier) @variable.parameter))
+(assume_prove (new (operator_declaration name: (_) @variable.parameter)))
+(assumption name: (identifier) @constant)
+(pick_proof_step (identifier) @variable.parameter)
+(proof_step_id "<" @punctuation.bracket)
+(proof_step_id (level) @tag)
+(proof_step_id (name) @tag)
+(proof_step_id ">" @punctuation.bracket)
+(proof_step_ref "<" @punctuation.bracket)
+(proof_step_ref (level) @tag)
+(proof_step_ref (name) @tag)
+(proof_step_ref ">" @punctuation.bracket)
+(take_proof_step (identifier) @variable.parameter)
+(theorem name: (identifier) @constant)
+
+; Comments and tags
+(block_comment "(*" @comment.block)
+(block_comment "*)" @comment.block)
+(block_comment_text) @comment.block
+(comment) @comment
+(single_line) @comment
+(_ label: (identifier) @tag)
+(label name: (_) @tag)
+(pcal_goto statement: (identifier) @tag)
+
+; Put these last so they are overridden by everything else
+(bound_infix_op symbol: (_) @function.builtin)
+(bound_nonfix_op symbol: (_) @function.builtin)
+(bound_postfix_op symbol: (_) @function.builtin)
+(bound_prefix_op symbol: (_) @function.builtin)
+((prefix_op_symbol) @function.builtin)
+((infix_op_symbol) @function.builtin)
+((postfix_op_symbol) @function.builtin)
diff --git a/runtime/queries/tlaplus/locals.scm b/runtime/queries/tlaplus/locals.scm
new file mode 100644
index 000000000..aee8d612b
--- /dev/null
+++ b/runtime/queries/tlaplus/locals.scm
@@ -0,0 +1,70 @@
+; TLA⁺ scopes and definitions
+[
+  (bounded_quantification)
+  (choose)
+  (function_definition) 
+  (function_literal)
+  (lambda) 
+  (let_in)
+  (module) 
+  (module_definition)
+  (operator_definition)
+  (set_filter)
+  (set_map)
+  (unbounded_quantification)
+] @local.scope
+
+; Definitions
+(choose (identifier) @local.definition)
+(choose (tuple_of_identifiers (identifier) @local.definition))
+(constant_declaration (identifier) @local.definition)
+(constant_declaration (operator_declaration name: (_) @local.definition))
+(function_definition name: (identifier) @local.definition)
+(lambda (identifier) @local.definition)
+(module_definition name: (_) @local.definition)
+(module_definition parameter: (identifier) @local.definition)
+(module_definition parameter: (operator_declaration name: (_) @local.definition))
+(operator_definition name: (_) @local.definition)
+(operator_definition parameter: (identifier) @local.definition)
+(operator_definition parameter: (operator_declaration name: (_) @local.definition))
+(quantifier_bound (identifier) @local.definition)
+(quantifier_bound (tuple_of_identifiers (identifier) @local.definition))
+(unbounded_quantification (identifier) @local.definition)
+(variable_declaration (identifier) @local.definition)
+
+; Proof scopes and definitions
+[
+  (non_terminal_proof)
+  (suffices_proof_step)
+  (theorem)
+] @local.scope
+
+(assume_prove (new (identifier) @local.definition))
+(assume_prove (new (operator_declaration name: (_) @local.definition)))
+(assumption name: (identifier) @local.definition)
+(pick_proof_step (identifier) @local.definition)
+(take_proof_step (identifier) @local.definition)
+(theorem name: (identifier) @local.definition)
+
+;PlusCal scopes and definitions
+[
+  (pcal_algorithm)
+  (pcal_macro)
+  (pcal_procedure)
+  (pcal_with)
+] @local.scope
+
+(pcal_macro_decl parameter: (identifier) @local.definition)
+(pcal_proc_var_decl (identifier) @local.definition)
+(pcal_var_decl (identifier) @local.definition)
+(pcal_with (identifier) @local.definition)
+
+; References
+(identifier_ref) @local.reference
+((prefix_op_symbol) @local.reference)
+(bound_prefix_op symbol: (_) @local.reference)
+((infix_op_symbol) @local.reference)
+(bound_infix_op symbol: (_) @local.reference)
+((postfix_op_symbol) @local.reference)
+(bound_postfix_op symbol: (_) @local.reference)
+(bound_nonfix_op symbol: (_) @local.reference)
diff --git a/runtime/queries/toml/textobjects.scm b/runtime/queries/toml/textobjects.scm
index a8fd57c99..5b88d81cd 100644
--- a/runtime/queries/toml/textobjects.scm
+++ b/runtime/queries/toml/textobjects.scm
@@ -3,3 +3,5 @@
 
 (array
   (_) @entry.around)
+
+(comment)+ @comment.around
diff --git a/runtime/queries/vhdl/highlights.scm b/runtime/queries/vhdl/highlights.scm
index 1b9742fc8..71b8a5bd9 100644
--- a/runtime/queries/vhdl/highlights.scm
+++ b/runtime/queries/vhdl/highlights.scm
@@ -1,134 +1,377 @@
+(line_comment) @comment.line
+
+(block_comment) @comment.block
+
+(identifier) @variable
+
 [
-  "alias" "package" "file" "entity" "architecture" "type" "subtype"
-  "attribute" "to" "downto" "signal" "variable" "record" "array"
-  "others" "process" "component" "shared" "constant" "port" "generic"
-  "generate" "range" "map" "in" "inout" "of" "out" "configuration"
-  "pure" "impure" "is" "begin" "end" "context" "wait" "until" "after"
-  "report" "open" "exit" "assert" "next" "null" "force" "property"
-  "release" "sequence" "transport" "unaffected" "select" "severity"
-  "register" "reject" "postponed" "on" "new" "literal" "linkage"
-  "inertial" "guarded" "group" "disconnect" "bus" "buffer" "body"
-  "all" "block" "access"
+  "access"
+  "after"
+  "alias"
+  "architecture"
+  "array"
+  "attribute"
+  "block"
+  "body"
+  "component"
+  "configuration"
+  "context"
+  "disconnect"
+  "entity"
+  "file"
+  "force"
+  "generate"
+  "generic"
+  "group"
+  "label"
+  "literal"
+  "map"
+  "new"
+  "package"
+  "parameter"
+  "port"
+  "property"
+  "range"
+  "reject"
+  "release"
+  "sequence"
+  "transport"
+  "unaffected"
+  "view"
+  "vunit"
 ] @keyword
 
 [
-  "function" "procedure"
+  (ALL)
+  (OTHERS)
+  "<>"
+  (DEFAULT)
+  (OPEN)
+] @constant.builtin
+
+[
+  "is"
+  "begin"
+  "end"
+] @keyword
+
+(parameter_specification
+  "in" @keyword)
+
+[
+  "process"
+  "wait"
+  "on"
+  "until"
+] @keyword
+
+(timeout_clause
+  "for" @keyword)
+
+[
+  "function"
+  "procedure"
 ] @keyword.function
 
 [
-  "return"
-] @keyword.control.return
-
-[
-  "for" "loop" "while"
-] @keyword.control.repeat
-
-[ 
-  "if" "elsif" "else" "case" "then" "when"
-] @keyword.control.conditional
-
-[ 
-  "library" "use"
-] @keyword.control.import
-
-(comment) @comment
-
-(type_mark) @type
-
-[
-  "(" ")" "[" "]"
-] @punctuation.bracket
-
-[
-  "." ";" "," ":"
-] @punctuation.delimiter
-
-[
-  "=>" "<=" "+" ":=" "=" "/=" "<" ">" "-" "*"
-  "**" "/" "?>" "?<" "?<=" "?>=" "?=" "?/="
-; "?/" errors, maybe due to escape character
-  (attribute_name "'")
-  (index_subtype_definition (any))
-] @operator
-
-[
-  "not" "xor" "xnor" "and" "nand" "or" "nor" "mod" "rem"
-  (attribute_name "'")
-  (index_subtype_definition (any))
+  "to"
+  "downto"
+  "of"
 ] @keyword.operator
 
 [
-  (real_decimal)
-  (integer_decimal)
-] @constant.numeric
+  "library"
+  "use"
+] @keyword.control.import
+
+[
+  "subtype"
+  "type"
+  "record"
+  "units"
+  "constant"
+  "signal"
+  "variable"
+] @keyword.storage.type
+
+[
+  "protected"
+  "private"
+  "pure"
+  "impure"
+  "inertial"
+  "postponed"
+  "guarded"
+  "out"
+  "inout"
+  "linkage"
+  "buffer"
+  "register"
+  "bus"
+  "shared"
+] @keyword.storage.modifier
+
+(mode
+  "in" @keyword.storage.modifier)
+
+(force_mode
+  "in" @keyword.storage.modifier)
+
+[
+  "while"
+  "loop"
+  "next"
+  "exit"
+] @keyword.control.repeat
+
+(for_loop
+  "for" @keyword.control.repeat)
+
+(block_configuration
+  "for" @keyword)
+
+(configuration_specification
+  "for" @keyword)
+
+(component_configuration
+  "for" @keyword)
+
+(end_for
+  "for" @keyword)
+
+"return" @keyword.control.return
+
+[
+  "assert"
+  "report"
+  "severity"
+] @keyword
+
+[
+  "if"
+  "then"
+  "elsif"
+  "case"
+] @keyword.control.conditional
+
+(when_element
+  "when" @keyword.control.conditional)
+
+(case_generate_alternative
+  "when" @keyword.control.conditional)
+
+(else_statement
+  "else" @keyword.control.conditional)
+
+(else_generate
+  "else" @keyword.control.conditional)
+
+[
+  "with"
+  "select"
+] @keyword.control.conditional
+
+(when_expression
+  "when" @keyword.control.conditional)
+
+(else_expression
+  "else" @keyword.control.conditional)
+
+(else_waveform
+  "else" @keyword.control.conditional)
+
+(else_expression_or_unaffected
+  "else" @keyword.control.conditional)
+
+"null" @constant.builtin
+
+(user_directive) @keyword.directive
+
+(protect_directive) @keyword.directive
+
+(warning_directive) @keyword.directive
+
+(error_directive) @keyword.directive
+
+(if_conditional_analysis
+  "if" @keyword.directive)
+
+(if_conditional_analysis
+  "then" @keyword.directive)
+
+(elsif_conditional_analysis
+  "elsif" @keyword.directive)
+
+(else_conditional_analysis
+  "else" @keyword.directive)
+
+(end_conditional_analysis
+  "end" @keyword.directive)
+
+(end_conditional_analysis
+  "if" @keyword.directive)
+
+(directive_body) @keyword.directive
+
+(directive_constant_builtin) @constant.builtin
+
+(directive_error) @keyword.directive
+
+(directive_protect) @keyword.directive
+
+(directive_warning) @keyword.directive
+
+[
+  (condition_conversion)
+  (relational_operator)
+  (sign)
+  (adding_operator)
+  (exponentiate)
+  (variable_assignment)
+  (signal_assignment)
+  "*"
+  "/"
+  ":"
+  "=>"
+] @operator
+
+[
+  (unary_operator)
+  (logical_operator)
+  (shift_operator)
+  "mod"
+  "not"
+  "rem"
+] @keyword.operator
+
+[
+  "'"
+  ","
+  "."
+  ";"
+] @punctuation.delimiters
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "<<"
+  ">>"
+] @punctuation.bracket
+
+"@" @punctuation.special
+
+[
+  (decimal_integer)
+  (string_literal_std_logic)
+] @constant.numeric.integer
+
+(decimal_float) @constant.numeric.float
+
+(bit_string_length) @type.parameter
+
+(bit_string_base) @type.builtin
+
+(bit_string_value) @constant.numeric.integer
+
+(based_literal
+  (based_base) @type.builtin
+  (based_integer) @constant.numeric.integer)
+
+(based_literal
+  (based_base) @type.builtin
+  (based_float) @constant.numeric.float)
+
+(string_literal) @string
 
 (character_literal) @constant.character
 
-[
-  (string_literal)
-  (bit_string_literal)
-] @string
+(library_constant_std_logic) @constant.builtin
 
-(physical_literal
-  unit: (simple_name) @attribute)
+(library_constant) @constant.builtin
 
-(attribute_name
-  prefix: (_) @variable
-  designator: (_) @attribute)
+(library_function) @function.builtin
 
-((simple_name) @variable.builtin (#any-of? @variable.builtin
-  "true" "false" "now"))
+(library_constant_boolean) @constant.builtin.boolean
 
-(severity_expression) @constant.builtin
+(library_constant_character) @constant.character
 
-(procedure_call_statement
-  procedure: (simple_name) @function)
+(unit) @keyword.storage.modifier
 
-(ambiguous_name
-  prefix: (simple_name) @function.builtin (#any-of? @function.builtin
-    "rising_edge" "falling_edge" "find_rightmost" "find_leftmost"
-    "maximum" "minimum" "shift_left" "shift_right" "rotate_left"
-    "rotate_right" "sll" "srl" "rol" "ror" "sla" "sra" "resize"
-    "mod" "rem" "abs" "saturate"
-    "to_sfixed" "to_ufixed" "to_signed" "to_unsigned" "to_real"
-    "to_integer" "sfixed_low" "ufixed_low" "sfixed_high"
-    "ufixed_high" "to_slv" "to_stdulogicvector" "to_sulv"
-    "to_float" "std_logic" "std_logic_vector" "integer" "signed"
-    "unsigned" "real" "std_ulogic_vector"
-    "std_ulogic" "x01" "x01z" "ux01" "ux01Z"
-;math_real
-    "sign" "ceil" "floor" "round" "fmax" "fmin" "uniform" "srand"
-    "rand" "get_rand_max" "sqrt" "cbrt" "exp" "log" "log2" "log10"
-    "sin" "cos" "tan" "asin" "acos" "atan" "atan2" "sinh" "cosh"
-    "tanh" "asinh" "acosh" "atanh" "realmax" "realmin" "trunc"
-    "conj" "arg" "polar_to_complex" "complex_to_polar"
-    "get_principal_value" "cmplx"
-;std_textio
-    "read" "write" "hread" "hwrite" "to_hstring" "to_string"
-    "from_hstring" "from_string"
-    "justify" "readline" "sread" "string_read" " bread"
-    "binary_read" "oread" "octal_read" "hex_read"
-    "writeline" "swrite" "string_write" "bwrite"
-    "binary_write" "owrite" "octal_write" "hex_write"
-    "synthesis_return"
-;std_logic_1164
-    "resolved" "logic_type_encoding" "is_signed" "to_bit"
-    "to_bitvector" "to_stdulogic" "to_stdlogicvector"
-    "to_bit_vector" "to_bv" "to_std_logic_vector"
-    "to_std_ulogic_vector" "to_01" "to_x01" "to_x01z" "to_ux01"
-    "is_x" "to_bstring" "to_binary_string" "to_ostring"
-    "to_octal_string" "to_hex_string"
-;float_pkg
-    "add" "subtract" "multiply" "divide" "remainder" "modulo"
-    "reciprocal" "dividebyp2" "mac" "eq" "ne" "lt" "gt" "le" "ge"
-    "to_float32" "to_float64" "to_float128" "realtobits" "bitstoreal"
-    "break_number" "normalize" "copysign" "scalb" "logb" "nextafter"
-    "unordered" "finite" "isnan" "zerofp" "nanfp" "qnanfp"
-    "pos_inffp" "neg_inffp" "neg_zerofp" "from_bstring"
-    "from_binary_string" "from_ostring" "from_octal_string"
-    "from_hex_string"
-;fixed_pkg
-    "add_carry" "to_ufix" "to_sfix" "ufix_high"
-    "ufix_low" "sfix_high" "sfix_low"
-))
+(library_constant_unit) @keyword.storage.modifier
+
+(label) @label
+
+(generic_map_aspect
+  "generic" @constructor
+  "map" @constructor)
+
+(port_map_aspect
+  "port" @constructor
+  "map" @constructor)
+
+(selection
+  (identifier) @variable.other.member)
+
+(_
+  view: (_) @type)
+
+(_
+  type: (_) @type)
+
+(_
+  library: (_) @namespace)
+
+(_
+  package: (_) @namespace)
+
+(_
+  entity: (_) @namespace)
+
+(_
+  component: (_) @namespace)
+
+(_
+  configuration: (_) @type.parameter)
+
+(_
+  architecture: (_) @type.parameter)
+
+(_
+  function: (_) @function)
+
+(_
+  procedure: (_) @function.method)
+
+(_
+  attribute: (_) @attribute)
+
+(_
+  constant: (_) @constant)
+
+(_
+  generic: (_) @variable.parameter)
+
+(_
+  view: (name
+    (_)) @type)
+
+(_
+  type: (name
+    (_)) @type)
+
+(_
+  entity: (name
+    (_)) @namespace)
+
+(_
+  component: (name
+    (_)) @namespace)
+
+(_
+  configuration: (name
+    (_)) @namespace)
+
+(library_type) @type.builtin
 
diff --git a/runtime/themes/base16_transparent.toml b/runtime/themes/base16_transparent.toml
index d5786f89e..fc697b920 100644
--- a/runtime/themes/base16_transparent.toml
+++ b/runtime/themes/base16_transparent.toml
@@ -8,7 +8,7 @@
 "ui.menu" = { fg = "white" }
 "ui.menu.selected" = { modifiers = ["reversed"] }
 "ui.menu.scroll" = { fg = "light-gray" }
-"ui.linenr" = { fg = "light-gray" }
+"ui.linenr" = { modifiers = ["dim"] }
 "ui.linenr.selected" = { fg = "white",  modifiers = ["bold"] }
 "ui.popup" = { fg = "white" }
 "ui.window" = { fg = "gray" }
diff --git a/runtime/themes/beans.toml b/runtime/themes/beans.toml
new file mode 100644
index 000000000..bde2ed4dd
--- /dev/null
+++ b/runtime/themes/beans.toml
@@ -0,0 +1,134 @@
+# Beans
+# A slightly modified Jellybeans with better support for multi-cursor and multiple selections
+#
+# Original repository: nanotech/jellybeans.vim
+# Contributors:
+# @cemalokten
+# @gnur
+
+
+"attribute" = "green"
+"type" = "light_blue"
+"type.enum.variant" = "purple"
+"constructor" = "yellow"
+"constant" = "dark_orange"
+
+"constant.builtin.boolean" = "yellow"
+"constant.character" = "yellow"
+"constant.character.escape" = "red_error"
+"constant.numeric" = "dark_orange"
+"string" = "dark_green"
+"string.regexp" = "light_purple"
+"string.special" = { fg = "yellow", modifiers = ["underlined"] }
+"comment" = "light_gray"
+
+"variable" = "light_yellow"
+"variable.builtin" = { fg = "dark_green", modifiers = ["underlined"] }
+"variable.parameter" = "yellow"
+"variable.other.member" = "light_purple"
+"label" = "yellow"
+"punctuation" = "mid_blue"
+"keyword" = "mid_blue"
+"keyword.control.exception" = "purple"
+"operator" = "light_purple"
+"function" = "yellow"
+"function.macro" = "green"
+"function.builtin" = "green"
+"function.special" = "green"
+"function.method" = "yellow"
+"tag" = "light_blue"
+"special" = "green"
+"namespace" = "light_purple"
+
+"markup.bold" = { fg = "white", modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+"markup.heading" = { fg = "mid_blue", modifiers = ["bold"] }
+"markup.list" = "dark_green"
+"markup.list.numbered" = "mid_blue"
+"markup.list.unnumbered" = "mid_blue"
+"markup.link.url" = { fg = "dark_green", modifiers = ['italic', 'underlined'] }
+"markup.link.text" = "mid_blue"
+"markup.link.label" = "purple"
+"markup.quote" = "dark_green"
+"markup.raw" = "dark_green"
+"markup.raw.inline" = "mid_blue"
+"markup.raw.block" = "dark_green"
+
+"diff.plus" = "diff_plus"
+"diff.minus" = "red_accent"
+"diff.delta" = "blue_accent"
+
+# ui specific
+"ui.background" = { bg = "background" }
+"ui.cursor" = { bg = "purple", fg = "selectionfg" }
+"ui.cursor.primary" = { bg = "dark_blue", fg = "white" }
+"ui.cursor.normal" = { bg = "purple", fg = "selectionfg" }
+"ui.cursor.insert" = { bg = "light_yellow", fg = "background" }
+"ui.cursor.match" = { fg = "background", bg = "dark_orange" }
+"ui.cursorline" = { bg = "darker" }
+"ui.linenr" = "dark_gray"
+"ui.linenr.selected" = { fg = "light_yellow", bg = "darker" }
+"ui.statusline" = { fg = "light_yellow", bg = "darker" }
+"ui.statusline.inactive" = { fg = "dark", bg = "darker" }
+"ui.statusline.normal" = { fg = "light_yellow", bg = "darker" }
+"ui.statusline.insert" = { fg = "darker", bg = "purple" }
+"ui.statusline.select" = { fg = "selectionfg", bg = "selection" }
+"ui.popup" = { fg = "light_yellow", bg = "darkest" }
+"ui.window" = { fg = "dark", bg = "darkest" }
+"ui.help" = { fg = "light_yellow", bg = "darkest" }
+"ui.text" = "light_yellow"
+"ui.text.focus" = { fg = "white", bg = "dark_blue" }
+"ui.virtual" = "dark"
+"ui.virtual.ruler" = { bg = "darker" }
+"ui.virtual.jump-label" = { bg = "light_blue", fg = "darkest", modifiers = ["bold"] }
+"ui.menu" = { fg = "light_purple", bg = "darkest" }
+"ui.menu.selected" = { fg = "white", bg = "dark_blue" }
+"ui.selection.primary" = { bg = "light_purple", fg = "darkest" }
+"ui.selection" = { bg = "light_blue", fg = "darkest" }
+"hint" = "blue"
+"info" = "yellow_accent"
+"warning" = "orange_accent"
+"error" = "red_error"
+"diagnostic" = { modifiers = [] }
+"diagnostic.hint" = { underline = { color = "white", style = "line" } }
+"diagnostic.info" = { underline = { color = "blue_accent", style = "line" } }
+"diagnostic.warning" = { underline = { color = "yellow_accent", style = "line" } }
+"diagnostic.error" = { underline = { color = "red_error", style = "line" } }
+
+[palette]
+background = "#111111"
+darkest = "#1c1c1c"
+darker = "#292929"
+dark = "#898989"
+white = "#ffffff"
+dark_gray = "#535353"
+light_gray = "#6d6d6d"
+
+purple = "#833c9f"
+light_purple = "#be67e1"
+
+blue = "#048ac7"
+light_blue = "#48c6ff"
+mid_blue = "#8197bf"
+dark_blue = "#0ac1cd"
+blue_accent = "#63e7f0"
+
+green = "#ccff00"
+dark_green = "#cee318"
+
+red = "#cc7c8a"
+red_error = "#902020"
+red_accent = "#f44747"
+
+orange = "#ff9f00"
+dark_orange = "#ff005b"
+orange_accent = "#ee7f25"
+
+yellow = "#fad07a"
+light_yellow = "#ebebd8"
+yellow_accent = "#dea407"
+
+diff_plus = "#5a9f81"
+selection = "#37232d"
+selectionfg = "#e5e5e5"
diff --git a/runtime/themes/kanagawa.toml b/runtime/themes/kanagawa.toml
index 8d5a80eef..be3f841fc 100644
--- a/runtime/themes/kanagawa.toml
+++ b/runtime/themes/kanagawa.toml
@@ -9,14 +9,14 @@
 ## User interface
 "ui.selection" = { bg = "waveBlue2" }
 "ui.selection.primary" = { bg = "waveBlue2" }
-"ui.background" = { fg = "fujiWhite", bg = "sumiInk1" }
+"ui.background" = { fg = "fujiWhite", bg = "sumiInk3" }
 
 "ui.linenr" = { fg = "sumiInk6" }
 "ui.linenr.selected" = { fg = "roninYellow", modifiers = ["bold"] }
 "ui.gutter" = { fg = "sumiInk6", bg = "sumiInk4" }
 
 "ui.virtual" = "sumiInk6"
-"ui.virtual.ruler" = { bg = "sumiInk2" }
+"ui.virtual.ruler" = { bg = "sumiInk4" }
 "ui.virtual.inlay-hint" = "sumiInk6"
 "ui.virtual.jump-label" = { fg = "peachRed", modifiers = ["bold"] }
 
@@ -25,8 +25,6 @@
 "ui.statusline.normal" = { fg = "sumiInk0", bg = "crystalBlue", modifiers = ["bold"] }
 "ui.statusline.insert" = { fg = "sumiInk0", bg = "autumnGreen", modifiers = ["bold"] }
 "ui.statusline.select" = { fg = "sumiInk0", bg = "oniViolet", modifiers = ["bold"] }
-# Malformed ANSI: "". See 'https://github.com/helix-editor/helix/issues/5709'
-# "ui.statusline.separator" = { fg = "", bg = "" }
 
 "ui.bufferline" = { fg = "fujiGray", bg = "sumiInk0" }
 "ui.bufferline.active" = { fg = "oldWhite", bg = "sumiInk0" }
@@ -46,8 +44,8 @@
 "ui.menu.selected" = { fg = "fujiWhite", bg = "waveBlue2", modifiers = ["bold"] }
 "ui.menu.scroll" = { fg = "oldWhite", bg = "waveBlue1" }
 
-"ui.cursorline.primary" = { bg = "sumiInk3" }
-"ui.cursorcolumn.primary" = { bg = "sumiInk3" }
+"ui.cursorline.primary" = { bg = "sumiInk5" }
+"ui.cursorcolumn.primary" = { bg = "sumiInk5" }
 
 "ui.debug.breakpoint" = "springBlue"
 "ui.debug.active" = "winterRed"
@@ -101,56 +99,62 @@ hint = "waveAqua1"
 "special" = "peachRed"
 
 ## Markup modifiers
+"markup.heading" = { fg = "springViolet2", modifiers = ["bold"] }
 "markup.heading.marker" = "springViolet2"
-"markup.heading" = { fg = "crystalBlue", modifiers = ["bold"] }
-"markup.list" = "oniViolet"
+"markup.heading.1" = { fg = "carpYellow", modifiers = ["bold"] }
+"markup.heading.2" = { fg = "crystalBlue", modifiers = ["bold"] }
+"markup.heading.3" = { fg = "waveAqua2", modifiers = ["bold"] }
+"markup.list" = "sakuraPink"
 "markup.bold" = { modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
 "markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.text" = { fg = "springBlue" }
-"markup.link.url" = { fg = "sakuraPink" }
+"markup.link.url" = { fg = "lightBlue" }
 "markup.link.label" = "surimiOrange"
-"markup.quote" = "springViolet1"
+"markup.quote" = "oniViolet2"
 "markup.raw" = "springGreen"
 
 [palette]
-seaFoam = "#C7CCD1"       # custom lighter foreground
-fujiWhite = "#DCD7BA"     # default foreground
-oldWhite = "#C8C093"      # dark foreground, e.g. statuslines
-sumiInk0 = "#16161D"      # dark background, e.g. statuslines, floating windows
-sumiInk1 = "#1F1F28"      # default background
-sumiInk2 = "#2A2A37"      # lighter background, e.g. colorcolumns, folds
-sumiInk3 = "#363646"      # lighter background, e.g. cursorline
-sumiInk4 = "#2A2A37"      # darker foreground, e.g. linenumbers, fold column
-sumiInk6 = "#54546D"      # inlay hints
-waveBlue1 = "#223249"     # popup background, visual selection background
-waveBlue2 = "#2D4F67"     # popup selection background, search background
-winterGreen = "#2B3328"   # diff add background
-winterYellow = "#49443C"  # diff change background
-winterRed = "#43242B"     # diff deleted background
-winterBlue = "#252535"    # diff line background
-autumnGreen = "#76946A"   # git add
-autumnRed = "#C34043"     # git delete
-autumnYellow = "#DCA561"  # git change
-samuraiRed = "#E82424"    # diagnostic error
-roninYellow = "#FF9E3B"   # diagnostic warning
-waveAqua1 = "#6A9589"     # diagnostic info
-dragonBlue = "#658594"    # diagnostic hint
-fujiGray = "#727169"      # comments
-springViolet1 = "#938AA9" # light foreground
-oniViolet = "#957FB8"     # statements and keywords
-oniViolet2 = "#B8B4D0"    # parameters
-crystalBlue = "#7E9CD8"   # functions and titles
-springViolet2 = "#9CABCA" # brackets and punctuation
-springBlue = "#7FB4CA"    # specials and builtins
-lightBlue = "#A3D4D5"     # not used!
-waveAqua2 = "#7AA89F"     # types
-springGreen = "#98BB6C"   # strings
-boatYellow1 = "#938056"   # not used
-boatYellow2 = "#C0A36E"   # operators, regex
-carpYellow = "#E6C384"    # identifiers
-sakuraPink = "#D27E99"    # numbers
-waveRed = "#E46876"       # standout specials 1, e.g. builtin variables
-peachRed = "#FF5D62"      # standout specials 2, e.g. exception handling, returns
-surimiOrange = "#FFA066"  # constants, imports, booleans
-katanaGray = "#717C7C"    # deprecated
+oldWhite = "#C8C093"       # dark foreground, e.g. statuslines
+fujiWhite = "#DCD7BA"      # default foreground
+fujiGray = "#727169"       # comments
+sumiInk0 = "#16161D"       # dark background, e.g. statuslines, floating windows
+sumiInk1 = "#181820"       # unused
+sumiInk2 = "#1A1A22"       # unused
+sumiInk3 = "#1F1F28"       # default background
+sumiInk4 = "#2A2A37"       # lighter background, e.g. colorcolumns, folds
+sumiInk5 = "#363646"       # lighter background, e.g. cursorline
+sumiInk6 = "#54546D"       # inlay hints
+waveBlue1 = "#223249"      # popup background, visual selection background
+waveBlue2 = "#2D4F67"      # popup selection background, search background
+winterGreen = "#2B3328"    # diff add background
+winterYellow = "#49443C"   # diff change background
+winterRed = "#43242B"      # diff delete background
+winterBlue = "#252535"     # diff line background
+autumnGreen = "#76946A"    # git add
+autumnRed = "#C34043"      # git delete
+autumnYellow = "#DCA561"   # git change
+samuraiRed = "#E82424"     # diagnostic error
+roninYellow = "#FF9E3B"    # diagnostic warning
+waveAqua1 = "#6A9589"      # diagnostic info
+dragonBlue = "#658594"     # diagnostic hint
+oniViolet = "#957FB8"      # statements and keywords
+oniViolet2 = "#B8B4D0"     # parameters
+crystalBlue = "#7E9CD8"    # functions and titles
+springViolet1 = "#938AA9"  # unused
+springViolet2 = "#9CABCA"  # brackets and punctuation
+springBlue = "#7FB4CA"     # specials and builtins
+lightBlue = "#A3D4D5"      # URLs
+waveAqua2 = "#7AA89F"      # types
+waveAqua3  = "#68AD99"     # unused
+waveAqua4  = "#7AA880"     # unused
+waveAqua5  = "#6CAF95"     # unused
+springGreen = "#98BB6C"    # strings
+boatYellow1 = "#938056"    # unused
+boatYellow2 = "#C0A36E"    # operators, regex
+carpYellow = "#E6C384"     # identifiers
+sakuraPink = "#D27E99"     # numbers
+waveRed = "#E46876"        # standout specials 1, e.g. builtin variables
+peachRed = "#FF5D62"       # standout specials 2, e.g. exception handling, returns
+surimiOrange = "#FFA066"   # constants, imports, booleans
+katanaGray = "#717C7C"     # unused
diff --git a/runtime/themes/sunset.toml b/runtime/themes/sunset.toml
index ec3aca8f5..d417bb402 100644
--- a/runtime/themes/sunset.toml
+++ b/runtime/themes/sunset.toml
@@ -4,21 +4,20 @@
 
 # Syntax highlighting
 # ----------------------------------------------------------------
-attribute = "rose"
+attribute = "mud"
 
-type = "rose"
-"type.builtin" = { fg = "rose", modifiers = ["italic"] }
+type = "mud"
+"type.builtin" = { fg = "mud", modifiers = ["italic"] }
 
 constructor = "wood"
 
 constant = "fire"
 "constant.builtin"   = { fg = "fire", modifiers = ["italic"] }
 "constant.character" = "wood"
-"constant.character.escape" = "pink"
 "constant.numeric"   = "wood"
 
 string = "grass"
-"string.regexp"  = "pink"
+"string.regexp"  = "mud"
 "string.special" = "rose"
 "string.special.symbol" = "fire"
 
@@ -26,9 +25,9 @@ comment = { fg = "cmnt", modifiers = ["italic"] }
 "comment.block.documentation" = "grass"
 
 variable = "text"
-"variable.builtin" = { fg = "sky", modifiers = ["italic"] }
-# TODO: variable.parameter
-"variable.other.member" = "mud"
+"variable.builtin"   = { fg = "sky", modifiers = ["italic"] }
+"variable.parameter" = "rose"
+"variable.other.member" = "pink"
 
 label = "sky"
 
@@ -44,23 +43,23 @@ operator = "wine"
 
 function = "peach"
 "function.builtin" = { fg = "peach", modifiers = ["italic"] }
-"function.macro"   = "pink"
+"function.macro"   = "sky"
 
 tag = "peach"
 
-namespace = { fg = "pink", modifiers = ["italic"] }
+namespace = { fg = "text", modifiers = ["italic"] }
 
-special = "sky"
+special = "wine"
 
 # Editor interface
 # ----------------------------------------------------------------
 "markup.heading.marker" = "sun"
-"markup.heading.1" = "attn"
-"markup.heading.2" = "fire"
+"markup.heading.1" = "fire"
+"markup.heading.2" = "wine"
 "markup.heading.3" = "rose"
 "markup.heading.4" = "peach"
-"markup.heading.5" = "wine"
-"markup.heading.6" = "grass"
+"markup.heading.5" = "grass"
+"markup.heading.6" = "wood"
 
 "markup.list" = "wood"
 
@@ -69,12 +68,12 @@ special = "sky"
 "markup.strikethrough" = { modifiers = ["crossed_out"] }
 
 "markup.link.url"   = { fg = "sky", underline.style = "line" }
-"markup.link.label" = { fg = "sky", modifiers = ["italic"] }
+"markup.link.label" = "sky"
 "markup.link.text"  = "mud"
 
-"markup.quote" = "grass"
+"markup.quote" = "mud"
 
-"markup.raw"   = "pink"
+"markup.raw" = "pink"
 
 "diff.plus"  = "grass"
 "diff.minus" = "attn"
@@ -84,7 +83,10 @@ special = "sky"
 # ----------------------------------------------------------------
 "ui.background" = { fg = "text", bg = "base" }
 
-"ui.cursor" = { modifiers = ["reversed"] }
+"ui.cursor" = { fg = "base", bg = "cmnt" }
+"ui.cursor.primary.normal" = { fg = "base", bg = "text" }
+"ui.cursor.primary.insert" = { fg = "base", bg = "grass" }
+"ui.cursor.primary.select" = { fg = "base", bg = "sky" }
 "ui.cursor.match" = { fg = "attn", modifiers = ["bold"] }
 
 # TODO: ui.debug
@@ -94,34 +96,35 @@ special = "sky"
 
 "ui.statusline" = { bg = "block" }
 "ui.statusline.inactive" = { fg = "cmnt" }
-"ui.statusline.normal"   = { fg = "block", bg = "sun",  modifiers = ["bold"] }
+"ui.statusline.normal"   = { fg = "block", bg = "text",  modifiers = ["bold"] }
 "ui.statusline.insert"   = { fg = "block", bg = "grass", modifiers = ["bold"] }
-"ui.statusline.select"   = { fg = "block", bg = "wine",  modifiers = ["bold"] }
+"ui.statusline.select"   = { fg = "block", bg = "sky",   modifiers = ["bold"] }
 
 "ui.bufferline" = { fg = "cmnt", bg = "block" }
-"ui.bufferline.active" = "sun"
+"ui.bufferline.active" = "fire"
 
 "ui.popup" = { fg = "text", bg = "base" }
 "ui.popup.info" = { fg = "text", bg = "block" }
 
+"ui.picker.header" = { underline.style = "line" }
+
 "ui.window" = { fg = "block", modifiers = ["bold"] }
 
 "ui.help" = { fg = "text", bg = "block" }
 
-"ui.text" = { fg = "text", bg = "base" }
-"ui.text.directory" = "sky"
+"ui.text" = "text"
 "ui.text.focus"     = "sun"
 "ui.text.inactive"  = { fg = "cmnt", modifiers = ["italic"] }
 "ui.text.info"      = { bg = "block" }
+"ui.text.directory" = "sky"
 
 "ui.virtual" = { fg = "block" }
 "ui.virtual.ruler"        = { bg = "block" }
-"ui.virtual.indent-guide" = "sel"
 "ui.virtual.jump-label"   = { fg = "attn", modifiers = ["bold"] }
 
 "ui.menu" = { fg = "text", bg = "base" }
 "ui.menu.selected" = { bg = "sel" }
-"ui.menu.scroll"   = "sel"
+"ui.menu.scroll"   = "block"
 
 "ui.selection" = { bg = "sel" }
 
@@ -129,8 +132,8 @@ special = "sky"
 
 error   = "attn"
 warning = "fire"
-info    = "pink"
-hint    = "sky"
+info    = "sky"
+hint    = "mud"
 
 diagnostic = { underline.style = "line" }
 
@@ -144,12 +147,12 @@ wood  = "#997755"
 
 # Greenish
 grass = "#66CC33"
-mud   = "#BBCC77"
+mud   = "#AACC77"
 sun   = "#EEEE11"
 
 # Bluish
-sky  = "#77AAAA"
-wine = "#775599"
+sky   = "#77AAAA"
+wine  = "#775599"
 
 # Ui
 base  = "#111111"