feat: Handle duplicate dir names better

If we run `dust /usr/*/Trash` We see several 'Trash' directories in the output but do not know which user they belong to. This fix means if we see duplicate names in a directory we will display the parent directory name as well
2025-12-17 09:57:51 -08:00 · 2025-02-07 20:15:11 +00:00
21 changed files with 743 additions and 776 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -115,9 +115,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 [[package]]
 name = "bitflags"
-version = "2.9.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 [[package]]
 name = "bstr"
@@ -138,9 +138,9 @@ checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 [[package]]
 name = "cc"
-version = "1.2.16"
+version = "1.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
+checksum = "755717a7de9ec452bf7f3f1a3099085deabd7f2962b861dae91ecd7a365903d2"
 dependencies = [
 "shlex",
 ]
@@ -159,33 +159,32 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 [[package]]
 name = "chrono"
-version = "0.4.40"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
 "android-tzdata",
 "iana-time-zone",
 "js-sys",
 "num-traits",
 "wasm-bindgen",
- "windows-link",
+ "windows-targets 0.52.6",
 ]
 [[package]]
 name = "clap"
-version = "4.5.31"
+version = "4.5.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767"
+checksum = "3e77c3243bd94243c03672cb5154667347c457ca271254724f9f393aee1c05ff"
 dependencies = [
 "clap_builder",
 "clap_derive",
 ]
 [[package]]
 name = "clap_builder"
-version = "4.5.31"
+version = "4.5.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863"
+checksum = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7"
 dependencies = [
 "anstream",
 "anstyle",
@@ -195,25 +194,13 @@ dependencies = [
 [[package]]
 name = "clap_complete"
-version = "4.5.46"
+version = "4.5.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5c5508ea23c5366f77e53f5a0070e5a84e51687ec3ef9e0464c86dc8d13ce98"
+checksum = "375f9d8255adeeedd51053574fd8d4ba875ea5fa558e86617b07f09f1680c8b6"
 dependencies = [
 "clap",
 ]
 [[package]]
 name = "clap_derive"
 version = "4.5.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed"
 dependencies = [
 "heck",
 "proc-macro2",
 "quote",
 "syn",
 ]
 [[package]]
 name = "clap_lex"
 version = "0.7.4"
@@ -322,7 +309,7 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 [[package]]
 name = "du-dust"
-version = "1.2.1"
+version = "1.1.1"
 dependencies = [
 "ansi_term",
 "assert_cmd",
@@ -351,9 +338,9 @@ dependencies = [
 [[package]]
 name = "either"
-version = "1.15.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 [[package]]
 name = "errno"
@@ -403,12 +390,6 @@ dependencies = [
 "windows-targets 0.52.6",
 ]
 [[package]]
 name = "heck"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 [[package]]
 name = "hermit-abi"
 version = "0.3.9"
@@ -457,9 +438,9 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 [[package]]
 name = "itoa"
-version = "1.0.15"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 [[package]]
 name = "js-sys"
@@ -473,9 +454,9 @@ dependencies = [
 [[package]]
 name = "libc"
-version = "0.2.170"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 [[package]]
 name = "libredox"
@@ -483,7 +464,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "libc",
 ]
@@ -495,15 +476,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 [[package]]
 name = "linux-raw-sys"
-version = "0.9.2"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9c683daf087dc577b7506e9695b3d556a9f3849903fa28186283afd6809e9"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 [[package]]
 name = "log"
-version = "0.4.26"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 [[package]]
 name = "lscolors"
@@ -527,7 +508,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "cfg-if",
 "cfg_aliases",
 "libc",
@@ -563,9 +544,9 @@ dependencies = [
 [[package]]
 name = "once_cell"
-version = "1.20.3"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 [[package]]
 name = "overload"
@@ -575,9 +556,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 [[package]]
 name = "portable-atomic"
-version = "1.11.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 [[package]]
 name = "predicates"
@@ -608,18 +589,18 @@ dependencies = [
 [[package]]
 name = "proc-macro2"
-version = "1.0.94"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
 "unicode-ident",
 ]
 [[package]]
 name = "quote"
-version = "1.0.39"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
 "proc-macro2",
 ]
@@ -706,43 +687,43 @@ dependencies = [
 [[package]]
 name = "rustix"
-version = "1.0.1"
+version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dade4812df5c384711475be5fcd8c162555352945401aed22a35bffeab61f657"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "errno",
 "libc",
- "linux-raw-sys 0.9.2",
+ "linux-raw-sys 0.4.15",
 "windows-sys 0.59.0",
 ]
 [[package]]
 name = "rustversion"
-version = "1.0.20"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
 [[package]]
 name = "ryu"
-version = "1.0.20"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
 "serde_derive",
 ]
 [[package]]
 name = "serde_derive"
-version = "1.0.219"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -751,9 +732,9 @@ dependencies = [
 [[package]]
 name = "serde_json"
-version = "1.0.140"
+version = "1.0.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
 dependencies = [
 "itoa",
 "memchr",
@@ -781,9 +762,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 [[package]]
 name = "syn"
-version = "2.0.100"
+version = "2.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
+checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -807,15 +788,15 @@ dependencies = [
 [[package]]
 name = "tempfile"
-version = "3.18.0"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c317e0a526ee6120d8dabad239c8dadca62b24b6f168914bbbc8e2fb1f0e567"
+checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91"
 dependencies = [
 "cfg-if",
 "fastrand",
 "getrandom 0.3.1",
 "once_cell",
- "rustix 1.0.1",
+ "rustix 0.38.44",
 "windows-sys 0.59.0",
 ]
@@ -872,9 +853,9 @@ dependencies = [
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
 [[package]]
 name = "unicode-width"
@@ -1010,12 +991,6 @@ dependencies = [
 "windows-targets 0.52.6",
 ]
 [[package]]
 name = "windows-link"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -1161,5 +1136,5 @@ version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "du-dust"
 description = "A more intuitive version of du"
-version = "1.2.1"
+version = "1.1.1"
 authors = ["bootandy <bootandy@gmail.com>", "nebkor <code@ardent.nebcorp.com>"]
-edition = "2024"
+edition = "2021"
 readme = "README.md"
 documentation = "https://github.com/bootandy/dust"
@@ -28,7 +28,7 @@ strip = true
 [dependencies]
 ansi_term = "0.12"
-clap = { version = "4.4", features = ["derive"] }
+clap = "4.4"
 lscolors = "0.13"
 terminal_size = "0.2"
 unicode-width = "0.1"
@@ -56,7 +56,7 @@ assert_cmd = "2"
 tempfile = "=3"
 [build-dependencies]
-clap = { version = "4.4", features = ["derive"] }
+clap = "4.4"
 clap_complete = "4.4"
 clap_mangen = "0.2"
--- a/build.rs
+++ b/build.rs
@@ -1,4 +1,3 @@
 use clap::CommandFactory;
 use clap_complete::{generate_to, shells::*};
 use clap_mangen::Man;
 use std::fs::File;
@@ -10,7 +9,7 @@ include!("src/cli.rs");
 fn main() -> Result<(), Error> {
    let outdir = "completions";
    let app_name = "dust";
-    let mut cmd = Cli::command();
+    let mut cmd = build_cli();
    generate_to(Bash, &mut cmd, app_name, outdir)?;
    generate_to(Zsh, &mut cmd, app_name, outdir)?;
--- a/completions/_dust
+++ b/completions/_dust
@@ -17,8 +17,8 @@ _dust() {
    _arguments "${_arguments_options[@]}" : \
 '-d+[Depth to show]:DEPTH:_default' \
 '--depth=[Depth to show]:DEPTH:_default' \
-'-T+[Number of threads to use]:THREADS:_default' \
+'-T+[Number of threads to use]: :_default' \
-'--threads=[Number of threads to use]:THREADS:_default' \
+'--threads=[Number of threads to use]: :_default' \
 '--config=[Specify a config file to use]:FILE:_files' \
 '-n+[Number of lines of output to show. (Default is terminal_height - 10)]:NUMBER:_default' \
 '--number-of-lines=[Number of lines of output to show. (Default is terminal_height - 10)]:NUMBER:_default' \
@@ -28,48 +28,26 @@ _dust() {
 '--ignore-all-in-file=[Exclude any file or directory with a regex matching that listed in this file, the file entries will be added to the ignore regexs provided by --invert_filter]:FILE:_files' \
 '-z+[Minimum size file to include in output]:MIN_SIZE:_default' \
 '--min-size=[Minimum size file to include in output]:MIN_SIZE:_default' \
-'(-e --filter -t --file-types)*-v+[Exclude filepaths matching this regex. To ignore png files type\: -v "\\.png\$"]:REGEX:_default' \
+'(-e --filter -t --file_types)*-v+[Exclude filepaths matching this regex. To ignore png files type\: -v "\\.png\$" ]:REGEX:_default' \
-'(-e --filter -t --file-types)*--invert-filter=[Exclude filepaths matching this regex. To ignore png files type\: -v "\\.png\$"]:REGEX:_default' \
+'(-e --filter -t --file_types)*--invert-filter=[Exclude filepaths matching this regex. To ignore png files type\: -v "\\.png\$" ]:REGEX:_default' \
-'(-t --file-types)*-e+[Only include filepaths matching this regex. For png files type\: -e "\\.png\$"]:REGEX:_default' \
+'(-t --file_types)*-e+[Only include filepaths matching this regex. For png files type\: -e "\\.png\$" ]:REGEX:_default' \
-'(-t --file-types)*--filter=[Only include filepaths matching this regex. For png files type\: -e "\\.png\$"]:REGEX:_default' \
+'(-t --file_types)*--filter=[Only include filepaths matching this regex. For png files type\: -e "\\.png\$" ]:REGEX:_default' \
 '-w+[Specify width of output overriding the auto detection of terminal width]:WIDTH:_default' \
-'--terminal-width=[Specify width of output overriding the auto detection of terminal width]:WIDTH:_default' \
+'--terminal_width=[Specify width of output overriding the auto detection of terminal width]:WIDTH:_default' \
-'-o+[Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size]:FORMAT:((si\:"SI prefix (powers of 1000)"
+'-o+[Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.]:FORMAT:(si b k m g t kb mb gb tb)' \
-b\:"byte (B)"
+'--output-format=[Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.]:FORMAT:(si b k m g t kb mb gb tb)' \
 k\:"kibibyte (KiB)"
 m\:"mebibyte (MiB)"
 g\:"gibibyte (GiB)"
 t\:"tebibyte (TiB)"
 kb\:"kilobyte (kB)"
 mb\:"megabyte (MB)"
 gb\:"gigabyte (GB)"
 tb\:"terabyte (TB)"))' \
 '--output-format=[Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size]:FORMAT:((si\:"SI prefix (powers of 1000)"
 b\:"byte (B)"
 k\:"kibibyte (KiB)"
 m\:"mebibyte (MiB)"
 g\:"gibibyte (GiB)"
 t\:"tebibyte (TiB)"
 kb\:"kilobyte (kB)"
 mb\:"megabyte (MB)"
 gb\:"gigabyte (GB)"
 tb\:"terabyte (TB)"))' \
 '-S+[Specify memory to use as stack size - use if you see\: '\''fatal runtime error\: stack overflow'\'' (default low memory=1048576, high memory=1073741824)]:STACK_SIZE:_default' \
 '--stack-size=[Specify memory to use as stack size - use if you see\: '\''fatal runtime error\: stack overflow'\'' (default low memory=1048576, high memory=1073741824)]:STACK_SIZE:_default' \
-'-M+[+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => \[curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)]:MTIME:_default' \
+'-M+[+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => \[curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)]: :_default' \
-'--mtime=[+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => \[curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)]:MTIME:_default' \
+'--mtime=[+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => \[curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)]: :_default' \
-'-A+[just like -mtime, but based on file access time]:ATIME:_default' \
+'-A+[just like -mtime, but based on file access time]: :_default' \
-'--atime=[just like -mtime, but based on file access time]:ATIME:_default' \
+'--atime=[just like -mtime, but based on file access time]: :_default' \
-'-y+[just like -mtime, but based on file change time]:CTIME:_default' \
+'-y+[just like -mtime, but based on file change time]: :_default' \
-'--ctime=[just like -mtime, but based on file change time]:CTIME:_default' \
+'--ctime=[just like -mtime, but based on file change time]: :_default' \
-'--files0-from=[run dust on NUL-terminated file names specified in file; if argument is -, then read names from standard input]:FILES0_FROM:_files' \
+'--files0-from=[run dust on NUL-terminated file names specified in file; if argument is -, then read names from standard input]: :_files' \
-'*--collapse=[Keep these directories collapsed]:COLLAPSE:_files' \
+'*--collapse=[Keep these directories collapsed]: :_files' \
-'-m+[Directory '\''size'\'' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time]:FILETIME:((a\:"last accessed time"
+'-m+[Directory '\''size'\'' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time]: :(a c m)' \
-c\:"last changed time"
+'--filetime=[Directory '\''size'\'' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time]: :(a c m)' \
 m\:"last modified time"))' \
 '--filetime=[Directory '\''size'\'' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time]:FILETIME:((a\:"last accessed time"
 c\:"last changed time"
 m\:"last modified time"))' \
 '-p[Subdirectories will not have their path shortened]' \
 '--full-paths[Subdirectories will not have their path shortened]' \
 '-L[dereference sym links - Treat sym links as directories and go into them]' \
@@ -94,23 +72,23 @@ m\:"last modified time"))' \
 '-f[Directory '\''size'\'' is number of child files instead of disk size]' \
 '--filecount[Directory '\''size'\'' is number of child files instead of disk size]' \
 '-i[Do not display hidden files]' \
-'--ignore-hidden[Do not display hidden files]' \
+'--ignore_hidden[Do not display hidden files]' \
 '(-d --depth -D --only-dir)-t[show only these file types]' \
-'(-d --depth -D --only-dir)--file-types[show only these file types]' \
+'(-d --depth -D --only-dir)--file_types[show only these file types]' \
-'-P[Disable the progress indication]' \
+'-P[Disable the progress indication.]' \
-'--no-progress[Disable the progress indication]' \
+'--no-progress[Disable the progress indication.]' \
-'--print-errors[Print path with errors]' \
+'--print-errors[Print path with errors.]' \
-'(-F --only-file -t --file-types)-D[Only directories will be displayed]' \
+'(-F --only-file -t --file_types)-D[Only directories will be displayed.]' \
-'(-F --only-file -t --file-types)--only-dir[Only directories will be displayed]' \
+'(-F --only-file -t --file_types)--only-dir[Only directories will be displayed.]' \
 '(-D --only-dir)-F[Only files will be displayed. (Finds your largest files)]' \
 '(-D --only-dir)--only-file[Only files will be displayed. (Finds your largest files)]' \
 '-j[Output the directory tree as json to the current directory]' \
 '--output-json[Output the directory tree as json to the current directory]' \
-'-h[Print help (see more with '\''--help'\'')]' \
+'-h[Print help]' \
-'--help[Print help (see more with '\''--help'\'')]' \
+'--help[Print help]' \
 '-V[Print version]' \
 '--version[Print version]' \
-'*::params -- Input files or directories:_files' \
+'*::params:_files' \
 && ret=0
 }
--- a/completions/_dust.ps1
+++ b/completions/_dust.ps1
@@ -39,9 +39,9 @@ Register-ArgumentCompleter -Native -CommandName 'dust' -ScriptBlock {
            [CompletionResult]::new('-e', '-e', [CompletionResultType]::ParameterName, 'Only include filepaths matching this regex. For png files type: -e "\.png$" ')
            [CompletionResult]::new('--filter', '--filter', [CompletionResultType]::ParameterName, 'Only include filepaths matching this regex. For png files type: -e "\.png$" ')
            [CompletionResult]::new('-w', '-w', [CompletionResultType]::ParameterName, 'Specify width of output overriding the auto detection of terminal width')
-            [CompletionResult]::new('--terminal-width', '--terminal-width', [CompletionResultType]::ParameterName, 'Specify width of output overriding the auto detection of terminal width')
+            [CompletionResult]::new('--terminal_width', '--terminal_width', [CompletionResultType]::ParameterName, 'Specify width of output overriding the auto detection of terminal width')
-            [CompletionResult]::new('-o', '-o', [CompletionResultType]::ParameterName, 'Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size')
+            [CompletionResult]::new('-o', '-o', [CompletionResultType]::ParameterName, 'Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.')
-            [CompletionResult]::new('--output-format', '--output-format', [CompletionResultType]::ParameterName, 'Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size')
+            [CompletionResult]::new('--output-format', '--output-format', [CompletionResultType]::ParameterName, 'Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.')
            [CompletionResult]::new('-S', '-S ', [CompletionResultType]::ParameterName, 'Specify memory to use as stack size - use if you see: ''fatal runtime error: stack overflow'' (default low memory=1048576, high memory=1073741824)')
            [CompletionResult]::new('--stack-size', '--stack-size', [CompletionResultType]::ParameterName, 'Specify memory to use as stack size - use if you see: ''fatal runtime error: stack overflow'' (default low memory=1048576, high memory=1073741824)')
            [CompletionResult]::new('-M', '-M ', [CompletionResultType]::ParameterName, '+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)')
@@ -78,20 +78,20 @@ Register-ArgumentCompleter -Native -CommandName 'dust' -ScriptBlock {
            [CompletionResult]::new('-f', '-f', [CompletionResultType]::ParameterName, 'Directory ''size'' is number of child files instead of disk size')
            [CompletionResult]::new('--filecount', '--filecount', [CompletionResultType]::ParameterName, 'Directory ''size'' is number of child files instead of disk size')
            [CompletionResult]::new('-i', '-i', [CompletionResultType]::ParameterName, 'Do not display hidden files')
-            [CompletionResult]::new('--ignore-hidden', '--ignore-hidden', [CompletionResultType]::ParameterName, 'Do not display hidden files')
+            [CompletionResult]::new('--ignore_hidden', '--ignore_hidden', [CompletionResultType]::ParameterName, 'Do not display hidden files')
            [CompletionResult]::new('-t', '-t', [CompletionResultType]::ParameterName, 'show only these file types')
-            [CompletionResult]::new('--file-types', '--file-types', [CompletionResultType]::ParameterName, 'show only these file types')
+            [CompletionResult]::new('--file_types', '--file_types', [CompletionResultType]::ParameterName, 'show only these file types')
-            [CompletionResult]::new('-P', '-P ', [CompletionResultType]::ParameterName, 'Disable the progress indication')
+            [CompletionResult]::new('-P', '-P ', [CompletionResultType]::ParameterName, 'Disable the progress indication.')
-            [CompletionResult]::new('--no-progress', '--no-progress', [CompletionResultType]::ParameterName, 'Disable the progress indication')
+            [CompletionResult]::new('--no-progress', '--no-progress', [CompletionResultType]::ParameterName, 'Disable the progress indication.')
-            [CompletionResult]::new('--print-errors', '--print-errors', [CompletionResultType]::ParameterName, 'Print path with errors')
+            [CompletionResult]::new('--print-errors', '--print-errors', [CompletionResultType]::ParameterName, 'Print path with errors.')
-            [CompletionResult]::new('-D', '-D ', [CompletionResultType]::ParameterName, 'Only directories will be displayed')
+            [CompletionResult]::new('-D', '-D ', [CompletionResultType]::ParameterName, 'Only directories will be displayed.')
-            [CompletionResult]::new('--only-dir', '--only-dir', [CompletionResultType]::ParameterName, 'Only directories will be displayed')
+            [CompletionResult]::new('--only-dir', '--only-dir', [CompletionResultType]::ParameterName, 'Only directories will be displayed.')
            [CompletionResult]::new('-F', '-F ', [CompletionResultType]::ParameterName, 'Only files will be displayed. (Finds your largest files)')
            [CompletionResult]::new('--only-file', '--only-file', [CompletionResultType]::ParameterName, 'Only files will be displayed. (Finds your largest files)')
            [CompletionResult]::new('-j', '-j', [CompletionResultType]::ParameterName, 'Output the directory tree as json to the current directory')
            [CompletionResult]::new('--output-json', '--output-json', [CompletionResultType]::ParameterName, 'Output the directory tree as json to the current directory')
-            [CompletionResult]::new('-h', '-h', [CompletionResultType]::ParameterName, 'Print help (see more with ''--help'')')
+            [CompletionResult]::new('-h', '-h', [CompletionResultType]::ParameterName, 'Print help')
-            [CompletionResult]::new('--help', '--help', [CompletionResultType]::ParameterName, 'Print help (see more with ''--help'')')
+            [CompletionResult]::new('--help', '--help', [CompletionResultType]::ParameterName, 'Print help')
            [CompletionResult]::new('-V', '-V ', [CompletionResultType]::ParameterName, 'Print version')
            [CompletionResult]::new('--version', '--version', [CompletionResultType]::ParameterName, 'Print version')
            break
--- a/completions/dust.bash
+++ b/completions/dust.bash
@@ -19,7 +19,7 @@ _dust() {
    case "${cmd}" in
        dust)
-            opts="-d -T -n -p -X -I -L -x -s -r -c -C -b -B -z -R -f -i -v -e -t -w -P -D -F -o -S -j -M -A -y -m -h -V --depth --threads --config --number-of-lines --full-paths --ignore-directory --ignore-all-in-file --dereference-links --limit-filesystem --apparent-size --reverse --no-colors --force-colors --no-percent-bars --bars-on-right --min-size --screen-reader --skip-total --filecount --ignore-hidden --invert-filter --filter --file-types --terminal-width --no-progress --print-errors --only-dir --only-file --output-format --stack-size --output-json --mtime --atime --ctime --files0-from --collapse --filetime --help --version [PATH]..."
+            opts="-d -T -n -p -X -I -L -x -s -r -c -C -b -B -z -R -f -i -v -e -t -w -P -D -F -o -S -j -M -A -y -m -h -V --depth --threads --config --number-of-lines --full-paths --ignore-directory --ignore-all-in-file --dereference-links --limit-filesystem --apparent-size --reverse --no-colors --force-colors --no-percent-bars --bars-on-right --min-size --screen-reader --skip-total --filecount --ignore_hidden --invert-filter --filter --file_types --terminal_width --no-progress --print-errors --only-dir --only-file --output-format --stack-size --output-json --mtime --atime --ctime --files0-from --collapse --filetime --help --version [PATH]..."
            if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                return 0
@@ -126,7 +126,7 @@ _dust() {
                    COMPREPLY=($(compgen -f "${cur}"))
                    return 0
                    ;;
-                --terminal-width)
+                --terminal_width)
                    COMPREPLY=($(compgen -f "${cur}"))
                    return 0
                    ;;
--- a/completions/dust.elv
+++ b/completions/dust.elv
@@ -36,9 +36,9 @@ set edit:completion:arg-completer[dust] = {|@words|
            cand -e 'Only include filepaths matching this regex. For png files type: -e "\.png$" '
            cand --filter 'Only include filepaths matching this regex. For png files type: -e "\.png$" '
            cand -w 'Specify width of output overriding the auto detection of terminal width'
-            cand --terminal-width 'Specify width of output overriding the auto detection of terminal width'
+            cand --terminal_width 'Specify width of output overriding the auto detection of terminal width'
-            cand -o 'Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size'
+            cand -o 'Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.'
-            cand --output-format 'Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size'
+            cand --output-format 'Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.'
            cand -S 'Specify memory to use as stack size - use if you see: ''fatal runtime error: stack overflow'' (default low memory=1048576, high memory=1073741824)'
            cand --stack-size 'Specify memory to use as stack size - use if you see: ''fatal runtime error: stack overflow'' (default low memory=1048576, high memory=1073741824)'
            cand -M '+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)'
@@ -75,20 +75,20 @@ set edit:completion:arg-completer[dust] = {|@words|
            cand -f 'Directory ''size'' is number of child files instead of disk size'
            cand --filecount 'Directory ''size'' is number of child files instead of disk size'
            cand -i 'Do not display hidden files'
-            cand --ignore-hidden 'Do not display hidden files'
+            cand --ignore_hidden 'Do not display hidden files'
            cand -t 'show only these file types'
-            cand --file-types 'show only these file types'
+            cand --file_types 'show only these file types'
-            cand -P 'Disable the progress indication'
+            cand -P 'Disable the progress indication.'
-            cand --no-progress 'Disable the progress indication'
+            cand --no-progress 'Disable the progress indication.'
-            cand --print-errors 'Print path with errors'
+            cand --print-errors 'Print path with errors.'
-            cand -D 'Only directories will be displayed'
+            cand -D 'Only directories will be displayed.'
-            cand --only-dir 'Only directories will be displayed'
+            cand --only-dir 'Only directories will be displayed.'
            cand -F 'Only files will be displayed. (Finds your largest files)'
            cand --only-file 'Only files will be displayed. (Finds your largest files)'
            cand -j 'Output the directory tree as json to the current directory'
            cand --output-json 'Output the directory tree as json to the current directory'
-            cand -h 'Print help (see more with ''--help'')'
+            cand -h 'Print help'
-            cand --help 'Print help (see more with ''--help'')'
+            cand --help 'Print help'
            cand -V 'Print version'
            cand --version 'Print version'
        }
--- a/completions/dust.fish
+++ b/completions/dust.fish
@@ -7,26 +7,26 @@ complete -c dust -s I -l ignore-all-in-file -d 'Exclude any file or directory wi
 complete -c dust -s z -l min-size -d 'Minimum size file to include in output' -r
 complete -c dust -s v -l invert-filter -d 'Exclude filepaths matching this regex. To ignore png files type: -v "\\.png$" ' -r
 complete -c dust -s e -l filter -d 'Only include filepaths matching this regex. For png files type: -e "\\.png$" ' -r
-complete -c dust -s w -l terminal-width -d 'Specify width of output overriding the auto detection of terminal width' -r
+complete -c dust -s w -l terminal_width -d 'Specify width of output overriding the auto detection of terminal width' -r
-complete -c dust -s o -l output-format -d 'Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size' -r -f -a "si\t'SI prefix (powers of 1000)'
+complete -c dust -s o -l output-format -d 'Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.' -r -f -a "si\t''
-b\t'byte (B)'
+b\t''
-k\t'kibibyte (KiB)'
+k\t''
-m\t'mebibyte (MiB)'
+m\t''
-g\t'gibibyte (GiB)'
+g\t''
-t\t'tebibyte (TiB)'
+t\t''
-kb\t'kilobyte (kB)'
+kb\t''
-mb\t'megabyte (MB)'
+mb\t''
-gb\t'gigabyte (GB)'
+gb\t''
-tb\t'terabyte (TB)'"
+tb\t''"
 complete -c dust -s S -l stack-size -d 'Specify memory to use as stack size - use if you see: \'fatal runtime error: stack overflow\' (default low memory=1048576, high memory=1073741824)' -r
 complete -c dust -s M -l mtime -d '+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)' -r
 complete -c dust -s A -l atime -d 'just like -mtime, but based on file access time' -r
 complete -c dust -s y -l ctime -d 'just like -mtime, but based on file change time' -r
 complete -c dust -l files0-from -d 'run dust on NUL-terminated file names specified in file; if argument is -, then read names from standard input' -r -F
 complete -c dust -l collapse -d 'Keep these directories collapsed' -r -F
-complete -c dust -s m -l filetime -d 'Directory \'size\' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time' -r -f -a "a\t'last accessed time'
+complete -c dust -s m -l filetime -d 'Directory \'size\' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time' -r -f -a "a\t''
-c\t'last changed time'
+c\t''
-m\t'last modified time'"
+m\t''"
 complete -c dust -s p -l full-paths -d 'Subdirectories will not have their path shortened'
 complete -c dust -s L -l dereference-links -d 'dereference sym links - Treat sym links as directories and go into them'
 complete -c dust -s x -l limit-filesystem -d 'Only count the files and directories on the same filesystem as the supplied directory'
@@ -39,12 +39,12 @@ complete -c dust -s B -l bars-on-right -d 'percent bars moved to right side of s
 complete -c dust -s R -l screen-reader -d 'For screen readers. Removes bars. Adds new column: depth level (May want to use -p too for full path)'
 complete -c dust -l skip-total -d 'No total row will be displayed'
 complete -c dust -s f -l filecount -d 'Directory \'size\' is number of child files instead of disk size'
-complete -c dust -s i -l ignore-hidden -d 'Do not display hidden files'
+complete -c dust -s i -l ignore_hidden -d 'Do not display hidden files'
-complete -c dust -s t -l file-types -d 'show only these file types'
+complete -c dust -s t -l file_types -d 'show only these file types'
-complete -c dust -s P -l no-progress -d 'Disable the progress indication'
+complete -c dust -s P -l no-progress -d 'Disable the progress indication.'
-complete -c dust -l print-errors -d 'Print path with errors'
+complete -c dust -l print-errors -d 'Print path with errors.'
-complete -c dust -s D -l only-dir -d 'Only directories will be displayed'
+complete -c dust -s D -l only-dir -d 'Only directories will be displayed.'
 complete -c dust -s F -l only-file -d 'Only files will be displayed. (Finds your largest files)'
 complete -c dust -s j -l output-json -d 'Output the directory tree as json to the current directory'
-complete -c dust -s h -l help -d 'Print help (see more with \'--help\')'
+complete -c dust -s h -l help -d 'Print help'
 complete -c dust -s V -l version -d 'Print version'
--- a/man-page/dust.1
+++ b/man-page/dust.1
@@ -1,10 +1,10 @@
 .ie \n(.g .ds Aq \(aq
 .el .ds Aq '
-.TH Dust 1  "Dust 1.2.1" 
+.TH Dust 1  "Dust 1.1.1" 
 .SH NAME
 Dust \- Like du but more intuitive
 .SH SYNOPSIS
-\fBdust\fR [\fB\-d\fR|\fB\-\-depth\fR] [\fB\-T\fR|\fB\-\-threads\fR] [\fB\-\-config\fR] [\fB\-n\fR|\fB\-\-number\-of\-lines\fR] [\fB\-p\fR|\fB\-\-full\-paths\fR] [\fB\-X\fR|\fB\-\-ignore\-directory\fR] [\fB\-I\fR|\fB\-\-ignore\-all\-in\-file\fR] [\fB\-L\fR|\fB\-\-dereference\-links\fR] [\fB\-x\fR|\fB\-\-limit\-filesystem\fR] [\fB\-s\fR|\fB\-\-apparent\-size\fR] [\fB\-r\fR|\fB\-\-reverse\fR] [\fB\-c\fR|\fB\-\-no\-colors\fR] [\fB\-C\fR|\fB\-\-force\-colors\fR] [\fB\-b\fR|\fB\-\-no\-percent\-bars\fR] [\fB\-B\fR|\fB\-\-bars\-on\-right\fR] [\fB\-z\fR|\fB\-\-min\-size\fR] [\fB\-R\fR|\fB\-\-screen\-reader\fR] [\fB\-\-skip\-total\fR] [\fB\-f\fR|\fB\-\-filecount\fR] [\fB\-i\fR|\fB\-\-ignore\-hidden\fR] [\fB\-v\fR|\fB\-\-invert\-filter\fR] [\fB\-e\fR|\fB\-\-filter\fR] [\fB\-t\fR|\fB\-\-file\-types\fR] [\fB\-w\fR|\fB\-\-terminal\-width\fR] [\fB\-P\fR|\fB\-\-no\-progress\fR] [\fB\-\-print\-errors\fR] [\fB\-D\fR|\fB\-\-only\-dir\fR] [\fB\-F\fR|\fB\-\-only\-file\fR] [\fB\-o\fR|\fB\-\-output\-format\fR] [\fB\-S\fR|\fB\-\-stack\-size\fR] [\fB\-j\fR|\fB\-\-output\-json\fR] [\fB\-M\fR|\fB\-\-mtime\fR] [\fB\-A\fR|\fB\-\-atime\fR] [\fB\-y\fR|\fB\-\-ctime\fR] [\fB\-\-files0\-from\fR] [\fB\-\-collapse\fR] [\fB\-m\fR|\fB\-\-filetime\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fB\-V\fR|\fB\-\-version\fR] [\fIPATH\fR] 
+\fBdust\fR [\fB\-d\fR|\fB\-\-depth\fR] [\fB\-T\fR|\fB\-\-threads\fR] [\fB\-\-config\fR] [\fB\-n\fR|\fB\-\-number\-of\-lines\fR] [\fB\-p\fR|\fB\-\-full\-paths\fR] [\fB\-X\fR|\fB\-\-ignore\-directory\fR] [\fB\-I\fR|\fB\-\-ignore\-all\-in\-file\fR] [\fB\-L\fR|\fB\-\-dereference\-links\fR] [\fB\-x\fR|\fB\-\-limit\-filesystem\fR] [\fB\-s\fR|\fB\-\-apparent\-size\fR] [\fB\-r\fR|\fB\-\-reverse\fR] [\fB\-c\fR|\fB\-\-no\-colors\fR] [\fB\-C\fR|\fB\-\-force\-colors\fR] [\fB\-b\fR|\fB\-\-no\-percent\-bars\fR] [\fB\-B\fR|\fB\-\-bars\-on\-right\fR] [\fB\-z\fR|\fB\-\-min\-size\fR] [\fB\-R\fR|\fB\-\-screen\-reader\fR] [\fB\-\-skip\-total\fR] [\fB\-f\fR|\fB\-\-filecount\fR] [\fB\-i\fR|\fB\-\-ignore_hidden\fR] [\fB\-v\fR|\fB\-\-invert\-filter\fR] [\fB\-e\fR|\fB\-\-filter\fR] [\fB\-t\fR|\fB\-\-file_types\fR] [\fB\-w\fR|\fB\-\-terminal_width\fR] [\fB\-P\fR|\fB\-\-no\-progress\fR] [\fB\-\-print\-errors\fR] [\fB\-D\fR|\fB\-\-only\-dir\fR] [\fB\-F\fR|\fB\-\-only\-file\fR] [\fB\-o\fR|\fB\-\-output\-format\fR] [\fB\-S\fR|\fB\-\-stack\-size\fR] [\fB\-j\fR|\fB\-\-output\-json\fR] [\fB\-M\fR|\fB\-\-mtime\fR] [\fB\-A\fR|\fB\-\-atime\fR] [\fB\-y\fR|\fB\-\-ctime\fR] [\fB\-\-files0\-from\fR] [\fB\-\-collapse\fR] [\fB\-m\fR|\fB\-\-filetime\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fB\-V\fR|\fB\-\-version\fR] [\fIPATH\fR] 
 .SH DESCRIPTION
 Like du but more intuitive
 .SH OPTIONS
@@ -12,7 +12,7 @@ Like du but more intuitive
 \fB\-d\fR, \fB\-\-depth\fR=\fIDEPTH\fR
 Depth to show
 .TP
-\fB\-T\fR, \fB\-\-threads\fR=\fITHREADS\fR
+\fB\-T\fR, \fB\-\-threads\fR
 Number of threads to use
 .TP
 \fB\-\-config\fR=\fIFILE\fR
@@ -66,7 +66,7 @@ No total row will be displayed
 \fB\-f\fR, \fB\-\-filecount\fR
 Directory \*(Aqsize\*(Aq is number of child files instead of disk size
 .TP
-\fB\-i\fR, \fB\-\-ignore\-hidden\fR
+\fB\-i\fR, \fB\-\-ignore_hidden\fR
 Do not display hidden files
 .TP
 \fB\-v\fR, \fB\-\-invert\-filter\fR=\fIREGEX\fR
@@ -75,52 +75,30 @@ Exclude filepaths matching this regex. To ignore png files type: \-v "\\.png$"
 \fB\-e\fR, \fB\-\-filter\fR=\fIREGEX\fR
 Only include filepaths matching this regex. For png files type: \-e "\\.png$" 
 .TP
-\fB\-t\fR, \fB\-\-file\-types\fR
+\fB\-t\fR, \fB\-\-file_types\fR
 show only these file types
 .TP
-\fB\-w\fR, \fB\-\-terminal\-width\fR=\fIWIDTH\fR
+\fB\-w\fR, \fB\-\-terminal_width\fR=\fIWIDTH\fR
 Specify width of output overriding the auto detection of terminal width
 .TP
 \fB\-P\fR, \fB\-\-no\-progress\fR
-Disable the progress indication
+Disable the progress indication.
 .TP
 \fB\-\-print\-errors\fR
-Print path with errors
+Print path with errors.
 .TP
 \fB\-D\fR, \fB\-\-only\-dir\fR
-Only directories will be displayed
+Only directories will be displayed.
 .TP
 \fB\-F\fR, \fB\-\-only\-file\fR
 Only files will be displayed. (Finds your largest files)
 .TP
 \fB\-o\fR, \fB\-\-output\-format\fR=\fIFORMAT\fR
-Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size
+Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.
 .br
 .br
-\fIPossible values:\fR
+[\fIpossible values: \fRsi, b, k, m, g, t, kb, mb, gb, tb]
 .RS 14
 .IP \(bu 2
 si: SI prefix (powers of 1000)
 .IP \(bu 2
 b: byte (B)
 .IP \(bu 2
 k: kibibyte (KiB)
 .IP \(bu 2
 m: mebibyte (MiB)
 .IP \(bu 2
 g: gibibyte (GiB)
 .IP \(bu 2
 t: tebibyte (TiB)
 .IP \(bu 2
 kb: kilobyte (kB)
 .IP \(bu 2
 mb: megabyte (MB)
 .IP \(bu 2
 gb: gigabyte (GB)
 .IP \(bu 2
 tb: terabyte (TB)
 .RE
 .TP
 \fB\-S\fR, \fB\-\-stack\-size\fR=\fISTACK_SIZE\fR
 Specify memory to use as stack size \- use if you see: \*(Aqfatal runtime error: stack overflow\*(Aq (default low memory=1048576, high memory=1073741824)
@@ -128,43 +106,35 @@ Specify memory to use as stack size \- use if you see: \*(Aqfatal runtime error:
 \fB\-j\fR, \fB\-\-output\-json\fR
 Output the directory tree as json to the current directory
 .TP
-\fB\-M\fR, \fB\-\-mtime\fR=\fIMTIME\fR
+\fB\-M\fR, \fB\-\-mtime\fR
 +/\-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and \-n => (𝑐𝑢𝑟𝑟−𝑛, +∞)
 .TP
-\fB\-A\fR, \fB\-\-atime\fR=\fIATIME\fR
+\fB\-A\fR, \fB\-\-atime\fR
 just like \-mtime, but based on file access time
 .TP
-\fB\-y\fR, \fB\-\-ctime\fR=\fICTIME\fR
+\fB\-y\fR, \fB\-\-ctime\fR
 just like \-mtime, but based on file change time
 .TP
-\fB\-\-files0\-from\fR=\fIFILES0_FROM\fR
+\fB\-\-files0\-from\fR
 run dust on NUL\-terminated file names specified in file; if argument is \-, then read names from standard input
 .TP
-\fB\-\-collapse\fR=\fICOLLAPSE\fR
+\fB\-\-collapse\fR
 Keep these directories collapsed
 .TP
-\fB\-m\fR, \fB\-\-filetime\fR=\fIFILETIME\fR
+\fB\-m\fR, \fB\-\-filetime\fR
 Directory \*(Aqsize\*(Aq is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time
 .br
 .br
-\fIPossible values:\fR
+[\fIpossible values: \fRa, c, m]
 .RS 14
 .IP \(bu 2
 a: last accessed time
 .IP \(bu 2
 c: last changed time
 .IP \(bu 2
 m: last modified time
 .RE
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-Print help (see a summary with \*(Aq\-h\*(Aq)
+Print help
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 Print version
 .TP
 [\fIPATH\fR]
-Input files or directories
+
 .SH VERSION
-v1.2.1
+v1.1.1
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -1,258 +1,326 @@
-use std::fmt;
+use clap::{builder::PossibleValue, value_parser, Arg, Command};
 use clap::{Parser, ValueEnum, ValueHint};
 // For single thread mode set this variable on your command line:
 // export RAYON_NUM_THREADS=1
-/// Like du but more intuitive
+pub fn build_cli() -> Command {
-#[derive(Debug, Parser)]
+    Command::new("Dust")
-#[command(name("Dust"), version)]
+        .about("Like du but more intuitive")
-pub struct Cli {
+        .version(env!("CARGO_PKG_VERSION"))
-    /// Depth to show
+        .arg(
-    #[arg(short, long)]
+            Arg::new("depth")
-    pub depth: Option<usize>,
+                .short('d')
-
+                .long("depth")
-    /// Number of threads to use
+                .value_name("DEPTH")
-    #[arg(short('T'), long)]
+                .value_parser(value_parser!(usize))
-    pub threads: Option<usize>,
+                .help("Depth to show")
-
+                .num_args(1)
-    /// Specify a config file to use
+        )
-    #[arg(long, value_name("FILE"), value_hint(ValueHint::FilePath))]
+        .arg(
-    pub config: Option<String>,
+            Arg::new("threads")
-
+                .short('T')
-    /// Number of lines of output to show. (Default is terminal_height - 10)
+                .long("threads")
-    #[arg(short, long, value_name("NUMBER"))]
+                .value_parser(value_parser!(usize))
-    pub number_of_lines: Option<usize>,
+                .help("Number of threads to use")
-
+                .num_args(1)
-    /// Subdirectories will not have their path shortened
+        )
-    #[arg(short('p'), long)]
+        .arg(
-    pub full_paths: bool,
+            Arg::new("config")
-
+                .long("config")
-    /// Exclude any file or directory with this path
+                .help("Specify a config file to use")
-    #[arg(short('X'), long, value_name("PATH"), value_hint(ValueHint::AnyPath))]
+                .value_name("FILE")
-    pub ignore_directory: Option<Vec<String>>,
+                .value_hint(clap::ValueHint::FilePath)
-
+                .value_parser(value_parser!(String))
-    /// Exclude any file or directory with a regex matching that listed in this
+                .num_args(1)
-    /// file, the file entries will be added to the ignore regexs provided by
+        )
-    /// --invert_filter
+        .arg(
-    #[arg(short('I'), long, value_name("FILE"), value_hint(ValueHint::FilePath))]
+            Arg::new("number_of_lines")
-    pub ignore_all_in_file: Option<String>,
+                .short('n')
-
+                .long("number-of-lines")
-    /// dereference sym links - Treat sym links as directories and go into them
+                .value_name("NUMBER")
-    #[arg(short('L'), long)]
+                .value_parser(value_parser!(usize))
-    pub dereference_links: bool,
+                .help("Number of lines of output to show. (Default is terminal_height - 10)")
-
+                .num_args(1)
-    /// Only count the files and directories on the same filesystem as the
+        )
-    /// supplied directory
+        .arg(
-    #[arg(short('x'), long)]
+            Arg::new("display_full_paths")
-    pub limit_filesystem: bool,
+                .short('p')
-
+                .long("full-paths")
-    /// Use file length instead of blocks
+                .action(clap::ArgAction::SetTrue)
-    #[arg(short('s'), long)]
+                .help("Subdirectories will not have their path shortened"),
-    pub apparent_size: bool,
+        )
-
+        .arg(
-    /// Print tree upside down (biggest highest)
+            Arg::new("ignore_directory")
-    #[arg(short, long)]
+                .short('X')
-    pub reverse: bool,
+                .long("ignore-directory")
-
+                .value_name("PATH")
-    /// No colors will be printed (Useful for commands like: watch)
+                .value_hint(clap::ValueHint::AnyPath)
-    #[arg(short('c'), long)]
+                .action(clap::ArgAction::Append)
-    pub no_colors: bool,
+                .help("Exclude any file or directory with this path"),
-
+        )
-    /// Force colors print
+        .arg(
-    #[arg(short('C'), long)]
+            Arg::new("ignore_all_in_file")
-    pub force_colors: bool,
+                .short('I')
-
+                .long("ignore-all-in-file")
-    /// No percent bars or percentages will be displayed
+                .value_name("FILE")
-    #[arg(short('b'), long)]
+                .value_hint(clap::ValueHint::FilePath)
-    pub no_percent_bars: bool,
+                .value_parser(value_parser!(String))
-
+                .help("Exclude any file or directory with a regex matching that listed in this file, the file entries will be added to the ignore regexs provided by --invert_filter"),
-    /// percent bars moved to right side of screen
+        )
-    #[arg(short('B'), long)]
+         .arg(
-    pub bars_on_right: bool,
+            Arg::new("dereference_links")
-
+                .short('L')
-    /// Minimum size file to include in output
+                .long("dereference-links")
-    #[arg(short('z'), long)]
+                .action(clap::ArgAction::SetTrue)
-    pub min_size: Option<String>,
+                .help("dereference sym links - Treat sym links as directories and go into them"),
-
+        )
-    /// For screen readers. Removes bars. Adds new column: depth level (May want
+        .arg(
-    /// to use -p too for full path)
+            Arg::new("limit_filesystem")
-    #[arg(short('R'), long)]
+                .short('x')
-    pub screen_reader: bool,
+                .long("limit-filesystem")
-
+                .action(clap::ArgAction::SetTrue)
-    /// No total row will be displayed
+                .help("Only count the files and directories on the same filesystem as the supplied directory"),
-    #[arg(long)]
+        )
-    pub skip_total: bool,
+        .arg(
-
+            Arg::new("display_apparent_size")
-    /// Directory 'size' is number of child files instead of disk size
+                .short('s')
-    #[arg(short, long)]
+                .long("apparent-size")
-    pub filecount: bool,
+                .action(clap::ArgAction::SetTrue)
-
+                .help("Use file length instead of blocks"),
-    /// Do not display hidden files
+        )
-    // Do not use 'h' this is used by 'help'
+        .arg(
-    #[arg(short, long)]
+            Arg::new("reverse")
-    pub ignore_hidden: bool,
+                .short('r')
-
+                .long("reverse")
-    /// Exclude filepaths matching this regex. To ignore png files type: -v
+                .action(clap::ArgAction::SetTrue)
-    /// "\.png$"
+                .help("Print tree upside down (biggest highest)"),
-    #[arg(
+        )
-        short('v'),
+        .arg(
-        long,
+            Arg::new("no_colors")
-        value_name("REGEX"),
+                .short('c')
-        conflicts_with("filter"),
+                .long("no-colors")
-        conflicts_with("file_types")
+                .action(clap::ArgAction::SetTrue)
-    )]
+                .help("No colors will be printed (Useful for commands like: watch)"),
-    pub invert_filter: Option<Vec<String>>,
+        )
-
+        .arg(
-    /// Only include filepaths matching this regex. For png files type: -e
+            Arg::new("force_colors")
-    /// "\.png$"
+                .short('C')
-    #[arg(short('e'), long, value_name("REGEX"), conflicts_with("file_types"))]
+                .long("force-colors")
-    pub filter: Option<Vec<String>>,
+                .action(clap::ArgAction::SetTrue)
-
+                .help("Force colors print"),
-    /// show only these file types
+        )
-    #[arg(short('t'), long, conflicts_with("depth"), conflicts_with("only_dir"))]
+        .arg(
-    pub file_types: bool,
+            Arg::new("no_bars")
-
+                .short('b')
-    /// Specify width of output overriding the auto detection of terminal width
+                .long("no-percent-bars")
-    #[arg(short('w'), long, value_name("WIDTH"))]
+                .action(clap::ArgAction::SetTrue)
-    pub terminal_width: Option<usize>,
+                .help("No percent bars or percentages will be displayed"),
-
+        )
-    /// Disable the progress indication.
+        .arg(
-    #[arg(short('P'), long)]
+            Arg::new("bars_on_right")
-    pub no_progress: bool,
+                .short('B')
-
+                .long("bars-on-right")
-    /// Print path with errors.
+                .action(clap::ArgAction::SetTrue)
-    #[arg(long)]
+                .help("percent bars moved to right side of screen"),
-    pub print_errors: bool,
+        )
-
+        .arg(
-    /// Only directories will be displayed.
+            Arg::new("min_size")
-    #[arg(
+                .short('z')
-        short('D'),
+                .long("min-size")
-        long,
+                .value_name("MIN_SIZE")
-        conflicts_with("only_file"),
+                .num_args(1)
-        conflicts_with("file_types")
+                .help("Minimum size file to include in output"),
-    )]
+        )
-    pub only_dir: bool,
+        .arg(
-
+            Arg::new("screen_reader")
-    /// Only files will be displayed. (Finds your largest files)
+                .short('R')
-    #[arg(short('F'), long, conflicts_with("only_dir"))]
+                .long("screen-reader")
-    pub only_file: bool,
+                .action(clap::ArgAction::SetTrue)
-
+                .help("For screen readers. Removes bars. Adds new column: depth level (May want to use -p too for full path)"),
-    /// Changes output display size. si will print sizes in powers of 1000. b k
+        )
-    /// m g t kb mb gb tb will print the whole tree in that size.
+        .arg(
-    #[arg(short, long, value_enum, value_name("FORMAT"), ignore_case(true))]
+            Arg::new("skip_total")
-    pub output_format: Option<OutputFormat>,
+                .long("skip-total")
-
+                .action(clap::ArgAction::SetTrue)
-    /// Specify memory to use as stack size - use if you see: 'fatal runtime
+                .help("No total row will be displayed"),
-    /// error: stack overflow' (default low memory=1048576, high
+        )
-    /// memory=1073741824)
+        .arg(
-    #[arg(short('S'), long)]
+            Arg::new("by_filecount")
-    pub stack_size: Option<usize>,
+                .short('f')
-
+                .long("filecount")
-    /// Input files or directories.
+                .action(clap::ArgAction::SetTrue)
-    #[arg(value_name("PATH"), value_hint(ValueHint::AnyPath))]
+                .help("Directory 'size' is number of child files instead of disk size"),
-    pub params: Option<Vec<String>>,
+        )
-
+        .arg(
-    /// Output the directory tree as json to the current directory
+            Arg::new("ignore_hidden")
-    #[arg(short('j'), long)]
+                .short('i') // Do not use 'h' this is used by 'help'
-    pub output_json: bool,
+                .long("ignore_hidden")
-
+                .action(clap::ArgAction::SetTrue)
-    /// +/-n matches files modified more/less than n days ago , and n matches
+                .help("Do not display hidden files"),
-    /// files modified exactly n days ago, days are rounded down.That is +n =>
+        )
-    /// (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)
+        .arg(
-    #[arg(short('M'), long, allow_hyphen_values(true))]
+            Arg::new("invert_filter")
-    pub mtime: Option<String>,
+                .short('v')
-
+                .long("invert-filter")
-    /// just like -mtime, but based on file access time
+                .value_name("REGEX")
-    #[arg(short('A'), long, allow_hyphen_values(true))]
+                .action(clap::ArgAction::Append)
-    pub atime: Option<String>,
+                .conflicts_with("filter")
-
+                .conflicts_with("types")
-    /// just like -mtime, but based on file change time
+                .help("Exclude filepaths matching this regex. To ignore png files type: -v \"\\.png$\" "),
-    #[arg(short('y'), long, allow_hyphen_values(true))]
+        )
-    pub ctime: Option<String>,
+        .arg(
-
+            Arg::new("filter")
-    /// run dust on NUL-terminated file names specified in file; if argument is
+                .short('e')
-    /// -, then read names from standard input
+                .long("filter")
-    #[arg(long, value_hint(ValueHint::AnyPath))]
+                .value_name("REGEX")
-    pub files0_from: Option<String>,
+                .action(clap::ArgAction::Append)
-
+                .conflicts_with("types")
-    /// Keep these directories collapsed
+                .help("Only include filepaths matching this regex. For png files type: -e \"\\.png$\" "),
-    #[arg(long, value_hint(ValueHint::AnyPath))]
+        )
-    pub collapse: Option<Vec<String>>,
+        .arg(
-
+            Arg::new("types")
-    /// Directory 'size' is max filetime of child files instead of disk size.
+                .short('t')
-    /// while a/c/m for last accessed/changed/modified time
+                .long("file_types")
-    #[arg(short('m'), long, value_enum)]
+                .conflicts_with("depth")
-    pub filetime: Option<FileTime>,
+                .conflicts_with("only_dir")
-}
+                .action(clap::ArgAction::SetTrue)
-
+                .help("show only these file types"),
-#[derive(Clone, Copy, Debug, ValueEnum)]
+        )
-#[value(rename_all = "lower")]
+        .arg(
-pub enum OutputFormat {
+            Arg::new("width")
-    /// SI prefix (powers of 1000)
+                .short('w')
-    SI,
+                .long("terminal_width")
-
+                .value_name("WIDTH")
-    /// byte (B)
+                .value_parser(value_parser!(usize))
-    B,
+                .num_args(1)
-
+                .help("Specify width of output overriding the auto detection of terminal width"),
-    /// kibibyte (KiB)
+        )
-    #[value(name = "k", alias("kib"))]
+        .arg(
-    KiB,
+            Arg::new("disable_progress")
-
+                .short('P')
-    /// mebibyte (MiB)
+                .long("no-progress")
-    #[value(name = "m", alias("mib"))]
+                .action(clap::ArgAction::SetTrue)
-    MiB,
+                .help("Disable the progress indication."),
-
+        )
-    /// gibibyte (GiB)
+        .arg(
-    #[value(name = "g", alias("gib"))]
+            Arg::new("print_errors")
-    GiB,
+                .long("print-errors")
-
+                .action(clap::ArgAction::SetTrue)
-    /// tebibyte (TiB)
+                .help("Print path with errors."),
-    #[value(name = "t", alias("tib"))]
+        )
-    TiB,
+        .arg(
-
+            Arg::new("only_dir")
-    /// kilobyte (kB)
+                .short('D')
-    KB,
+                .long("only-dir")
-
+                .conflicts_with("only_file")
-    /// megabyte (MB)
+                .conflicts_with("types")
-    MB,
+                .action(clap::ArgAction::SetTrue)
-
+                .help("Only directories will be displayed."),
-    /// gigabyte (GB)
+        )
-    GB,
+        .arg(
-
+            Arg::new("only_file")
-    /// terabyte (TB)
+                .short('F')
-    TB,
+                .long("only-file")
-}
+                .conflicts_with("only_dir")
-
+                .action(clap::ArgAction::SetTrue)
-impl fmt::Display for OutputFormat {
+                .help("Only files will be displayed. (Finds your largest files)"),
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        )
-        match self {
+        .arg(
-            Self::SI => write!(f, "si"),
+            Arg::new("output_format")
-            Self::B => write!(f, "b"),
+                .short('o')
-            Self::KiB => write!(f, "k"),
+                .long("output-format")
-            Self::MiB => write!(f, "m"),
+                .value_name("FORMAT")
-            Self::GiB => write!(f, "g"),
+                .value_parser([
-            Self::TiB => write!(f, "t"),
+                    PossibleValue::new("si"),
-            Self::KB => write!(f, "kb"),
+                    PossibleValue::new("b"),
-            Self::MB => write!(f, "mb"),
+                    PossibleValue::new("k").alias("kib"),
-            Self::GB => write!(f, "gb"),
+                    PossibleValue::new("m").alias("mib"),
-            Self::TB => write!(f, "tb"),
+                    PossibleValue::new("g").alias("gib"),
-        }
+                    PossibleValue::new("t").alias("tib"),
-    }
+                    PossibleValue::new("kb"),
-}
+                    PossibleValue::new("mb"),
-
+                    PossibleValue::new("gb"),
-#[derive(Clone, Copy, Debug, ValueEnum)]
+                    PossibleValue::new("tb"),
-pub enum FileTime {
+                ])
-    /// last accessed time
+                .ignore_case(true)
-    #[value(name = "a", alias("accessed"))]
+                .help("Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.")
-    Accessed,
+        )
-
+        .arg(
-    /// last changed time
+            Arg::new("stack_size")
-    #[value(name = "c", alias("changed"))]
+                .short('S')
-    Changed,
+                .long("stack-size")
-
+                .value_name("STACK_SIZE")
-    /// last modified time
+                .value_parser(value_parser!(usize))
-    #[value(name = "m", alias("modified"))]
+                .num_args(1)
-    Modified,
+                .help("Specify memory to use as stack size - use if you see: 'fatal runtime error: stack overflow' (default low memory=1048576, high memory=1073741824)"),
        )
        .arg(
            Arg::new("params")
                .value_name("PATH")
                .value_hint(clap::ValueHint::AnyPath)
                .value_parser(value_parser!(String))
                .num_args(1..)
        )
        .arg(
            Arg::new("output_json")
                .short('j')
                .long("output-json")
                .action(clap::ArgAction::SetTrue)
                .help("Output the directory tree as json to the current directory"),
        )
        .arg(
            Arg::new("mtime")
            .short('M')
            .long("mtime")
            .num_args(1)
            .allow_hyphen_values(true)
            .value_parser(value_parser!(String))
            .help("+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)")
        )
        .arg(
            Arg::new("atime")
            .short('A')
            .long("atime")
            .num_args(1)
            .allow_hyphen_values(true)
            .value_parser(value_parser!(String))
            .help("just like -mtime, but based on file access time")
        )
        .arg(
            Arg::new("ctime")
            .short('y')
            .long("ctime")
            .num_args(1)
            .allow_hyphen_values(true)
            .value_parser(value_parser!(String))
            .help("just like -mtime, but based on file change time")
        )
        .arg(
            Arg::new("files0_from")
                .long("files0-from")
                .value_hint(clap::ValueHint::AnyPath)
                .value_parser(value_parser!(String))
                .num_args(1)
                .help("run dust on NUL-terminated file names specified in file; if argument is -, then read names from standard input"),
        )
        .arg(
            Arg::new("collapse")
                .long("collapse")
                .value_hint(clap::ValueHint::AnyPath)
                .value_parser(value_parser!(String))
                .action(clap::ArgAction::Append)
                .help("Keep these directories collapsed"),
        )
        .arg(
            Arg::new("filetime")
                .short('m')
                .long("filetime")
                .num_args(1)
                .value_parser([
                    PossibleValue::new("a").alias("accessed"),
                    PossibleValue::new("c").alias("changed"),
                    PossibleValue::new("m").alias("modified"),
                ])
                .help("Directory 'size' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time"),
        )
 }
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,12 +1,13 @@
 use crate::node::FileTime;
 use chrono::{Local, TimeZone};
 use clap::ArgMatches;
 use config_file::FromConfigFile;
 use regex::Regex;
 use serde::Deserialize;
 use std::io::IsTerminal;
 use std::path::Path;
 use std::path::PathBuf;
 use crate::cli::Cli;
 use crate::dir_walker::Operator;
 use crate::display::get_number_format;
@@ -39,68 +40,79 @@ pub struct Config {
 }
 impl Config {
-    pub fn get_files_from(&self, options: &Cli) -> Option<String> {
+    pub fn get_files_from(&self, options: &ArgMatches) -> Option<String> {
-        let from_file = &options.files0_from;
+        let from_file = options.get_one::<String>("files0_from");
        match from_file {
            None => self.files0_from.as_ref().map(|x| x.to_string()),
            Some(x) => Some(x.to_string()),
        }
    }
-    pub fn get_no_colors(&self, options: &Cli) -> bool {
+    pub fn get_no_colors(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.no_colors || options.no_colors
+        Some(true) == self.no_colors || options.get_flag("no_colors")
    }
-    pub fn get_force_colors(&self, options: &Cli) -> bool {
+    pub fn get_force_colors(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.force_colors || options.force_colors
+        Some(true) == self.force_colors || options.get_flag("force_colors")
    }
-    pub fn get_disable_progress(&self, options: &Cli) -> bool {
+    pub fn get_disable_progress(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.disable_progress || options.no_progress
+        Some(true) == self.disable_progress
            || options.get_flag("disable_progress")
            || !std::io::stdout().is_terminal()
    }
-    pub fn get_apparent_size(&self, options: &Cli) -> bool {
+    pub fn get_apparent_size(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.display_apparent_size || options.apparent_size
+        Some(true) == self.display_apparent_size || options.get_flag("display_apparent_size")
    }
-    pub fn get_ignore_hidden(&self, options: &Cli) -> bool {
+    pub fn get_ignore_hidden(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.ignore_hidden || options.ignore_hidden
+        Some(true) == self.ignore_hidden || options.get_flag("ignore_hidden")
    }
-    pub fn get_full_paths(&self, options: &Cli) -> bool {
+    pub fn get_full_paths(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.display_full_paths || options.full_paths
+        Some(true) == self.display_full_paths || options.get_flag("display_full_paths")
    }
-    pub fn get_reverse(&self, options: &Cli) -> bool {
+    pub fn get_reverse(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.reverse || options.reverse
+        Some(true) == self.reverse || options.get_flag("reverse")
    }
-    pub fn get_no_bars(&self, options: &Cli) -> bool {
+    pub fn get_no_bars(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.no_bars || options.no_percent_bars
+        Some(true) == self.no_bars || options.get_flag("no_bars")
    }
-    pub fn get_output_format(&self, options: &Cli) -> String {
+    pub fn get_output_format(&self, options: &ArgMatches) -> String {
-        let out_fmt = options.output_format;
+        let out_fmt = options.get_one::<String>("output_format");
        (match out_fmt {
            None => match &self.output_format {
                None => "".to_string(),
                Some(x) => x.to_string(),
            },
-            Some(x) => x.to_string(),
+            Some(x) => x.into(),
        })
        .to_lowercase()
    }
-    pub fn get_filetime(&self, options: &Cli) -> Option<FileTime> {
+    pub fn get_filetime(&self, options: &ArgMatches) -> Option<FileTime> {
-        options.filetime.map(FileTime::from)
+        let out_fmt = options.get_one::<String>("filetime");
        match out_fmt {
            None => None,
            Some(x) => match x.as_str() {
                "m" | "modified" => Some(FileTime::Modified),
                "a" | "accessed" => Some(FileTime::Accessed),
                "c" | "changed" => Some(FileTime::Changed),
                _ => unreachable!(),
            },
        }
    }
-    pub fn get_skip_total(&self, options: &Cli) -> bool {
+    pub fn get_skip_total(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.skip_total || options.skip_total
+        Some(true) == self.skip_total || options.get_flag("skip_total")
    }
-    pub fn get_screen_reader(&self, options: &Cli) -> bool {
+    pub fn get_screen_reader(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.screen_reader || options.screen_reader
+        Some(true) == self.screen_reader || options.get_flag("screen_reader")
    }
-    pub fn get_depth(&self, options: &Cli) -> usize {
+    pub fn get_depth(&self, options: &ArgMatches) -> usize {
-        if let Some(v) = options.depth {
+        if let Some(v) = options.get_one::<usize>("depth") {
-            return v;
+            return *v;
        }
        self.depth.unwrap_or(usize::MAX)
    }
-    pub fn get_min_size(&self, options: &Cli) -> Option<usize> {
+    pub fn get_min_size(&self, options: &ArgMatches) -> Option<usize> {
-        let size_from_param = options.min_size.as_ref();
+        let size_from_param = options.get_one::<String>("min_size");
        self._get_min_size(size_from_param)
    }
    fn _get_min_size(&self, min_size: Option<&String>) -> Option<usize> {
@@ -114,49 +126,58 @@ impl Config {
            size_from_param
        }
    }
-    pub fn get_only_dir(&self, options: &Cli) -> bool {
+    pub fn get_only_dir(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.only_dir || options.only_dir
+        Some(true) == self.only_dir || options.get_flag("only_dir")
    }
-    pub fn get_print_errors(&self, options: &Cli) -> bool {
+    pub fn get_print_errors(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.print_errors || options.print_errors
+        Some(true) == self.print_errors || options.get_flag("print_errors")
    }
-    pub fn get_only_file(&self, options: &Cli) -> bool {
+    pub fn get_only_file(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.only_file || options.only_file
+        Some(true) == self.only_file || options.get_flag("only_file")
    }
-    pub fn get_bars_on_right(&self, options: &Cli) -> bool {
+    pub fn get_bars_on_right(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.bars_on_right || options.bars_on_right
+        Some(true) == self.bars_on_right || options.get_flag("bars_on_right")
    }
-    pub fn get_custom_stack_size(&self, options: &Cli) -> Option<usize> {
+    pub fn get_custom_stack_size(&self, options: &ArgMatches) -> Option<usize> {
-        let from_cmd_line = options.stack_size;
+        let from_cmd_line = options.get_one::<usize>("stack_size");
        if from_cmd_line.is_none() {
            self.stack_size
        } else {
-            from_cmd_line
+            from_cmd_line.copied()
        }
    }
-    pub fn get_threads(&self, options: &Cli) -> Option<usize> {
+    pub fn get_threads(&self, options: &ArgMatches) -> Option<usize> {
-        let from_cmd_line = options.threads;
+        let from_cmd_line = options.get_one::<usize>("threads");
        if from_cmd_line.is_none() {
            self.threads
        } else {
-            from_cmd_line
+            from_cmd_line.copied()
        }
    }
-    pub fn get_output_json(&self, options: &Cli) -> bool {
+    pub fn get_output_json(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.output_json || options.output_json
+        Some(true) == self.output_json || options.get_flag("output_json")
    }
-    pub fn get_modified_time_operator(&self, options: &Cli) -> Option<(Operator, i64)> {
+    pub fn get_modified_time_operator(&self, options: &ArgMatches) -> Option<(Operator, i64)> {
-        get_filter_time_operator(options.mtime.as_ref(), get_current_date_epoch_seconds())
+        get_filter_time_operator(
            options.get_one::<String>("mtime"),
            get_current_date_epoch_seconds(),
        )
    }
-    pub fn get_accessed_time_operator(&self, options: &Cli) -> Option<(Operator, i64)> {
+    pub fn get_accessed_time_operator(&self, options: &ArgMatches) -> Option<(Operator, i64)> {
-        get_filter_time_operator(options.atime.as_ref(), get_current_date_epoch_seconds())
+        get_filter_time_operator(
            options.get_one::<String>("atime"),
            get_current_date_epoch_seconds(),
        )
    }
-    pub fn get_changed_time_operator(&self, options: &Cli) -> Option<(Operator, i64)> {
+    pub fn get_changed_time_operator(&self, options: &ArgMatches) -> Option<(Operator, i64)> {
-        get_filter_time_operator(options.ctime.as_ref(), get_current_date_epoch_seconds())
+        get_filter_time_operator(
            options.get_one::<String>("ctime"),
            get_current_date_epoch_seconds(),
        )
    }
 }
@@ -232,10 +253,10 @@ fn get_config_locations(base: &Path) -> Vec<PathBuf> {
    ]
 }
-pub fn get_config(conf_path: Option<&String>) -> Config {
+pub fn get_config(conf_path: Option<String>) -> Config {
    match conf_path {
        Some(path_str) => {
-            let path = Path::new(path_str);
+            let path = Path::new(&path_str);
            if path.exists() {
                match Config::from_config_file(path) {
                    Ok(config) => return config,
@@ -269,7 +290,8 @@ mod tests {
    #[allow(unused_imports)]
    use super::*;
    use chrono::{Datelike, Timelike};
-    use clap::Parser;
+    use clap::builder::PossibleValue;
    use clap::{value_parser, Arg, ArgMatches, Command};
    #[test]
    fn test_get_current_date_epoch_seconds() {
@@ -338,8 +360,15 @@ mod tests {
        assert_eq!(c.get_depth(&args), 5);
    }
-    fn get_args(args: Vec<&str>) -> Cli {
+    fn get_args(args: Vec<&str>) -> ArgMatches {
-        Cli::parse_from(args)
+        Command::new("Dust")
            .arg(
                Arg::new("depth")
                    .long("depth")
                    .num_args(1)
                    .value_parser(value_parser!(usize)),
            )
            .get_matches_from(args)
    }
    #[test]
@@ -377,7 +406,20 @@ mod tests {
        assert_eq!(c.get_filetime(&args), Some(FileTime::Changed));
    }
-    fn get_filetime_args(args: Vec<&str>) -> Cli {
+    fn get_filetime_args(args: Vec<&str>) -> ArgMatches {
-        Cli::parse_from(args)
+        Command::new("Dust")
        .arg(
            Arg::new("filetime")
                .short('m')
                .long("filetime")
                .num_args(1)
                .value_parser([
                    PossibleValue::new("a").alias("accessed"),
                    PossibleValue::new("c").alias("changed"),
                    PossibleValue::new("m").alias("modified"),
                ])
                .help("Directory 'size' is max filetime of child files instead of disk size. while a/c/m for accessed/changed/modified time"),
        )
            .get_matches_from(args)
    }
 }
--- a/src/dir_walker.rs
+++ b/src/dir_walker.rs
@@ -5,10 +5,10 @@ use std::sync::Arc;
 use std::sync::Mutex;
 use crate::node::Node;
 use crate::progress::ORDERING;
 use crate::progress::Operation;
 use crate::progress::PAtomicInfo;
 use crate::progress::RuntimeErrors;
 use crate::progress::ORDERING;
 use crate::utils::is_filtered_out_due_to_file_time;
 use crate::utils::is_filtered_out_due_to_invert_regex;
 use crate::utils::is_filtered_out_due_to_regex;
@@ -125,33 +125,9 @@ fn sort_by_inode(a: &Node, b: &Node) -> std::cmp::Ordering {
    }
 }
 // Check if `path` is inside ignored directory
 fn is_ignored_path(path: &Path, walk_data: &WalkData) -> bool {
    if walk_data.ignore_directories.contains(path) {
        return true;
    }
    // Entry is inside an ignored absolute path
    // Absolute paths should be canonicalized before being added to `WalkData.ignore_directories`
    for ignored_path in walk_data.ignore_directories.iter() {
        if !ignored_path.is_absolute() {
            continue;
        }
        let absolute_entry_path = std::fs::canonicalize(path).unwrap_or_default();
        if absolute_entry_path.starts_with(ignored_path) {
            return true;
        }
    }
    false
 }
 fn ignore_file(entry: &DirEntry, walk_data: &WalkData) -> bool {
    if is_ignored_path(&entry.path(), walk_data) {
        return true;
    }
    let is_dot_file = entry.file_name().to_str().unwrap_or("").starts_with('.');
    let is_ignored_path = walk_data.ignore_directories.contains(&entry.path());
    let follow_links = walk_data.follow_links && entry.file_type().is_ok_and(|ft| ft.is_symlink());
    if !walk_data.allowed_filesystems.is_empty() {
@@ -199,13 +175,17 @@ fn ignore_file(entry: &DirEntry, walk_data: &WalkData) -> bool {
        return true;
    }
-    is_dot_file && walk_data.ignore_hidden
+    (is_dot_file && walk_data.ignore_hidden) || is_ignored_path
 }
 fn walk(dir: PathBuf, walk_data: &WalkData, depth: usize) -> Option<Node> {
    let prog_data = &walk_data.progress_data;
    let errors = &walk_data.errors;
    if errors.lock().unwrap().abort {
        return None;
    }
    let children = if dir.is_dir() {
        let read_dir = fs::read_dir(&dir);
        match read_dir {
@@ -304,6 +284,7 @@ fn handle_error_and_retry(failed: &Error, dir: &Path, walk_data: &WalkData) -> b
            editable_error.file_not_found.insert(failed.to_string());
        }
        std::io::ErrorKind::Interrupted => {
            let mut editable_error = walk_data.errors.lock().unwrap();
            editable_error.interrupted_error += 1;
            if editable_error.interrupted_error > 3 {
                panic!("Multiple Interrupted Errors occurred while scanning filesystem. Aborting");
--- a/src/display.rs
+++ b/src/display.rs
@@ -12,7 +12,7 @@ use chrono::{DateTime, Local, TimeZone, Utc};
 use std::cmp::max;
 use std::cmp::min;
 use std::fs;
-use std::iter::repeat_n;
+use std::iter::repeat;
 use std::path::Path;
 use thousands::Separable;
@@ -71,7 +71,11 @@ impl DisplayData {
    fn percent_size(&self, node: &DisplayNode) -> f32 {
        let result = node.size as f32 / self.base_size as f32;
-        if result.is_normal() { result } else { 0.0 }
+        if result.is_normal() {
            result
        } else {
            0.0
        }
    }
 }
@@ -125,9 +129,9 @@ impl DrawData<'_> {
 pub fn draw_it(
    idd: InitialDisplayData,
    root_node: &DisplayNode,
    no_percent_bars: bool,
    terminal_width: usize,
    root_node: &DisplayNode,
    skip_total: bool,
 ) {
    let num_chars_needed_on_left_most = if idd.by_filecount {
@@ -155,7 +159,7 @@ pub fn draw_it(
        allowed_width - longest_string_length - 7
    };
-    let first_size_bar = repeat_n(BLOCKS[0], max_bar_length).collect();
+    let first_size_bar = repeat(BLOCKS[0]).take(max_bar_length).collect();
    let display_data = DisplayData {
        initial: idd,
@@ -298,9 +302,12 @@ fn pad_or_trim_filename(node: &DisplayNode, indent: &str, display_data: &Display
    );
    // Add spaces after the filename so we can draw the % used bar chart.
-    name + " "
+    let name_and_padding = name
        + " "
            .repeat(display_data.longest_string_length - width)
-        .as_str()
+            .as_str();
    name_and_padding
 }
 fn maybe_trim_filename(name_in: String, indent: &str, display_data: &DisplayData) -> String {
@@ -591,7 +598,7 @@ mod tests {
            size: 2_u64.pow(size),
            children: vec![],
        };
-        let first_size_bar = repeat_n(BLOCKS[0], 13).collect();
+        let first_size_bar = repeat(BLOCKS[0]).take(13).collect();
        let dd = DrawData {
            indent: "".into(),
            percent_bar: first_size_bar,
--- a/src/filter.rs
+++ b/src/filter.rs
@@ -25,14 +25,15 @@ pub fn get_biggest(
    display_data: AggregateData,
    by_filetime: &Option<FileTime>,
    keep_collapsed: HashSet<PathBuf>,
-) -> DisplayNode {
+) -> Option<DisplayNode> {
    if top_level_nodes.is_empty() {
        // perhaps change this, bring back Error object?
        return None;
    }
    let mut heap = BinaryHeap::new();
    let number_top_level_nodes = top_level_nodes.len();
    let root;
    if number_top_level_nodes == 0 {
        root = total_node_builder(0, vec![])
    } else {
    if number_top_level_nodes > 1 {
        let size = if by_filetime.is_some() {
            top_level_nodes
@@ -45,24 +46,28 @@ pub fn get_biggest(
        };
        let nodes = handle_duplicate_top_level_names(top_level_nodes, display_data.short_paths);
-            root = total_node_builder(size, nodes);
+
        root = Node {
            name: PathBuf::from("(total)"),
            size,
            children: nodes,
            inode_device: None,
            depth: 0,
        };
        // Always include the base nodes if we add a 'parent' (total) node
        heap = always_add_children(&display_data, &root, heap);
    } else {
        root = top_level_nodes.into_iter().next().unwrap();
        }
        heap = add_children(&display_data, &root, heap);
    }
-    fill_remaining_lines(heap, &root, display_data, keep_collapsed)
+    Some(fill_remaining_lines(
-}
+        heap,
-
+        &root,
-fn total_node_builder(size: u64, children: Vec<Node>) -> Node {
+        display_data,
-    Node {
+        keep_collapsed,
-        name: PathBuf::from("(total)"),
+    ))
        size,
        children,
        inode_device: None,
        depth: 0,
    }
 }
 pub fn fill_remaining_lines<'a>(
--- a/src/filter_type.rs
+++ b/src/filter_type.rs
@@ -15,7 +15,7 @@ pub fn get_all_file_types(
    top_level_nodes: &[Node],
    n: usize,
    by_filetime: &Option<FileTime>,
-) -> DisplayNode {
+) -> Option<DisplayNode> {
    let ext_nodes = {
        let mut extension_cumulative_sizes = HashMap::new();
        build_by_all_file_types(top_level_nodes, &mut extension_cumulative_sizes);
@@ -67,11 +67,13 @@ pub fn get_all_file_types(
        displayed.iter().map(|node| node.size).sum()
    };
-    DisplayNode {
+    let result = DisplayNode {
        name: PathBuf::from("(total)"),
        size: actual_size,
        children: displayed,
-    }
+    };
    Some(result)
 }
 fn build_by_all_file_types<'a>(
--- a/src/main.rs
+++ b/src/main.rs
@@ -10,12 +10,9 @@ mod platform;
 mod progress;
 mod utils;
-use crate::cli::Cli;
+use crate::cli::build_cli;
 use crate::config::Config;
 use crate::display_node::DisplayNode;
 use crate::node::FileTime;
 use crate::progress::RuntimeErrors;
-use clap::Parser;
+use clap::parser::ValuesRef;
 use dir_walker::WalkData;
 use display::InitialDisplayData;
 use filter::AggregateData;
@@ -27,10 +24,11 @@ use std::fs::read_to_string;
 use std::io;
 use std::panic;
 use std::process;
 use std::sync::atomic::AtomicBool;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
 use std::sync::Mutex;
 use sysinfo::{System, SystemExt};
 use utils::canonicalize_absolute_path;
 use self::display::draw_it;
 use config::get_config;
@@ -41,7 +39,7 @@ use filter_type::get_all_file_types;
 use regex::Regex;
 use std::cmp::max;
 use std::path::PathBuf;
-use terminal_size::{Height, Width, terminal_size};
+use terminal_size::{terminal_size, Height, Width};
 use utils::get_filesystem_devices;
 use utils::simplify_dir_names;
@@ -101,10 +99,9 @@ fn get_width_of_terminal() -> usize {
        .unwrap_or(DEFAULT_TERMINAL_WIDTH)
 }
-fn get_regex_value(maybe_value: Option<&Vec<String>>) -> Vec<Regex> {
+fn get_regex_value(maybe_value: Option<ValuesRef<String>>) -> Vec<Regex> {
    maybe_value
-        .unwrap_or(&Vec::new())
+        .unwrap_or_default()
        .iter()
        .map(|reg| {
            Regex::new(reg).unwrap_or_else(|err| {
                eprintln!("Ignoring bad value for regex {err:?}");
@@ -115,19 +112,26 @@ fn get_regex_value(maybe_value: Option<&Vec<String>>) -> Vec<Regex> {
 }
 fn main() {
-    let options = Cli::parse();
+    let options = build_cli().get_matches();
-    let config = get_config(options.config.as_ref());
+    let config = get_config(options.get_one::<String>("config").cloned());
    let errors = RuntimeErrors::default();
    let error_listen_for_ctrlc = Arc::new(Mutex::new(errors));
    let errors_for_rayon = error_listen_for_ctrlc.clone();
    let errors_final = error_listen_for_ctrlc.clone();
    let is_in_listing = Arc::new(AtomicBool::new(false));
    let cloned_is_in_listing = Arc::clone(&is_in_listing);
    ctrlc::set_handler(move || {
        error_listen_for_ctrlc.lock().unwrap().abort = true;
        println!("\nAborting");
        if cloned_is_in_listing.load(Ordering::Relaxed) {
            process::exit(1);
        }
    })
    .expect("Error setting Ctrl-C handler");
    is_in_listing.store(true, Ordering::Relaxed);
    let target_dirs = match config.get_files_from(&options) {
        Some(path) => {
            if path == "-" {
@@ -152,19 +156,20 @@ fn main() {
                }
            }
        }
-        None => match options.params {
+        None => match options.get_many::<String>("params") {
-            Some(ref values) => values.clone(),
+            Some(values) => values.cloned().collect(),
            None => vec![".".to_owned()],
        },
    };
    is_in_listing.store(false, Ordering::Relaxed);
-    let summarize_file_types = options.file_types;
+    let summarize_file_types = options.get_flag("types");
-    let filter_regexs = get_regex_value(options.filter.as_ref());
+    let filter_regexs = get_regex_value(options.get_many("filter"));
-    let invert_filter_regexs = get_regex_value(options.invert_filter.as_ref());
+    let invert_filter_regexs = get_regex_value(options.get_many("invert_filter"));
-    let terminal_width: usize = match options.terminal_width {
+    let terminal_width: usize = match options.get_one::<usize>("width") {
-        Some(val) => val,
+        Some(&val) => val,
        None => get_width_of_terminal(),
    };
@@ -173,8 +178,8 @@ fn main() {
    // If depth is set, then we set the default number_of_lines to be max
    // instead of screen height
-    let number_of_lines = match options.number_of_lines {
+    let number_of_lines = match options.get_one::<usize>("number_of_lines") {
-        Some(val) => val,
+        Some(&val) => val,
        None => {
            if depth != usize::MAX {
                usize::MAX
@@ -189,17 +194,16 @@ fn main() {
        config.get_force_colors(&options),
    );
-    let ignore_directories = match options.ignore_directory {
+    let ignore_directories = match options.get_many::<String>("ignore_directory") {
-        Some(ref values) => values
+        Some(values) => values
-            .iter()
+            .map(|v| v.as_str())
            .map(PathBuf::from)
            .map(canonicalize_absolute_path)
            .collect::<Vec<PathBuf>>(),
        None => vec![],
    };
-    let ignore_from_file_result = match options.ignore_all_in_file {
+    let ignore_from_file_result = match options.get_one::<String>("ignore_all_in_file") {
-        Some(ref val) => read_to_string(val)
+        Some(val) => read_to_string(val)
            .unwrap()
            .lines()
            .map(Regex::new)
@@ -216,10 +220,10 @@ fn main() {
        .chain(ignore_from_file)
        .collect::<Vec<Regex>>();
-    let by_filecount = options.filecount;
+    let by_filecount = options.get_flag("by_filecount");
    let by_filetime = config.get_filetime(&options);
-    let limit_filesystem = options.limit_filesystem;
+    let limit_filesystem = options.get_flag("limit_filesystem");
-    let follow_links = options.dereference_links;
+    let follow_links = options.get_flag("dereference_links");
    let allowed_filesystems = limit_filesystem
        .then(|| get_filesystem_devices(&target_dirs, follow_links))
@@ -240,8 +244,8 @@ fn main() {
        indicator.spawn(output_format.clone())
    }
-    let keep_collapsed: HashSet<PathBuf> = match options.collapse {
+    let keep_collapsed: HashSet<PathBuf> = match options.get_many::<String>("collapse") {
-        Some(ref collapse) => {
+        Some(collapse) => {
            let mut combined_dirs = HashSet::new();
            for collapse_dir in collapse {
                for target_dir in target_dirs.iter() {
@@ -298,60 +302,11 @@ fn main() {
    // Must have stopped indicator before we print to stderr
    indicator.stop();
-    let print_errors = config.get_print_errors(&options);
+    if errors_final.lock().unwrap().abort {
-    print_any_errors(print_errors, walk_data.errors);
+        return;
    print_output(
        config,
        options,
        tree,
        walk_data.by_filecount,
        by_filetime,
        is_colors,
        terminal_width,
    )
    }
-fn print_output(
+    let final_errors = walk_data.errors.lock().unwrap();
    config: Config,
    options: Cli,
    tree: DisplayNode,
    by_filecount: bool,
    by_filetime: Option<FileTime>,
    is_colors: bool,
    terminal_width: usize,
 ) {
    let output_format = config.get_output_format(&options);
    if config.get_output_json(&options) {
        OUTPUT_TYPE.with(|wrapped| {
            wrapped.replace(output_format);
        });
        println!("{}", serde_json::to_string(&tree).unwrap());
    } else {
        let idd = InitialDisplayData {
            short_paths: !config.get_full_paths(&options),
            is_reversed: !config.get_reverse(&options),
            colors_on: is_colors,
            by_filecount,
            by_filetime,
            is_screen_reader: config.get_screen_reader(&options),
            output_format,
            bars_on_right: config.get_bars_on_right(&options),
        };
        draw_it(
            idd,
            &tree,
            config.get_no_bars(&options),
            terminal_width,
            config.get_skip_total(&options),
        )
    }
 }
 fn print_any_errors(print_errors: bool, errors: Arc<Mutex<RuntimeErrors>>) {
    let final_errors = errors.lock().unwrap();
    if !final_errors.file_not_found.is_empty() {
        let err = final_errors
            .file_not_found
@@ -362,7 +317,7 @@ fn print_any_errors(print_errors: bool, errors: Arc<Mutex<RuntimeErrors>>) {
        eprintln!("No such file or directory: {}", err);
    }
    if !final_errors.no_permissions.is_empty() {
-        if print_errors {
+        if config.get_print_errors(&options) {
            let err = final_errors
                .no_permissions
                .iter()
@@ -385,6 +340,34 @@ fn print_any_errors(print_errors: bool, errors: Arc<Mutex<RuntimeErrors>>) {
            .join(", ");
        eprintln!("Unknown Error: {}", err);
    }
    if let Some(root_node) = tree {
        if config.get_output_json(&options) {
            OUTPUT_TYPE.with(|wrapped| {
                wrapped.replace(output_format);
            });
            println!("{}", serde_json::to_string(&root_node).unwrap());
        } else {
            let idd = InitialDisplayData {
                short_paths: !config.get_full_paths(&options),
                is_reversed: !config.get_reverse(&options),
                colors_on: is_colors,
                by_filecount,
                by_filetime,
                is_screen_reader: config.get_screen_reader(&options),
                output_format,
                bars_on_right: config.get_bars_on_right(&options),
            };
            draw_it(
                idd,
                config.get_no_bars(&options),
                terminal_width,
                &root_node,
                config.get_skip_total(&options),
            )
        }
    }
 }
 fn init_rayon(stack_size: &Option<usize>, threads: &Option<usize>) {
--- a/src/node.rs
+++ b/src/node.rs
@@ -23,16 +23,6 @@ pub enum FileTime {
    Changed,
 }
 impl From<crate::cli::FileTime> for FileTime {
    fn from(time: crate::cli::FileTime) -> Self {
        match time {
            crate::cli::FileTime::Modified => Self::Modified,
            crate::cli::FileTime::Accessed => Self::Accessed,
            crate::cli::FileTime::Changed => Self::Changed,
        }
    }
 }
 #[allow(clippy::too_many_arguments)]
 pub fn build_node(
    dir: PathBuf,
--- a/src/platform.rs
+++ b/src/platform.rs
@@ -27,32 +27,15 @@ pub fn get_metadata<P: AsRef<Path>>(
    };
    match metadata {
        Ok(md) => {
            let file_size = md.len();
            if use_apparent_size {
                Some((
-                    file_size,
+                    md.len(),
                    Some((md.ino(), md.dev())),
                    (md.mtime(), md.atime(), md.ctime()),
                ))
            } else {
                // On NTFS mounts, the reported block count can be unexpectedly large.
                // To avoid overestimating disk usage, cap the allocated size to what the
                // file should occupy based on the file system I/O block size (blksize).
                // Related: https://github.com/bootandy/dust/issues/295
                let blksize = md.blksize();
                let target_size = file_size.div_ceil(blksize) * blksize;
                let reported_size = md.blocks() * get_block_size();
                // File systems can pre-allocate more space for a file than what would be necessary
                let pre_allocation_buffer = blksize * 65536;
                let max_size = target_size + pre_allocation_buffer;
                let allocated_size = if reported_size > max_size {
                    target_size
                } else {
                    reported_size
                };
                Some((
-                    allocated_size,
+                    md.blocks() * get_block_size(),
                    Some((md.ino(), md.dev())),
                    (md.mtime(), md.atime(), md.ctime()),
                ))
--- a/src/progress.rs
+++ b/src/progress.rs
@@ -3,9 +3,9 @@ use std::{
    io::Write,
    path::Path,
    sync::{
        Arc, RwLock,
        atomic::{AtomicU8, AtomicUsize, Ordering},
        mpsc::{self, RecvTimeoutError, Sender},
        Arc, RwLock,
    },
    thread::JoinHandle,
    time::Duration,
@@ -79,6 +79,7 @@ pub struct RuntimeErrors {
    pub file_not_found: HashSet<String>,
    pub unknown_error: HashSet<String>,
    pub interrupted_error: i32,
    pub abort: bool,
 }
 /* -------------------------------------------------------------------------- */
@@ -118,7 +119,7 @@ impl PIndicator {
        let time_info_thread = std::thread::spawn(move || {
            let mut progress_char_i: usize = 0;
-            let mut stderr = std::io::stderr();
+            let mut stdout = std::io::stdout();
            let mut msg = "".to_string();
            // While the timeout triggers we go round the loop
@@ -127,8 +128,7 @@ impl PIndicator {
                receiver.recv_timeout(Duration::from_millis(SPINNER_SLEEP_TIME))
            {
                // Clear the text written by 'write!'& Return at the start of line
-                let clear = format!("\r{:width$}", " ", width = msg.len());
+                print!("\r{:width$}", " ", width = msg.len());
                write!(stderr, "{clear}").unwrap();
                let prog_char = PROGRESS_CHARS[progress_char_i];
                msg = match data.state.load(ORDERING) {
@@ -137,17 +137,15 @@ impl PIndicator {
                    _ => panic!("Unknown State"),
                };
-                write!(stderr, "\r{msg}").unwrap();
+                write!(stdout, "\r{msg}").unwrap();
-                stderr.flush().unwrap();
+                stdout.flush().unwrap();
                progress_char_i += 1;
                progress_char_i %= PROGRESS_CHARS_LEN;
            }
-
+            print!("\r{:width$}", " ", width = msg.len());
-            let clear = format!("\r{:width$}", " ", width = msg.len());
+            print!("\r");
-            write!(stderr, "{clear}").unwrap();
+            stdout.flush().unwrap();
            write!(stderr, "\r").unwrap();
            stderr.flush().unwrap();
        });
        self.thread = Some((stop_handler, time_info_thread))
    }
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -67,17 +67,6 @@ pub fn normalize_path<P: AsRef<Path>>(path: P) -> PathBuf {
    path.as_ref().components().collect()
 }
 // Canonicalize the path only if it is an absolute path
 pub fn canonicalize_absolute_path(path: PathBuf) -> PathBuf {
    if !path.is_absolute() {
        return path;
    }
    match std::fs::canonicalize(&path) {
        Ok(canonicalized_path) => canonicalized_path,
        Err(_) => path,
    }
 }
 pub fn is_filtered_out_due_to_regex(filter_regex: &[Regex], dir: &Path) -> bool {
    if filter_regex.is_empty() {
        false
--- a/tests/test_flags.rs
+++ b/tests/test_flags.rs
@@ -10,9 +10,6 @@ use std::str;
 fn build_command<T: AsRef<OsStr>>(command_args: Vec<T>) -> String {
    let mut cmd = &mut Command::cargo_bin("dust").unwrap();
    // Hide progress bar
    cmd = cmd.arg("-P");
    for p in command_args {
        cmd = cmd.arg(p);
    }