diff --git a/Cargo.lock b/Cargo.lock
index 780d3c65034..405ac33d892 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -188,16 +188,16 @@ version = "3.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df099ccb16cd014ff054ac1bf392c67feeef57164b05c42f037cd40f5d4357f4"
 dependencies = [
- "clipboard-win 5.4.0",
+ "clipboard-win",
  "core-graphics",
  "image",
  "log",
  "objc2",
  "objc2-app-kit",
  "objc2-foundation",
- "parking_lot",
+ "parking_lot 0.12.3",
  "windows-sys 0.48.0",
- "x11rb 0.13.1",
+ "x11rb",
 ]
 
 [[package]]
@@ -1005,6 +1005,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "backtrace-ext"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50"
+dependencies = [
+ "backtrace",
+]
+
 [[package]]
 name = "bare-metal"
 version = "0.2.5"
@@ -1160,12 +1169,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "block"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -1568,16 +1571,6 @@ dependencies = [
  "roff",
 ]
 
-[[package]]
-name = "clipboard-win"
-version = "3.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fdf5e01086b6be750428ba4a40619f847eb2e95756eee84b18e06e5f0b50342"
-dependencies = [
- "lazy-bytes-cast",
- "winapi",
-]
-
 [[package]]
 name = "clipboard-win"
 version = "5.4.0"
@@ -1677,32 +1670,6 @@ version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "373e9fafaa20882876db20562275ff58d50e0caa2590077fe7ce7bef90211d0d"
 
-[[package]]
-name = "copypasta"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "133fc8675ee3a4ec9aa513584deda9aa0faeda3586b87f7f0f2ba082c66fb172"
-dependencies = [
- "clipboard-win 3.1.1",
- "objc",
- "objc-foundation",
- "objc_id",
- "smithay-clipboard",
- "x11-clipboard",
-]
-
-[[package]]
-name = "copypasta-ext"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9455f470ea0c7d50c3fe3d22389c3a482f38a9f5fbab1c8ee368121356c56718"
-dependencies = [
- "copypasta",
- "libc",
- "which 4.4.2",
- "x11-clipboard",
-]
-
 [[package]]
 name = "core-error"
 version = "0.0.0"
@@ -1898,23 +1865,6 @@ version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
-[[package]]
-name = "crossterm"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
-dependencies = [
- "bitflags 2.6.0",
- "crossterm_winapi",
- "libc",
- "mio 0.8.11",
- "parking_lot",
- "serde",
- "signal-hook",
- "signal-hook-mio",
- "winapi",
-]
-
 [[package]]
 name = "crossterm"
 version = "0.28.1"
@@ -1924,9 +1874,10 @@ dependencies = [
  "bitflags 2.6.0",
  "crossterm_winapi",
  "futures-core",
- "mio 1.0.2",
- "parking_lot",
+ "mio",
+ "parking_lot 0.12.3",
  "rustix",
+ "serde",
  "signal-hook",
  "signal-hook-mio",
  "winapi",
@@ -2063,7 +2014,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
- "parking_lot_core",
+ "parking_lot_core 0.9.10",
 ]
 
 [[package]]
@@ -2077,7 +2028,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
- "parking_lot_core",
+ "parking_lot_core 0.9.10",
 ]
 
 [[package]]
@@ -2241,15 +2192,6 @@ version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59f8e79d1fbf76bdfbde321e902714bf6c49df88a7dda6fc682fc2979226962d"
 
-[[package]]
-name = "dlib"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
-dependencies = [
- "libloading",
-]
-
 [[package]]
 name = "doc-comment"
 version = "0.3.3"
@@ -2268,12 +2210,6 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
 
-[[package]]
-name = "downcast-rs"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
-
 [[package]]
 name = "duct"
 version = "0.13.7"
@@ -2810,7 +2746,7 @@ checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f"
 dependencies = [
  "futures-core",
  "lock_api",
- "parking_lot",
+ "parking_lot 0.12.3",
 ]
 
 [[package]]
@@ -2874,6 +2810,15 @@ dependencies = [
  "tokio-io",
 ]
 
+[[package]]
+name = "fxhash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
+dependencies = [
+ "byteorder",
+]
+
 [[package]]
 name = "gcd"
 version = "2.3.0"
@@ -2909,16 +2854,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "gethostname"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "gethostname"
 version = "0.4.3"
@@ -3490,6 +3425,15 @@ dependencies = [
  "generic-array 0.14.7",
 ]
 
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "iovec"
 version = "0.1.4"
@@ -3514,17 +3458,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "is-terminal"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
-dependencies = [
- "hermit-abi 0.4.0",
- "libc",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "is-wsl"
 version = "0.4.0"
@@ -3719,6 +3652,21 @@ dependencies = [
  "zstd",
 ]
 
+[[package]]
+name = "kv"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "620727085ac39ee9650b373fe6d8073a0aee6f99e52a9c72b25f7671078039ab"
+dependencies = [
+ "bincode",
+ "pin-project-lite",
+ "serde",
+ "serde_json",
+ "sled",
+ "thiserror",
+ "toml 0.5.11",
+]
+
 [[package]]
 name = "kv-log-macro"
 version = "1.0.7"
@@ -3728,12 +3676,6 @@ dependencies = [
  "log",
 ]
 
-[[package]]
-name = "lazy-bytes-cast"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10257499f089cd156ad82d0a9cd57d9501fa2c989068992a97eb3c27836f206b"
-
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -3777,7 +3719,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3812,12 +3754,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "linked-hash-map"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.14"
@@ -3862,15 +3798,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "malloc_buf"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "matchers"
 version = "0.1.0"
@@ -3902,24 +3829,6 @@ version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
-[[package]]
-name = "memmap2"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "memoffset"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "memoffset"
 version = "0.9.1"
@@ -3935,6 +3844,8 @@ version = "7.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1"
 dependencies = [
+ "backtrace",
+ "backtrace-ext",
  "cfg-if",
  "miette-derive",
  "owo-colors",
@@ -4000,18 +3911,6 @@ dependencies = [
  "simd-adler32",
 ]
 
-[[package]]
-name = "mio"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
-dependencies = [
- "libc",
- "log",
- "wasi",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "mio"
 version = "1.0.2"
@@ -4213,18 +4112,6 @@ dependencies = [
  "smallvec",
 ]
 
-[[package]]
-name = "nix"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
-dependencies = [
- "bitflags 1.3.2",
- "cfg-if",
- "libc",
- "memoffset 0.6.5",
-]
-
 [[package]]
 name = "nix"
 version = "0.28.0"
@@ -4247,7 +4134,7 @@ dependencies = [
  "cfg-if",
  "cfg_aliases 0.2.1",
  "libc",
- "memoffset 0.9.1",
+ "memoffset",
 ]
 
 [[package]]
@@ -4376,26 +4263,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
-[[package]]
-name = "objc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-dependencies = [
- "malloc_buf",
-]
-
-[[package]]
-name = "objc-foundation"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
-dependencies = [
- "block",
- "objc",
- "objc_id",
-]
-
 [[package]]
 name = "objc-sys"
 version = "0.3.5"
@@ -4506,15 +4373,6 @@ dependencies = [
  "objc2-metal",
 ]
 
-[[package]]
-name = "objc_id"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
-dependencies = [
- "objc",
-]
-
 [[package]]
 name = "object"
 version = "0.36.5"
@@ -4640,8 +4498,7 @@ dependencies = [
  "proptest",
  "quickcheck",
  "quickcheck_macros",
- "r3bl_rs_utils_core",
- "r3bl_tui",
+ "r3bl_core",
  "r3bl_tuify",
  "rand",
  "regex",
@@ -4729,8 +4586,7 @@ dependencies = [
  "opentelemetry",
  "pem-rfc7468",
  "proptest",
- "r3bl_rs_utils_core",
- "r3bl_tui",
+ "r3bl_core",
  "rand",
  "regex",
  "reqwest",
@@ -4751,7 +4607,7 @@ dependencies = [
  "tokio-retry",
  "tracing",
  "url",
- "which 6.0.3",
+ "which 7.0.0",
 ]
 
 [[package]]
@@ -5257,6 +5113,17 @@ version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
 [[package]]
 name = "parking_lot"
 version = "0.12.3"
@@ -5264,7 +5131,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
- "parking_lot_core",
+ "parking_lot_core 0.9.10",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
 ]
 
 [[package]]
@@ -5275,7 +5156,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.5.7",
  "smallvec",
  "windows-targets 0.52.6",
 ]
@@ -5458,19 +5339,6 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
-[[package]]
-name = "plist"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"
-dependencies = [
- "base64 0.22.1",
- "indexmap 2.6.0",
- "quick-xml",
- "serde",
- "time",
-]
-
 [[package]]
 name = "png"
 version = "0.17.14"
@@ -5655,15 +5523,6 @@ dependencies = [
  "byteorder",
 ]
 
-[[package]]
-name = "quick-xml"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "quickcheck"
 version = "1.0.3"
@@ -5745,103 +5604,68 @@ dependencies = [
 
 [[package]]
 name = "r3bl_ansi_color"
-version = "0.6.10"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3adbb050f49ec04d4e3c9e33118f7a9cc29d9d7fed45852f8fb00f93da48e786"
+checksum = "ed5be50e9547e995b93be1515a1a257f6ff66e90af407dac913edf70d04bdbd2"
 dependencies = [
- "is-terminal",
  "is_ci",
 ]
 
 [[package]]
-name = "r3bl_rs_utils_core"
-version = "0.9.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffae0ffc735435d5dd4bc6a757c268b48f2d9ecff2107b56f77d00a005bfc1bd"
-dependencies = [
- "chrono",
- "log",
- "nom",
- "r3bl_ansi_color",
- "r3bl_simple_logger",
- "rand",
- "serde",
- "serde_json",
- "sha2",
- "size-of",
- "strip-ansi",
- "time",
- "unicode-segmentation",
- "unicode-width 0.1.14",
-]
-
-[[package]]
-name = "r3bl_rs_utils_macro"
-version = "0.9.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f20cacd36d4efb7f13e94892bf74a5ee2dbcc4a34b697cb75db489645cc7241b"
-dependencies = [
- "paste",
- "proc-macro2",
- "quote",
- "r3bl_rs_utils_core",
- "syn 2.0.79",
-]
-
-[[package]]
-name = "r3bl_simple_logger"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6460e22409b07237ca014dd40cbe571457cd3ae7ca7f916ff5b97f9a1d2b22de"
-dependencies = [
- "log",
- "r3bl_ansi_color",
- "termcolor",
- "time",
-]
-
-[[package]]
-name = "r3bl_tui"
-version = "0.5.9"
+name = "r3bl_core"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ac20ae9e32b047c15ddf1f1661d63ee2d3fc40423ab5c4ff6b8b060ac51a2e7"
+checksum = "a14940d2a5b75add398236067c19a773c518c12f5c8033d17605e941aecfece5"
 dependencies = [
+ "async-stream",
+ "bincode",
  "chrono",
  "colorgrad",
- "copypasta-ext",
- "crossterm 0.28.1",
+ "crossterm",
+ "futures-core",
  "futures-util",
- "is-terminal",
- "log",
+ "kv",
+ "miette",
  "nom",
+ "pretty_assertions",
  "r3bl_ansi_color",
- "r3bl_rs_utils_core",
- "r3bl_rs_utils_macro",
  "rand",
  "serde",
  "serde_json",
+ "sha2",
  "size-of",
+ "strip-ansi",
  "strum",
  "strum_macros 0.26.4",
- "syntect",
+ "thiserror",
+ "time",
  "tokio",
+ "tracing",
+ "tracing-appender",
+ "tracing-core",
+ "tracing-subscriber",
+ "unicode-segmentation",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
 name = "r3bl_tuify"
-version = "0.1.27"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b50f3c2fb3d30e608a05991ccc621b5e5eee500282ed7d4af8f82a8eb7dad49f"
+checksum = "997600a2c33a4dc7344c0fedf72bc160c0e233e1be6cecd4ea1052d8a78ebb83"
 dependencies = [
  "clap",
- "crossterm 0.28.1",
- "is-terminal",
- "log",
+ "crossterm",
  "r3bl_ansi_color",
- "r3bl_rs_utils_core",
+ "r3bl_core",
  "reedline",
  "serde",
  "serde_json",
+ "tokio",
+ "tracing",
+ "tracing-appender",
+ "tracing-core",
+ "tracing-subscriber",
 ]
 
 [[package]]
@@ -5922,6 +5746,15 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.5.7"
@@ -5933,12 +5766,12 @@ dependencies = [
 
 [[package]]
 name = "reedline"
-version = "0.34.0"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc271368d0d3f395745b40fababc0c9061f3fc2978189a8bc76f889e47255b01"
+checksum = "57016fc0ec4c651a05cb80fb1200b7c3518afcc2f769edffe15aca2363395c15"
 dependencies = [
  "chrono",
- "crossterm 0.27.0",
+ "crossterm",
  "fd-lock",
  "itertools 0.12.1",
  "nu-ansi-term 0.50.1",
@@ -6323,7 +6156,7 @@ checksum = "7803e8936da37efd9b6d4478277f4b2b9bb5cdb37a113e8d63222e58da647e63"
 dependencies = [
  "bitflags 2.6.0",
  "cfg-if",
- "clipboard-win 5.4.0",
+ "clipboard-win",
  "fd-lock",
  "home",
  "libc",
@@ -6381,12 +6214,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -6526,9 +6353,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.128"
+version = "1.0.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
 dependencies = [
  "itoa",
  "memchr",
@@ -6579,7 +6406,7 @@ dependencies = [
  "futures 0.3.31",
  "log",
  "once_cell",
- "parking_lot",
+ "parking_lot 0.12.3",
  "scc",
  "serial_test_derive",
 ]
@@ -6687,8 +6514,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
 dependencies = [
  "libc",
- "mio 0.8.11",
- "mio 1.0.2",
+ "mio",
  "signal-hook",
 ]
 
@@ -6758,6 +6584,22 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "sled"
+version = "0.34.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935"
+dependencies = [
+ "crc32fast",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "fs2",
+ "fxhash",
+ "libc",
+ "log",
+ "parking_lot 0.11.2",
+]
+
 [[package]]
 name = "smallvec"
 version = "1.13.2"
@@ -6773,34 +6615,6 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
 
-[[package]]
-name = "smithay-client-toolkit"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9"
-dependencies = [
- "bitflags 1.3.2",
- "dlib",
- "lazy_static",
- "log",
- "memmap2",
- "nix 0.24.3",
- "pkg-config",
- "wayland-client",
- "wayland-cursor",
- "wayland-protocols",
-]
-
-[[package]]
-name = "smithay-clipboard"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8"
-dependencies = [
- "smithay-client-toolkit",
- "wayland-client",
-]
-
 [[package]]
 name = "snap"
 version = "1.1.1"
@@ -7294,14 +7108,12 @@ dependencies = [
  "fnv",
  "once_cell",
  "onig",
- "plist",
  "regex-syntax 0.8.5",
  "serde",
  "serde_derive",
  "serde_json",
  "thiserror",
  "walkdir",
- "yaml-rust",
 ]
 
 [[package]]
@@ -7352,7 +7164,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c5a2e3f9dc199dfb67c63ed7fa1157f6728303c4154074bf301a002572b7711a"
 dependencies = [
  "async-std",
- "crossterm 0.28.1",
+ "crossterm",
  "thiserror",
  "winapi",
 ]
@@ -7513,12 +7325,13 @@ dependencies = [
  "backtrace",
  "bytes 1.7.2",
  "libc",
- "mio 1.0.2",
- "parking_lot",
+ "mio",
+ "parking_lot 0.12.3",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
+ "tracing",
  "windows-sys 0.52.0",
 ]
 
@@ -8265,79 +8078,6 @@ dependencies = [
  "wasm-encoder",
 ]
 
-[[package]]
-name = "wayland-client"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715"
-dependencies = [
- "bitflags 1.3.2",
- "downcast-rs",
- "libc",
- "nix 0.24.3",
- "scoped-tls",
- "wayland-commons",
- "wayland-scanner",
- "wayland-sys",
-]
-
-[[package]]
-name = "wayland-commons"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902"
-dependencies = [
- "nix 0.24.3",
- "once_cell",
- "smallvec",
- "wayland-sys",
-]
-
-[[package]]
-name = "wayland-cursor"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661"
-dependencies = [
- "nix 0.24.3",
- "wayland-client",
- "xcursor",
-]
-
-[[package]]
-name = "wayland-protocols"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6"
-dependencies = [
- "bitflags 1.3.2",
- "wayland-client",
- "wayland-commons",
- "wayland-scanner",
-]
-
-[[package]]
-name = "wayland-scanner"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53"
-dependencies = [
- "proc-macro2",
- "quote",
- "xml-rs",
-]
-
-[[package]]
-name = "wayland-sys"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4"
-dependencies = [
- "dlib",
- "lazy_static",
- "pkg-config",
-]
-
 [[package]]
 name = "web-sys"
 version = "0.3.72"
@@ -8378,9 +8118,9 @@ dependencies = [
 
 [[package]]
 name = "which"
-version = "6.0.3"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f"
+checksum = "c9cad3279ade7346b96e38731a641d7343dd6a53d55083dd54eadfa5a1b38c6b"
 dependencies = [
  "either",
  "home",
@@ -8394,7 +8134,7 @@ version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
 dependencies = [
- "redox_syscall",
+ "redox_syscall 0.5.7",
  "wasite",
 ]
 
@@ -8423,15 +8163,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "winapi-wsapoll"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1eafc5f679c576995526e81635d0cf9695841736712b4e892f87abbe6fed3f28"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
@@ -8693,28 +8424,6 @@ version = "0.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
 
-[[package]]
-name = "x11-clipboard"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "980b9aa9226c3b7de8e2adb11bf20124327c054e0e5812d2aac0b5b5a87e7464"
-dependencies = [
- "x11rb 0.10.1",
-]
-
-[[package]]
-name = "x11rb"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507"
-dependencies = [
- "gethostname 0.2.3",
- "nix 0.24.3",
- "winapi",
- "winapi-wsapoll",
- "x11rb-protocol 0.10.0",
-]
-
 [[package]]
 name = "x11rb"
 version = "0.13.1"
@@ -8723,16 +8432,7 @@ checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12"
 dependencies = [
  "gethostname 0.4.3",
  "rustix",
- "x11rb-protocol 0.13.1",
-]
-
-[[package]]
-name = "x11rb-protocol"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67"
-dependencies = [
- "nix 0.24.3",
+ "x11rb-protocol",
 ]
 
 [[package]]
@@ -8753,12 +8453,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "xcursor"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61"
-
 [[package]]
 name = "xml-rs"
 version = "0.8.22"
@@ -8778,15 +8472,6 @@ dependencies = [
  "clap",
 ]
 
-[[package]]
-name = "yaml-rust"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
-dependencies = [
- "linked-hash-map",
-]
-
 [[package]]
 name = "yansi"
 version = "1.0.1"
diff --git a/NOTICE.md b/NOTICE.md
index 58be74c6d11..2a84fd85839 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -71,6 +71,7 @@ This file contains attributions for any 3rd-party open source code used in this
 | aya-log-common | MIT, Apache-2.0 | https://crates.io/crates/aya-log-common |
 | aya-obj | MIT, Apache-2.0 | https://crates.io/crates/aya-obj |
 | backtrace | MIT, Apache-2.0 | https://crates.io/crates/backtrace |
+| backtrace-ext | MIT, Apache-2.0 | https://crates.io/crates/backtrace-ext |
 | bare-metal | MIT, Apache-2.0 | https://crates.io/crates/bare-metal |
 | base16ct | Apache-2.0, MIT | https://crates.io/crates/base16ct |
 | base64 | MIT, Apache-2.0 | https://crates.io/crates/base64 |
@@ -83,7 +84,6 @@ This file contains attributions for any 3rd-party open source code used in this
 | bit_field | Apache-2.0, MIT | https://crates.io/crates/bit_field |
 | bitfield | MIT, Apache-2.0 | https://crates.io/crates/bitfield |
 | bitflags | MIT, Apache-2.0 | https://crates.io/crates/bitflags |
-| block | MIT | https://crates.io/crates/block |
 | block-buffer | MIT, Apache-2.0 | https://crates.io/crates/block-buffer |
 | block2 | MIT | https://crates.io/crates/block2 |
 | blocking | Apache-2.0, MIT | https://crates.io/crates/blocking |
@@ -117,7 +117,7 @@ This file contains attributions for any 3rd-party open source code used in this
 | clap_derive | MIT, Apache-2.0 | https://crates.io/crates/clap_derive |
 | clap_lex | MIT, Apache-2.0 | https://crates.io/crates/clap_lex |
 | clap_mangen | MIT, Apache-2.0 | https://crates.io/crates/clap_mangen |
-| clipboard-win | MIT | https://crates.io/crates/clipboard-win |
+| clipboard-win | BSL-1.0 | https://crates.io/crates/clipboard-win |
 | cmake | MIT, Apache-2.0 | https://crates.io/crates/cmake |
 | colorchoice | MIT, Apache-2.0 | https://crates.io/crates/colorchoice |
 | colorful | MIT | https://crates.io/crates/colorful |
@@ -128,8 +128,6 @@ This file contains attributions for any 3rd-party open source code used in this
 | console | MIT | https://crates.io/crates/console |
 | const-oid | Apache-2.0, MIT | https://crates.io/crates/const-oid |
 | const_fn | Apache-2.0, MIT | https://crates.io/crates/const_fn |
-| copypasta | MIT, Apache-2.0 | https://crates.io/crates/copypasta |
-| copypasta-ext | MIT, Apache-2.0 | https://crates.io/crates/copypasta-ext |
 | core-error | MIT, Apache-2.0 | https://crates.io/crates/core-error |
 | core-foundation | MIT, Apache-2.0 | https://crates.io/crates/core-foundation |
 | core-foundation-sys | MIT, Apache-2.0 | https://crates.io/crates/core-foundation-sys |
@@ -173,11 +171,10 @@ This file contains attributions for any 3rd-party open source code used in this
 | derive_builder_core | MIT, Apache-2.0 | https://crates.io/crates/derive_builder_core |
 | derive_builder_macro | MIT, Apache-2.0 | https://crates.io/crates/derive_builder_macro |
 | dialoguer | MIT | https://crates.io/crates/dialoguer |
+| diff | MIT, Apache-2.0 | https://crates.io/crates/diff |
 | digest | MIT, Apache-2.0 | https://crates.io/crates/digest |
-| dlib | MIT | https://crates.io/crates/dlib |
 | doc-comment | MIT | https://crates.io/crates/doc-comment |
 | dotenvy | MIT | https://crates.io/crates/dotenvy |
-| downcast-rs | MIT, Apache-2.0 | https://crates.io/crates/downcast-rs |
 | duct | MIT | https://crates.io/crates/duct |
 | dunce | CC0-1.0, MIT-0, Apache-2.0 | https://crates.io/crates/dunce |
 | dyn-clone | MIT, Apache-2.0 | https://crates.io/crates/dyn-clone |
@@ -229,6 +226,7 @@ This file contains attributions for any 3rd-party open source code used in this
 | futures-sink | MIT, Apache-2.0 | https://crates.io/crates/futures-sink |
 | futures-task | MIT, Apache-2.0 | https://crates.io/crates/futures-task |
 | futures-util | MIT, Apache-2.0 | https://crates.io/crates/futures-util |
+| fxhash | Apache-2.0, MIT | https://crates.io/crates/fxhash |
 | gcd | MIT, Apache-2.0 | https://crates.io/crates/gcd |
 | generic-array | MIT | https://crates.io/crates/generic-array |
 | gethostname | Apache-2.0 | https://crates.io/crates/gethostname |
@@ -268,10 +266,10 @@ This file contains attributions for any 3rd-party open source code used in this
 | indicatif | MIT | https://crates.io/crates/indicatif |
 | indoc | MIT, Apache-2.0 | https://crates.io/crates/indoc |
 | inout | MIT, Apache-2.0 | https://crates.io/crates/inout |
+| instant | BSD-3-Clause | https://crates.io/crates/instant |
 | iovec | MIT, Apache-2.0 | https://crates.io/crates/iovec |
 | ipnet | MIT, Apache-2.0 | https://crates.io/crates/ipnet |
 | is-docker | MIT | https://crates.io/crates/is-docker |
-| is-terminal | MIT | https://crates.io/crates/is-terminal |
 | is-wsl | MIT | https://crates.io/crates/is-wsl |
 | is_ci | ISC | https://crates.io/crates/is_ci |
 | is_terminal_polyfill | MIT, Apache-2.0 | https://crates.io/crates/is_terminal_polyfill |
@@ -289,8 +287,8 @@ This file contains attributions for any 3rd-party open source code used in this
 | jpeg-decoder | MIT, Apache-2.0 | https://crates.io/crates/jpeg-decoder |
 | js-sys | MIT, Apache-2.0 | https://crates.io/crates/js-sys |
 | kafka-protocol | MIT, Apache-2.0 | https://crates.io/crates/kafka-protocol |
+| kv | ISC | https://crates.io/crates/kv |
 | kv-log-macro | MIT, Apache-2.0 | https://crates.io/crates/kv-log-macro |
-| lazy-bytes-cast | BSL-1.0 | https://crates.io/crates/lazy-bytes-cast |
 | lazy_static | MIT, Apache-2.0 | https://crates.io/crates/lazy_static |
 | lazycell | MIT, Apache-2.0 | https://crates.io/crates/lazycell |
 | leb128 | Apache-2.0, MIT | https://crates.io/crates/leb128 |
@@ -299,17 +297,14 @@ This file contains attributions for any 3rd-party open source code used in this
 | libloading | ISC | https://crates.io/crates/libloading |
 | libm | MIT, Apache-2.0 | https://crates.io/crates/libm |
 | libsqlite3-sys | MIT | https://crates.io/crates/libsqlite3-sys |
-| linked-hash-map | MIT, Apache-2.0 | https://crates.io/crates/linked-hash-map |
 | linux-raw-sys | Apache-2.0 WITH LLVM-exception, Apache-2.0, MIT | https://crates.io/crates/linux-raw-sys |
 | lock_api | MIT, Apache-2.0 | https://crates.io/crates/lock_api |
 | log | MIT, Apache-2.0 | https://crates.io/crates/log |
 | lz4 | MIT | https://crates.io/crates/lz4 |
-| malloc_buf | MIT | https://crates.io/crates/malloc_buf |
 | matchers | MIT | https://crates.io/crates/matchers |
 | matchit | MIT, BSD-3-Clause | https://crates.io/crates/matchit |
 | md-5 | MIT, Apache-2.0 | https://crates.io/crates/md-5 |
 | memchr | Unlicense, MIT | https://crates.io/crates/memchr |
-| memmap2 | MIT, Apache-2.0 | https://crates.io/crates/memmap2 |
 | memoffset | MIT | https://crates.io/crates/memoffset |
 | miette | Apache-2.0 | https://crates.io/crates/miette |
 | miette-derive | Apache-2.0 | https://crates.io/crates/miette-derive |
@@ -338,15 +333,12 @@ This file contains attributions for any 3rd-party open source code used in this
 | num_enum_derive | BSD-3-Clause, MIT, Apache-2.0 | https://crates.io/crates/num_enum_derive |
 | num_threads | MIT, Apache-2.0 | https://crates.io/crates/num_threads |
 | number_prefix | MIT | https://crates.io/crates/number_prefix |
-| objc | MIT | https://crates.io/crates/objc |
-| objc-foundation | MIT | https://crates.io/crates/objc-foundation |
 | objc-sys | MIT | https://crates.io/crates/objc-sys |
 | objc2 | MIT | https://crates.io/crates/objc2 |
 | objc2-app-kit | MIT | https://crates.io/crates/objc2-app-kit |
 | objc2-core-bluetooth | MIT | https://crates.io/crates/objc2-core-bluetooth |
 | objc2-encode | MIT | https://crates.io/crates/objc2-encode |
 | objc2-foundation | MIT | https://crates.io/crates/objc2-foundation |
-| objc_id | MIT | https://crates.io/crates/objc_id |
 | object | Apache-2.0, MIT | https://crates.io/crates/object |
 | once_cell | MIT, Apache-2.0 | https://crates.io/crates/once_cell |
 | onig | MIT | https://crates.io/crates/onig |
@@ -366,8 +358,8 @@ This file contains attributions for any 3rd-party open source code used in this
 | owo-colors | MIT | https://crates.io/crates/owo-colors |
 | p256 | Apache-2.0, MIT | https://crates.io/crates/p256 |
 | parking | Apache-2.0, MIT | https://crates.io/crates/parking |
-| parking_lot | MIT, Apache-2.0 | https://crates.io/crates/parking_lot |
-| parking_lot_core | MIT, Apache-2.0 | https://crates.io/crates/parking_lot_core |
+| parking_lot | Apache-2.0, MIT | https://crates.io/crates/parking_lot |
+| parking_lot_core | Apache-2.0, MIT | https://crates.io/crates/parking_lot_core |
 | paste | MIT, Apache-2.0 | https://crates.io/crates/paste |
 | pathdiff | MIT, Apache-2.0 | https://crates.io/crates/pathdiff |
 | pem-rfc7468 | Apache-2.0, MIT | https://crates.io/crates/pem-rfc7468 |
@@ -386,25 +378,21 @@ This file contains attributions for any 3rd-party open source code used in this
 | piper | MIT, Apache-2.0 | https://crates.io/crates/piper |
 | pkcs8 | Apache-2.0, MIT | https://crates.io/crates/pkcs8 |
 | pkg-config | MIT, Apache-2.0 | https://crates.io/crates/pkg-config |
-| plist | MIT | https://crates.io/crates/plist |
 | png | MIT, Apache-2.0 | https://crates.io/crates/png |
 | polling | Apache-2.0, MIT | https://crates.io/crates/polling |
 | polyval | Apache-2.0, MIT | https://crates.io/crates/polyval |
 | portable-atomic | Apache-2.0, MIT | https://crates.io/crates/portable-atomic |
 | powerfmt | MIT, Apache-2.0 | https://crates.io/crates/powerfmt |
 | ppv-lite86 | MIT, Apache-2.0 | https://crates.io/crates/ppv-lite86 |
+| pretty_assertions | MIT, Apache-2.0 | https://crates.io/crates/pretty_assertions |
 | prettyplease | MIT, Apache-2.0 | https://crates.io/crates/prettyplease |
 | primeorder | Apache-2.0, MIT | https://crates.io/crates/primeorder |
 | proc-macro2 | MIT, Apache-2.0 | https://crates.io/crates/proc-macro2 |
 | prost | Apache-2.0 | https://crates.io/crates/prost |
 | prost-derive | Apache-2.0 | https://crates.io/crates/prost-derive |
-| quick-xml | MIT | https://crates.io/crates/quick-xml |
 | quote | MIT, Apache-2.0 | https://crates.io/crates/quote |
 | r3bl_ansi_color | Apache-2.0 | https://crates.io/crates/r3bl_ansi_color |
-| r3bl_rs_utils_core | Apache-2.0 | https://crates.io/crates/r3bl_rs_utils_core |
-| r3bl_rs_utils_macro | Apache-2.0 | https://crates.io/crates/r3bl_rs_utils_macro |
-| r3bl_simple_logger | Apache-2.0 | https://crates.io/crates/r3bl_simple_logger |
-| r3bl_tui | Apache-2.0 | https://crates.io/crates/r3bl_tui |
+| r3bl_core | Apache-2.0 | https://crates.io/crates/r3bl_core |
 | r3bl_tuify | Apache-2.0 | https://crates.io/crates/r3bl_tuify |
 | radix_trie | MIT | https://crates.io/crates/radix_trie |
 | rand | MIT, Apache-2.0 | https://crates.io/crates/rand |
@@ -442,7 +430,6 @@ This file contains attributions for any 3rd-party open source code used in this
 | ryu | Apache-2.0, BSL-1.0 | https://crates.io/crates/ryu |
 | same-file | Unlicense, MIT | https://crates.io/crates/same-file |
 | schannel | MIT | https://crates.io/crates/schannel |
-| scoped-tls | MIT, Apache-2.0 | https://crates.io/crates/scoped-tls |
 | scopeguard | MIT, Apache-2.0 | https://crates.io/crates/scopeguard |
 | sct | Apache-2.0, ISC, MIT | https://crates.io/crates/sct |
 | sec1 | Apache-2.0, MIT | https://crates.io/crates/sec1 |
@@ -476,10 +463,9 @@ This file contains attributions for any 3rd-party open source code used in this
 | size-of | MIT, Apache-2.0 | https://crates.io/crates/size-of |
 | size-of-derive | MIT, Apache-2.0 | https://crates.io/crates/size-of-derive |
 | slab | MIT | https://crates.io/crates/slab |
+| sled | MIT, Apache-2.0 | https://crates.io/crates/sled |
 | smallvec | MIT, Apache-2.0 | https://crates.io/crates/smallvec |
 | smawk | MIT | https://crates.io/crates/smawk |
-| smithay-client-toolkit | MIT | https://crates.io/crates/smithay-client-toolkit |
-| smithay-clipboard | MIT | https://crates.io/crates/smithay-clipboard |
 | snap | BSD-3-Clause | https://crates.io/crates/snap |
 | socket2 | MIT, Apache-2.0 | https://crates.io/crates/socket2 |
 | spin | MIT | https://crates.io/crates/spin |
@@ -515,7 +501,6 @@ This file contains attributions for any 3rd-party open source code used in this
 | sysinfo | MIT | https://crates.io/crates/sysinfo |
 | tempfile | MIT, Apache-2.0 | https://crates.io/crates/tempfile |
 | termbg | MIT, Apache-2.0 | https://crates.io/crates/termbg |
-| termcolor | Unlicense, MIT | https://crates.io/crates/termcolor |
 | terminal_size | MIT, Apache-2.0 | https://crates.io/crates/terminal_size |
 | textwrap | MIT | https://crates.io/crates/textwrap |
 | thiserror | MIT, Apache-2.0 | https://crates.io/crates/thiserror |
@@ -595,12 +580,6 @@ This file contains attributions for any 3rd-party open source code used in this
 | wasm-bindgen-shared | MIT, Apache-2.0 | https://crates.io/crates/wasm-bindgen-shared |
 | wasm-encoder | Apache-2.0 WITH LLVM-exception, Apache-2.0, MIT | https://crates.io/crates/wasm-encoder |
 | wast | Apache-2.0 WITH LLVM-exception, Apache-2.0, MIT | https://crates.io/crates/wast |
-| wayland-client | MIT | https://crates.io/crates/wayland-client |
-| wayland-commons | MIT | https://crates.io/crates/wayland-commons |
-| wayland-cursor | MIT | https://crates.io/crates/wayland-cursor |
-| wayland-protocols | MIT | https://crates.io/crates/wayland-protocols |
-| wayland-scanner | MIT | https://crates.io/crates/wayland-scanner |
-| wayland-sys | MIT | https://crates.io/crates/wayland-sys |
 | web-sys | MIT, Apache-2.0 | https://crates.io/crates/web-sys |
 | web-time | MIT, Apache-2.0 | https://crates.io/crates/web-time |
 | weezl | MIT, Apache-2.0 | https://crates.io/crates/weezl |
@@ -609,7 +588,6 @@ This file contains attributions for any 3rd-party open source code used in this
 | winapi | MIT, Apache-2.0 | https://crates.io/crates/winapi |
 | winapi-i686-pc-windows-gnu | MIT, Apache-2.0 | https://crates.io/crates/winapi-i686-pc-windows-gnu |
 | winapi-util | Unlicense, MIT | https://crates.io/crates/winapi-util |
-| winapi-wsapoll | MIT, Apache-2.0 | https://crates.io/crates/winapi-wsapoll |
 | winapi-x86_64-pc-windows-gnu | MIT, Apache-2.0 | https://crates.io/crates/winapi-x86_64-pc-windows-gnu |
 | windows | MIT, Apache-2.0 | https://crates.io/crates/windows |
 | windows-core | MIT, Apache-2.0 | https://crates.io/crates/windows-core |
@@ -630,14 +608,12 @@ This file contains attributions for any 3rd-party open source code used in this
 | windows_x86_64_msvc | MIT, Apache-2.0 | https://crates.io/crates/windows_x86_64_msvc |
 | winnow | MIT | https://crates.io/crates/winnow |
 | winsafe | MIT | https://crates.io/crates/winsafe |
-| x11-clipboard | MIT | https://crates.io/crates/x11-clipboard |
 | x11rb | MIT, Apache-2.0 | https://crates.io/crates/x11rb |
 | x11rb-protocol | MIT, Apache-2.0 | https://crates.io/crates/x11rb-protocol |
 | x25519-dalek | BSD-3-Clause | https://crates.io/crates/x25519-dalek |
-| xcursor | MIT | https://crates.io/crates/xcursor |
 | xml-rs | MIT | https://crates.io/crates/xml-rs |
 | xmlparser | MIT, Apache-2.0 | https://crates.io/crates/xmlparser |
-| yaml-rust | MIT, Apache-2.0 | https://crates.io/crates/yaml-rust |
+| yansi | MIT, Apache-2.0 | https://crates.io/crates/yansi |
 | zerocopy | BSD-2-Clause, Apache-2.0, MIT | https://crates.io/crates/zerocopy |
 | zerocopy-derive | BSD-2-Clause, Apache-2.0, MIT | https://crates.io/crates/zerocopy-derive |
 | zeroize | Apache-2.0, MIT | https://crates.io/crates/zeroize |
diff --git a/implementations/rust/ockam/ockam_api/Cargo.toml b/implementations/rust/ockam/ockam_api/Cargo.toml
index 78061c9421b..8ef059f963a 100644
--- a/implementations/rust/ockam/ockam_api/Cargo.toml
+++ b/implementations/rust/ockam/ockam_api/Cargo.toml
@@ -86,9 +86,8 @@ opentelemetry-otlp = { version = "0.26.0", features = ["logs", "metrics", "trace
 opentelemetry-semantic-conventions = { version = "0.26.0", features = ["semconv_experimental"] }
 opentelemetry_sdk = { version = "0.26.0", features = ["logs", "metrics", "trace", "rt-tokio", "rt-tokio-current-thread", "testing", "logs_level_enabled"], default-features = false }
 petname = { version = "2.0.2", default-features = false, features = ["default-rng", "default-words"] }
-r3bl_rs_utils_core = "0.9"
-r3bl_tui = "0.5"
-r3bl_tuify = "0.1"
+r3bl_core = "0.10.0"
+r3bl_tuify = "0.2.0"
 rand = "0.8"
 regex = "1.10.6"
 reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls-native-roots"] }
@@ -98,7 +97,7 @@ sha2 = "0.10.8"
 sqlx = { version = "0.8.2", default-features = false }
 strip-ansi-escapes = "0.2"
 strum = { version = "0.26.3", default-features = false, features = ["derive"] }
-syntect = { version = "5.2.0", default-features = false, features = ["default-syntaxes", "regex-onig"] }
+syntect = { version = "5.2.0", default-features = false, features = ["default-themes", "default-syntaxes", "regex-onig"] }
 sysinfo = "0.32"
 termbg = "0.5.2"
 thiserror = "1.0"
diff --git a/implementations/rust/ockam/ockam_api/src/ui/colors.rs b/implementations/rust/ockam/ockam_api/src/ui/colors.rs
index 18f47131712..9b029acfa17 100644
--- a/implementations/rust/ockam/ockam_api/src/ui/colors.rs
+++ b/implementations/rust/ockam/ockam_api/src/ui/colors.rs
@@ -1,8 +1,8 @@
 use colorful::{core::color_string::CString, Colorful, RGB};
 use colors_transform::{Color, Rgb};
-use r3bl_rs_utils_core::UnicodeString;
-use r3bl_tui::{
-    ColorWheel, ColorWheelConfig, ColorWheelSpeed, GradientGenerationPolicy, TextColorizationPolicy,
+use r3bl_core::{
+    ColorWheel, ColorWheelConfig, ColorWheelSpeed, GradientGenerationPolicy,
+    TextColorizationPolicy, UnicodeString,
 };
 use std::fmt::Display;
 
diff --git a/implementations/rust/ockam/ockam_api/src/ui/terminal/fmt.rs b/implementations/rust/ockam/ockam_api/src/ui/terminal/fmt.rs
index 855e5515235..077d84dbc09 100644
--- a/implementations/rust/ockam/ockam_api/src/ui/terminal/fmt.rs
+++ b/implementations/rust/ockam/ockam_api/src/ui/terminal/fmt.rs
@@ -9,15 +9,15 @@ pub const INDENTATION: &str = "  ";
 
 pub fn get_separator_width() -> usize {
     // If we can't get the terminal width, use the default width
-    let mut terminal_width = r3bl_tuify::get_terminal_width();
+    let mut terminal_width = r3bl_core::get_terminal_width();
     if terminal_width == 0 {
-        terminal_width = r3bl_tuify::DEFAULT_WIDTH;
+        terminal_width = r3bl_core::DEFAULT_WIDTH;
     }
     // Make sure the separator width is at least twice the length of the padding.
     // We want to show a small separator even if the terminal is too narrow.
     let terminal_width = std::cmp::max(terminal_width, 2 * PADDING.len());
     // Limit the separator width to the default width
-    std::cmp::min(terminal_width - PADDING.len(), r3bl_tuify::DEFAULT_WIDTH)
+    std::cmp::min(terminal_width - PADDING.len(), r3bl_core::DEFAULT_WIDTH)
 }
 
 #[test]
diff --git a/implementations/rust/ockam/ockam_api/src/ui/terminal/mod.rs b/implementations/rust/ockam/ockam_api/src/ui/terminal/mod.rs
index ffc401371f3..51f80645bbe 100644
--- a/implementations/rust/ockam/ockam_api/src/ui/terminal/mod.rs
+++ b/implementations/rust/ockam/ockam_api/src/ui/terminal/mod.rs
@@ -14,8 +14,8 @@ use indicatif::{ProgressBar, ProgressDrawTarget, ProgressStyle};
 use jaq_interpret::{Ctx, FilterT, ParseCtx, RcIter, Val};
 use miette::{miette, IntoDiagnostic};
 use ockam_core::env::get_env_with_default;
-use r3bl_rs_utils_core::{ch, ChUnit};
-use r3bl_tuify::{get_size, select_from_list, SelectionMode, StyleSheet};
+use r3bl_core::{ch, get_size};
+use r3bl_tuify::{select_from_list, SelectionMode, StyleSheet};
 use serde::Serialize;
 use std::fmt::Write as _;
 use std::fmt::{Debug, Display};
diff --git a/implementations/rust/ockam/ockam_command/Cargo.toml b/implementations/rust/ockam/ockam_command/Cargo.toml
index d47516f585c..f4f40fe8bda 100644
--- a/implementations/rust/ockam/ockam_command/Cargo.toml
+++ b/implementations/rust/ockam/ockam_command/Cargo.toml
@@ -81,8 +81,7 @@ once_cell = "1.19"
 open = "5.3.0"
 opentelemetry = { version = "0.26.0", features = ["metrics", "trace"] }
 pem-rfc7468 = { version = "0.7.0", features = ["std"] }
-r3bl_rs_utils_core = "0.9.12"
-r3bl_tui = "0.5.8"
+r3bl_core = "0.10.0"
 rand = "0.8"
 regex = "1.10.6"
 reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls-native-roots", "blocking"] }
@@ -94,13 +93,13 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 serde_yaml = "0.9"
 shellexpand = { version = "3.1.0", default-features = false, features = ["base-0"] }
-syntect = { version = "5.2.0", default-features = false, features = ["default-syntaxes", "regex-onig"] }
+syntect = { version = "5.2.0", default-features = false, features = ["default-themes", "default-syntaxes", "regex-onig"] }
 thiserror = "1"
 tokio = { version = "1.41.0", features = ["full"] }
 tokio-retry = "0.3"
 tracing = { version = "0.1", default-features = false }
 url = "2.5.2"
-which = "6.0.2"
+which = "7.0.0"
 
 [dev-dependencies]
 assert_cmd = "2"
diff --git a/implementations/rust/ockam/ockam_command/src/enroll/command.rs b/implementations/rust/ockam/ockam_command/src/enroll/command.rs
index 2921b7accdd..6826e099777 100644
--- a/implementations/rust/ockam/ockam_command/src/enroll/command.rs
+++ b/implementations/rust/ockam/ockam_command/src/enroll/command.rs
@@ -6,9 +6,9 @@ use std::sync::Arc;
 use clap::Args;
 use colorful::Colorful;
 use miette::{miette, IntoDiagnostic, WrapErr};
-use r3bl_rs_utils_core::UnicodeString;
-use r3bl_tui::{
-    ColorWheel, ColorWheelConfig, ColorWheelSpeed, GradientGenerationPolicy, TextColorizationPolicy,
+use r3bl_core::{
+    ColorWheel, ColorWheelConfig, ColorWheelSpeed, GradientGenerationPolicy,
+    TextColorizationPolicy, UnicodeString,
 };
 use tokio::sync::Mutex;
 use tokio::try_join;