perf(cargo): make schemars derives optional

This commit makes all schemars::JsonSchema derives optional. After analyzing the output of cargo build timings and llvm-lines, it was clear that the majority of the 2m+ incremental dev build times was taken up by codegen, and the majority of it by schemars. Developers can now run cargo commands with --no-default-features to disable schemars::JsonSchema codegen, and all justfile commands have been updated to take this flag by default, with the exception of the jsonschema target, which will compile with all derives required to export the various jsonschema files. Incremental dev build times for komorebi.exe on my machine are now at around ~18s, while clean dev build times for the entire workspace are at around ~1m.
2026-03-04 18:00:03 +01:00 · 2025-03-03 14:31:53 -08:00
26 changed files with 374 additions and 1559 deletions
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -18,14 +18,6 @@ on:
  workflow_dispatch:

 jobs:
-  cargo-deny:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - uses: EmbarkStudios/cargo-deny-action@v2
-
  build:
    strategy:
      fail-fast: true
@@ -55,7 +47,7 @@ jobs:
          key: ${{ matrix.platform.target }}
      - run: cargo +nightly fmt --check
      - run: cargo clippy
-      - run: cargo test
+      - run: cargo test --package komorebi --test compat
      - uses: houseabsolute/actions-rust-cross@v1
        with:
          command: "build"
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -181,7 +181,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046"
 dependencies = [
 "android-properties",
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "cc",
 "cesu8",
 "jni",
@@ -268,9 +268,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.97"
+version = "1.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
+checksum = "6b964d184e89d9b6b67dd2715bc8e74cf3107fb2b529990c90cf517326150bf4"

 [[package]]
 name = "arbitrary"
@@ -468,9 +468,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"

 [[package]]
 name = "async-trait"
-version = "0.1.87"
+version = "0.1.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d556ec1359574147ec0c4fc5eb525f3f23263a592b1a9c07e0a75b427de55c97"
+checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -634,9 +634,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"
 dependencies = [
 "serde",
 ]
@@ -719,9 +719,9 @@ checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"

 [[package]]
 name = "bytemuck"
-version = "1.22.0"
+version = "1.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540"
+checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3"
 dependencies = [
 "bytemuck_derive",
 ]
@@ -761,7 +761,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "log",
 "polling",
 "rustix",
@@ -791,9 +791,9 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.2.16"
+version = "1.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
+checksum = "c736e259eea577f443d5c86c304f9f4ae0295c43f3ba05c21f1d66b5f06001af"
 dependencies = [
 "jobserver",
 "libc",
@@ -924,7 +924,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
 dependencies = [
 "termcolor",
- "unicode-width 0.1.14",
+ "unicode-width",
 ]

 [[package]]
@@ -1270,9 +1270,9 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"

 [[package]]
 name = "dyn-clone"
-version = "1.0.19"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005"
+checksum = "feeef44e73baff3a26d371801df019877a9866a8c493d315ab00177843314f35"

 [[package]]
 name = "ecolor"
@@ -1328,7 +1328,7 @@ checksum = "7d2768eaa6d5c80a6e2a008da1f0e062dff3c83eb2b28605ea2d0732d46e74d6"
 dependencies = [
 "accesskit",
 "ahash",
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "emath",
 "epaint",
 "log",
@@ -1933,7 +1933,7 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "libc",
 "libgit2-sys",
 "log",
@@ -1969,7 +1969,7 @@ version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03642b8b0cce622392deb0ee3e88511f75df2daac806102597905c3ea1974848"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "cfg_aliases",
 "cgl",
 "core-foundation 0.9.4",
@@ -2035,7 +2035,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "gpu-alloc-types",
 ]

@@ -2045,7 +2045,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 ]

 [[package]]
@@ -2054,7 +2054,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcf29e94d6d243368b7a56caa16bc213e4f9f8ed38c4d9557069527b5d5281ca"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "gpu-descriptor-types",
 "hashbrown",
 ]
@@ -2065,7 +2065,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 ]

 [[package]]
@@ -2197,9 +2197,9 @@ dependencies = [

 [[package]]
 name = "httparse"
-version = "1.10.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a"

 [[package]]
 name = "hyper"
@@ -2574,9 +2574,9 @@ dependencies = [

 [[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 = "jni"
@@ -2646,7 +2646,7 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 name = "komorebi"
 version = "0.1.35"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "clap",
 "color-eyre",
 "crossbeam-channel",
@@ -2678,7 +2678,6 @@ dependencies = [
 "tracing-appender",
 "tracing-subscriber",
 "uds_windows",
- "uuid",
 "which",
 "win32-display-data",
 "windows 0.60.0",
@@ -2781,7 +2780,7 @@ dependencies = [
 "serde_json_lenient",
 "shadow-rs",
 "sysinfo",
- "thiserror 2.0.12",
+ "thiserror 2.0.11",
 "which",
 "windows 0.60.0",
 ]
@@ -2872,9 +2871,9 @@ 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",
- "redox_syscall 0.5.10",
+ "redox_syscall 0.5.9",
 ]

 [[package]]
@@ -2999,7 +2998,7 @@ version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f569fb946490b5743ad69813cb19629130ce9374034abe31614a36402d18f99e"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "block",
 "core-graphics-types",
 "foreign-types 0.5.0",
@@ -3025,7 +3024,7 @@ dependencies = [
 "terminal_size",
 "textwrap",
 "thiserror 1.0.69",
- "unicode-width 0.1.14",
+ "unicode-width",
 ]

 [[package]]
@@ -3120,7 +3119,7 @@ checksum = "e380993072e52eef724eddfcde0ed013b0c023c3f0417336ed041aa9f076994e"
 dependencies = [
 "arrayvec",
 "bit-set",
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "cfg_aliases",
 "codespan-reporting",
 "hexf-parse",
@@ -3130,7 +3129,7 @@ dependencies = [
 "spirv",
 "strum 0.26.3",
 "termcolor",
- "thiserror 2.0.12",
+ "thiserror 2.0.11",
 "unicode-xid",
 ]

@@ -3166,7 +3165,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "jni-sys",
 "log",
 "ndk-sys 0.6.0+11769913",
@@ -3245,7 +3244,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "483325d4bfef65699214858f097d504eb812c38ce7077d165f301ec406c3066e"
 dependencies = [
 "anyhow",
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "byteorder",
 "libc",
 "log",
@@ -3288,7 +3287,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 1.0.0",
 "cfg_aliases",
 "libc",
@@ -3323,7 +3322,7 @@ version = "6.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "crossbeam-channel",
 "filetime",
 "fsevent-sys",
@@ -3519,7 +3518,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "block2",
 "libc",
 "objc2",
@@ -3535,7 +3534,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "block2",
 "objc2",
 "objc2-core-location",
@@ -3559,7 +3558,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "block2",
 "objc2",
 "objc2-foundation",
@@ -3601,7 +3600,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "block2",
 "dispatch",
 "libc",
@@ -3626,7 +3625,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "block2",
 "objc2",
 "objc2-foundation",
@@ -3638,7 +3637,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "block2",
 "objc2",
 "objc2-foundation",
@@ -3661,7 +3660,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "block2",
 "objc2",
 "objc2-cloud-kit",
@@ -3693,7 +3692,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "block2",
 "objc2",
 "objc2-core-location",
@@ -3721,7 +3720,7 @@ version = "0.10.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "cfg-if 1.0.0",
 "foreign-types 0.3.2",
 "libc",
@@ -3857,7 +3856,7 @@ dependencies = [
 "cfg-if 1.0.0",
 "libc",
 "petgraph",
- "redox_syscall 0.5.10",
+ "redox_syscall 0.5.9",
 "smallvec",
 "thread-id",
 "windows-targets 0.52.6",
@@ -3887,18 +3886,18 @@ dependencies = [

 [[package]]
 name = "pin-project"
-version = "1.1.10"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
+checksum = "dfe2e71e1471fe07709406bf725f710b02927c9c54b2b5b2ec0e8087d97c327d"
 dependencies = [
 "pin-project-internal",
 ]

 [[package]]
 name = "pin-project-internal"
-version = "1.1.10"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
+checksum = "f6e859e6e5bd50440ab63c47e3ebabc90f26251f7c73c3d3e837b74a1cc3fa67"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3930,9 +3929,9 @@ dependencies = [

 [[package]]
 name = "pkg-config"
-version = "0.3.32"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"

 [[package]]
 name = "plist"
@@ -4029,9 +4028,9 @@ 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",
 ]
@@ -4100,9 +4099,9 @@ dependencies = [

 [[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",
 ]
@@ -4238,11 +4237,11 @@ dependencies = [

 [[package]]
 name = "redox_syscall"
-version = "0.5.10"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
+checksum = "82b568323e98e49e2a0899dcee453dd679fae22d69adf9b11dd508d1549b7e2f"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 ]

 [[package]]
@@ -4253,7 +4252,7 @@ checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
 dependencies = [
 "getrandom 0.2.15",
 "libredox",
- "thiserror 2.0.12",
+ "thiserror 2.0.11",
 ]

 [[package]]
@@ -4389,7 +4388,7 @@ version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "errno",
 "libc",
 "linux-raw-sys",
@@ -4437,15 +4436,15 @@ dependencies = [

 [[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 = "same-file"
@@ -4520,7 +4519,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "core-foundation 0.9.4",
 "core-foundation-sys",
 "libc",
@@ -4570,9 +4569,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.140"
+version = "1.0.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6"
 dependencies = [
 "itoa",
 "memchr",
@@ -4594,9 +4593,9 @@ dependencies = [

 [[package]]
 name = "serde_repr"
-version = "0.1.20"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
+checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -4760,7 +4759,7 @@ version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "calloop",
 "calloop-wayland-source",
 "cursor-icon",
@@ -4815,7 +4814,7 @@ version = "0.3.0+sdk-1.3.268.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 ]

 [[package]]
@@ -4933,9 +4932,9 @@ checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2"

 [[package]]
 name = "syn"
-version = "2.0.99"
+version = "2.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e02e925281e18ffd9d640e234264753c43edc62d64b2d4cf898f1bc5e75f3fc2"
+checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -4982,7 +4981,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "core-foundation 0.9.4",
 "system-configuration-sys",
 ]
@@ -5051,12 +5050,12 @@ dependencies = [

 [[package]]
 name = "textwrap"
-version = "0.16.2"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057"
+checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
 dependencies = [
 "unicode-linebreak",
- "unicode-width 0.2.0",
+ "unicode-width",
 ]

 [[package]]
@@ -5070,11 +5069,11 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "2.0.12"
+version = "2.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
 dependencies = [
- "thiserror-impl 2.0.12",
+ "thiserror-impl 2.0.11",
 ]

 [[package]]
@@ -5090,9 +5089,9 @@ dependencies = [

 [[package]]
 name = "thiserror-impl"
-version = "2.0.12"
+version = "2.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -5225,9 +5224,9 @@ dependencies = [

 [[package]]
 name = "tokio-rustls"
-version = "0.26.2"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
 "rustls",
 "tokio",
@@ -5462,9 +5461,9 @@ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"

 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"

 [[package]]
 name = "unicode-linebreak"
@@ -5484,12 +5483,6 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"

-[[package]]
-name = "unicode-width"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
-
 [[package]]
 name = "unicode-xid"
 version = "0.2.6"
@@ -5547,15 +5540,6 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"

-[[package]]
-name = "uuid"
-version = "1.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0f540e3240398cce6128b64ba83fdbdd86129c16a3aa1a3a252efd66eb3d587"
-dependencies = [
- "getrandom 0.3.1",
-]
-
 [[package]]
 name = "v_frame"
 version = "0.3.8"
@@ -5716,7 +5700,7 @@ version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2120de3d33638aaef5b9f4472bff75f07c56379cf76ea320bd3a3d65ecaf73f"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "rustix",
 "wayland-backend",
 "wayland-scanner",
@@ -5728,7 +5712,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "cursor-icon",
 "wayland-backend",
 ]
@@ -5750,7 +5734,7 @@ version = "0.32.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0781cf46869b37e36928f7b432273c0995aa8aed9552c556fb18754420541efc"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "wayland-backend",
 "wayland-client",
 "wayland-scanner",
@@ -5762,7 +5746,7 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ccaacc76703fefd6763022ac565b590fcade92202492381c95b2edfdf7d46b3"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "wayland-backend",
 "wayland-client",
 "wayland-protocols",
@@ -5775,7 +5759,7 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "248a02e6f595aad796561fa82d25601bd2c8c3b145b1c7453fc8f94c1a58f8b2"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "wayland-backend",
 "wayland-client",
 "wayland-protocols",
@@ -5856,7 +5840,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47f55718f85c2fa756edffa0e7f0e0a60aba463d1362b57e23123c58f035e4b6"
 dependencies = [
 "arrayvec",
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "cfg_aliases",
 "document-features",
 "js-sys",
@@ -5882,7 +5866,7 @@ checksum = "671c25545d479b47d3f0a8e373aceb2060b67c6eb841b24ac8c32348151c7a0c"
 dependencies = [
 "arrayvec",
 "bit-vec",
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "cfg_aliases",
 "document-features",
 "indexmap",
@@ -5894,7 +5878,7 @@ dependencies = [
 "raw-window-handle",
 "rustc-hash",
 "smallvec",
- "thiserror 2.0.12",
+ "thiserror 2.0.11",
 "wgpu-hal",
 "wgpu-types",
 ]
@@ -5908,7 +5892,7 @@ dependencies = [
 "android_system_properties",
 "arrayvec",
 "ash",
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "bytemuck",
 "cfg_aliases",
 "core-graphics-types",
@@ -5933,7 +5917,7 @@ dependencies = [
 "renderdoc-sys",
 "rustc-hash",
 "smallvec",
- "thiserror 2.0.12",
+ "thiserror 2.0.11",
 "wasm-bindgen",
 "web-sys",
 "wgpu-types",
@@ -5946,7 +5930,7 @@ version = "24.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50ac044c0e76c03a0378e7786ac505d010a873665e2d51383dcff8dd227dc69c"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "js-sys",
 "log",
 "web-sys",
@@ -5971,7 +5955,7 @@ source = "git+https://github.com/LGUG2Z/win32-display-data?rev=55cebdebfbd68dbd1
 dependencies = [
 "itertools 0.14.0",
 "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.11",
 "windows 0.60.0",
 "windows-core 0.60.1",
 "wmi",
@@ -6480,7 +6464,7 @@ dependencies = [
 "ahash",
 "android-activity",
 "atomic-waker",
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "block2",
 "bytemuck",
 "calloop",
@@ -6563,7 +6547,7 @@ 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",
 ]

 [[package]]
@@ -6576,7 +6560,7 @@ dependencies = [
 "futures",
 "log",
 "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.11",
 "windows 0.60.0",
 "windows-core 0.60.1",
 ]
@@ -6647,7 +6631,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.8.0",
 "dlib",
 "log",
 "once_cell",
--- a/deny.toml
+++ b/deny.toml
@@ -1,96 +0,0 @@
-[graph]
-targets = [
-    "x86_64-pc-windows-msvc",
-    "i686-pc-windows-msvc",
-    "aarch64-pc-windows-msvc",
-]
-all-features = false
-no-default-features = false
-
-[output]
-feature-depth = 1
-
-[advisories]
-ignore = [
-    { id = "RUSTSEC-2020-0016", reason = "local tcp connectivity is an opt-in feature, and there is no upgrade path for TcpStreamExt" },
-    { id = "RUSTSEC-2024-0436", reason = "paste being unmaintained is not an issue in our use" }
-]
-
-[licenses]
-allow = [
-    "0BSD",
-    "Apache-2.0",
-    "Artistic-2.0",
-    "BSD-2-Clause",
-    "BSD-3-Clause",
-    "BSL-1.0",
-    "CC0-1.0",
-    "ISC",
-    "MIT",
-    "MIT-0",
-    "MPL-2.0",
-    "OFL-1.1",
-    "Ubuntu-font-1.0",
-    "Unicode-3.0",
-    "Zlib",
-    "LicenseRef-Komorebi-1.0"
-]
-confidence-threshold = 0.8
-
-[[licenses.clarify]]
-crate = "komorebi"
-expression = "LicenseRef-Komorebi-1.0"
-license-files = []
-
-[[licenses.clarify]]
-crate = "komorebi-client"
-expression = "LicenseRef-Komorebi-1.0"
-license-files = []
-
-[[licenses.clarify]]
-crate = "komorebic"
-expression = "LicenseRef-Komorebi-1.0"
-license-files = []
-
-[[licenses.clarify]]
-crate = "komorebic-no-console"
-expression = "LicenseRef-Komorebi-1.0"
-license-files = []
-
-[[licenses.clarify]]
-crate = "komorebi-themes"
-expression = "LicenseRef-Komorebi-1.0"
-license-files = []
-
-[[licenses.clarify]]
-crate = "komorebi-gui"
-expression = "LicenseRef-Komorebi-1.0"
-license-files = []
-
-[[licenses.clarify]]
-crate = "komorebi-bar"
-expression = "LicenseRef-Komorebi-1.0"
-license-files = []
-
-[[licenses.clarify]]
-crate = "base16-egui-themes"
-expression = "MIT"
-license-files = []
-
-[bans]
-multiple-versions = "allow"
-wildcards = "allow"
-highlight = "all"
-workspace-default-features = "allow"
-external-default-features = "allow"
-
-[sources]
-unknown-registry = "deny"
-unknown-git = "deny"
-allow-registry = ["https://github.com/rust-lang/crates.io-index"]
-allow-git = [
-    "https://github.com/LGUG2Z/base16-egui-themes",
-    "https://github.com/LGUG2Z/catppuccin-egui",
-    "https://github.com/LGUG2Z/windows-icons",
-    "https://github.com/LGUG2Z/win32-display-data",
-]
--- a/dependencies.json
+++ b/dependencies.json
@@ -1,771 +0,0 @@
-{
-  "licenses": [
-    [
-      "0BSD",
-      [
-        "adler2 2.0.0 registry+https://github.com/rust-lang/crates.io-index",
-        "win32-display-data 0.1.0 git+https://github.com/LGUG2Z/win32-display-data?rev=55cebdebfbd68dbd14945a1ba90f6b05b7be2893"
-      ]
-    ],
-    [
-      "Apache-2.0",
-      [
-        "ab_glyph 0.2.29 registry+https://github.com/rust-lang/crates.io-index",
-        "ab_glyph_rasterizer 0.1.8 registry+https://github.com/rust-lang/crates.io-index",
-        "accesskit 0.17.1 registry+https://github.com/rust-lang/crates.io-index",
-        "accesskit_consumer 0.26.0 registry+https://github.com/rust-lang/crates.io-index",
-        "accesskit_windows 0.24.1 registry+https://github.com/rust-lang/crates.io-index",
-        "accesskit_winit 0.23.1 registry+https://github.com/rust-lang/crates.io-index",
-        "adler2 2.0.0 registry+https://github.com/rust-lang/crates.io-index",
-        "ahash 0.8.11 registry+https://github.com/rust-lang/crates.io-index",
-        "anstream 0.6.18 registry+https://github.com/rust-lang/crates.io-index",
-        "anstyle 1.0.10 registry+https://github.com/rust-lang/crates.io-index",
-        "anstyle-parse 0.2.6 registry+https://github.com/rust-lang/crates.io-index",
-        "anstyle-query 1.1.2 registry+https://github.com/rust-lang/crates.io-index",
-        "anstyle-wincon 3.0.7 registry+https://github.com/rust-lang/crates.io-index",
-        "anyhow 1.0.97 registry+https://github.com/rust-lang/crates.io-index",
-        "arboard 3.4.1 registry+https://github.com/rust-lang/crates.io-index",
-        "arrayvec 0.7.6 registry+https://github.com/rust-lang/crates.io-index",
-        "atomic-waker 1.1.2 registry+https://github.com/rust-lang/crates.io-index",
-        "autocfg 1.4.0 registry+https://github.com/rust-lang/crates.io-index",
-        "backtrace 0.3.71 registry+https://github.com/rust-lang/crates.io-index",
-        "backtrace-ext 0.2.1 registry+https://github.com/rust-lang/crates.io-index",
-        "base64 0.22.1 registry+https://github.com/rust-lang/crates.io-index",
-        "bit_field 0.10.2 registry+https://github.com/rust-lang/crates.io-index",
-        "bitflags 1.3.2 registry+https://github.com/rust-lang/crates.io-index",
-        "bitflags 2.9.0 registry+https://github.com/rust-lang/crates.io-index",
-        "bitstream-io 2.6.0 registry+https://github.com/rust-lang/crates.io-index",
-        "bytemuck 1.22.0 registry+https://github.com/rust-lang/crates.io-index",
-        "bytemuck_derive 1.8.1 registry+https://github.com/rust-lang/crates.io-index",
-        "cc 1.2.16 registry+https://github.com/rust-lang/crates.io-index",
-        "cfg-if 0.1.10 registry+https://github.com/rust-lang/crates.io-index",
-        "cfg-if 1.0.0 registry+https://github.com/rust-lang/crates.io-index",
-        "chrono 0.4.40 registry+https://github.com/rust-lang/crates.io-index",
-        "clap 4.5.31 registry+https://github.com/rust-lang/crates.io-index",
-        "clap_builder 4.5.31 registry+https://github.com/rust-lang/crates.io-index",
-        "clap_derive 4.5.28 registry+https://github.com/rust-lang/crates.io-index",
-        "clap_lex 0.7.4 registry+https://github.com/rust-lang/crates.io-index",
-        "color-eyre 0.6.3 registry+https://github.com/rust-lang/crates.io-index",
-        "color-spantrace 0.2.1 registry+https://github.com/rust-lang/crates.io-index",
-        "colorchoice 1.0.3 registry+https://github.com/rust-lang/crates.io-index",
-        "crc32fast 1.4.2 registry+https://github.com/rust-lang/crates.io-index",
-        "crossbeam-channel 0.5.14 registry+https://github.com/rust-lang/crates.io-index",
-        "crossbeam-deque 0.8.6 registry+https://github.com/rust-lang/crates.io-index",
-        "crossbeam-epoch 0.9.18 registry+https://github.com/rust-lang/crates.io-index",
-        "crossbeam-utils 0.8.21 registry+https://github.com/rust-lang/crates.io-index",
-        "ctrlc 3.4.5 registry+https://github.com/rust-lang/crates.io-index",
-        "cursor-icon 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "deranged 0.3.11 registry+https://github.com/rust-lang/crates.io-index",
-        "dirs 6.0.0 registry+https://github.com/rust-lang/crates.io-index",
-        "dirs-sys 0.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "displaydoc 0.2.5 registry+https://github.com/rust-lang/crates.io-index",
-        "document-features 0.2.11 registry+https://github.com/rust-lang/crates.io-index",
-        "dpi 0.1.1 registry+https://github.com/rust-lang/crates.io-index",
-        "dunce 1.0.5 registry+https://github.com/rust-lang/crates.io-index",
-        "dyn-clone 1.0.19 registry+https://github.com/rust-lang/crates.io-index",
-        "ecolor 0.31.0 registry+https://github.com/rust-lang/crates.io-index",
-        "eframe 0.31.0 registry+https://github.com/rust-lang/crates.io-index",
-        "egui 0.31.0 registry+https://github.com/rust-lang/crates.io-index",
-        "egui-phosphor 0.9.0 registry+https://github.com/rust-lang/crates.io-index",
-        "egui-winit 0.31.0 registry+https://github.com/rust-lang/crates.io-index",
-        "egui_extras 0.31.0 registry+https://github.com/rust-lang/crates.io-index",
-        "egui_glow 0.31.0 registry+https://github.com/rust-lang/crates.io-index",
-        "either 1.14.0 registry+https://github.com/rust-lang/crates.io-index",
-        "emath 0.31.0 registry+https://github.com/rust-lang/crates.io-index",
-        "encoding_rs 0.8.35 registry+https://github.com/rust-lang/crates.io-index",
-        "enum-map 2.7.3 registry+https://github.com/rust-lang/crates.io-index",
-        "enum-map-derive 0.17.0 registry+https://github.com/rust-lang/crates.io-index",
-        "env_home 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "epaint 0.31.0 registry+https://github.com/rust-lang/crates.io-index",
-        "epaint_default_fonts 0.31.0 registry+https://github.com/rust-lang/crates.io-index",
-        "equivalent 1.0.2 registry+https://github.com/rust-lang/crates.io-index",
-        "eyre 0.6.12 registry+https://github.com/rust-lang/crates.io-index",
-        "fastrand 2.3.0 registry+https://github.com/rust-lang/crates.io-index",
-        "fdeflate 0.3.7 registry+https://github.com/rust-lang/crates.io-index",
-        "filetime 0.2.25 registry+https://github.com/rust-lang/crates.io-index",
-        "flate2 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "fnv 1.0.7 registry+https://github.com/rust-lang/crates.io-index",
-        "form_urlencoded 1.2.1 registry+https://github.com/rust-lang/crates.io-index",
-        "futures 0.3.31 registry+https://github.com/rust-lang/crates.io-index",
-        "futures-channel 0.3.31 registry+https://github.com/rust-lang/crates.io-index",
-        "futures-core 0.3.31 registry+https://github.com/rust-lang/crates.io-index",
-        "futures-executor 0.3.31 registry+https://github.com/rust-lang/crates.io-index",
-        "futures-io 0.3.31 registry+https://github.com/rust-lang/crates.io-index",
-        "futures-macro 0.3.31 registry+https://github.com/rust-lang/crates.io-index",
-        "futures-sink 0.3.31 registry+https://github.com/rust-lang/crates.io-index",
-        "futures-task 0.3.31 registry+https://github.com/rust-lang/crates.io-index",
-        "futures-util 0.3.31 registry+https://github.com/rust-lang/crates.io-index",
-        "getrandom 0.2.15 registry+https://github.com/rust-lang/crates.io-index",
-        "getrandom 0.3.1 registry+https://github.com/rust-lang/crates.io-index",
-        "gif 0.13.1 registry+https://github.com/rust-lang/crates.io-index",
-        "git2 0.20.0 registry+https://github.com/rust-lang/crates.io-index",
-        "gl_generator 0.14.0 registry+https://github.com/rust-lang/crates.io-index",
-        "glow 0.16.0 registry+https://github.com/rust-lang/crates.io-index",
-        "glutin 0.32.2 registry+https://github.com/rust-lang/crates.io-index",
-        "glutin_egl_sys 0.7.1 registry+https://github.com/rust-lang/crates.io-index",
-        "glutin_wgl_sys 0.6.1 registry+https://github.com/rust-lang/crates.io-index",
-        "half 2.4.1 registry+https://github.com/rust-lang/crates.io-index",
-        "hashbrown 0.15.2 registry+https://github.com/rust-lang/crates.io-index",
-        "heck 0.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "hex_color 3.0.0 registry+https://github.com/rust-lang/crates.io-index",
-        "hotwatch 0.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "http 1.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "httparse 1.10.1 registry+https://github.com/rust-lang/crates.io-index",
-        "hyper-tls 0.6.0 registry+https://github.com/rust-lang/crates.io-index",
-        "iana-time-zone 0.1.61 registry+https://github.com/rust-lang/crates.io-index",
-        "idna 1.0.3 registry+https://github.com/rust-lang/crates.io-index",
-        "idna_adapter 1.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "image 0.25.5 registry+https://github.com/rust-lang/crates.io-index",
-        "image-webp 0.2.1 registry+https://github.com/rust-lang/crates.io-index",
-        "imgref 1.11.0 registry+https://github.com/rust-lang/crates.io-index",
-        "immutable-chunkmap 2.0.6 registry+https://github.com/rust-lang/crates.io-index",
-        "indenter 0.3.3 registry+https://github.com/rust-lang/crates.io-index",
-        "indexmap 2.7.1 registry+https://github.com/rust-lang/crates.io-index",
-        "ipnet 2.11.0 registry+https://github.com/rust-lang/crates.io-index",
-        "is_debug 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "is_terminal_polyfill 1.70.1 registry+https://github.com/rust-lang/crates.io-index",
-        "itertools 0.12.1 registry+https://github.com/rust-lang/crates.io-index",
-        "itertools 0.14.0 registry+https://github.com/rust-lang/crates.io-index",
-        "itoa 1.0.15 registry+https://github.com/rust-lang/crates.io-index",
-        "jobserver 0.1.32 registry+https://github.com/rust-lang/crates.io-index",
-        "jpeg-decoder 0.3.1 registry+https://github.com/rust-lang/crates.io-index",
-        "khronos_api 3.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "lazy_static 1.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "libc 0.2.170 registry+https://github.com/rust-lang/crates.io-index",
-        "libgit2-sys 0.18.0+1.9.0 registry+https://github.com/rust-lang/crates.io-index",
-        "libz-sys 1.1.21 registry+https://github.com/rust-lang/crates.io-index",
-        "litrs 0.4.1 registry+https://github.com/rust-lang/crates.io-index",
-        "lock_api 0.4.12 registry+https://github.com/rust-lang/crates.io-index",
-        "log 0.4.26 registry+https://github.com/rust-lang/crates.io-index",
-        "miette 7.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "miette-derive 7.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "mime 0.3.17 registry+https://github.com/rust-lang/crates.io-index",
-        "minimal-lexical 0.2.1 registry+https://github.com/rust-lang/crates.io-index",
-        "miniz_oxide 0.8.5 registry+https://github.com/rust-lang/crates.io-index",
-        "miow 0.6.0 registry+https://github.com/rust-lang/crates.io-index",
-        "native-tls 0.2.14 registry+https://github.com/rust-lang/crates.io-index",
-        "net2 0.2.39 registry+https://github.com/rust-lang/crates.io-index",
-        "nohash-hasher 0.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "ntapi 0.4.1 registry+https://github.com/rust-lang/crates.io-index",
-        "num 0.4.3 registry+https://github.com/rust-lang/crates.io-index",
-        "num-bigint 0.4.6 registry+https://github.com/rust-lang/crates.io-index",
-        "num-complex 0.4.6 registry+https://github.com/rust-lang/crates.io-index",
-        "num-conv 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "num-derive 0.4.2 registry+https://github.com/rust-lang/crates.io-index",
-        "num-integer 0.1.46 registry+https://github.com/rust-lang/crates.io-index",
-        "num-iter 0.1.45 registry+https://github.com/rust-lang/crates.io-index",
-        "num-rational 0.4.2 registry+https://github.com/rust-lang/crates.io-index",
-        "num-traits 0.2.19 registry+https://github.com/rust-lang/crates.io-index",
-        "once_cell 1.20.3 registry+https://github.com/rust-lang/crates.io-index",
-        "owned_ttf_parser 0.25.0 registry+https://github.com/rust-lang/crates.io-index",
-        "parking_lot 0.12.3 registry+https://github.com/rust-lang/crates.io-index",
-        "parking_lot_core 0.9.10 registry+https://github.com/rust-lang/crates.io-index",
-        "paste 1.0.15 registry+https://github.com/rust-lang/crates.io-index",
-        "percent-encoding 2.3.1 registry+https://github.com/rust-lang/crates.io-index",
-        "pin-project-lite 0.2.16 registry+https://github.com/rust-lang/crates.io-index",
-        "pin-utils 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "pkg-config 0.3.32 registry+https://github.com/rust-lang/crates.io-index",
-        "png 0.17.16 registry+https://github.com/rust-lang/crates.io-index",
-        "powerfmt 0.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "ppv-lite86 0.2.20 registry+https://github.com/rust-lang/crates.io-index",
-        "proc-macro-error-attr2 2.0.0 registry+https://github.com/rust-lang/crates.io-index",
-        "proc-macro-error2 2.0.1 registry+https://github.com/rust-lang/crates.io-index",
-        "proc-macro2 1.0.94 registry+https://github.com/rust-lang/crates.io-index",
-        "profiling 1.0.16 registry+https://github.com/rust-lang/crates.io-index",
-        "profiling-procmacros 1.0.16 registry+https://github.com/rust-lang/crates.io-index",
-        "qoi 0.4.1 registry+https://github.com/rust-lang/crates.io-index",
-        "quick-error 2.0.1 registry+https://github.com/rust-lang/crates.io-index",
-        "quote 1.0.39 registry+https://github.com/rust-lang/crates.io-index",
-        "rand 0.8.5 registry+https://github.com/rust-lang/crates.io-index",
-        "rand_chacha 0.3.1 registry+https://github.com/rust-lang/crates.io-index",
-        "rand_core 0.6.4 registry+https://github.com/rust-lang/crates.io-index",
-        "raw-window-handle 0.6.2 registry+https://github.com/rust-lang/crates.io-index",
-        "rayon 1.10.0 registry+https://github.com/rust-lang/crates.io-index",
-        "rayon-core 1.12.1 registry+https://github.com/rust-lang/crates.io-index",
-        "regex 1.11.1 registry+https://github.com/rust-lang/crates.io-index",
-        "regex-automata 0.4.9 registry+https://github.com/rust-lang/crates.io-index",
-        "regex-syntax 0.6.29 registry+https://github.com/rust-lang/crates.io-index",
-        "regex-syntax 0.8.5 registry+https://github.com/rust-lang/crates.io-index",
-        "reqwest 0.12.12 registry+https://github.com/rust-lang/crates.io-index",
-        "rustc-demangle 0.1.24 registry+https://github.com/rust-lang/crates.io-index",
-        "rustls-pemfile 2.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "rustls-pki-types 1.11.0 registry+https://github.com/rust-lang/crates.io-index",
-        "rustversion 1.0.20 registry+https://github.com/rust-lang/crates.io-index",
-        "ryu 1.0.20 registry+https://github.com/rust-lang/crates.io-index",
-        "scopeguard 1.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "serde 1.0.218 registry+https://github.com/rust-lang/crates.io-index",
-        "serde_derive 1.0.218 registry+https://github.com/rust-lang/crates.io-index",
-        "serde_derive_internals 0.29.1 registry+https://github.com/rust-lang/crates.io-index",
-        "serde_json 1.0.140 registry+https://github.com/rust-lang/crates.io-index",
-        "serde_json_lenient 0.2.4 registry+https://github.com/rust-lang/crates.io-index",
-        "serde_urlencoded 0.7.1 registry+https://github.com/rust-lang/crates.io-index",
-        "serde_variant 0.1.3 registry+https://github.com/rust-lang/crates.io-index",
-        "serde_yaml 0.9.34+deprecated registry+https://github.com/rust-lang/crates.io-index",
-        "shadow-rs 1.0.1 registry+https://github.com/rust-lang/crates.io-index",
-        "shlex 1.3.0 registry+https://github.com/rust-lang/crates.io-index",
-        "smallvec 1.14.0 registry+https://github.com/rust-lang/crates.io-index",
-        "smol_str 0.2.2 registry+https://github.com/rust-lang/crates.io-index",
-        "socket2 0.5.8 registry+https://github.com/rust-lang/crates.io-index",
-        "stable_deref_trait 1.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "static_assertions 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "supports-color 3.0.2 registry+https://github.com/rust-lang/crates.io-index",
-        "supports-hyperlinks 3.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "supports-unicode 3.0.0 registry+https://github.com/rust-lang/crates.io-index",
-        "syn 2.0.99 registry+https://github.com/rust-lang/crates.io-index",
-        "sync_wrapper 1.0.2 registry+https://github.com/rust-lang/crates.io-index",
-        "tempfile 3.17.1 registry+https://github.com/rust-lang/crates.io-index",
-        "terminal_size 0.4.1 registry+https://github.com/rust-lang/crates.io-index",
-        "thiserror 1.0.69 registry+https://github.com/rust-lang/crates.io-index",
-        "thiserror 2.0.12 registry+https://github.com/rust-lang/crates.io-index",
-        "thiserror-impl 1.0.69 registry+https://github.com/rust-lang/crates.io-index",
-        "thiserror-impl 2.0.12 registry+https://github.com/rust-lang/crates.io-index",
-        "thread_local 1.1.8 registry+https://github.com/rust-lang/crates.io-index",
-        "time 0.3.37 registry+https://github.com/rust-lang/crates.io-index",
-        "time-core 0.1.2 registry+https://github.com/rust-lang/crates.io-index",
-        "ttf-parser 0.25.1 registry+https://github.com/rust-lang/crates.io-index",
-        "typenum 1.18.0 registry+https://github.com/rust-lang/crates.io-index",
-        "tz-rs 0.7.0 registry+https://github.com/rust-lang/crates.io-index",
-        "tzdb 0.7.2 registry+https://github.com/rust-lang/crates.io-index",
-        "unicase 2.8.1 registry+https://github.com/rust-lang/crates.io-index",
-        "unicode-ident 1.0.18 registry+https://github.com/rust-lang/crates.io-index",
-        "unicode-linebreak 0.1.5 registry+https://github.com/rust-lang/crates.io-index",
-        "unicode-segmentation 1.12.0 registry+https://github.com/rust-lang/crates.io-index",
-        "unicode-width 0.1.14 registry+https://github.com/rust-lang/crates.io-index",
-        "unicode-width 0.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "unicode-xid 0.2.6 registry+https://github.com/rust-lang/crates.io-index",
-        "uom 0.36.0 registry+https://github.com/rust-lang/crates.io-index",
-        "url 2.5.4 registry+https://github.com/rust-lang/crates.io-index",
-        "utf16_iter 1.0.5 registry+https://github.com/rust-lang/crates.io-index",
-        "utf8_iter 1.0.4 registry+https://github.com/rust-lang/crates.io-index",
-        "utf8parse 0.2.2 registry+https://github.com/rust-lang/crates.io-index",
-        "vcpkg 0.2.15 registry+https://github.com/rust-lang/crates.io-index",
-        "version_check 0.9.5 registry+https://github.com/rust-lang/crates.io-index",
-        "web-time 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "webbrowser 1.0.3 registry+https://github.com/rust-lang/crates.io-index",
-        "weezl 0.1.8 registry+https://github.com/rust-lang/crates.io-index",
-        "winapi 0.3.9 registry+https://github.com/rust-lang/crates.io-index",
-        "windows 0.57.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows 0.58.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows 0.60.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-collections 0.1.1 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-core 0.52.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-core 0.57.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-core 0.58.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-core 0.60.1 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-future 0.1.1 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-implement 0.57.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-implement 0.58.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-implement 0.59.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-interface 0.57.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-interface 0.58.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-interface 0.59.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-link 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-numerics 0.1.1 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-registry 0.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-result 0.1.2 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-result 0.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-result 0.3.1 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-strings 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-strings 0.3.1 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-sys 0.48.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-sys 0.52.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-sys 0.59.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-targets 0.48.5 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-targets 0.52.6 registry+https://github.com/rust-lang/crates.io-index",
-        "windows_aarch64_msvc 0.48.5 registry+https://github.com/rust-lang/crates.io-index",
-        "windows_aarch64_msvc 0.52.6 registry+https://github.com/rust-lang/crates.io-index",
-        "windows_i686_msvc 0.48.5 registry+https://github.com/rust-lang/crates.io-index",
-        "windows_i686_msvc 0.52.6 registry+https://github.com/rust-lang/crates.io-index",
-        "windows_x86_64_msvc 0.48.5 registry+https://github.com/rust-lang/crates.io-index",
-        "windows_x86_64_msvc 0.52.6 registry+https://github.com/rust-lang/crates.io-index",
-        "winit 0.30.9 registry+https://github.com/rust-lang/crates.io-index",
-        "wmi 0.15.1 registry+https://github.com/rust-lang/crates.io-index",
-        "write16 1.0.0 registry+https://github.com/rust-lang/crates.io-index",
-        "zerocopy 0.7.35 registry+https://github.com/rust-lang/crates.io-index",
-        "zerocopy-derive 0.7.35 registry+https://github.com/rust-lang/crates.io-index",
-        "zune-core 0.4.12 registry+https://github.com/rust-lang/crates.io-index",
-        "zune-inflate 0.2.54 registry+https://github.com/rust-lang/crates.io-index",
-        "zune-jpeg 0.4.14 registry+https://github.com/rust-lang/crates.io-index"
-      ]
-    ],
-    [
-      "Artistic-2.0",
-      [
-        "file-id 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "notify-debouncer-full 0.1.0 registry+https://github.com/rust-lang/crates.io-index"
-      ]
-    ],
-    [
-      "BSD-2-Clause",
-      [
-        "av1-grain 0.2.3 registry+https://github.com/rust-lang/crates.io-index",
-        "rav1e 0.7.1 registry+https://github.com/rust-lang/crates.io-index",
-        "v_frame 0.3.8 registry+https://github.com/rust-lang/crates.io-index",
-        "zerocopy 0.7.35 registry+https://github.com/rust-lang/crates.io-index",
-        "zerocopy-derive 0.7.35 registry+https://github.com/rust-lang/crates.io-index"
-      ]
-    ],
-    [
-      "BSD-3-Clause",
-      [
-        "alloc-no-stdlib 2.0.4 registry+https://github.com/rust-lang/crates.io-index",
-        "alloc-stdlib 0.2.2 registry+https://github.com/rust-lang/crates.io-index",
-        "avif-serialize 0.8.3 registry+https://github.com/rust-lang/crates.io-index",
-        "brotli 3.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "brotli-decompressor 2.5.1 registry+https://github.com/rust-lang/crates.io-index",
-        "encoding_rs 0.8.35 registry+https://github.com/rust-lang/crates.io-index",
-        "exr 1.73.0 registry+https://github.com/rust-lang/crates.io-index",
-        "lebe 0.5.2 registry+https://github.com/rust-lang/crates.io-index",
-        "ravif 0.11.11 registry+https://github.com/rust-lang/crates.io-index"
-      ]
-    ],
-    [
-      "BSL-1.0",
-      [
-        "clipboard-win 5.4.0 registry+https://github.com/rust-lang/crates.io-index",
-        "error-code 3.3.1 registry+https://github.com/rust-lang/crates.io-index",
-        "ryu 1.0.20 registry+https://github.com/rust-lang/crates.io-index"
-      ]
-    ],
-    [
-      "CC0-1.0",
-      [
-        "dunce 1.0.5 registry+https://github.com/rust-lang/crates.io-index",
-        "file-id 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "imgref 1.11.0 registry+https://github.com/rust-lang/crates.io-index",
-        "notify 6.1.1 registry+https://github.com/rust-lang/crates.io-index",
-        "notify-debouncer-full 0.1.0 registry+https://github.com/rust-lang/crates.io-index"
-      ]
-    ],
-    [
-      "ISC",
-      [
-        "is_ci 1.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "libloading 0.8.6 registry+https://github.com/rust-lang/crates.io-index",
-        "rustls-pemfile 2.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "starship-battery 0.10.0 registry+https://github.com/rust-lang/crates.io-index"
-      ]
-    ],
-    [
-      "MIT",
-      [
-        "accesskit 0.17.1 registry+https://github.com/rust-lang/crates.io-index",
-        "accesskit_consumer 0.26.0 registry+https://github.com/rust-lang/crates.io-index",
-        "accesskit_windows 0.24.1 registry+https://github.com/rust-lang/crates.io-index",
-        "adler2 2.0.0 registry+https://github.com/rust-lang/crates.io-index",
-        "ahash 0.8.11 registry+https://github.com/rust-lang/crates.io-index",
-        "aho-corasick 1.1.3 registry+https://github.com/rust-lang/crates.io-index",
-        "aligned-vec 0.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "anstream 0.6.18 registry+https://github.com/rust-lang/crates.io-index",
-        "anstyle 1.0.10 registry+https://github.com/rust-lang/crates.io-index",
-        "anstyle-parse 0.2.6 registry+https://github.com/rust-lang/crates.io-index",
-        "anstyle-query 1.1.2 registry+https://github.com/rust-lang/crates.io-index",
-        "anstyle-wincon 3.0.7 registry+https://github.com/rust-lang/crates.io-index",
-        "anyhow 1.0.97 registry+https://github.com/rust-lang/crates.io-index",
-        "arboard 3.4.1 registry+https://github.com/rust-lang/crates.io-index",
-        "arg_enum_proc_macro 0.3.4 registry+https://github.com/rust-lang/crates.io-index",
-        "arrayvec 0.7.6 registry+https://github.com/rust-lang/crates.io-index",
-        "atomic-waker 1.1.2 registry+https://github.com/rust-lang/crates.io-index",
-        "autocfg 1.4.0 registry+https://github.com/rust-lang/crates.io-index",
-        "backtrace 0.3.71 registry+https://github.com/rust-lang/crates.io-index",
-        "backtrace-ext 0.2.1 registry+https://github.com/rust-lang/crates.io-index",
-        "base64 0.22.1 registry+https://github.com/rust-lang/crates.io-index",
-        "bit_field 0.10.2 registry+https://github.com/rust-lang/crates.io-index",
-        "bitflags 1.3.2 registry+https://github.com/rust-lang/crates.io-index",
-        "bitflags 2.9.0 registry+https://github.com/rust-lang/crates.io-index",
-        "bitstream-io 2.6.0 registry+https://github.com/rust-lang/crates.io-index",
-        "brotli 3.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "brotli-decompressor 2.5.1 registry+https://github.com/rust-lang/crates.io-index",
-        "built 0.7.7 registry+https://github.com/rust-lang/crates.io-index",
-        "bytemuck 1.22.0 registry+https://github.com/rust-lang/crates.io-index",
-        "bytemuck_derive 1.8.1 registry+https://github.com/rust-lang/crates.io-index",
-        "byteorder 1.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "byteorder-lite 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "bytes 1.10.0 registry+https://github.com/rust-lang/crates.io-index",
-        "catppuccin-egui 5.3.1 git+https://github.com/LGUG2Z/catppuccin-egui?rev=bdaff30959512c4f7ee7304117076a48633d777f",
-        "cc 1.2.16 registry+https://github.com/rust-lang/crates.io-index",
-        "cfg-if 0.1.10 registry+https://github.com/rust-lang/crates.io-index",
-        "cfg-if 1.0.0 registry+https://github.com/rust-lang/crates.io-index",
-        "cfg_aliases 0.2.1 registry+https://github.com/rust-lang/crates.io-index",
-        "chrono 0.4.40 registry+https://github.com/rust-lang/crates.io-index",
-        "clap 4.5.31 registry+https://github.com/rust-lang/crates.io-index",
-        "clap_builder 4.5.31 registry+https://github.com/rust-lang/crates.io-index",
-        "clap_derive 4.5.28 registry+https://github.com/rust-lang/crates.io-index",
-        "clap_lex 0.7.4 registry+https://github.com/rust-lang/crates.io-index",
-        "color-eyre 0.6.3 registry+https://github.com/rust-lang/crates.io-index",
-        "color-spantrace 0.2.1 registry+https://github.com/rust-lang/crates.io-index",
-        "color_quant 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "colorchoice 1.0.3 registry+https://github.com/rust-lang/crates.io-index",
-        "crc32fast 1.4.2 registry+https://github.com/rust-lang/crates.io-index",
-        "crossbeam-channel 0.5.14 registry+https://github.com/rust-lang/crates.io-index",
-        "crossbeam-deque 0.8.6 registry+https://github.com/rust-lang/crates.io-index",
-        "crossbeam-epoch 0.9.18 registry+https://github.com/rust-lang/crates.io-index",
-        "crossbeam-utils 0.8.21 registry+https://github.com/rust-lang/crates.io-index",
-        "ctrlc 3.4.5 registry+https://github.com/rust-lang/crates.io-index",
-        "cursor-icon 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "deranged 0.3.11 registry+https://github.com/rust-lang/crates.io-index",
-        "dirs 6.0.0 registry+https://github.com/rust-lang/crates.io-index",
-        "dirs-sys 0.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "displaydoc 0.2.5 registry+https://github.com/rust-lang/crates.io-index",
-        "document-features 0.2.11 registry+https://github.com/rust-lang/crates.io-index",
-        "dyn-clone 1.0.19 registry+https://github.com/rust-lang/crates.io-index",
-        "ecolor 0.31.0 registry+https://github.com/rust-lang/crates.io-index",
-        "eframe 0.31.0 registry+https://github.com/rust-lang/crates.io-index",
-        "egui 0.31.0 registry+https://github.com/rust-lang/crates.io-index",
-        "egui-phosphor 0.9.0 registry+https://github.com/rust-lang/crates.io-index",
-        "egui-winit 0.31.0 registry+https://github.com/rust-lang/crates.io-index",
-        "egui_extras 0.31.0 registry+https://github.com/rust-lang/crates.io-index",
-        "egui_glow 0.31.0 registry+https://github.com/rust-lang/crates.io-index",
-        "either 1.14.0 registry+https://github.com/rust-lang/crates.io-index",
-        "emath 0.31.0 registry+https://github.com/rust-lang/crates.io-index",
-        "encoding_rs 0.8.35 registry+https://github.com/rust-lang/crates.io-index",
-        "enum-map 2.7.3 registry+https://github.com/rust-lang/crates.io-index",
-        "enum-map-derive 0.17.0 registry+https://github.com/rust-lang/crates.io-index",
-        "env_home 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "epaint 0.31.0 registry+https://github.com/rust-lang/crates.io-index",
-        "epaint_default_fonts 0.31.0 registry+https://github.com/rust-lang/crates.io-index",
-        "equivalent 1.0.2 registry+https://github.com/rust-lang/crates.io-index",
-        "eyre 0.6.12 registry+https://github.com/rust-lang/crates.io-index",
-        "fastrand 2.3.0 registry+https://github.com/rust-lang/crates.io-index",
-        "fdeflate 0.3.7 registry+https://github.com/rust-lang/crates.io-index",
-        "filetime 0.2.25 registry+https://github.com/rust-lang/crates.io-index",
-        "flate2 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "fnv 1.0.7 registry+https://github.com/rust-lang/crates.io-index",
-        "font-loader 0.11.0 registry+https://github.com/rust-lang/crates.io-index",
-        "form_urlencoded 1.2.1 registry+https://github.com/rust-lang/crates.io-index",
-        "fs-tail 0.1.4 registry+https://github.com/rust-lang/crates.io-index",
-        "futures 0.3.31 registry+https://github.com/rust-lang/crates.io-index",
-        "futures-channel 0.3.31 registry+https://github.com/rust-lang/crates.io-index",
-        "futures-core 0.3.31 registry+https://github.com/rust-lang/crates.io-index",
-        "futures-executor 0.3.31 registry+https://github.com/rust-lang/crates.io-index",
-        "futures-io 0.3.31 registry+https://github.com/rust-lang/crates.io-index",
-        "futures-macro 0.3.31 registry+https://github.com/rust-lang/crates.io-index",
-        "futures-sink 0.3.31 registry+https://github.com/rust-lang/crates.io-index",
-        "futures-task 0.3.31 registry+https://github.com/rust-lang/crates.io-index",
-        "futures-util 0.3.31 registry+https://github.com/rust-lang/crates.io-index",
-        "getrandom 0.2.15 registry+https://github.com/rust-lang/crates.io-index",
-        "getrandom 0.3.1 registry+https://github.com/rust-lang/crates.io-index",
-        "getset 0.1.5 registry+https://github.com/rust-lang/crates.io-index",
-        "gif 0.13.1 registry+https://github.com/rust-lang/crates.io-index",
-        "git2 0.20.0 registry+https://github.com/rust-lang/crates.io-index",
-        "glow 0.16.0 registry+https://github.com/rust-lang/crates.io-index",
-        "glutin-winit 0.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "h2 0.4.8 registry+https://github.com/rust-lang/crates.io-index",
-        "half 2.4.1 registry+https://github.com/rust-lang/crates.io-index",
-        "hashbrown 0.15.2 registry+https://github.com/rust-lang/crates.io-index",
-        "heck 0.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "hex_color 3.0.0 registry+https://github.com/rust-lang/crates.io-index",
-        "hotwatch 0.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "http 1.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "http-body 1.0.1 registry+https://github.com/rust-lang/crates.io-index",
-        "http-body-util 0.1.2 registry+https://github.com/rust-lang/crates.io-index",
-        "httparse 1.10.1 registry+https://github.com/rust-lang/crates.io-index",
-        "hyper 1.6.0 registry+https://github.com/rust-lang/crates.io-index",
-        "hyper-tls 0.6.0 registry+https://github.com/rust-lang/crates.io-index",
-        "hyper-util 0.1.10 registry+https://github.com/rust-lang/crates.io-index",
-        "iana-time-zone 0.1.61 registry+https://github.com/rust-lang/crates.io-index",
-        "idna 1.0.3 registry+https://github.com/rust-lang/crates.io-index",
-        "idna_adapter 1.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "image 0.25.5 registry+https://github.com/rust-lang/crates.io-index",
-        "image-webp 0.2.1 registry+https://github.com/rust-lang/crates.io-index",
-        "immutable-chunkmap 2.0.6 registry+https://github.com/rust-lang/crates.io-index",
-        "indenter 0.3.3 registry+https://github.com/rust-lang/crates.io-index",
-        "indexmap 2.7.1 registry+https://github.com/rust-lang/crates.io-index",
-        "ipnet 2.11.0 registry+https://github.com/rust-lang/crates.io-index",
-        "is_debug 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "is_terminal_polyfill 1.70.1 registry+https://github.com/rust-lang/crates.io-index",
-        "itertools 0.12.1 registry+https://github.com/rust-lang/crates.io-index",
-        "itertools 0.14.0 registry+https://github.com/rust-lang/crates.io-index",
-        "itoa 1.0.15 registry+https://github.com/rust-lang/crates.io-index",
-        "jobserver 0.1.32 registry+https://github.com/rust-lang/crates.io-index",
-        "jpeg-decoder 0.3.1 registry+https://github.com/rust-lang/crates.io-index",
-        "lazy_static 1.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "libc 0.2.170 registry+https://github.com/rust-lang/crates.io-index",
-        "libgit2-sys 0.18.0+1.9.0 registry+https://github.com/rust-lang/crates.io-index",
-        "libz-sys 1.1.21 registry+https://github.com/rust-lang/crates.io-index",
-        "litrs 0.4.1 registry+https://github.com/rust-lang/crates.io-index",
-        "lock_api 0.4.12 registry+https://github.com/rust-lang/crates.io-index",
-        "log 0.4.26 registry+https://github.com/rust-lang/crates.io-index",
-        "loop9 0.1.5 registry+https://github.com/rust-lang/crates.io-index",
-        "matchers 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "maybe-rayon 0.1.1 registry+https://github.com/rust-lang/crates.io-index",
-        "memchr 2.7.4 registry+https://github.com/rust-lang/crates.io-index",
-        "memoffset 0.9.1 registry+https://github.com/rust-lang/crates.io-index",
-        "mime 0.3.17 registry+https://github.com/rust-lang/crates.io-index",
-        "mime_guess2 2.0.5 registry+https://github.com/rust-lang/crates.io-index",
-        "minimal-lexical 0.2.1 registry+https://github.com/rust-lang/crates.io-index",
-        "miniz_oxide 0.8.5 registry+https://github.com/rust-lang/crates.io-index",
-        "mio 1.0.3 registry+https://github.com/rust-lang/crates.io-index",
-        "miow 0.6.0 registry+https://github.com/rust-lang/crates.io-index",
-        "nanoid 0.4.0 registry+https://github.com/rust-lang/crates.io-index",
-        "native-tls 0.2.14 registry+https://github.com/rust-lang/crates.io-index",
-        "net2 0.2.39 registry+https://github.com/rust-lang/crates.io-index",
-        "netdev 0.32.0 registry+https://github.com/rust-lang/crates.io-index",
-        "new_debug_unreachable 1.0.6 registry+https://github.com/rust-lang/crates.io-index",
-        "nohash-hasher 0.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "nom 7.1.3 registry+https://github.com/rust-lang/crates.io-index",
-        "noop_proc_macro 0.3.0 registry+https://github.com/rust-lang/crates.io-index",
-        "ntapi 0.4.1 registry+https://github.com/rust-lang/crates.io-index",
-        "nu-ansi-term 0.46.0 registry+https://github.com/rust-lang/crates.io-index",
-        "num 0.4.3 registry+https://github.com/rust-lang/crates.io-index",
-        "num-bigint 0.4.6 registry+https://github.com/rust-lang/crates.io-index",
-        "num-complex 0.4.6 registry+https://github.com/rust-lang/crates.io-index",
-        "num-conv 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "num-derive 0.4.2 registry+https://github.com/rust-lang/crates.io-index",
-        "num-integer 0.1.46 registry+https://github.com/rust-lang/crates.io-index",
-        "num-iter 0.1.45 registry+https://github.com/rust-lang/crates.io-index",
-        "num-rational 0.4.2 registry+https://github.com/rust-lang/crates.io-index",
-        "num-traits 0.2.19 registry+https://github.com/rust-lang/crates.io-index",
-        "once_cell 1.20.3 registry+https://github.com/rust-lang/crates.io-index",
-        "os_info 3.10.0 registry+https://github.com/rust-lang/crates.io-index",
-        "overload 0.1.1 registry+https://github.com/rust-lang/crates.io-index",
-        "owo-colors 3.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "owo-colors 4.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "parking_lot 0.12.3 registry+https://github.com/rust-lang/crates.io-index",
-        "parking_lot_core 0.9.10 registry+https://github.com/rust-lang/crates.io-index",
-        "paste 1.0.15 registry+https://github.com/rust-lang/crates.io-index",
-        "percent-encoding 2.3.1 registry+https://github.com/rust-lang/crates.io-index",
-        "pin-project-lite 0.2.16 registry+https://github.com/rust-lang/crates.io-index",
-        "pin-utils 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "pkg-config 0.3.32 registry+https://github.com/rust-lang/crates.io-index",
-        "png 0.17.16 registry+https://github.com/rust-lang/crates.io-index",
-        "powerfmt 0.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "powershell_script 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "ppv-lite86 0.2.20 registry+https://github.com/rust-lang/crates.io-index",
-        "proc-macro-error-attr2 2.0.0 registry+https://github.com/rust-lang/crates.io-index",
-        "proc-macro-error2 2.0.1 registry+https://github.com/rust-lang/crates.io-index",
-        "proc-macro2 1.0.94 registry+https://github.com/rust-lang/crates.io-index",
-        "profiling 1.0.16 registry+https://github.com/rust-lang/crates.io-index",
-        "profiling-procmacros 1.0.16 registry+https://github.com/rust-lang/crates.io-index",
-        "qoi 0.4.1 registry+https://github.com/rust-lang/crates.io-index",
-        "quick-error 2.0.1 registry+https://github.com/rust-lang/crates.io-index",
-        "quote 1.0.39 registry+https://github.com/rust-lang/crates.io-index",
-        "rand 0.8.5 registry+https://github.com/rust-lang/crates.io-index",
-        "rand_chacha 0.3.1 registry+https://github.com/rust-lang/crates.io-index",
-        "rand_core 0.6.4 registry+https://github.com/rust-lang/crates.io-index",
-        "random_word 0.4.3 registry+https://github.com/rust-lang/crates.io-index",
-        "raw-window-handle 0.6.2 registry+https://github.com/rust-lang/crates.io-index",
-        "rayon 1.10.0 registry+https://github.com/rust-lang/crates.io-index",
-        "rayon-core 1.12.1 registry+https://github.com/rust-lang/crates.io-index",
-        "regex 1.11.1 registry+https://github.com/rust-lang/crates.io-index",
-        "regex-automata 0.1.10 registry+https://github.com/rust-lang/crates.io-index",
-        "regex-automata 0.4.9 registry+https://github.com/rust-lang/crates.io-index",
-        "regex-syntax 0.6.29 registry+https://github.com/rust-lang/crates.io-index",
-        "regex-syntax 0.8.5 registry+https://github.com/rust-lang/crates.io-index",
-        "reqwest 0.12.12 registry+https://github.com/rust-lang/crates.io-index",
-        "rgb 0.8.50 registry+https://github.com/rust-lang/crates.io-index",
-        "rustc-demangle 0.1.24 registry+https://github.com/rust-lang/crates.io-index",
-        "rustls-pemfile 2.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "rustls-pki-types 1.11.0 registry+https://github.com/rust-lang/crates.io-index",
-        "rustversion 1.0.20 registry+https://github.com/rust-lang/crates.io-index",
-        "same-file 1.0.6 registry+https://github.com/rust-lang/crates.io-index",
-        "schannel 0.1.27 registry+https://github.com/rust-lang/crates.io-index",
-        "schemars 0.8.22 registry+https://github.com/rust-lang/crates.io-index",
-        "schemars_derive 0.8.22 registry+https://github.com/rust-lang/crates.io-index",
-        "scopeguard 1.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "serde 1.0.218 registry+https://github.com/rust-lang/crates.io-index",
-        "serde_derive 1.0.218 registry+https://github.com/rust-lang/crates.io-index",
-        "serde_derive_internals 0.29.1 registry+https://github.com/rust-lang/crates.io-index",
-        "serde_json 1.0.140 registry+https://github.com/rust-lang/crates.io-index",
-        "serde_json_lenient 0.2.4 registry+https://github.com/rust-lang/crates.io-index",
-        "serde_urlencoded 0.7.1 registry+https://github.com/rust-lang/crates.io-index",
-        "serde_variant 0.1.3 registry+https://github.com/rust-lang/crates.io-index",
-        "serde_yaml 0.9.34+deprecated registry+https://github.com/rust-lang/crates.io-index",
-        "shadow-rs 1.0.1 registry+https://github.com/rust-lang/crates.io-index",
-        "sharded-slab 0.1.7 registry+https://github.com/rust-lang/crates.io-index",
-        "shlex 1.3.0 registry+https://github.com/rust-lang/crates.io-index",
-        "simd-adler32 0.3.7 registry+https://github.com/rust-lang/crates.io-index",
-        "simd_helpers 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "slab 0.4.9 registry+https://github.com/rust-lang/crates.io-index",
-        "smallvec 1.14.0 registry+https://github.com/rust-lang/crates.io-index",
-        "smol_str 0.2.2 registry+https://github.com/rust-lang/crates.io-index",
-        "socket2 0.5.8 registry+https://github.com/rust-lang/crates.io-index",
-        "stable_deref_trait 1.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "static_assertions 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "strsim 0.11.1 registry+https://github.com/rust-lang/crates.io-index",
-        "strum 0.27.1 registry+https://github.com/rust-lang/crates.io-index",
-        "strum_macros 0.27.1 registry+https://github.com/rust-lang/crates.io-index",
-        "syn 2.0.99 registry+https://github.com/rust-lang/crates.io-index",
-        "synstructure 0.13.1 registry+https://github.com/rust-lang/crates.io-index",
-        "sysinfo 0.33.1 registry+https://github.com/rust-lang/crates.io-index",
-        "tempfile 3.17.1 registry+https://github.com/rust-lang/crates.io-index",
-        "terminal_size 0.4.1 registry+https://github.com/rust-lang/crates.io-index",
-        "textwrap 0.16.2 registry+https://github.com/rust-lang/crates.io-index",
-        "thiserror 1.0.69 registry+https://github.com/rust-lang/crates.io-index",
-        "thiserror 2.0.12 registry+https://github.com/rust-lang/crates.io-index",
-        "thiserror-impl 1.0.69 registry+https://github.com/rust-lang/crates.io-index",
-        "thiserror-impl 2.0.12 registry+https://github.com/rust-lang/crates.io-index",
-        "thread_local 1.1.8 registry+https://github.com/rust-lang/crates.io-index",
-        "tiff 0.9.1 registry+https://github.com/rust-lang/crates.io-index",
-        "time 0.3.37 registry+https://github.com/rust-lang/crates.io-index",
-        "time-core 0.1.2 registry+https://github.com/rust-lang/crates.io-index",
-        "tokio 1.43.0 registry+https://github.com/rust-lang/crates.io-index",
-        "tokio-native-tls 0.3.1 registry+https://github.com/rust-lang/crates.io-index",
-        "tokio-util 0.7.13 registry+https://github.com/rust-lang/crates.io-index",
-        "tower 0.5.2 registry+https://github.com/rust-lang/crates.io-index",
-        "tower-layer 0.3.3 registry+https://github.com/rust-lang/crates.io-index",
-        "tower-service 0.3.3 registry+https://github.com/rust-lang/crates.io-index",
-        "tracing 0.1.41 registry+https://github.com/rust-lang/crates.io-index",
-        "tracing-appender 0.2.3 registry+https://github.com/rust-lang/crates.io-index",
-        "tracing-attributes 0.1.28 registry+https://github.com/rust-lang/crates.io-index",
-        "tracing-core 0.1.33 registry+https://github.com/rust-lang/crates.io-index",
-        "tracing-error 0.2.1 registry+https://github.com/rust-lang/crates.io-index",
-        "tracing-log 0.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "tracing-subscriber 0.3.19 registry+https://github.com/rust-lang/crates.io-index",
-        "try-lock 0.2.5 registry+https://github.com/rust-lang/crates.io-index",
-        "ttf-parser 0.25.1 registry+https://github.com/rust-lang/crates.io-index",
-        "typenum 1.18.0 registry+https://github.com/rust-lang/crates.io-index",
-        "tz-rs 0.7.0 registry+https://github.com/rust-lang/crates.io-index",
-        "uds_windows 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "unicase 2.8.1 registry+https://github.com/rust-lang/crates.io-index",
-        "unicode-ident 1.0.18 registry+https://github.com/rust-lang/crates.io-index",
-        "unicode-segmentation 1.12.0 registry+https://github.com/rust-lang/crates.io-index",
-        "unicode-width 0.1.14 registry+https://github.com/rust-lang/crates.io-index",
-        "unicode-width 0.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "unicode-xid 0.2.6 registry+https://github.com/rust-lang/crates.io-index",
-        "unsafe-libyaml 0.2.11 registry+https://github.com/rust-lang/crates.io-index",
-        "uom 0.36.0 registry+https://github.com/rust-lang/crates.io-index",
-        "url 2.5.4 registry+https://github.com/rust-lang/crates.io-index",
-        "utf16_iter 1.0.5 registry+https://github.com/rust-lang/crates.io-index",
-        "utf8_iter 1.0.4 registry+https://github.com/rust-lang/crates.io-index",
-        "utf8parse 0.2.2 registry+https://github.com/rust-lang/crates.io-index",
-        "vcpkg 0.2.15 registry+https://github.com/rust-lang/crates.io-index",
-        "version_check 0.9.5 registry+https://github.com/rust-lang/crates.io-index",
-        "walkdir 2.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "want 0.3.1 registry+https://github.com/rust-lang/crates.io-index",
-        "web-time 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "webbrowser 1.0.3 registry+https://github.com/rust-lang/crates.io-index",
-        "weezl 0.1.8 registry+https://github.com/rust-lang/crates.io-index",
-        "which 7.0.2 registry+https://github.com/rust-lang/crates.io-index",
-        "winapi 0.3.9 registry+https://github.com/rust-lang/crates.io-index",
-        "winapi-util 0.1.9 registry+https://github.com/rust-lang/crates.io-index",
-        "windows 0.57.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows 0.58.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows 0.60.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-collections 0.1.1 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-core 0.52.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-core 0.57.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-core 0.58.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-core 0.60.1 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-future 0.1.1 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-icons 0.1.0 git+https://github.com/LGUG2Z/windows-icons?rev=d67cc9920aa9b4883393e411fb4fa2ddd4c498b5",
-        "windows-implement 0.57.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-implement 0.58.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-implement 0.59.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-interface 0.57.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-interface 0.58.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-interface 0.59.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-link 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-numerics 0.1.1 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-registry 0.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-result 0.1.2 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-result 0.2.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-result 0.3.1 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-strings 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-strings 0.3.1 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-sys 0.48.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-sys 0.52.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-sys 0.59.0 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-targets 0.48.5 registry+https://github.com/rust-lang/crates.io-index",
-        "windows-targets 0.52.6 registry+https://github.com/rust-lang/crates.io-index",
-        "windows_aarch64_msvc 0.48.5 registry+https://github.com/rust-lang/crates.io-index",
-        "windows_aarch64_msvc 0.52.6 registry+https://github.com/rust-lang/crates.io-index",
-        "windows_i686_msvc 0.48.5 registry+https://github.com/rust-lang/crates.io-index",
-        "windows_i686_msvc 0.52.6 registry+https://github.com/rust-lang/crates.io-index",
-        "windows_x86_64_msvc 0.48.5 registry+https://github.com/rust-lang/crates.io-index",
-        "windows_x86_64_msvc 0.52.6 registry+https://github.com/rust-lang/crates.io-index",
-        "winput 0.2.5 registry+https://github.com/rust-lang/crates.io-index",
-        "winreg 0.55.0 registry+https://github.com/rust-lang/crates.io-index",
-        "winsafe 0.0.19 registry+https://github.com/rust-lang/crates.io-index",
-        "wmi 0.15.1 registry+https://github.com/rust-lang/crates.io-index",
-        "write16 1.0.0 registry+https://github.com/rust-lang/crates.io-index",
-        "xml-rs 0.8.25 registry+https://github.com/rust-lang/crates.io-index",
-        "zerocopy 0.7.35 registry+https://github.com/rust-lang/crates.io-index",
-        "zerocopy-derive 0.7.35 registry+https://github.com/rust-lang/crates.io-index",
-        "zune-core 0.4.12 registry+https://github.com/rust-lang/crates.io-index",
-        "zune-inflate 0.2.54 registry+https://github.com/rust-lang/crates.io-index",
-        "zune-jpeg 0.4.14 registry+https://github.com/rust-lang/crates.io-index"
-      ]
-    ],
-    [
-      "MIT-0",
-      [
-        "dunce 1.0.5 registry+https://github.com/rust-lang/crates.io-index",
-        "tzdb_data 0.2.1 registry+https://github.com/rust-lang/crates.io-index"
-      ]
-    ],
-    [
-      "MPL-2.0",
-      [
-        "option-ext 0.2.0 registry+https://github.com/rust-lang/crates.io-index"
-      ]
-    ],
-    [
-      "OFL-1.1",
-      [
-        "epaint_default_fonts 0.31.0 registry+https://github.com/rust-lang/crates.io-index"
-      ]
-    ],
-    [
-      "Ubuntu-font-1.0",
-      [
-        "epaint_default_fonts 0.31.0 registry+https://github.com/rust-lang/crates.io-index"
-      ]
-    ],
-    [
-      "Unicode-3.0",
-      [
-        "icu_collections 1.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "icu_locid 1.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "icu_locid_transform 1.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "icu_locid_transform_data 1.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "icu_normalizer 1.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "icu_normalizer_data 1.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "icu_properties 1.5.1 registry+https://github.com/rust-lang/crates.io-index",
-        "icu_properties_data 1.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "icu_provider 1.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "icu_provider_macros 1.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "litemap 0.7.5 registry+https://github.com/rust-lang/crates.io-index",
-        "tinystr 0.7.6 registry+https://github.com/rust-lang/crates.io-index",
-        "unicode-ident 1.0.18 registry+https://github.com/rust-lang/crates.io-index",
-        "writeable 0.5.5 registry+https://github.com/rust-lang/crates.io-index",
-        "yoke 0.7.5 registry+https://github.com/rust-lang/crates.io-index",
-        "yoke-derive 0.7.5 registry+https://github.com/rust-lang/crates.io-index",
-        "zerofrom 0.1.6 registry+https://github.com/rust-lang/crates.io-index",
-        "zerofrom-derive 0.1.6 registry+https://github.com/rust-lang/crates.io-index",
-        "zerovec 0.10.4 registry+https://github.com/rust-lang/crates.io-index",
-        "zerovec-derive 0.10.3 registry+https://github.com/rust-lang/crates.io-index"
-      ]
-    ],
-    [
-      "Unlicense",
-      [
-        "aho-corasick 1.1.3 registry+https://github.com/rust-lang/crates.io-index",
-        "byteorder 1.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "byteorder-lite 0.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "memchr 2.7.4 registry+https://github.com/rust-lang/crates.io-index",
-        "regex-automata 0.1.10 registry+https://github.com/rust-lang/crates.io-index",
-        "same-file 1.0.6 registry+https://github.com/rust-lang/crates.io-index",
-        "walkdir 2.5.0 registry+https://github.com/rust-lang/crates.io-index",
-        "winapi-util 0.1.9 registry+https://github.com/rust-lang/crates.io-index"
-      ]
-    ],
-    [
-      "Zlib",
-      [
-        "bytemuck 1.22.0 registry+https://github.com/rust-lang/crates.io-index",
-        "bytemuck_derive 1.8.1 registry+https://github.com/rust-lang/crates.io-index",
-        "const_format 0.2.34 registry+https://github.com/rust-lang/crates.io-index",
-        "const_format_proc_macros 0.2.34 registry+https://github.com/rust-lang/crates.io-index",
-        "cursor-icon 1.1.0 registry+https://github.com/rust-lang/crates.io-index",
-        "foldhash 0.1.4 registry+https://github.com/rust-lang/crates.io-index",
-        "glow 0.16.0 registry+https://github.com/rust-lang/crates.io-index",
-        "miniz_oxide 0.8.5 registry+https://github.com/rust-lang/crates.io-index",
-        "raw-window-handle 0.6.2 registry+https://github.com/rust-lang/crates.io-index",
-        "zune-core 0.4.12 registry+https://github.com/rust-lang/crates.io-index",
-        "zune-inflate 0.2.54 registry+https://github.com/rust-lang/crates.io-index",
-        "zune-jpeg 0.4.14 registry+https://github.com/rust-lang/crates.io-index"
-      ]
-    ]
-  ]
-}
--- a/docs/cli/cycle-empty-workspace.md
+++ b/docs/cli/cycle-empty-workspace.md
@@ -1,16 +0,0 @@
-# cycle-empty-workspace
-
-```
-Focus the next empty workspace in the given cycle direction (if one exists)
-
-Usage: komorebic.exe cycle-empty-workspace <CYCLE_DIRECTION>
-
-Arguments:
-  <CYCLE_DIRECTION>
-          [possible values: previous, next]
-
-Options:
-  -h, --help
-          Print help
-
-```
--- a/komorebi-bar/src/config.rs
+++ b/komorebi-bar/src/config.rs
@@ -478,7 +478,6 @@ mod tests {
    use serde_json::json;

    #[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq)]
-    #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
    pub enum OriginalDisplayFormat {
        /// Show None Of The Things
        NoneOfTheThings,
--- a/komorebi-bar/src/time.rs
+++ b/komorebi-bar/src/time.rs
@@ -110,37 +110,36 @@ impl Time {
        let full_height = size;
        let height = full_height / 4.0;
        let width = height;
-        let offset = height / 2.0 - height / 8.0;

        let (response, painter) =
-            ui.allocate_painter(Vec2::new(width, full_height + offset * 2.0), Sense::hover());
+            ui.allocate_painter(Vec2::new(width, full_height), Sense::hover());
        let color = ctx.style().visuals.text_color();

        let c = response.rect.center();
        let r = height / 2.0 - 0.5;

        if number == 1 || number == 3 || number == 5 || number == 7 || number == 9 {
-            painter.circle_filled(c + Vec2::new(0.0, height * 1.50 + offset), r, color);
+            painter.circle_filled(c + Vec2::new(0.0, height * 1.50), r, color);
        } else {
-            painter.circle_filled(c + Vec2::new(0.0, height * 1.50 + offset), r / 2.5, color);
+            painter.circle_filled(c + Vec2::new(0.0, height * 1.50), r / 2.5, color);
        }

        if number == 2 || number == 3 || number == 6 || number == 7 {
-            painter.circle_filled(c + Vec2::new(0.0, height * 0.50 + offset), r, color);
+            painter.circle_filled(c + Vec2::new(0.0, height * 0.50), r, color);
        } else {
-            painter.circle_filled(c + Vec2::new(0.0, height * 0.50 + offset), r / 2.5, color);
+            painter.circle_filled(c + Vec2::new(0.0, height * 0.50), r / 2.5, color);
        }

        if number == 4 || number == 5 || number == 6 || number == 7 {
-            painter.circle_filled(c + Vec2::new(0.0, -height * 0.50 + offset), r, color);
+            painter.circle_filled(c + Vec2::new(0.0, -height * 0.50), r, color);
        } else if max_power > 2 {
-            painter.circle_filled(c + Vec2::new(0.0, -height * 0.50 + offset), r / 2.5, color);
+            painter.circle_filled(c + Vec2::new(0.0, -height * 0.50), r / 2.5, color);
        }

        if number == 8 || number == 9 {
-            painter.circle_filled(c + Vec2::new(0.0, -height * 1.50 + offset), r, color);
+            painter.circle_filled(c + Vec2::new(0.0, -height * 1.50), r, color);
        } else if max_power > 3 {
-            painter.circle_filled(c + Vec2::new(0.0, -height * 1.50 + offset), r / 2.5, color);
+            painter.circle_filled(c + Vec2::new(0.0, -height * 1.50), r / 2.5, color);
        }
    }

@@ -155,10 +154,9 @@ impl Time {
        let full_height = size;
        let height = full_height / 4.0;
        let width = height * 1.5;
-        let offset = height / 2.0 - height / 8.0;

        let (response, painter) =
-            ui.allocate_painter(Vec2::new(width, full_height + offset * 2.0), Sense::hover());
+            ui.allocate_painter(Vec2::new(width, full_height), Sense::hover());
        let color = ctx.style().visuals.text_color();
        let stroke = Stroke::new(1.0, color);

@@ -176,25 +174,22 @@ impl Time {
        };

        if max_power == 2 {
-            let mut rect = response
-                .rect
-                .shrink2(Vec2::new(stroke.width, stroke.width + offset));
+            let mut rect = response.rect.shrink(stroke.width);
            rect.set_height(rect.height() - height * 2.0);
-            rect = rect.translate(Vec2::new(0.0, height * 2.0 + offset));
+            rect = rect.translate(Vec2::new(0.0, height * 2.0));
            painter.rect_stroke(rect, round_all, stroke, StrokeKind::Outside);
        } else if max_power == 3 {
-            let mut rect = response
-                .rect
-                .shrink2(Vec2::new(stroke.width, stroke.width + offset));
+            let mut rect = response.rect.shrink(stroke.width);
            rect.set_height(rect.height() - height);
-            rect = rect.translate(Vec2::new(0.0, height + offset));
+            rect = rect.translate(Vec2::new(0.0, height));
            painter.rect_stroke(rect, round_all, stroke, StrokeKind::Outside);
        } else {
-            let mut rect = response
-                .rect
-                .shrink2(Vec2::new(stroke.width, stroke.width + offset));
-            rect = rect.translate(Vec2::new(0.0, 0.0 + offset));
-            painter.rect_stroke(rect, round_all, stroke, StrokeKind::Outside);
+            painter.rect_stroke(
+                response.rect.shrink(stroke.width),
+                round_all,
+                stroke,
+                StrokeKind::Outside,
+            );
        }

        let mut rect_bin = response.rect;
@@ -203,7 +198,7 @@ impl Time {
        if number == 1 || number == 5 || number == 9 {
            rect_bin.set_height(height);
            painter.rect_filled(
-                rect_bin.translate(Vec2::new(stroke.width, height * 3.0 + offset * 2.0)),
+                rect_bin.translate(Vec2::new(0.0, height * 3.0)),
                round_bottom,
                color,
            );
@@ -211,7 +206,7 @@ impl Time {
        if number == 2 {
            rect_bin.set_height(height);
            painter.rect_filled(
-                rect_bin.translate(Vec2::new(stroke.width, height * 2.0 + offset * 2.0)),
+                rect_bin.translate(Vec2::new(0.0, height * 2.0)),
                if max_power == 2 {
                    round_top
                } else {
@@ -223,7 +218,7 @@ impl Time {
        if number == 3 {
            rect_bin.set_height(height * 2.0);
            painter.rect_filled(
-                rect_bin.translate(Vec2::new(stroke.width, height * 2.0 + offset * 2.0)),
+                rect_bin.translate(Vec2::new(0.0, height * 2.0)),
                round_bottom,
                color,
            );
@@ -231,7 +226,7 @@ impl Time {
        if number == 4 || number == 5 {
            rect_bin.set_height(height);
            painter.rect_filled(
-                rect_bin.translate(Vec2::new(stroke.width, height * 1.0 + offset * 2.0)),
+                rect_bin.translate(Vec2::new(0.0, height * 1.0)),
                if max_power == 3 {
                    round_top
                } else {
@@ -243,7 +238,7 @@ impl Time {
        if number == 6 {
            rect_bin.set_height(height * 2.0);
            painter.rect_filled(
-                rect_bin.translate(Vec2::new(stroke.width, height * 1.0 + offset * 2.0)),
+                rect_bin.translate(Vec2::new(0.0, height * 1.0)),
                if max_power == 3 {
                    round_top
                } else {
@@ -255,7 +250,7 @@ impl Time {
        if number == 7 {
            rect_bin.set_height(height * 3.0);
            painter.rect_filled(
-                rect_bin.translate(Vec2::new(stroke.width, height + offset * 2.0)),
+                rect_bin.translate(Vec2::new(0.0, height)),
                if max_power == 3 {
                    round_all
                } else {
@@ -266,11 +261,7 @@ impl Time {
        }
        if number == 8 || number == 9 {
            rect_bin.set_height(height);
-            painter.rect_filled(
-                rect_bin.translate(Vec2::new(stroke.width, 0.0 + offset * 2.0)),
-                round_top,
-                color,
-            );
+            painter.rect_filled(rect_bin.translate(Vec2::new(0.0, 0.0)), round_top, color);
        }
    }
 }
--- a/komorebi-client/Cargo.toml
+++ b/komorebi-client/Cargo.toml
@@ -10,7 +10,3 @@ komorebi = { path = "../komorebi" }

 uds_windows = { workspace = true }
 serde_json = { workspace = true }
-
-[features]
-default = ["schemars"]
-schemars = ["komorebi/schemars"]
--- a/komorebi-client/src/lib.rs
+++ b/komorebi-client/src/lib.rs
@@ -4,7 +4,6 @@
 pub use komorebi::animation::prefix::AnimationPrefix;
 pub use komorebi::animation::PerAnimationPrefixConfig;
 pub use komorebi::asc::ApplicationSpecificConfiguration;
-pub use komorebi::border_manager::BorderInfo;
 pub use komorebi::colour::Colour;
 pub use komorebi::colour::Rgb;
 pub use komorebi::config_generation::ApplicationConfiguration;
--- a/komorebi/Cargo.toml
+++ b/komorebi/Cargo.toml
@@ -55,7 +55,6 @@ shadow-rs = { workspace = true }

 [dev-dependencies]
 reqwest = { version = "0.12", features = ["blocking"] }
-uuid = { version = "1", features = ["v4"] }

 [features]
 default = ["schemars"]
--- a/komorebi/src/border_manager/border.rs
+++ b/komorebi/src/border_manager/border.rs
@@ -3,6 +3,8 @@ use crate::border_manager::RenderTarget;
 use crate::border_manager::WindowKind;
 use crate::border_manager::BORDER_OFFSET;
 use crate::border_manager::BORDER_WIDTH;
+use crate::border_manager::FOCUS_STATE;
+use crate::border_manager::RENDER_TARGETS;
 use crate::border_manager::STYLE;
 use crate::core::BorderStyle;
 use crate::core::Rect;
@@ -112,8 +114,6 @@ pub extern "system" fn border_hwnds(hwnd: HWND, lparam: LPARAM) -> BOOL {
 #[derive(Debug, Clone)]
 pub struct Border {
    pub hwnd: isize,
-    pub id: String,
-    pub monitor_idx: Option<usize>,
    pub render_target: OnceLock<RenderTarget>,
    pub tracking_hwnd: isize,
    pub window_rect: Rect,
@@ -130,8 +130,6 @@ impl From<isize> for Border {
    fn from(value: isize) -> Self {
        Self {
            hwnd: value,
-            id: String::new(),
-            monitor_idx: None,
            render_target: OnceLock::new(),
            tracking_hwnd: 0,
            window_rect: Rect::default(),
@@ -151,11 +149,7 @@ impl Border {
        HWND(windows_api::as_ptr!(self.hwnd))
    }

-    pub fn create(
-        id: &str,
-        tracking_hwnd: isize,
-        monitor_idx: usize,
-    ) -> color_eyre::Result<Box<Self>> {
+    pub fn create(id: &str, tracking_hwnd: isize) -> color_eyre::Result<Self> {
        let name: Vec<u16> = format!("komoborder-{id}\0").encode_utf16().collect();
        let class_name = PCWSTR(name.as_ptr());

@@ -174,12 +168,9 @@ impl Border {
        let (border_sender, border_receiver) = mpsc::channel();

        let instance = h_module.0 as isize;
-        let container_id = id.to_owned();
        std::thread::spawn(move || -> color_eyre::Result<()> {
            let mut border = Self {
                hwnd: 0,
-                id: container_id,
-                monitor_idx: Some(monitor_idx),
                render_target: OnceLock::new(),
                tracking_hwnd,
                window_rect: WindowsApi::window_rect(tracking_hwnd).unwrap_or_default(),
@@ -192,15 +183,12 @@ impl Border {
                brushes: HashMap::new(),
            };

-            let border_pointer = &raw mut border;
+            let border_pointer = std::ptr::addr_of!(border);
            let hwnd =
                WindowsApi::create_border_window(PCWSTR(name.as_ptr()), instance, border_pointer)?;

-            let boxed = unsafe {
-                (*border_pointer).hwnd = hwnd;
-                Box::from_raw(border_pointer)
-            };
-            border_sender.send(boxed)?;
+            border.hwnd = hwnd;
+            border_sender.send(border_pointer as isize)?;

            let mut msg: MSG = MSG::default();

@@ -219,7 +207,8 @@ impl Border {
            Ok(())
        });

-        let mut border = border_receiver.recv()?;
+        let border_ref = border_receiver.recv()?;
+        let border = unsafe { &mut *(border_ref as *mut Border) };

        // I have literally no idea, apparently this is to get rid of the black pixels
        // around the edges of rounded corners? @lukeyou05 borrowed this from PowerToys
@@ -303,13 +292,17 @@ impl Border {
                    }
                };

-                Ok(border)
+                let mut render_targets = RENDER_TARGETS.lock();
+                render_targets.insert(border.hwnd, RenderTarget(render_target));
+                Ok(border.clone())
            },
            Err(error) => Err(error.into()),
        }
    }

    pub fn destroy(&self) -> color_eyre::Result<()> {
+        let mut render_targets = RENDER_TARGETS.lock();
+        render_targets.remove(&self.hwnd);
        WindowsApi::close_window(self.hwnd)
    }

@@ -368,7 +361,7 @@ impl Border {
                        return LRESULT(0);
                    }

-                    let reference_hwnd = (*border_pointer).tracking_hwnd;
+                    let reference_hwnd = lparam.0;

                    let old_rect = (*border_pointer).window_rect;
                    let rect = WindowsApi::window_rect(reference_hwnd).unwrap_or_default();
@@ -482,6 +475,11 @@ impl Border {
                            });

                            // Get window kind and color
+                            (*border_pointer).window_kind = FOCUS_STATE
+                                .lock()
+                                .get(&(window.0 as isize))
+                                .copied()
+                                .unwrap_or(WindowKind::Unfocused);
                            let window_kind = (*border_pointer).window_kind;
                            if let Some(brush) = (*border_pointer).brushes.get(&window_kind) {
                                render_target.BeginDraw();
--- a/komorebi/src/border_manager/mod.rs
+++ b/komorebi/src/border_manager/mod.rs
@@ -5,7 +5,6 @@ use crate::core::BorderImplementation;
 use crate::core::BorderStyle;
 use crate::core::WindowKind;
 use crate::ring::Ring;
-use crate::windows_api;
 use crate::workspace::WorkspaceLayer;
 use crate::workspace_reconciliator::ALT_TAB_HWND;
 use crate::Colour;
@@ -32,7 +31,6 @@ use std::sync::atomic::Ordering;
 use std::sync::Arc;
 use std::sync::OnceLock;
 use strum::Display;
-use windows::Win32::Foundation::HWND;
 use windows::Win32::Graphics::Direct2D::ID2D1HwndRenderTarget;

 pub static BORDER_WIDTH: AtomicI32 = AtomicI32::new(8);
@@ -56,8 +54,11 @@ lazy_static! {
 }

 lazy_static! {
-    static ref BORDER_STATE: Mutex<HashMap<String, Box<Border>>> = Mutex::new(HashMap::new());
-    static ref WINDOWS_BORDERS: Mutex<HashMap<isize, String>> = Mutex::new(HashMap::new());
+    static ref BORDERS_MONITORS: Mutex<HashMap<String, usize>> = Mutex::new(HashMap::new());
+    static ref BORDER_STATE: Mutex<HashMap<String, Border>> = Mutex::new(HashMap::new());
+    static ref WINDOWS_BORDERS: Mutex<HashMap<isize, Border>> = Mutex::new(HashMap::new());
+    static ref FOCUS_STATE: Mutex<HashMap<isize, WindowKind>> = Mutex::new(HashMap::new());
+    static ref RENDER_TARGETS: Mutex<HashMap<isize, RenderTarget>> = Mutex::new(HashMap::new());
 }

 #[derive(Debug, Clone)]
@@ -74,18 +75,6 @@ impl Deref for RenderTarget {

 pub struct Notification(pub Option<isize>);

-#[derive(Debug, Default, Clone, Copy, PartialEq)]
-pub struct BorderInfo {
-    pub border_hwnd: isize,
-    pub window_kind: WindowKind,
-}
-
-impl BorderInfo {
-    pub fn hwnd(&self) -> HWND {
-        HWND(windows_api::as_ptr!(self.border_hwnd))
-    }
-}
-
 static CHANNEL: OnceLock<(Sender<Notification>, Receiver<Notification>)> = OnceLock::new();

 pub fn channel() -> &'static (Sender<Notification>, Receiver<Notification>) {
@@ -100,13 +89,8 @@ fn event_rx() -> Receiver<Notification> {
    channel().1.clone()
 }

-pub fn window_border(hwnd: isize) -> Option<BorderInfo> {
-    WINDOWS_BORDERS.lock().get(&hwnd).and_then(|id| {
-        BORDER_STATE.lock().get(id).map(|b| BorderInfo {
-            border_hwnd: b.hwnd,
-            window_kind: b.window_kind,
-        })
-    })
+pub fn window_border(hwnd: isize) -> Option<Border> {
+    WINDOWS_BORDERS.lock().get(&hwnd).cloned()
 }

 pub fn send_notification(hwnd: Option<isize>) {
@@ -122,11 +106,15 @@ pub fn destroy_all_borders() -> color_eyre::Result<()> {
        borders.iter().map(|b| b.1.hwnd).collect::<Vec<_>>()
    );

-    for (_, border) in borders.drain() {
-        let _ = destroy_border(border);
+    for (_, border) in borders.iter() {
+        let _ = border.destroy();
    }

+    borders.clear();
+    BORDERS_MONITORS.lock().clear();
    WINDOWS_BORDERS.lock().clear();
+    FOCUS_STATE.lock().clear();
+    RENDER_TARGETS.lock().clear();

    let mut remaining_hwnds = vec![];

@@ -139,7 +127,7 @@ pub fn destroy_all_borders() -> color_eyre::Result<()> {
        tracing::info!("purging unknown borders: {:?}", remaining_hwnds);

        for hwnd in remaining_hwnds {
-            let _ = destroy_border(Box::new(Border::from(hwnd)));
+            let _ = Border::from(hwnd).destroy();
        }
    }

@@ -288,20 +276,10 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                    // border.
                    (fw != &foreground_window
                        && window_border(*fw)
-                        .is_some_and(|b| b.window_kind == WindowKind::Floating))
+                        .map(|b| b.window_kind == WindowKind::Floating)
+                        .unwrap_or_default())
                });

-                // when the focused window has an `Unfocused` border kind, usually this happens if
-                // we focus an admin window and then refocus the previously focused window. For
-                // komorebi it will have the same state has before, however the previously focused
-                // window changed its border to unfocused so now we need to update it again.
-                if !should_process_notification
-                    && window_border(notification.0.unwrap_or_default())
-                        .is_some_and(|b| b.window_kind == WindowKind::Unfocused)
-                {
-                    should_process_notification = true;
-                }
-
                if !should_process_notification && switch_focus_to_from_floating_window {
                    should_process_notification = true;
                }
@@ -320,7 +298,9 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                }

                let mut borders = BORDER_STATE.lock();
+                let mut borders_monitors = BORDERS_MONITORS.lock();
                let mut windows_borders = WINDOWS_BORDERS.lock();
+                let mut focus_state = FOCUS_STATE.lock();

                // If borders are disabled
                if !BORDER_ENABLED.load_consume()
@@ -330,11 +310,14 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                    || ALT_TAB_HWND.load().is_some()
                {
                    // Destroy the borders we know about
-                    for (_, border) in borders.drain() {
-                        destroy_border(border)?;
+                    for (_, border) in borders.iter() {
+                        border.destroy()?;
                    }

+                    borders.clear();
+                    borders_monitors.clear();
                    windows_borders.clear();
+                    focus_state.clear();

                    previous_is_paused = is_paused;
                    continue 'receiver;
@@ -349,6 +332,8 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                            remove_borders(
                                &mut borders,
                                &mut windows_borders,
+                                &mut focus_state,
+                                &mut borders_monitors,
                                monitor_idx,
                                |_, _| true,
                            )?;
@@ -359,16 +344,12 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                        // Handle the monocle container separately
                        if let Some(monocle) = ws.monocle_container() {
                            let mut new_border = false;
-                            let focused_window_hwnd =
-                                monocle.focused_window().map(|w| w.hwnd).unwrap_or_default();
-                            let id = monocle.id().clone();
-                            let border = match borders.entry(id.clone()) {
+                            let border = match borders.entry(monocle.id().clone()) {
                                Entry::Occupied(entry) => entry.into_mut(),
                                Entry::Vacant(entry) => {
                                    if let Ok(border) = Border::create(
                                        monocle.id(),
-                                        focused_window_hwnd,
-                                        monitor_idx,
+                                        monocle.focused_window().copied().unwrap_or_default().hwnd,
                                    ) {
                                        new_border = true;
                                        entry.insert(border)
@@ -384,41 +365,32 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                                WindowKind::Monocle
                            };
                            border.window_kind = new_focus_state;
+                            focus_state.insert(border.hwnd, new_focus_state);

-                            // Update the borders tracking_hwnd in case it changed and remove the
-                            // old `tracking_hwnd` from `WINDOWS_BORDERS` if needed.
-                            if border.tracking_hwnd != focused_window_hwnd {
-                                if let Some(previous) = windows_borders.get(&border.tracking_hwnd) {
-                                    // Only remove the border from `windows_borders` if it
-                                    // still corresponds to the same border, if doesn't then
-                                    // it means it was already updated by another border for
-                                    // that window and in that case we don't want to remove it.
-                                    if previous == &id {
-                                        windows_borders.remove(&border.tracking_hwnd);
-                                    }
-                                }
-                                border.tracking_hwnd = focused_window_hwnd;
-                                if !WindowsApi::is_window_visible(border.hwnd) {
-                                    WindowsApi::restore_window(border.hwnd);
-                                }
-                            }
+                            let reference_hwnd =
+                                monocle.focused_window().copied().unwrap_or_default().hwnd;

-                            let rect = WindowsApi::window_rect(focused_window_hwnd)?;
-                            border.window_rect = rect;
+                            let rect = WindowsApi::window_rect(reference_hwnd)?;

                            if new_border {
-                                border.set_position(&rect, focused_window_hwnd)?;
+                                border.set_position(&rect, reference_hwnd)?;
                            }

                            border.invalidate();

-                            windows_borders.insert(focused_window_hwnd, id);
+                            borders_monitors.insert(monocle.id().clone(), monitor_idx);
+                            windows_borders.insert(
+                                monocle.focused_window().cloned().unwrap_or_default().hwnd,
+                                border.clone(),
+                            );

                            let border_hwnd = border.hwnd;
                            // Remove all borders on this monitor except monocle
                            remove_borders(
                                &mut borders,
                                &mut windows_borders,
+                                &mut focus_state,
+                                &mut borders_monitors,
                                monitor_idx,
                                |_, b| border_hwnd != b.hwnd,
                            )?;
@@ -437,6 +409,8 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                            remove_borders(
                                &mut borders,
                                &mut windows_borders,
+                                &mut focus_state,
+                                &mut borders_monitors,
                                monitor_idx,
                                |_, _| true,
                            )?;
@@ -459,22 +433,56 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                        remove_borders(
                            &mut borders,
                            &mut windows_borders,
+                            &mut focus_state,
+                            &mut borders_monitors,
                            monitor_idx,
                            |id, _| !container_and_floating_window_ids.contains(id),
                        )?;

                        'containers: for (idx, c) in ws.containers().iter().enumerate() {
+                            // In case this container is a stack we need to check it's
+                            // unfocused windows to remove any attached border
+                            let is_stack = c.windows().len() > 1;
+                            if is_stack {
+                                let focused_window_idx = c.focused_window_idx();
+                                let potential_stacked_border_handles = c
+                                    .windows()
+                                    .iter()
+                                    .enumerate()
+                                    .flat_map(|(i, w)| {
+                                        if i != focused_window_idx {
+                                            windows_borders.get(&w.hwnd).map(|b| b.hwnd)
+                                        } else {
+                                            None
+                                        }
+                                    })
+                                    .collect::<Vec<_>>();
+
+                                if !potential_stacked_border_handles.is_empty() {
+                                    tracing::debug!(
+                                        "purging stacked borders: {:?}",
+                                        potential_stacked_border_handles
+                                    );
+                                    remove_borders(
+                                        &mut borders,
+                                        &mut windows_borders,
+                                        &mut focus_state,
+                                        &mut borders_monitors,
+                                        monitor_idx,
+                                        |_, b| potential_stacked_border_handles.contains(&b.hwnd),
+                                    )?;
+                                }
+                            }
+
                            let focused_window_hwnd =
                                c.focused_window().map(|w| w.hwnd).unwrap_or_default();
-                            let id = c.id().clone();

                            // Get the border entry for this container from the map or create one
                            let mut new_border = false;
-                            let border = match borders.entry(id.clone()) {
+                            let border = match borders.entry(c.id().clone()) {
                                Entry::Occupied(entry) => entry.into_mut(),
                                Entry::Vacant(entry) => {
-                                    if let Ok(border) =
-                                        Border::create(c.id(), focused_window_hwnd, monitor_idx)
+                                    if let Ok(border) = Border::create(c.id(), focused_window_hwnd)
                                    {
                                        new_border = true;
                                        entry.insert(border)
@@ -484,7 +492,8 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                                }
                            };

-                            let last_focus_state = border.window_kind;
+                            #[allow(unused_assignments)]
+                            let mut last_focus_state = None;

                            let new_focus_state = if idx != ws.focused_container_idx()
                                || monitor_idx != focused_monitor_idx
@@ -496,24 +505,40 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                            } else {
                                WindowKind::Single
                            };
-
                            border.window_kind = new_focus_state;

-                            // Update the borders `tracking_hwnd` in case it changed and remove the
-                            // old `tracking_hwnd` from `WINDOWS_BORDERS` if needed.
+                            last_focus_state = focus_state.get(&border.hwnd).copied();
+
+                            // If this container's border was previously tracking a different
+                            // window, then we need to destroy that border and create a new one
+                            // tracking the correct window.
                            if border.tracking_hwnd != focused_window_hwnd {
-                                if let Some(previous) = windows_borders.get(&border.tracking_hwnd) {
-                                    // Only remove the border from `windows_borders` if it
-                                    // still corresponds to the same border, if doesn't then
-                                    // it means it was already updated by another border for
-                                    // that window and in that case we don't want to remove it.
-                                    if previous == &id {
-                                        windows_borders.remove(&border.tracking_hwnd);
+                                // Create new border
+                                if let Ok(b) = Border::create(
+                                    c.id(),
+                                    c.focused_window().copied().unwrap_or_default().hwnd,
+                                ) {
+                                    // Destroy previously stacked border window and remove its hwnd
+                                    // and tracking_hwnd.
+                                    border.destroy()?;
+                                    focus_state.remove(&border.hwnd);
+                                    if let Some(previous) =
+                                        windows_borders.get(&border.tracking_hwnd)
+                                    {
+                                        // Only remove the border from `windows_borders` if it
+                                        // still is the same border, if it isn't then it means it
+                                        // was already updated by another border for that window
+                                        // and in that case we don't want to remove it.
+                                        if previous.hwnd == border.hwnd {
+                                            windows_borders.remove(&border.tracking_hwnd);
+                                        }
                                    }
-                                }
-                                border.tracking_hwnd = focused_window_hwnd;
-                                if !WindowsApi::is_window_visible(border.hwnd) {
-                                    WindowsApi::restore_window(border.hwnd);
+
+                                    // Replace with new border
+                                    new_border = true;
+                                    *border = b;
+                                } else {
+                                    continue 'monitors;
                                }
                            }

@@ -523,38 +548,51 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                            let rect = match WindowsApi::window_rect(focused_window_hwnd) {
                                Ok(rect) => rect,
                                Err(_) => {
-                                    remove_border(c.id(), &mut borders, &mut windows_borders)?;
+                                    remove_border(
+                                        c.id(),
+                                        &mut borders,
+                                        &mut windows_borders,
+                                        &mut focus_state,
+                                        &mut borders_monitors,
+                                    )?;
                                    continue 'containers;
                                }
                            };
-                            border.window_rect = rect;

                            let layer_changed = previous_layer != workspace_layer;

-                            let should_invalidate = new_border
-                                || (last_focus_state != new_focus_state)
-                                || layer_changed;
+                            let should_invalidate = match last_focus_state {
+                                None => true,
+                                Some(last_focus_state) => {
+                                    (last_focus_state != new_focus_state) || layer_changed
+                                }
+                            };
+
+                            if new_border || should_invalidate {
+                                border.set_position(&rect, focused_window_hwnd)?;
+                            }

                            if should_invalidate {
-                                border.set_position(&rect, focused_window_hwnd)?;
                                border.invalidate();
                            }

-                            windows_borders.insert(focused_window_hwnd, id);
+                            borders_monitors.insert(c.id().clone(), monitor_idx);
+                            windows_borders.insert(
+                                c.focused_window().cloned().unwrap_or_default().hwnd,
+                                border.clone(),
+                            );
+                            focus_state.insert(border.hwnd, new_focus_state);
                        }

                        {
                            for window in ws.floating_windows() {
                                let mut new_border = false;
-                                let id = window.hwnd.to_string();
-                                let border = match borders.entry(id.clone()) {
+                                let border = match borders.entry(window.hwnd.to_string()) {
                                    Entry::Occupied(entry) => entry.into_mut(),
                                    Entry::Vacant(entry) => {
-                                        if let Ok(border) = Border::create(
-                                            &window.hwnd.to_string(),
-                                            window.hwnd,
-                                            monitor_idx,
-                                        ) {
+                                        if let Ok(border) =
+                                            Border::create(&window.hwnd.to_string(), window.hwnd)
+                                        {
                                            new_border = true;
                                            entry.insert(border)
                                        } else {
@@ -563,31 +601,39 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                                    }
                                };

-                                let last_focus_state = border.window_kind;
+                                #[allow(unused_assignments)]
+                                let mut last_focus_state = None;
+                                let mut new_focus_state = WindowKind::Unfocused;

-                                let new_focus_state = if foreground_window == window.hwnd {
-                                    WindowKind::Floating
-                                } else {
-                                    WindowKind::Unfocused
-                                };
+                                if foreground_window == window.hwnd {
+                                    new_focus_state = WindowKind::Floating;
+                                }

                                border.window_kind = new_focus_state;
+                                last_focus_state = focus_state.get(&border.hwnd).copied();

                                let rect = WindowsApi::window_rect(window.hwnd)?;
-                                border.window_rect = rect;

                                let layer_changed = previous_layer != workspace_layer;

-                                let should_invalidate = new_border
-                                    || (last_focus_state != new_focus_state)
-                                    || layer_changed;
+                                let should_invalidate = match last_focus_state {
+                                    None => true,
+                                    Some(last_focus_state) => {
+                                        last_focus_state != new_focus_state || layer_changed
+                                    }
+                                };
+
+                                if new_border {
+                                    border.set_position(&rect, window.hwnd)?;
+                                }

                                if should_invalidate {
-                                    border.set_position(&rect, window.hwnd)?;
                                    border.invalidate();
                                }

-                                windows_borders.insert(window.hwnd, id);
+                                borders_monitors.insert(window.hwnd.to_string(), monitor_idx);
+                                windows_borders.insert(window.hwnd, border.clone());
+                                focus_state.insert(border.hwnd, new_focus_state);
                            }
                        }
                    }
@@ -610,27 +656,24 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
 /// the container id and the border and returns a bool, if true that border
 /// will be removed.
 fn remove_borders(
-    borders: &mut HashMap<String, Box<Border>>,
-    windows_borders: &mut HashMap<isize, String>,
+    borders: &mut HashMap<String, Border>,
+    windows_borders: &mut HashMap<isize, Border>,
+    focus_state: &mut HashMap<isize, WindowKind>,
+    borders_monitors: &mut HashMap<String, usize>,
    monitor_idx: usize,
    condition: impl Fn(&String, &Border) -> bool,
 ) -> color_eyre::Result<()> {
    let mut to_remove = vec![];
    for (id, border) in borders.iter() {
-        // if border is on this monitor
-        if border.monitor_idx.is_some_and(|idx| idx == monitor_idx)
-            // and the condition applies
+        if borders_monitors.get(id).copied().unwrap_or_default() == monitor_idx
            && condition(id, border)
-            // and the border is visible (we don't remove hidden borders)
-            && WindowsApi::is_window_visible(border.hwnd)
        {
-            // we mark it to be removed
            to_remove.push(id.clone());
        }
    }

    for id in &to_remove {
-        remove_border(id, borders, windows_borders)?;
+        remove_border(id, borders, windows_borders, focus_state, borders_monitors)?;
    }

    Ok(())
@@ -639,71 +682,21 @@ fn remove_borders(
 /// Removes the border with `id` and all its related info from all maps
 fn remove_border(
    id: &str,
-    borders: &mut HashMap<String, Box<Border>>,
-    windows_borders: &mut HashMap<isize, String>,
+    borders: &mut HashMap<String, Border>,
+    windows_borders: &mut HashMap<isize, Border>,
+    focus_state: &mut HashMap<isize, WindowKind>,
+    borders_monitors: &mut HashMap<String, usize>,
 ) -> color_eyre::Result<()> {
    if let Some(removed_border) = borders.remove(id) {
+        removed_border.destroy()?;
        windows_borders.remove(&removed_border.tracking_hwnd);
-        destroy_border(removed_border)?;
+        focus_state.remove(&removed_border.hwnd);
    }
+    borders_monitors.remove(id);

    Ok(())
 }

-/// IMPORTANT: BEWARE when changing this function. We need to make sure that we don't let the
-/// `Box<Border>` be dropped normally. We need to turn the `Box` into the raw pointer and use that
-/// pointer to call the `.destroy()` funtion of the border so it closes the window. This way the
-/// `Box` is consumed and the pointer is dropped like a normal `Copy` number instead of trying to
-/// drop the struct it points to. The actual border is owned by the thread that created the window
-/// and once the window closes that thread gets out of its loop, finishes and properly disposes of
-/// the border.
-fn destroy_border(border: Box<Border>) -> color_eyre::Result<()> {
-    let raw_pointer = Box::into_raw(border);
-    unsafe {
-        (*raw_pointer).destroy()?;
-    }
-    Ok(())
-}
-
-/// Removes the border around window with `tracking_hwnd` if it exists
-pub fn delete_border(tracking_hwnd: isize) {
-    std::thread::spawn(move || {
-        let id = {
-            WINDOWS_BORDERS
-                .lock()
-                .get(&tracking_hwnd)
-                .cloned()
-                .unwrap_or_default()
-        };
-
-        let mut borders = BORDER_STATE.lock();
-        let mut windows_borders = WINDOWS_BORDERS.lock();
-
-        if let Err(error) = remove_border(&id, &mut borders, &mut windows_borders) {
-            tracing::error!("Failed to delete border: {}", error);
-        }
-    });
-}
-
-/// Shows the border around window with `tracking_hwnd` if it exists
-pub fn show_border(tracking_hwnd: isize) {
-    std::thread::spawn(move || {
-        if let Some(border_info) = window_border(tracking_hwnd) {
-            WindowsApi::restore_window(border_info.border_hwnd);
-        }
-    });
-}
-
-/// Hides the border around window with `tracking_hwnd` if it exists, unless the border kind is a
-/// `Stack` border.
-pub fn hide_border(tracking_hwnd: isize) {
-    std::thread::spawn(move || {
-        if let Some(border_info) = window_border(tracking_hwnd) {
-            WindowsApi::hide_window(border_info.border_hwnd);
-        }
-    });
-}
-
 #[derive(Debug, Copy, Clone, Display, Serialize, Deserialize, PartialEq)]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum ZOrder {
--- a/komorebi/src/container.rs
+++ b/komorebi/src/container.rs
@@ -52,17 +52,13 @@ impl Container {
        }
    }

-    /// Hides the unfocused windows of the container and restores the focused one. This function
-    /// is used to make sure we update the window that should be shown on a stack. If the container
-    /// isn't a stack this function won't change anything.
    pub fn load_focused_window(&mut self) {
        let focused_idx = self.focused_window_idx();
-
        for (i, window) in self.windows_mut().iter_mut().enumerate() {
            if i == focused_idx {
-                window.restore_with_border(false);
+                window.restore();
            } else {
-                window.hide_with_border(false);
+                window.hide();
            }
        }
    }
@@ -102,13 +98,14 @@ impl Container {
    }

    pub fn idx_for_window(&self, hwnd: isize) -> Option<usize> {
+        let mut idx = None;
        for (i, window) in self.windows().iter().enumerate() {
            if window.hwnd == hwnd {
-                return Option::from(i);
+                idx = Option::from(i);
            }
        }

-        None
+        idx
    }

    pub fn remove_window_by_idx(&mut self, idx: usize) -> Option<Window> {
--- a/komorebi/src/core/mod.rs
+++ b/komorebi/src/core/mod.rs
@@ -122,7 +122,6 @@ pub enum SocketMessage {
    Load(PathBuf),
    CycleFocusMonitor(CycleDirection),
    CycleFocusWorkspace(CycleDirection),
-    CycleFocusEmptyWorkspace(CycleDirection),
    FocusMonitorNumber(usize),
    FocusMonitorAtCursor,
    FocusLastWorkspace,
@@ -292,25 +291,13 @@ pub enum BorderImplementation {
 }

 #[derive(
-    Copy,
-    Clone,
-    Debug,
-    Default,
-    Serialize,
-    Deserialize,
-    Display,
-    EnumString,
-    ValueEnum,
-    PartialEq,
-    Eq,
-    Hash,
+    Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, PartialEq, Eq, Hash,
 )]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum WindowKind {
    Single,
    Stack,
    Monocle,
-    #[default]
    Unfocused,
    Floating,
 }
--- a/komorebi/src/main.rs
+++ b/komorebi/src/main.rs
@@ -235,7 +235,6 @@ fn main() -> Result<()> {
    } else {
        Arc::new(Mutex::new(WindowManager::new(
            winevent_listener::event_rx(),
-            None,
        )?))
    };

--- a/komorebi/src/process_command.rs
+++ b/komorebi/src/process_command.rs
@@ -205,9 +205,7 @@ impl WindowManager {
        let initial_state = State::from(self.as_ref());

        match message {
-            SocketMessage::CycleFocusEmptyWorkspace(_)
-            | SocketMessage::CycleFocusWorkspace(_)
-            | SocketMessage::FocusWorkspaceNumber(_) => {
+            SocketMessage::CycleFocusWorkspace(_) | SocketMessage::FocusWorkspaceNumber(_) => {
                if let Some(monitor) = self.focused_monitor_mut() {
                    let idx = monitor.focused_workspace_idx();
                    monitor.set_last_focused_workspace(Option::from(idx));
@@ -902,55 +900,6 @@ impl WindowManager {

                self.focus_workspace(workspace_idx)?;
            }
-            SocketMessage::CycleFocusEmptyWorkspace(direction) => {
-                // This is to ensure that even on an empty workspace on a secondary monitor, the
-                // secondary monitor where the cursor is focused will be used as the target for
-                // the workspace switch op
-                if let Some(monitor_idx) = self.monitor_idx_from_current_pos() {
-                    if monitor_idx != self.focused_monitor_idx() {
-                        if let Some(monitor) = self.monitors().get(monitor_idx) {
-                            if let Some(workspace) = monitor.focused_workspace() {
-                                if workspace.is_empty() {
-                                    self.focus_monitor(monitor_idx)?;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                let focused_monitor = self
-                    .focused_monitor()
-                    .ok_or_else(|| anyhow!("there is no monitor"))?;
-
-                let focused_workspace_idx = focused_monitor.focused_workspace_idx();
-                let workspaces = focused_monitor.workspaces().len();
-
-                let mut empty_workspaces = vec![];
-
-                for (idx, w) in focused_monitor.workspaces().iter().enumerate() {
-                    if w.is_empty() {
-                        empty_workspaces.push(idx);
-                    }
-                }
-
-                if !empty_workspaces.is_empty() {
-                    let mut workspace_idx = direction.next_idx(
-                        focused_workspace_idx,
-                        NonZeroUsize::new(workspaces)
-                            .ok_or_else(|| anyhow!("there must be at least one workspace"))?,
-                    );
-
-                    while !empty_workspaces.contains(&workspace_idx) {
-                        workspace_idx = direction.next_idx(
-                            workspace_idx,
-                            NonZeroUsize::new(workspaces)
-                                .ok_or_else(|| anyhow!("there must be at least one workspace"))?,
-                        );
-                    }
-
-                    self.focus_workspace(workspace_idx)?;
-                }
-            }
            SocketMessage::CloseWorkspace => {
                // This is to ensure that even on an empty workspace on a secondary monitor, the
                // secondary monitor where the cursor is focused will be used as the target for
@@ -2069,73 +2018,3 @@ pub fn read_commands_tcp(

    Ok(())
 }
-
-#[cfg(test)]
-mod tests {
-    use crate::monitor;
-    use crate::window_manager::WindowManager;
-    use crate::Rect;
-    use crate::SocketMessage;
-    use crate::WindowManagerEvent;
-    use crossbeam_channel::bounded;
-    use crossbeam_channel::Receiver;
-    use crossbeam_channel::Sender;
-    use std::io::BufRead;
-    use std::io::BufReader;
-    use std::io::Write;
-    use std::path::PathBuf;
-    use std::str::FromStr;
-    use std::time::Duration;
-    use uds_windows::UnixStream;
-    use uuid::Uuid;
-
-    fn send_socket_message(socket: &PathBuf, message: SocketMessage) {
-        let mut stream = UnixStream::connect(socket).unwrap();
-        stream
-            .set_write_timeout(Some(Duration::from_secs(1)))
-            .unwrap();
-        stream
-            .write_all(serde_json::to_string(&message).unwrap().as_bytes())
-            .unwrap();
-    }
-
-    #[test]
-    fn test_receive_socket_message() {
-        let (_sender, receiver): (Sender<WindowManagerEvent>, Receiver<WindowManagerEvent>) =
-            bounded(1);
-        let socket_name = format!("komorebi-test-{}.sock", Uuid::new_v4());
-        let socket_path = PathBuf::from(&socket_name);
-        let mut wm = WindowManager::new(receiver, Some(socket_path.clone())).unwrap();
-        let m = monitor::new(
-            0,
-            Rect::default(),
-            Rect::default(),
-            "TestMonitor".to_string(),
-            "TestDevice".to_string(),
-            "TestDeviceID".to_string(),
-            Some("TestMonitorID".to_string()),
-        );
-
-        wm.monitors_mut().push_back(m);
-
-        // send a message
-        send_socket_message(&socket_path, SocketMessage::FocusWorkspaceNumber(5));
-
-        let (stream, _) = wm.command_listener.accept().unwrap();
-        let reader = BufReader::new(stream.try_clone().unwrap());
-        let next = reader.lines().next();
-
-        // read and deserialize the message
-        let message_string = next.unwrap().unwrap();
-        let message = SocketMessage::from_str(&message_string).unwrap();
-        assert!(matches!(message, SocketMessage::FocusWorkspaceNumber(5)));
-
-        // process the message
-        wm.process_command(message, stream).unwrap();
-
-        // check the updated window manager state
-        assert_eq!(wm.focused_workspace_idx().unwrap(), 5);
-
-        std::fs::remove_file(socket_path).unwrap();
-    }
-}
--- a/komorebi/src/stackbar_manager/stackbar.rs
+++ b/komorebi/src/stackbar_manager/stackbar.rs
@@ -350,7 +350,7 @@ impl Stackbar {
                                }

                                // Restore the window corresponding to the tab we have clicked
-                                window.restore_with_border(false);
+                                window.restore();
                                if let Err(err) = window.focus(false) {
                                    tracing::error!(
                                        "stackbar WMLBUTTONDOWN focus error: hwnd {} ({})",
@@ -361,7 +361,7 @@ impl Stackbar {
                            } else {
                                // Hide any windows in the stack that don't correspond to the window
                                // we have clicked
-                                window.hide_with_border(false);
+                                window.hide();
                            }
                        }
                    }
--- a/komorebi/src/static_config.rs
+++ b/komorebi/src/static_config.rs
@@ -1721,36 +1721,3 @@ fn populate_rules(

    Ok(())
 }
-
-#[cfg(test)]
-mod tests {
-    use crate::StaticConfig;
-
-    #[test]
-    fn backwards_compat() {
-        let root = vec!["0.1.17", "0.1.18", "0.1.19"];
-        let docs = vec![
-            "0.1.20", "0.1.21", "0.1.22", "0.1.23", "0.1.24", "0.1.25", "0.1.26", "0.1.27",
-            "0.1.28", "0.1.29", "0.1.30", "0.1.31", "0.1.32", "0.1.33", "0.1.34",
-        ];
-
-        let mut versions = vec![];
-
-        let client = reqwest::blocking::Client::new();
-
-        for version in root {
-            let request = client.get(format!("https://raw.githubusercontent.com/LGUG2Z/komorebi/refs/tags/v{version}/komorebi.example.json")).header("User-Agent", "komorebi-backwards-compat-test").build().unwrap();
-            versions.push((version, client.execute(request).unwrap().text().unwrap()));
-        }
-
-        for version in docs {
-            let request = client.get(format!("https://raw.githubusercontent.com/LGUG2Z/komorebi/refs/tags/v{version}/docs/komorebi.example.json")).header("User-Agent", "komorebi-backwards-compat-test").build().unwrap();
-            versions.push((version, client.execute(request).unwrap().text().unwrap()));
-        }
-
-        for (version, config) in versions {
-            println!("{version}");
-            StaticConfig::read_raw(&config).unwrap();
-        }
-    }
-}
--- a/komorebi/src/window.rs
+++ b/komorebi/src/window.rs
@@ -10,7 +10,6 @@ use crate::animation::ANIMATION_ENABLED_PER_ANIMATION;
 use crate::animation::ANIMATION_MANAGER;
 use crate::animation::ANIMATION_STYLE_GLOBAL;
 use crate::animation::ANIMATION_STYLE_PER_ANIMATION;
-use crate::border_manager;
 use crate::com::SetCloak;
 use crate::core::config_generation::IdWithIdentifier;
 use crate::core::config_generation::MatchingRule;
@@ -477,7 +476,7 @@ impl Window {
        WindowsApi::is_window_visible(self.hwnd)
    }

-    pub fn hide_with_border(self, hide_border: bool) {
+    pub fn hide(self) {
        let mut programmatically_hidden_hwnds = HIDDEN_HWNDS.lock();
        if !programmatically_hidden_hwnds.contains(&self.hwnd) {
            programmatically_hidden_hwnds.push(self.hwnd);
@@ -489,16 +488,9 @@ impl Window {
            HidingBehaviour::Minimize => WindowsApi::minimize_window(self.hwnd),
            HidingBehaviour::Cloak => SetCloak(self.hwnd(), 1, 2),
        }
-        if hide_border {
-            border_manager::hide_border(self.hwnd);
-        }
    }

-    pub fn hide(self) {
-        self.hide_with_border(true);
-    }
-
-    pub fn restore_with_border(self, restore_border: bool) {
+    pub fn restore(self) {
        let mut programmatically_hidden_hwnds = HIDDEN_HWNDS.lock();
        if let Some(idx) = programmatically_hidden_hwnds
            .iter()
@@ -514,13 +506,6 @@ impl Window {
            }
            HidingBehaviour::Cloak => SetCloak(self.hwnd(), 1, 0),
        }
-        if restore_border {
-            border_manager::show_border(self.hwnd);
-        }
-    }
-
-    pub fn restore(self) {
-        self.restore_with_border(true);
    }

    pub fn minimize(self) {
@@ -753,8 +738,8 @@ impl Window {
    /// it raises it as well.
    pub fn raise(self) -> Result<()> {
        WindowsApi::raise_window(self.hwnd)?;
-        if let Some(border_info) = crate::border_manager::window_border(self.hwnd) {
-            WindowsApi::raise_window(border_info.border_hwnd)?;
+        if let Some(border) = crate::border_manager::window_border(self.hwnd) {
+            WindowsApi::raise_window(border.hwnd)?;
        }
        Ok(())
    }
@@ -765,8 +750,8 @@ impl Window {
    /// it lowers it as well.
    pub fn lower(self) -> Result<()> {
        WindowsApi::lower_window(self.hwnd)?;
-        if let Some(border_info) = crate::border_manager::window_border(self.hwnd) {
-            WindowsApi::lower_window(border_info.border_hwnd)?;
+        if let Some(border) = crate::border_manager::window_border(self.hwnd) {
+            WindowsApi::lower_window(border.hwnd)?;
        }
        Ok(())
    }
--- a/komorebi/src/window_manager.rs
+++ b/komorebi/src/window_manager.rs
@@ -398,11 +398,8 @@ impl EnforceWorkspaceRuleOp {

 impl WindowManager {
    #[tracing::instrument]
-    pub fn new(
-        incoming: Receiver<WindowManagerEvent>,
-        custom_socket_path: Option<PathBuf>,
-    ) -> Result<Self> {
-        let socket = custom_socket_path.unwrap_or_else(|| DATA_DIR.join("komorebi.sock"));
+    pub fn new(incoming: Receiver<WindowManagerEvent>) -> Result<Self> {
+        let socket = DATA_DIR.join("komorebi.sock");

        match std::fs::remove_file(&socket) {
            Ok(()) => {}
@@ -3660,79 +3657,3 @@ impl WindowManager {
        }
    }
 }
-
-#[cfg(test)]
-mod tests {
-    use crate::monitor;
-    use crate::window_manager::WindowManager;
-    use crate::Rect;
-    use crate::WindowManagerEvent;
-    use crossbeam_channel::bounded;
-    use crossbeam_channel::Receiver;
-    use crossbeam_channel::Sender;
-    use std::path::PathBuf;
-    use uuid::Uuid;
-
-    #[test]
-    fn test_create_window_manager() {
-        let (_sender, receiver): (Sender<WindowManagerEvent>, Receiver<WindowManagerEvent>) =
-            bounded(1);
-        let socket_name = format!("komorebi-test-{}.sock", Uuid::new_v4());
-        let socket_path = PathBuf::from(socket_name);
-        let wm = WindowManager::new(receiver, Some(socket_path.clone()).clone());
-        assert!(wm.is_ok());
-
-        std::fs::remove_file(socket_path).unwrap();
-    }
-
-    #[test]
-    fn test_focus_workspace() {
-        let (_sender, receiver): (Sender<WindowManagerEvent>, Receiver<WindowManagerEvent>) =
-            bounded(1);
-        let socket_name = format!("komorebi-test-{}.sock", Uuid::new_v4());
-        let socket_path = PathBuf::from(socket_name);
-        let mut wm = WindowManager::new(receiver, Some(socket_path.clone())).unwrap();
-        let m = monitor::new(
-            0,
-            Rect::default(),
-            Rect::default(),
-            "TestMonitor".to_string(),
-            "TestDevice".to_string(),
-            "TestDeviceID".to_string(),
-            Some("TestMonitorID".to_string()),
-        );
-
-        // a new monitor should have a single workspace
-        assert_eq!(m.workspaces().len(), 1);
-
-        // the next index on the monitor should be the not-yet-created second workspace
-        let new_workspace_index = m.new_workspace_idx();
-        assert_eq!(new_workspace_index, 1);
-
-        // add the monitor to the window manager
-        wm.monitors_mut().push_back(m);
-
-        {
-            // focusing a workspace which doesn't yet exist should create it
-            let monitor = wm.focused_monitor_mut().unwrap();
-            monitor.focus_workspace(new_workspace_index).unwrap();
-            assert_eq!(monitor.workspaces().len(), 2);
-        }
-        assert_eq!(wm.focused_workspace_idx().unwrap(), 1);
-
-        {
-            // focusing a workspace many indices ahead should create all workspaces
-            // required along the way
-            let monitor = wm.focused_monitor_mut().unwrap();
-            monitor.focus_workspace(new_workspace_index + 2).unwrap();
-            assert_eq!(monitor.workspaces().len(), 4);
-        }
-        assert_eq!(wm.focused_workspace_idx().unwrap(), 3);
-
-        // we should be able to successfully focus an existing workspace too
-        wm.focus_workspace(0).unwrap();
-        assert_eq!(wm.focused_workspace_idx().unwrap(), 0);
-
-        std::fs::remove_file(socket_path).unwrap();
-    }
-}
--- a/komorebi/src/windows_api.rs
+++ b/komorebi/src/windows_api.rs
@@ -1160,7 +1160,7 @@ impl WindowsApi {
    pub fn create_border_window(
        name: PCWSTR,
        instance: isize,
-        border: *mut Border,
+        border: *const Border,
    ) -> Result<isize> {
        unsafe {
            CreateWindowExW(
--- a/komorebi/src/windows_callbacks.rs
+++ b/komorebi/src/windows_callbacks.rs
@@ -105,16 +105,12 @@ pub extern "system" fn win_event_hook(
        WinEvent::ObjectLocationChange | WinEvent::ObjectDestroy
    ) && !has_filtered_style(hwnd)
    {
-        let border_info = border_manager::window_border(hwnd.0 as isize);
+        let border_window = border_manager::window_border(hwnd.0 as isize);

-        if let Some(border_info) = border_info {
+        if let Some(border) = border_window {
            unsafe {
-                let _ = SendNotifyMessageW(
-                    border_info.hwnd(),
-                    event,
-                    WPARAM(0),
-                    LPARAM(hwnd.0 as isize),
-                );
+                let _ =
+                    SendNotifyMessageW(border.hwnd(), event, WPARAM(0), LPARAM(hwnd.0 as isize));
            }
        }
    }
--- a/komorebi/src/workspace.rs
+++ b/komorebi/src/workspace.rs
@@ -13,7 +13,6 @@ use getset::Setters;
 use serde::Deserialize;
 use serde::Serialize;

-use crate::border_manager;
 use crate::core::Axis;
 use crate::core::CustomLayout;
 use crate::core::CycleDirection;
@@ -847,8 +846,6 @@ impl Workspace {
    }

    pub fn remove_window(&mut self, hwnd: isize) -> Result<()> {
-        border_manager::delete_border(hwnd);
-
        if self.floating_windows().iter().any(|w| w.hwnd == hwnd) {
            self.floating_windows_mut().retain(|w| w.hwnd != hwnd);
            return Ok(());
--- a/komorebi/tests/compat.rs
+++ b/komorebi/tests/compat.rs
@@ -0,0 +1,29 @@
+use komorebi::StaticConfig;
+
+#[test]
+fn backwards_compat() {
+    let root = vec!["0.1.17", "0.1.18", "0.1.19"];
+    let docs = vec![
+        "0.1.20", "0.1.21", "0.1.22", "0.1.23", "0.1.24", "0.1.25", "0.1.26", "0.1.27", "0.1.28",
+        "0.1.29", "0.1.30", "0.1.31", "0.1.32", "0.1.33",
+    ];
+
+    let mut versions = vec![];
+
+    let client = reqwest::blocking::Client::new();
+
+    for version in root {
+        let request = client.get(format!("https://raw.githubusercontent.com/LGUG2Z/komorebi/refs/tags/v{version}/komorebi.example.json")).header("User-Agent", "komorebi-backwards-compat-test").build().unwrap();
+        versions.push((version, client.execute(request).unwrap().text().unwrap()));
+    }
+
+    for version in docs {
+        let request = client.get(format!("https://raw.githubusercontent.com/LGUG2Z/komorebi/refs/tags/v{version}/docs/komorebi.example.json")).header("User-Agent", "komorebi-backwards-compat-test").build().unwrap();
+        versions.push((version, client.execute(request).unwrap().text().unwrap()));
+    }
+
+    for (version, config) in versions {
+        println!("{version}");
+        StaticConfig::read_raw(&config).unwrap();
+    }
+}
--- a/komorebic/src/main.rs
+++ b/komorebic/src/main.rs
@@ -155,7 +155,6 @@ gen_enum_subcommand_args! {
    CycleMoveToMonitor: CycleDirection,
    CycleMonitor: CycleDirection,
    CycleWorkspace: CycleDirection,
-    CycleEmptyWorkspace: CycleDirection,
    CycleMoveWorkspaceToMonitor: CycleDirection,
    Stack: OperationDirection,
    CycleStack: CycleDirection,
@@ -1130,9 +1129,6 @@ enum SubCommand {
    /// Focus the workspace in the given cycle direction
    #[clap(arg_required_else_help = true)]
    CycleWorkspace(CycleWorkspace),
-    /// Focus the next empty workspace in the given cycle direction (if one exists)
-    #[clap(arg_required_else_help = true)]
-    CycleEmptyWorkspace(CycleWorkspace),
    /// Move the focused workspace to the specified monitor
    #[clap(arg_required_else_help = true)]
    MoveWorkspaceToMonitor(MoveWorkspaceToMonitor),
@@ -2628,11 +2624,6 @@ if (Get-Command Get-CimInstance -ErrorAction SilentlyContinue) {
        SubCommand::CycleWorkspace(arg) => {
            send_message(&SocketMessage::CycleFocusWorkspace(arg.cycle_direction))?;
        }
-        SubCommand::CycleEmptyWorkspace(arg) => {
-            send_message(&SocketMessage::CycleFocusEmptyWorkspace(
-                arg.cycle_direction,
-            ))?;
-        }
        SubCommand::NewWorkspace => {
            send_message(&SocketMessage::NewWorkspace)?;
        }
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -136,7 +136,6 @@ nav:
      - cli/close-workspace.md
      - cli/cycle-monitor.md
      - cli/cycle-workspace.md
-      - cli/cycle-empty-workspace.md
      - cli/move-workspace-to-monitor.md
      - cli/cycle-move-workspace-to-monitor.md
      - cli/swap-workspaces-with-monitor.md