fix(reaper): avoid deadlocks at startup

Previously the reaper at startup would lock it's own `HWNDS_CACHE` and then try to lock the WM to get its `known_hwnds`. However if there was an event in the meantime, process_event would lock the WM first and then it would try to lock the reaper's `HWNDS_CACHE` to update it. This would deadlock since that would be locked by the reaper waiting for the WM lock to be released. This commit now makes it so we pass the `known_hwnds` to the reaper as an argument at startup and it also rearranges the order of loading the listeners. Now komorebi first loads all the manager-type listeners, and only afterwards does it load the commands and events listeners. After some testing this seems to be the best order that doesn't cause any issues at all! There were some other issues that I've noticed before when starting komorebi while having other 3rd parties trying to subscribe to it (like komorebi-bar and YASB), which would make those subscribers lock the `process_command` thread. This doesn't seem to be happening on my tests anymore with this new order.
perf(reaper): switch to channel notifications
2026-03-10 12:45:58 +01:00 · 2025-03-02 18:28:07 -08:00 · 2025-03-02 18:28:07 -08:00 · 2025-03-02 15:39:49 -08:00 · 2025-03-02 14:43:13 -08:00 · 2025-03-02 14:43:13 -08:00
65 changed files with 829 additions and 1925 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/Cargo.toml
+++ b/Cargo.toml
@@ -71,4 +71,17 @@ features = [
    "Win32_System_WindowsProgramming",
    "Media",
    "Media_Control"
-]
+]
+
+[profile.dev-jeezy]
+inherits = "dev"
+debug = false
+opt-level = 1
+
+[profile.dev-jeezy.package."*"]
+opt-level = 3
+
+[profile.release-jeezy]
+inherits = "release"
+incremental = true
+codegen-units = 256
--- 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/17
+++ b/17
@@ -19,31 +19,22 @@ install-targets *targets:
    "{{ targets }}" -split ' ' | ForEach-Object { just install-target $_ }

 install-target target:
-    cargo +stable install --path {{ target }} --locked --no-default-features
-
-install-targets-with-jsonschema *targets:
-    "{{ targets }}" -split ' ' | ForEach-Object { just install-target-with-jsonschema $_ }
-
-install-target-with-jsonschema target:
    cargo +stable install --path {{ target }} --locked

 install:
    just install-targets komorebic komorebic-no-console komorebi komorebi-bar komorebi-gui

-install-with-jsonschema:
-    just install-targets-with-jsonschema komorebic komorebic-no-console komorebi komorebi-bar komorebi-gui
-
 build-targets *targets:
    "{{ targets }}" -split ' ' | ForEach-Object { just build-target $_ }

 build-target target:
-    cargo +stable build --package {{ target }} --locked --release --no-default-features
+    cargo +stable build --package {{ target }} --locked --profile release-jeezy

 build:
    just build-targets komorebic komorebic-no-console komorebi komorebi-bar komorebi-gui

 copy-target target:
-    cp .\target\release\{{ target }}.exe $Env:USERPROFILE\.cargo\bin
+    cp .\target\release-jeezy\{{ target }}.exe $Env:USERPROFILE\.cargo\bin

 copy-targets *targets:
    "{{ targets }}" -split ' ' | ForEach-Object { just copy-target $_ }
@@ -55,7 +46,7 @@ copy:
    just copy-targets komorebic komorebic-no-console komorebi komorebi-bar komorebi-gui

 run target:
-    cargo +stable run --bin {{ target }} --locked --no-default-features
+    cargo +stable run --bin {{ target }} --locked

 warn target $RUST_LOG="warn":
    just run {{ target }}
@@ -70,7 +61,7 @@ trace target $RUST_LOG="trace":
    just run {{ target }}

 deadlock $RUST_LOG="trace":
-    cargo +stable run --bin komorebi --locked --no-default-features --features deadlock_detection
+    cargo +stable run --bin komorebi --locked --features deadlock_detection

 docgen:
    cargo run --package komorebic -- docgen
--- a/komorebi-bar/Cargo.toml
+++ b/komorebi-bar/Cargo.toml
@@ -26,7 +26,7 @@ num-derive = "0.4"
 num-traits = "0.2"
 random_word = { version = "0.4", features = ["en"] }
 reqwest = { version = "0.12", features = ["blocking"] }
-schemars = { workspace = true, optional = true }
+schemars = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 starship-battery = "0.10"
@@ -35,8 +35,4 @@ tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 windows = { workspace = true }
 windows-core = { workspace = true }
-windows-icons = { git = "https://github.com/LGUG2Z/windows-icons", rev = "d67cc9920aa9b4883393e411fb4fa2ddd4c498b5" }
-
-[features]
-default = ["schemars"]
-schemars = ["dep:schemars"]
+windows-icons = { git = "https://github.com/LGUG2Z/windows-icons", rev = "d67cc9920aa9b4883393e411fb4fa2ddd4c498b5" }
--- a/komorebi-bar/src/battery.rs
+++ b/komorebi-bar/src/battery.rs
@@ -8,6 +8,7 @@ use eframe::egui::Context;
 use eframe::egui::Label;
 use eframe::egui::TextFormat;
 use eframe::egui::Ui;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use starship_battery::units::ratio::percent;
@@ -17,8 +18,7 @@ use std::process::Command;
 use std::time::Duration;
 use std::time::Instant;

-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct BatteryConfig {
    /// Enable the Battery widget
    pub enable: bool,
--- a/komorebi-bar/src/config.rs
+++ b/komorebi-bar/src/config.rs
@@ -6,13 +6,13 @@ use eframe::egui::TextBuffer;
 use eframe::egui::Vec2;
 use komorebi_client::KomorebiTheme;
 use komorebi_client::Rect;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use std::collections::HashMap;
 use std::path::PathBuf;

-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 /// The `komorebi.bar.json` configuration file reference for `v0.1.35`
 pub struct KomobarConfig {
    /// Bar height (default: 50)
@@ -136,8 +136,7 @@ impl KomobarConfig {
    }
 }

-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct PositionConfig {
    /// The desired starting position of the bar (0,0 = top left of the screen)
    #[serde(alias = "position")]
@@ -147,15 +146,13 @@ pub struct PositionConfig {
    pub end: Option<Position>,
 }

-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct FrameConfig {
    /// Margin inside the painted frame
    pub inner_margin: Position,
 }

-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 #[serde(untagged)]
 pub enum MonitorConfigOrIndex {
    /// The monitor index where you want the bar to show
@@ -164,8 +161,7 @@ pub enum MonitorConfigOrIndex {
    MonitorConfig(MonitorConfig),
 }

-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct MonitorConfig {
    /// Komorebi monitor index of the monitor on which to render the bar
    pub index: usize,
@@ -176,8 +172,7 @@ pub struct MonitorConfig {
 pub type Padding = SpacingKind;
 pub type Margin = SpacingKind;

-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 #[serde(untagged)]
 // WARNING: To any developer messing with this code in the future: The order here matters!
 // `Grouped` needs to come last, otherwise serde might mistaken an `IndividualSpacingConfig` for a
@@ -228,23 +223,20 @@ impl SpacingKind {
    }
 }

-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct GroupedSpacingConfig {
    pub vertical: Option<GroupedSpacingOptions>,
    pub horizontal: Option<GroupedSpacingOptions>,
 }

-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 #[serde(untagged)]
 pub enum GroupedSpacingOptions {
    Symmetrical(f32),
    Split(f32, f32),
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct IndividualSpacingConfig {
    pub top: f32,
    pub bottom: f32,
@@ -346,8 +338,7 @@ impl KomobarConfig {
    }
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct Position {
    /// X coordinate
    pub x: f32,
@@ -373,8 +364,7 @@ impl From<Position> for Pos2 {
    }
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
 #[serde(tag = "palette")]
 pub enum KomobarTheme {
    /// A theme from catppuccin-egui
@@ -410,8 +400,7 @@ impl From<KomorebiTheme> for KomobarTheme {
    }
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub enum LabelPrefix {
    /// Show no prefix
    None,
@@ -423,8 +412,7 @@ pub enum LabelPrefix {
    IconAndText,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub enum DisplayFormat {
    /// Show only icon
    Icon,
@@ -440,8 +428,7 @@ pub enum DisplayFormat {

 macro_rules! extend_enum {
    ($existing_enum:ident, $new_enum:ident, { $($(#[$meta:meta])* $variant:ident),* $(,)? }) => {
-        #[derive(Copy, Clone, Debug, serde::Serialize, serde::Deserialize, PartialEq)]
-        #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+        #[derive(Copy, Clone, Debug, serde::Serialize, serde::Deserialize, schemars::JsonSchema, PartialEq)]
        pub enum $new_enum {
            // Add new variants
            $(
@@ -473,12 +460,12 @@ extend_enum!(DisplayFormat, WorkspacesDisplayFormat, {

 #[cfg(test)]
 mod tests {
+    use schemars::JsonSchema;
    use serde::Deserialize;
    use serde::Serialize;
    use serde_json::json;

-    #[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq)]
-    #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+    #[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
    pub enum OriginalDisplayFormat {
        /// Show None Of The Things
        NoneOfTheThings,
--- a/komorebi-bar/src/cpu.rs
+++ b/komorebi-bar/src/cpu.rs
@@ -8,6 +8,7 @@ use eframe::egui::Context;
 use eframe::egui::Label;
 use eframe::egui::TextFormat;
 use eframe::egui::Ui;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use std::process::Command;
@@ -16,8 +17,7 @@ use std::time::Instant;
 use sysinfo::RefreshKind;
 use sysinfo::System;

-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct CpuConfig {
    /// Enable the Cpu widget
    pub enable: bool,
--- a/komorebi-bar/src/date.rs
+++ b/komorebi-bar/src/date.rs
@@ -9,12 +9,12 @@ use eframe::egui::Label;
 use eframe::egui::TextFormat;
 use eframe::egui::Ui;
 use eframe::egui::WidgetText;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;

 /// Custom format with additive modifiers for integer format specifiers
-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct CustomModifiers {
    /// Custom format (https://docs.rs/chrono/latest/chrono/format/strftime/index.html)
    format: String,
@@ -55,8 +55,7 @@ impl CustomModifiers {
    }
 }

-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct DateConfig {
    /// Enable the Date widget
    pub enable: bool,
@@ -76,8 +75,7 @@ impl From<DateConfig> for Date {
    }
 }

-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub enum DateFormat {
    /// Month/Date/Year format (09/08/24)
    MonthDateYear,
--- a/komorebi-bar/src/keyboard.rs
+++ b/komorebi-bar/src/keyboard.rs
@@ -8,6 +8,7 @@ use eframe::egui::Label;
 use eframe::egui::TextFormat;
 use eframe::egui::Ui;
 use eframe::egui::WidgetText;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use std::time::Duration;
@@ -22,8 +23,7 @@ use windows::Win32::UI::WindowsAndMessaging::GetWindowThreadProcessId;
 const DEFAULT_DATA_REFRESH_INTERVAL: u64 = 1;
 const ERROR_TEXT: &str = "Error";

-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct KeyboardConfig {
    /// Enable the Input widget
    pub enable: bool,
--- a/komorebi-bar/src/komorebi.rs
+++ b/komorebi-bar/src/komorebi.rs
@@ -37,6 +37,7 @@ use komorebi_client::SocketMessage;
 use komorebi_client::Window;
 use komorebi_client::Workspace;
 use komorebi_client::WorkspaceLayer;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use std::cell::RefCell;
@@ -46,8 +47,7 @@ use std::path::PathBuf;
 use std::rc::Rc;
 use std::sync::atomic::Ordering;

-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct KomorebiConfig {
    /// Configure the Workspaces widget
    pub workspaces: Option<KomorebiWorkspacesConfig>,
@@ -61,8 +61,7 @@ pub struct KomorebiConfig {
    pub configuration_switcher: Option<KomorebiConfigurationSwitcherConfig>,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct KomorebiWorkspacesConfig {
    /// Enable the Komorebi Workspaces widget
    pub enable: bool,
@@ -72,8 +71,7 @@ pub struct KomorebiWorkspacesConfig {
    pub display: Option<WorkspacesDisplayFormat>,
 }

-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct KomorebiLayoutConfig {
    /// Enable the Komorebi Layout widget
    pub enable: bool,
@@ -83,8 +81,7 @@ pub struct KomorebiLayoutConfig {
    pub display: Option<DisplayFormat>,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct KomorebiWorkspaceLayerConfig {
    /// Enable the Komorebi Workspace Layer widget
    pub enable: bool,
@@ -94,8 +91,7 @@ pub struct KomorebiWorkspaceLayerConfig {
    pub show_when_tiling: Option<bool>,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct KomorebiFocusedWindowConfig {
    /// Enable the Komorebi Focused Window widget
    pub enable: bool,
@@ -105,8 +101,7 @@ pub struct KomorebiFocusedWindowConfig {
    pub display: Option<DisplayFormat>,
 }

-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct KomorebiConfigurationSwitcherConfig {
    /// Enable the Komorebi Configurations widget
    pub enable: bool,
--- a/komorebi-bar/src/komorebi_layout.rs
+++ b/komorebi-bar/src/komorebi_layout.rs
@@ -14,6 +14,7 @@ use eframe::egui::StrokeKind;
 use eframe::egui::Ui;
 use eframe::egui::Vec2;
 use komorebi_client::SocketMessage;
+use schemars::JsonSchema;
 use serde::de::Error;
 use serde::Deserialize;
 use serde::Deserializer;
@@ -22,8 +23,7 @@ use serde_json::from_str;
 use std::fmt::Display;
 use std::fmt::Formatter;

-#[derive(Copy, Clone, Debug, Serialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Copy, Clone, Debug, Serialize, JsonSchema, PartialEq)]
 #[serde(untagged)]
 pub enum KomorebiLayout {
    Default(komorebi_client::DefaultLayout),
--- a/komorebi-bar/src/main.rs
+++ b/komorebi-bar/src/main.rs
@@ -30,6 +30,7 @@ use hotwatch::Hotwatch;
 use image::RgbaImage;
 use komorebi_client::SocketMessage;
 use komorebi_client::SubscribeOptions;
+use schemars::gen::SchemaSettings;
 use std::collections::HashMap;
 use std::io::BufReader;
 use std::io::Read;
@@ -124,9 +125,8 @@ fn main() -> color_eyre::Result<()> {

    let opts: Opts = Opts::parse();

-    #[cfg(feature = "schemars")]
    if opts.schema {
-        let settings = schemars::gen::SchemaSettings::default().with(|s| {
+        let settings = SchemaSettings::default().with(|s| {
            s.option_nullable = false;
            s.option_add_null_type = false;
            s.inline_subschemas = true;
--- a/komorebi-bar/src/media.rs
+++ b/komorebi-bar/src/media.rs
@@ -10,13 +10,13 @@ use eframe::egui::Label;
 use eframe::egui::TextFormat;
 use eframe::egui::Ui;
 use eframe::egui::Vec2;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use std::sync::atomic::Ordering;
 use windows::Media::Control::GlobalSystemMediaTransportControlsSessionManager;

-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct MediaConfig {
    /// Enable the Media widget
    pub enable: bool,
--- a/komorebi-bar/src/memory.rs
+++ b/komorebi-bar/src/memory.rs
@@ -8,6 +8,7 @@ use eframe::egui::Context;
 use eframe::egui::Label;
 use eframe::egui::TextFormat;
 use eframe::egui::Ui;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use std::process::Command;
@@ -16,8 +17,7 @@ use std::time::Instant;
 use sysinfo::RefreshKind;
 use sysinfo::System;

-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct MemoryConfig {
    /// Enable the Memory widget
    pub enable: bool,
--- a/komorebi-bar/src/network.rs
+++ b/komorebi-bar/src/network.rs
@@ -9,6 +9,7 @@ use eframe::egui::Label;
 use eframe::egui::TextFormat;
 use eframe::egui::Ui;
 use num_derive::FromPrimitive;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use std::fmt;
@@ -17,8 +18,7 @@ use std::time::Duration;
 use std::time::Instant;
 use sysinfo::Networks;

-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct NetworkConfig {
    /// Enable the Network widget
    pub enable: bool,
--- a/komorebi-bar/src/render.rs
+++ b/komorebi-bar/src/render.rs
@@ -11,6 +11,7 @@ use eframe::egui::Margin;
 use eframe::egui::Shadow;
 use eframe::egui::TextStyle;
 use eframe::egui::Ui;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use std::sync::atomic::AtomicUsize;
@@ -19,8 +20,7 @@ use std::sync::Arc;

 static SHOW_KOMOREBI_LAYOUT_OPTIONS: AtomicUsize = AtomicUsize::new(0);

-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
 #[serde(tag = "kind")]
 pub enum Grouping {
    /// No grouping is applied
@@ -339,8 +339,7 @@ impl RenderConfig {
    }
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct GroupingConfig {
    /// Styles for the grouping
    pub style: Option<GroupingStyle>,
@@ -350,8 +349,7 @@ pub struct GroupingConfig {
    pub rounding: Option<RoundingConfig>,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub enum GroupingStyle {
    #[serde(alias = "CtByte")]
    Default,
@@ -371,8 +369,7 @@ pub enum GroupingStyle {
    DefaultWithGlowB0O1S2,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
 #[serde(untagged)]
 pub enum RoundingConfig {
    /// All 4 corners are the same    
--- a/komorebi-bar/src/storage.rs
+++ b/komorebi-bar/src/storage.rs
@@ -8,6 +8,7 @@ use eframe::egui::Context;
 use eframe::egui::Label;
 use eframe::egui::TextFormat;
 use eframe::egui::Ui;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use std::process::Command;
@@ -15,8 +16,7 @@ use std::time::Duration;
 use std::time::Instant;
 use sysinfo::Disks;

-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct StorageConfig {
    /// Enable the Storage widget
    pub enable: bool,
--- a/komorebi-bar/src/time.rs
+++ b/komorebi-bar/src/time.rs
@@ -14,11 +14,11 @@ use eframe::egui::TextFormat;
 use eframe::egui::Ui;
 use eframe::egui::Vec2;
 use eframe::epaint::StrokeKind;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;

-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct TimeConfig {
    /// Enable the Time widget
    pub enable: bool,
@@ -38,8 +38,7 @@ impl From<TimeConfig> for Time {
    }
 }

-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub enum TimeFormat {
    /// Twelve-hour format (with seconds)
    TwelveHour,
@@ -110,37 +109,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 +153,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 +173,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 +197,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 +205,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 +217,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 +225,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 +237,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 +249,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 +260,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-bar/src/update.rs
+++ b/komorebi-bar/src/update.rs
@@ -8,14 +8,14 @@ use eframe::egui::Context;
 use eframe::egui::Label;
 use eframe::egui::TextFormat;
 use eframe::egui::Ui;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use std::process::Command;
 use std::time::Duration;
 use std::time::Instant;

-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct UpdateConfig {
    /// Enable the Update widget
    pub enable: bool,
--- a/komorebi-bar/src/widget.rs
+++ b/komorebi-bar/src/widget.rs
@@ -23,6 +23,7 @@ use crate::update::Update;
 use crate::update::UpdateConfig;
 use eframe::egui::Context;
 use eframe::egui::Ui;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;

@@ -30,8 +31,7 @@ pub trait BarWidget {
    fn render(&mut self, ctx: &Context, ui: &mut Ui, config: &mut RenderConfig);
 }

-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub enum WidgetConfig {
    Battery(BatteryConfig),
    Cpu(CpuConfig),
--- 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
@@ -29,7 +29,7 @@ os_info = "3.10"
 parking_lot = "0.12"
 paste = { workspace = true }
 regex = "1"
-schemars = { workspace = true, optional = true }
+schemars = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 serde_yaml = { workspace = true }
@@ -55,9 +55,6 @@ shadow-rs = { workspace = true }

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

 [features]
-default = ["schemars"]
 deadlock_detection = ["parking_lot/deadlock_detection"]
-schemars = ["dep:schemars"]
--- a/komorebi/src/animation/engine.rs
+++ b/komorebi/src/animation/engine.rs
@@ -1,5 +1,7 @@
 use color_eyre::Result;

+use schemars::JsonSchema;
+
 use serde::Deserialize;
 use serde::Serialize;
 use std::sync::atomic::Ordering;
@@ -11,8 +13,7 @@ use super::ANIMATION_DURATION_GLOBAL;
 use super::ANIMATION_FPS;
 use super::ANIMATION_MANAGER;

-#[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub struct AnimationEngine;

 impl AnimationEngine {
--- a/komorebi/src/animation/mod.rs
+++ b/komorebi/src/animation/mod.rs
@@ -18,12 +18,11 @@ pub mod prefix;
 pub mod render_dispatcher;
 pub use render_dispatcher::RenderDispatcher;
 pub mod style;
-
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;

-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
 #[serde(untagged)]
 pub enum PerAnimationPrefixConfig<T> {
    Prefix(HashMap<AnimationPrefix, T>),
--- a/komorebi/src/animation/prefix.rs
+++ b/komorebi/src/animation/prefix.rs
@@ -1,14 +1,24 @@
 use clap::ValueEnum;
-
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use strum::Display;
 use strum::EnumString;

 #[derive(
-    Copy, Clone, Debug, Hash, PartialEq, Eq, Serialize, Deserialize, Display, EnumString, ValueEnum,
+    Copy,
+    Clone,
+    Debug,
+    Hash,
+    PartialEq,
+    Eq,
+    Serialize,
+    Deserialize,
+    Display,
+    EnumString,
+    ValueEnum,
+    JsonSchema,
 )]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 #[strum(serialize_all = "snake_case")]
 #[serde(rename_all = "snake_case")]
 pub enum AnimationPrefix {
--- 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;
@@ -20,6 +19,7 @@ use crossbeam_utils::atomic::AtomicCell;
 use crossbeam_utils::atomic::AtomicConsume;
 use lazy_static::lazy_static;
 use parking_lot::Mutex;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use std::collections::hash_map::Entry;
@@ -32,7 +32,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 +55,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 +76,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 +90,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 +107,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 +128,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 +277,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 +299,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 +311,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 +333,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 +345,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 +366,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 +410,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 +434,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 +493,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 +506,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 +549,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 +602,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 +657,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,73 +683,22 @@ 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))]
+#[derive(Debug, Copy, Clone, Display, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub enum ZOrder {
    Top,
    NoTopMost,
--- a/komorebi/src/colour.rs
+++ b/komorebi/src/colour.rs
@@ -1,19 +1,14 @@
 use hex_color::HexColor;
 use komorebi_themes::Color32;
-#[cfg(feature = "schemars")]
 use schemars::gen::SchemaGenerator;
-#[cfg(feature = "schemars")]
 use schemars::schema::InstanceType;
-#[cfg(feature = "schemars")]
 use schemars::schema::Schema;
-#[cfg(feature = "schemars")]
 use schemars::schema::SchemaObject;
-
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;

-#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Debug, Copy, Clone, Serialize, Deserialize, JsonSchema, PartialEq)]
 #[serde(untagged)]
 pub enum Colour {
    /// Colour represented as RGB
@@ -59,8 +54,7 @@ impl From<Colour> for Color32 {
 #[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq)]
 pub struct Hex(HexColor);

-#[cfg(feature = "schemars")]
-impl schemars::JsonSchema for Hex {
+impl JsonSchema for Hex {
    fn schema_name() -> String {
        String::from("Hex")
    }
@@ -84,8 +78,7 @@ impl From<Colour> for u32 {
    }
 }

-#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Debug, Copy, Clone, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub struct Rgb {
    /// Red
    pub r: u32,
--- a/komorebi/src/container.rs
+++ b/komorebi/src/container.rs
@@ -2,14 +2,14 @@ use std::collections::VecDeque;

 use getset::Getters;
 use nanoid::nanoid;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;

 use crate::ring::Ring;
 use crate::window::Window;

-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Getters)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Getters, JsonSchema)]
 pub struct Container {
    #[getset(get = "pub")]
    id: String,
@@ -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/animation.rs
+++ b/komorebi/src/core/animation.rs
@@ -1,12 +1,22 @@
 use clap::ValueEnum;
-
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use strum::Display;
 use strum::EnumString;

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(
+    Copy,
+    Clone,
+    Debug,
+    Serialize,
+    Deserialize,
+    Display,
+    EnumString,
+    ValueEnum,
+    JsonSchema,
+    PartialEq,
+)]
 pub enum AnimationStyle {
    Linear,
    EaseInSine,
--- a/komorebi/src/core/arrangement.rs
+++ b/komorebi/src/core/arrangement.rs
@@ -1,6 +1,7 @@
 use std::num::NonZeroUsize;

 use clap::ValueEnum;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use strum::Display;
@@ -602,8 +603,18 @@ impl Arrangement for CustomLayout {
    }
 }

-#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(
+    Clone,
+    Copy,
+    Debug,
+    Serialize,
+    Deserialize,
+    Display,
+    EnumString,
+    ValueEnum,
+    JsonSchema,
+    PartialEq,
+)]
 pub enum Axis {
    Horizontal,
    Vertical,
--- a/komorebi/src/core/asc.rs
+++ b/komorebi/src/core/asc.rs
@@ -2,6 +2,7 @@ use crate::config_generation::ApplicationConfiguration;
 use crate::config_generation::ApplicationOptions;
 use crate::config_generation::MatchingRule;
 use color_eyre::Result;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use std::collections::BTreeMap;
@@ -9,12 +10,10 @@ use std::ops::Deref;
 use std::ops::DerefMut;
 use std::path::PathBuf;

-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct ApplicationSpecificConfiguration(pub BTreeMap<String, AscApplicationRulesOrSchema>);

-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 #[serde(untagged)]
 pub enum AscApplicationRulesOrSchema {
    AscApplicationRules(AscApplicationRules),
@@ -47,8 +46,7 @@ impl ApplicationSpecificConfiguration {
 }

 /// Rules that determine how an application is handled
-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct AscApplicationRules {
    /// Rules to ignore specific windows
    #[serde(skip_serializing_if = "Option::is_none")]
--- a/komorebi/src/core/config_generation.rs
+++ b/komorebi/src/core/config_generation.rs
@@ -1,5 +1,6 @@
 use clap::ValueEnum;
 use color_eyre::Result;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use strum::Display;
@@ -7,8 +8,9 @@ use strum::EnumString;

 use super::ApplicationIdentifier;

-#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(
+    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
+)]
 #[strum(serialize_all = "snake_case")]
 #[serde(rename_all = "snake_case")]
 pub enum ApplicationOptions {
@@ -50,16 +52,14 @@ impl ApplicationOptions {
    }
 }

-#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize, JsonSchema)]
 #[serde(untagged)]
 pub enum MatchingRule {
    Simple(IdWithIdentifier),
    Composite(Vec<IdWithIdentifier>),
 }

-#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize, JsonSchema)]
 pub struct WorkspaceMatchingRule {
    pub monitor_index: usize,
    pub workspace_index: usize,
@@ -67,8 +67,7 @@ pub struct WorkspaceMatchingRule {
    pub initial_only: bool,
 }

-#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize, JsonSchema)]
 pub struct IdWithIdentifier {
    pub kind: ApplicationIdentifier,
    pub id: String,
@@ -76,8 +75,7 @@ pub struct IdWithIdentifier {
    pub matching_strategy: Option<MatchingStrategy>,
 }

-#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize, Display)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize, Display, JsonSchema)]
 pub enum MatchingStrategy {
    Legacy,
    Equals,
@@ -91,8 +89,7 @@ pub enum MatchingStrategy {
    DoesNotContain,
 }

-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct IdWithIdentifierAndComment {
    pub kind: ApplicationIdentifier,
    pub id: String,
@@ -112,8 +109,7 @@ impl From<IdWithIdentifierAndComment> for IdWithIdentifier {
    }
 }

-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct ApplicationConfiguration {
    pub name: String,
    pub identifier: IdWithIdentifier,
@@ -137,8 +133,7 @@ impl ApplicationConfiguration {
    }
 }

-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct ApplicationConfigurationGenerator;

 impl ApplicationConfigurationGenerator {
--- a/komorebi/src/core/custom_layout.rs
+++ b/komorebi/src/core/custom_layout.rs
@@ -8,13 +8,13 @@ use std::path::Path;
 use color_eyre::eyre::anyhow;
 use color_eyre::eyre::bail;
 use color_eyre::Result;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;

 use super::Rect;

-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub struct CustomLayout(Vec<Column>);

 impl Deref for CustomLayout {
@@ -250,8 +250,7 @@ impl CustomLayout {
    }
 }

-#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
 #[serde(tag = "column", content = "configuration")]
 pub enum Column {
    Primary(Option<ColumnWidth>),
@@ -259,21 +258,18 @@ pub enum Column {
    Tertiary(ColumnSplit),
 }

-#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub enum ColumnWidth {
    WidthPercentage(f32),
 }

-#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub enum ColumnSplit {
    Horizontal,
    Vertical,
 }

-#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub enum ColumnSplitWithCapacity {
    Horizontal(usize),
    Vertical(usize),
--- a/komorebi/src/core/cycle_direction.rs
+++ b/komorebi/src/core/cycle_direction.rs
@@ -1,13 +1,15 @@
 use std::num::NonZeroUsize;

 use clap::ValueEnum;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use strum::Display;
 use strum::EnumString;

-#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(
+    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
+)]
 pub enum CycleDirection {
    Previous,
    Next,
--- a/komorebi/src/core/default_layout.rs
+++ b/komorebi/src/core/default_layout.rs
@@ -1,4 +1,5 @@
 use clap::ValueEnum;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use strum::Display;
@@ -9,9 +10,18 @@ use super::Rect;
 use super::Sizing;

 #[derive(
-    Clone, Copy, Debug, Serialize, Deserialize, Eq, PartialEq, Display, EnumString, ValueEnum,
+    Clone,
+    Copy,
+    Debug,
+    Serialize,
+    Deserialize,
+    Eq,
+    PartialEq,
+    Display,
+    EnumString,
+    ValueEnum,
+    JsonSchema,
 )]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum DefaultLayout {
    BSP,
    Columns,
--- a/komorebi/src/core/layout.rs
+++ b/komorebi/src/core/layout.rs
@@ -1,3 +1,4 @@
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;

@@ -6,8 +7,7 @@ use super::CustomLayout;
 use super::DefaultLayout;
 use super::Direction;

-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub enum Layout {
    Default(DefaultLayout),
    Custom(CustomLayout),
--- a/komorebi/src/core/mod.rs
+++ b/komorebi/src/core/mod.rs
@@ -8,6 +8,7 @@ use std::str::FromStr;
 use clap::ValueEnum;
 use color_eyre::eyre::anyhow;
 use color_eyre::Result;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use strum::Display;
@@ -44,8 +45,7 @@ pub mod operation_direction;
 pub mod pathext;
 pub mod rect;

-#[derive(Clone, Debug, Serialize, Deserialize, Display)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, Display, JsonSchema)]
 #[serde(tag = "type", content = "content")]
 pub enum SocketMessage {
    // Window / Container Commands
@@ -122,7 +122,6 @@ pub enum SocketMessage {
    Load(PathBuf),
    CycleFocusMonitor(CycleDirection),
    CycleFocusWorkspace(CycleDirection),
-    CycleFocusEmptyWorkspace(CycleDirection),
    FocusMonitorNumber(usize),
    FocusMonitorAtCursor,
    FocusLastWorkspace,
@@ -242,23 +241,24 @@ impl FromStr for SocketMessage {
    }
 }

-#[derive(Default, Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Default, Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize, JsonSchema)]
 pub struct SubscribeOptions {
    /// Only emit notifications when the window manager state has changed
    pub filter_state_changes: bool,
 }

-#[derive(Debug, Copy, Clone, Eq, PartialEq, Display, Serialize, Deserialize, ValueEnum)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(
+    Debug, Copy, Clone, Eq, PartialEq, Display, Serialize, Deserialize, JsonSchema, ValueEnum,
+)]
 pub enum StackbarMode {
    Always,
    Never,
    OnStack,
 }

-#[derive(Debug, Copy, Default, Clone, Eq, PartialEq, Display, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(
+    Debug, Copy, Default, Clone, Eq, PartialEq, Display, Serialize, Deserialize, JsonSchema,
+)]
 pub enum StackbarLabel {
    #[default]
    Process,
@@ -266,9 +266,18 @@ pub enum StackbarLabel {
 }

 #[derive(
-    Default, Copy, Clone, Debug, Eq, PartialEq, Display, Serialize, Deserialize, ValueEnum,
+    Default,
+    Copy,
+    Clone,
+    Debug,
+    Eq,
+    PartialEq,
+    Display,
+    Serialize,
+    Deserialize,
+    JsonSchema,
+    ValueEnum,
 )]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum BorderStyle {
    #[default]
    /// Use the system border style
@@ -280,9 +289,18 @@ pub enum BorderStyle {
 }

 #[derive(
-    Default, Copy, Clone, Debug, Eq, PartialEq, Display, Serialize, Deserialize, ValueEnum,
+    Default,
+    Copy,
+    Clone,
+    Debug,
+    Eq,
+    PartialEq,
+    Display,
+    Serialize,
+    Deserialize,
+    JsonSchema,
+    ValueEnum,
 )]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum BorderImplementation {
    #[default]
    /// Use the adjustable komorebi border implementation
@@ -295,28 +313,27 @@ pub enum BorderImplementation {
    Copy,
    Clone,
    Debug,
-    Default,
    Serialize,
    Deserialize,
    Display,
    EnumString,
    ValueEnum,
+    JsonSchema,
    PartialEq,
    Eq,
    Hash,
 )]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum WindowKind {
    Single,
    Stack,
    Monocle,
-    #[default]
    Unfocused,
    Floating,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(
+    Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
+)]
 pub enum StateQuery {
    FocusedMonitorIndex,
    FocusedWorkspaceIndex,
@@ -326,9 +343,18 @@ pub enum StateQuery {
 }

 #[derive(
-    Copy, Clone, Debug, Eq, PartialEq, Serialize, Deserialize, Display, EnumString, ValueEnum,
+    Copy,
+    Clone,
+    Debug,
+    Eq,
+    PartialEq,
+    Serialize,
+    Deserialize,
+    Display,
+    EnumString,
+    ValueEnum,
+    JsonSchema,
 )]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum ApplicationIdentifier {
    #[serde(alias = "exe")]
    Exe,
@@ -340,8 +366,18 @@ pub enum ApplicationIdentifier {
    Path,
 }

-#[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize, Display, EnumString, ValueEnum)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(
+    Copy,
+    Clone,
+    Debug,
+    PartialEq,
+    Serialize,
+    Deserialize,
+    Display,
+    EnumString,
+    ValueEnum,
+    JsonSchema,
+)]
 pub enum FocusFollowsMouseImplementation {
    /// A custom FFM implementation (slightly more CPU-intensive)
    Komorebi,
@@ -349,8 +385,7 @@ pub enum FocusFollowsMouseImplementation {
    Windows,
 }

-#[derive(Clone, Copy, Debug, Default, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Copy, Debug, Default, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub struct WindowManagementBehaviour {
    /// The current WindowContainerBehaviour to be used
    pub current_behaviour: WindowContainerBehaviour,
@@ -361,9 +396,18 @@ pub struct WindowManagementBehaviour {
 }

 #[derive(
-    Clone, Copy, Debug, Default, Serialize, Deserialize, Display, EnumString, ValueEnum, PartialEq,
+    Clone,
+    Copy,
+    Debug,
+    Default,
+    Serialize,
+    Deserialize,
+    Display,
+    EnumString,
+    ValueEnum,
+    JsonSchema,
+    PartialEq,
 )]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum WindowContainerBehaviour {
    /// Create a new container for each new window
    #[default]
@@ -372,8 +416,18 @@ pub enum WindowContainerBehaviour {
    Append,
 }

-#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize, Display, EnumString, ValueEnum)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(
+    Clone,
+    Copy,
+    Debug,
+    PartialEq,
+    Serialize,
+    Deserialize,
+    Display,
+    EnumString,
+    ValueEnum,
+    JsonSchema,
+)]
 pub enum MoveBehaviour {
    /// Swap the window container with the window container at the edge of the adjacent monitor
    Swap,
@@ -383,8 +437,18 @@ pub enum MoveBehaviour {
    NoOp,
 }

-#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(
+    Clone,
+    Copy,
+    Debug,
+    Serialize,
+    Deserialize,
+    Display,
+    EnumString,
+    ValueEnum,
+    JsonSchema,
+    PartialEq,
+)]
 pub enum CrossBoundaryBehaviour {
    /// Attempt to perform actions across a workspace boundary
    Workspace,
@@ -392,8 +456,18 @@ pub enum CrossBoundaryBehaviour {
    Monitor,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(
+    Copy,
+    Clone,
+    Debug,
+    Serialize,
+    Deserialize,
+    Display,
+    EnumString,
+    ValueEnum,
+    JsonSchema,
+    PartialEq,
+)]
 pub enum HidingBehaviour {
    /// Use the SW_HIDE flag to hide windows when switching workspaces (has issues with Electron apps)
    Hide,
@@ -403,8 +477,18 @@ pub enum HidingBehaviour {
    Cloak,
 }

-#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize, Display, EnumString, ValueEnum)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(
+    Clone,
+    Copy,
+    Debug,
+    PartialEq,
+    Serialize,
+    Deserialize,
+    Display,
+    EnumString,
+    ValueEnum,
+    JsonSchema,
+)]
 pub enum OperationBehaviour {
    /// Process komorebic commands on temporarily unmanaged/floated windows
    Op,
@@ -412,8 +496,9 @@ pub enum OperationBehaviour {
    NoOp,
 }

-#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(
+    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
+)]
 pub enum Sizing {
    Increase,
    Decrease,
--- a/komorebi/src/core/operation_direction.rs
+++ b/komorebi/src/core/operation_direction.rs
@@ -1,6 +1,7 @@
 use std::num::NonZeroUsize;

 use clap::ValueEnum;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use strum::Display;
@@ -9,8 +10,9 @@ use strum::EnumString;
 use super::direction::Direction;
 use super::Axis;

-#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(
+    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
+)]
 pub enum OperationDirection {
    Left,
    Right,
--- a/komorebi/src/core/rect.rs
+++ b/komorebi/src/core/rect.rs
@@ -1,9 +1,9 @@
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use windows::Win32::Foundation::RECT;

-#[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, Eq, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, Eq, PartialEq, JsonSchema)]
 pub struct Rect {
    /// The left point in a Win32 Rect
    pub left: i32,
--- a/komorebi/src/lib.rs
+++ b/komorebi/src/lib.rs
@@ -66,6 +66,7 @@ use color_eyre::Result;
 use os_info::Version;
 use parking_lot::Mutex;
 use regex::Regex;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use uds_windows::UnixStream;
@@ -279,8 +280,7 @@ pub fn current_virtual_desktop() -> Option<Vec<u8>> {
    current
 }

-#[derive(Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
 #[serde(untagged)]
 pub enum NotificationEvent {
    WindowManager(WindowManagerEvent),
@@ -288,8 +288,7 @@ pub enum NotificationEvent {
    Monitor(MonitorNotification),
 }

-#[derive(Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct Notification {
    pub event: NotificationEvent,
    pub state: State,
--- 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/monitor.rs
+++ b/komorebi/src/monitor.rs
@@ -9,6 +9,7 @@ use getset::CopyGetters;
 use getset::Getters;
 use getset::MutGetters;
 use getset::Setters;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;

@@ -25,9 +26,17 @@ use crate::DEFAULT_CONTAINER_PADDING;
 use crate::DEFAULT_WORKSPACE_PADDING;

 #[derive(
-    Debug, Clone, Serialize, Deserialize, Getters, CopyGetters, MutGetters, Setters, PartialEq,
+    Debug,
+    Clone,
+    Serialize,
+    Deserialize,
+    Getters,
+    CopyGetters,
+    MutGetters,
+    Setters,
+    JsonSchema,
+    PartialEq,
 )]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Monitor {
    #[getset(get_copy = "pub", set = "pub")]
    pub id: isize,
--- a/komorebi/src/monitor_reconciliator/mod.rs
+++ b/komorebi/src/monitor_reconciliator/mod.rs
@@ -17,6 +17,7 @@ use crossbeam_channel::Receiver;
 use crossbeam_channel::Sender;
 use crossbeam_utils::atomic::AtomicConsume;
 use parking_lot::Mutex;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use std::collections::HashMap;
@@ -27,8 +28,7 @@ use std::sync::OnceLock;

 pub mod hidden;

-#[derive(Debug, Copy, Clone, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Debug, Copy, Clone, Serialize, Deserialize, JsonSchema)]
 #[serde(tag = "type", content = "content")]
 pub enum MonitorNotification {
    ResolutionScalingChanged,
--- a/komorebi/src/process_command.rs
+++ b/komorebi/src/process_command.rs
@@ -1,8 +1,3 @@
-use color_eyre::eyre::anyhow;
-use color_eyre::Result;
-use miow::pipe::connect;
-use net2::TcpStreamExt;
-use parking_lot::Mutex;
 use std::collections::HashMap;
 use std::fs::File;
 use std::fs::OpenOptions;
@@ -16,11 +11,20 @@ use std::str::FromStr;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
 use std::time::Duration;
+
+use color_eyre::eyre::anyhow;
+use color_eyre::Result;
+use miow::pipe::connect;
+use net2::TcpStreamExt;
+use parking_lot::Mutex;
+use schemars::gen::SchemaSettings;
+use schemars::schema_for;
 use uds_windows::UnixStream;

 use crate::animation::ANIMATION_DURATION_PER_ANIMATION;
 use crate::animation::ANIMATION_ENABLED_PER_ANIMATION;
 use crate::animation::ANIMATION_STYLE_PER_ANIMATION;
+use crate::core::config_generation::ApplicationConfiguration;
 use crate::core::config_generation::IdWithIdentifier;
 use crate::core::config_generation::MatchingRule;
 use crate::core::config_generation::MatchingStrategy;
@@ -205,9 +209,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 +904,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
@@ -1875,49 +1828,35 @@ impl WindowManager {
                *STACKBAR_FONT_FAMILY.lock() = font_family.clone();
            }
            SocketMessage::ApplicationSpecificConfigurationSchema => {
-                #[cfg(feature = "schemars")]
-                {
-                    let asc = schemars::schema_for!(
-                        Vec<crate::core::config_generation::ApplicationConfiguration>
-                    );
-                    let schema = serde_json::to_string_pretty(&asc)?;
+                let asc = schema_for!(Vec<ApplicationConfiguration>);
+                let schema = serde_json::to_string_pretty(&asc)?;

-                    reply.write_all(schema.as_bytes())?;
-                }
+                reply.write_all(schema.as_bytes())?;
            }
            SocketMessage::NotificationSchema => {
-                #[cfg(feature = "schemars")]
-                {
-                    let notification = schemars::schema_for!(Notification);
-                    let schema = serde_json::to_string_pretty(&notification)?;
+                let notification = schema_for!(Notification);
+                let schema = serde_json::to_string_pretty(&notification)?;

-                    reply.write_all(schema.as_bytes())?;
-                }
+                reply.write_all(schema.as_bytes())?;
            }
            SocketMessage::SocketSchema => {
-                #[cfg(feature = "schemars")]
-                {
-                    let socket_message = schemars::schema_for!(SocketMessage);
-                    let schema = serde_json::to_string_pretty(&socket_message)?;
+                let socket_message = schema_for!(SocketMessage);
+                let schema = serde_json::to_string_pretty(&socket_message)?;

-                    reply.write_all(schema.as_bytes())?;
-                }
+                reply.write_all(schema.as_bytes())?;
            }
            SocketMessage::StaticConfigSchema => {
-                #[cfg(feature = "schemars")]
-                {
-                    let settings = schemars::gen::SchemaSettings::default().with(|s| {
-                        s.option_nullable = false;
-                        s.option_add_null_type = false;
-                        s.inline_subschemas = true;
-                    });
+                let settings = SchemaSettings::default().with(|s| {
+                    s.option_nullable = false;
+                    s.option_add_null_type = false;
+                    s.inline_subschemas = true;
+                });

-                    let gen = settings.into_generator();
-                    let socket_message = gen.into_root_schema_for::<StaticConfig>();
-                    let schema = serde_json::to_string_pretty(&socket_message)?;
+                let gen = settings.into_generator();
+                let socket_message = gen.into_root_schema_for::<StaticConfig>();
+                let schema = serde_json::to_string_pretty(&socket_message)?;

-                    reply.write_all(schema.as_bytes())?;
-                }
+                reply.write_all(schema.as_bytes())?;
            }
            SocketMessage::GenerateStaticConfig => {
                let config = serde_json::to_string_pretty(&StaticConfig::from(&*self))?;
@@ -2069,73 +2008,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/reaper.rs
+++ b/komorebi/src/reaper.rs
@@ -79,7 +79,6 @@ fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result<()>
        for (hwnd, (m_idx, w_idx)) in orphan_hwnds.iter() {
            if let Some(monitor) = wm.monitors_mut().get_mut(*m_idx) {
                let focused_workspace_idx = monitor.focused_workspace_idx();
-
                if let Some(workspace) = monitor.workspaces_mut().get_mut(*w_idx) {
                    // Remove orphan window
                    if let Err(error) = workspace.remove_window(*hwnd) {
--- a/komorebi/src/ring.rs
+++ b/komorebi/src/ring.rs
@@ -1,10 +1,10 @@
 use std::collections::VecDeque;

+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;

-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub struct Ring<T> {
    elements: VecDeque<T>,
    focused: usize,
--- 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
@@ -7,35 +7,14 @@ use crate::animation::ANIMATION_FPS;
 use crate::animation::ANIMATION_STYLE_GLOBAL;
 use crate::animation::ANIMATION_STYLE_PER_ANIMATION;
 use crate::animation::DEFAULT_ANIMATION_FPS;
-use crate::asc::ApplicationSpecificConfiguration;
-use crate::asc::AscApplicationRulesOrSchema;
 use crate::border_manager;
 use crate::border_manager::ZOrder;
 use crate::border_manager::IMPLEMENTATION;
 use crate::border_manager::STYLE;
 use crate::colour::Colour;
-use crate::config_generation::WorkspaceMatchingRule;
-use crate::core::config_generation::ApplicationConfiguration;
-use crate::core::config_generation::ApplicationConfigurationGenerator;
-use crate::core::config_generation::ApplicationOptions;
-use crate::core::config_generation::MatchingRule;
-use crate::core::config_generation::MatchingStrategy;
-use crate::core::resolve_home_path;
-use crate::core::AnimationStyle;
 use crate::core::BorderImplementation;
-use crate::core::BorderStyle;
-use crate::core::DefaultLayout;
-use crate::core::FocusFollowsMouseImplementation;
-use crate::core::HidingBehaviour;
-use crate::core::Layout;
-use crate::core::MoveBehaviour;
-use crate::core::OperationBehaviour;
-use crate::core::Rect;
-use crate::core::SocketMessage;
 use crate::core::StackbarLabel;
 use crate::core::StackbarMode;
-use crate::core::WindowContainerBehaviour;
-use crate::core::WindowManagementBehaviour;
 use crate::current_virtual_desktop;
 use crate::monitor;
 use crate::monitor::Monitor;
@@ -82,12 +61,35 @@ use crate::TRANSPARENCY_BLACKLIST;
 use crate::TRAY_AND_MULTI_WINDOW_IDENTIFIERS;
 use crate::WINDOWS_11;
 use crate::WORKSPACE_MATCHING_RULES;
+
+use crate::asc::ApplicationSpecificConfiguration;
+use crate::asc::AscApplicationRulesOrSchema;
+use crate::config_generation::WorkspaceMatchingRule;
+use crate::core::config_generation::ApplicationConfiguration;
+use crate::core::config_generation::ApplicationConfigurationGenerator;
+use crate::core::config_generation::ApplicationOptions;
+use crate::core::config_generation::MatchingRule;
+use crate::core::config_generation::MatchingStrategy;
+use crate::core::resolve_home_path;
+use crate::core::AnimationStyle;
+use crate::core::BorderStyle;
+use crate::core::DefaultLayout;
+use crate::core::FocusFollowsMouseImplementation;
+use crate::core::HidingBehaviour;
+use crate::core::Layout;
+use crate::core::MoveBehaviour;
+use crate::core::OperationBehaviour;
+use crate::core::Rect;
+use crate::core::SocketMessage;
+use crate::core::WindowContainerBehaviour;
+use crate::core::WindowManagementBehaviour;
 use color_eyre::Result;
 use crossbeam_channel::Receiver;
 use hotwatch::EventKind;
 use hotwatch::Hotwatch;
 use parking_lot::Mutex;
 use regex::Regex;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use std::collections::HashMap;
@@ -100,8 +102,7 @@ use std::sync::Arc;
 use uds_windows::UnixListener;
 use uds_windows::UnixStream;

-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub struct BorderColours {
    /// Border colour when the container contains a single window
    #[serde(skip_serializing_if = "Option::is_none")]
@@ -120,8 +121,7 @@ pub struct BorderColours {
    pub unfocused: Option<Colour>,
 }

-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub struct WorkspaceConfig {
    /// Name
    pub name: String,
@@ -243,8 +243,7 @@ impl From<&Workspace> for WorkspaceConfig {
    }
 }

-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub struct MonitorConfig {
    /// Workspace configurations
    pub workspaces: Vec<WorkspaceConfig>,
@@ -302,8 +301,7 @@ impl From<&Monitor> for MonitorConfig {
    }
 }

-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, PartialEq)]
 /// The `komorebi.json` static configuration file reference for `v0.1.35`
 pub struct StaticConfig {
    /// DEPRECATED from v0.1.22: no longer required
@@ -451,8 +449,7 @@ pub struct StaticConfig {
    pub floating_window_aspect_ratio: Option<AspectRatio>,
 }

-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub struct AnimationsConfig {
    /// Enable or disable animations (default: false)
    pub enabled: PerAnimationPrefixConfig<bool>,
@@ -467,8 +464,7 @@ pub struct AnimationsConfig {
    pub fps: Option<u64>,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
 #[serde(tag = "palette")]
 pub enum KomorebiTheme {
    /// A theme from catppuccin-egui
@@ -618,8 +614,7 @@ impl StaticConfig {
    }
 }

-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub struct TabsConfig {
    /// Width of a stackbar tab
    #[serde(skip_serializing_if = "Option::is_none")]
@@ -641,8 +636,7 @@ pub struct TabsConfig {
    pub font_size: Option<i32>,
 }

-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub struct StackbarConfig {
    /// Stackbar height
    #[serde(skip_serializing_if = "Option::is_none")]
@@ -1721,36 +1715,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,44 +10,14 @@ 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;
-use crate::core::config_generation::MatchingStrategy;
-use crate::core::ApplicationIdentifier;
-use crate::core::HidingBehaviour;
-use crate::core::Rect;
 use crate::focus_manager;
 use crate::stackbar_manager;
-use crate::styles::ExtendedWindowStyle;
-use crate::styles::WindowStyle;
-use crate::transparency_manager;
-use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_api;
-use crate::windows_api::WindowsApi;
 use crate::AnimationStyle;
-use crate::FLOATING_APPLICATIONS;
 use crate::FLOATING_WINDOW_TOGGLE_ASPECT_RATIO;
-use crate::HIDDEN_HWNDS;
-use crate::HIDING_BEHAVIOUR;
-use crate::IGNORE_IDENTIFIERS;
-use crate::LAYERED_WHITELIST;
-use crate::MANAGE_IDENTIFIERS;
-use crate::NO_TITLEBAR;
-use crate::PERMAIGNORE_CLASSES;
-use crate::REGEX_IDENTIFIERS;
 use crate::SLOW_APPLICATION_COMPENSATION_TIME;
 use crate::SLOW_APPLICATION_IDENTIFIERS;
-use crate::WSL2_UI_PROCESSES;
-use color_eyre::eyre;
-use color_eyre::Result;
-use crossbeam_utils::atomic::AtomicConsume;
-use regex::Regex;
-use serde::ser::SerializeStruct;
-use serde::Deserialize;
-use serde::Serialize;
-use serde::Serializer;
 use std::collections::HashMap;
 use std::convert::TryFrom;
 use std::fmt::Display;
@@ -57,15 +27,47 @@ use std::sync::atomic::AtomicI32;
 use std::sync::atomic::Ordering;
 use std::thread;
 use std::time::Duration;
+
+use crate::core::config_generation::IdWithIdentifier;
+use crate::core::config_generation::MatchingRule;
+use crate::core::config_generation::MatchingStrategy;
+use color_eyre::eyre;
+use color_eyre::Result;
+use crossbeam_utils::atomic::AtomicConsume;
+use regex::Regex;
+use schemars::JsonSchema;
+use serde::ser::SerializeStruct;
+use serde::Deserialize;
+use serde::Serialize;
+use serde::Serializer;
 use strum::Display;
 use strum::EnumString;
 use windows::Win32::Foundation::HWND;

+use crate::core::ApplicationIdentifier;
+use crate::core::HidingBehaviour;
+use crate::core::Rect;
+
+use crate::styles::ExtendedWindowStyle;
+use crate::styles::WindowStyle;
+use crate::transparency_manager;
+use crate::window_manager_event::WindowManagerEvent;
+use crate::windows_api::WindowsApi;
+use crate::FLOATING_APPLICATIONS;
+use crate::HIDDEN_HWNDS;
+use crate::HIDING_BEHAVIOUR;
+use crate::IGNORE_IDENTIFIERS;
+use crate::LAYERED_WHITELIST;
+use crate::MANAGE_IDENTIFIERS;
+use crate::NO_TITLEBAR;
+use crate::PERMAIGNORE_CLASSES;
+use crate::REGEX_IDENTIFIERS;
+use crate::WSL2_UI_PROCESSES;
+
 pub static MINIMUM_WIDTH: AtomicI32 = AtomicI32::new(0);
 pub static MINIMUM_HEIGHT: AtomicI32 = AtomicI32::new(0);

-#[derive(Debug, Default, Clone, Copy, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Debug, Default, Clone, Copy, Deserialize, JsonSchema, PartialEq)]
 pub struct Window {
    pub hwnd: isize,
 }
@@ -85,8 +87,7 @@ impl From<HWND> for Window {
 }

 #[allow(clippy::module_name_repetitions)]
-#[derive(Debug, Clone, Serialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Debug, Clone, Serialize, JsonSchema)]
 pub struct WindowDetails {
    pub title: String,
    pub exe: String,
@@ -298,8 +299,9 @@ impl RenderDispatcher for TransparencyRenderDispatcher {
    }
 }

-#[derive(Copy, Clone, Debug, Display, EnumString, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(
+    Copy, Clone, Debug, Display, EnumString, Serialize, Deserialize, JsonSchema, PartialEq,
+)]
 #[serde(untagged)]
 pub enum AspectRatio {
    /// A predefined aspect ratio
@@ -314,8 +316,9 @@ impl Default for AspectRatio {
    }
 }

-#[derive(Copy, Clone, Debug, Default, Display, EnumString, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(
+    Copy, Clone, Debug, Default, Display, EnumString, Serialize, Deserialize, JsonSchema, PartialEq,
+)]
 pub enum PredefinedAspectRatio {
    /// 21:9
    Ultrawide,
@@ -477,7 +480,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 +492,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 +510,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 +742,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 +754,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
@@ -19,6 +19,7 @@ use hotwatch::notify::ErrorKind as NotifyErrorKind;
 use hotwatch::EventKind;
 use hotwatch::Hotwatch;
 use parking_lot::Mutex;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use uds_windows::UnixListener;
@@ -125,8 +126,7 @@ pub struct WindowManager {
 }

 #[allow(clippy::struct_excessive_bools)]
-#[derive(Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct State {
    pub monitors: Ring<Monitor>,
    pub monitor_usr_idx_map: HashMap<usize, usize>,
@@ -191,8 +191,7 @@ impl State {
 }

 #[allow(clippy::struct_excessive_bools)]
-#[derive(Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct GlobalState {
    pub border_enabled: bool,
    pub border_colours: BorderColours,
@@ -398,11 +397,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 +3656,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/window_manager_event.rs
+++ b/komorebi/src/window_manager_event.rs
@@ -1,6 +1,7 @@
 use std::fmt::Display;
 use std::fmt::Formatter;

+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;

@@ -11,8 +12,7 @@ use crate::OBJECT_NAME_CHANGE_ON_LAUNCH;
 use crate::OBJECT_NAME_CHANGE_TITLE_IGNORE_LIST;
 use crate::REGEX_IDENTIFIERS;

-#[derive(Debug, Copy, Clone, Serialize, Deserialize)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Debug, Copy, Clone, Serialize, Deserialize, JsonSchema)]
 #[serde(tag = "type", content = "content")]
 pub enum WindowManagerEvent {
    Destroy(WinEvent, Window),
--- 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/winevent.rs
+++ b/komorebi/src/winevent.rs
@@ -1,5 +1,6 @@
 #![allow(clippy::use_self)]

+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use strum::Display;
@@ -88,8 +89,7 @@ use windows::Win32::UI::WindowsAndMessaging::EVENT_UIA_EVENTID_START;
 use windows::Win32::UI::WindowsAndMessaging::EVENT_UIA_PROPID_END;
 use windows::Win32::UI::WindowsAndMessaging::EVENT_UIA_PROPID_START;

-#[derive(Clone, Copy, PartialEq, Eq, Debug, Serialize, Deserialize, Display)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Copy, PartialEq, Eq, Debug, Serialize, Deserialize, Display, JsonSchema)]
 #[repr(u32)]
 #[allow(dead_code)]
 pub enum WinEvent {
--- a/komorebi/src/workspace.rs
+++ b/komorebi/src/workspace.rs
@@ -10,10 +10,10 @@ use getset::CopyGetters;
 use getset::Getters;
 use getset::MutGetters;
 use getset::Setters;
+use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;

-use crate::border_manager;
 use crate::core::Axis;
 use crate::core::CustomLayout;
 use crate::core::CycleDirection;
@@ -43,9 +43,17 @@ use crate::REMOVE_TITLEBARS;

 #[allow(clippy::struct_field_names)]
 #[derive(
-    Debug, Clone, Serialize, Deserialize, Getters, CopyGetters, MutGetters, Setters, PartialEq,
+    Debug,
+    Clone,
+    Serialize,
+    Deserialize,
+    Getters,
+    CopyGetters,
+    MutGetters,
+    Setters,
+    JsonSchema,
+    PartialEq,
 )]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Workspace {
    #[getset(get = "pub", set = "pub")]
    pub name: Option<String>,
@@ -95,8 +103,7 @@ pub struct Workspace {
    pub workspace_config: Option<WorkspaceConfig>,
 }

-#[derive(Debug, Default, Copy, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Debug, Default, Copy, Clone, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
 pub enum WorkspaceLayer {
    #[default]
    Tiling,
@@ -162,9 +169,9 @@ pub enum WorkspaceWindowLocation {
    CopyGetters,
    MutGetters,
    Setters,
+    JsonSchema,
    PartialEq,
 )]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 /// Settings setup either by the parent monitor or by the `WindowManager`
 pub struct WorkspaceGlobals {
    pub container_padding: Option<i32>,
@@ -847,8 +854,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/Cargo.toml
+++ b/komorebic/Cargo.toml
@@ -21,7 +21,7 @@ miette = { version = "7", features = ["fancy"] }
 paste = { workspace = true }
 powershell_script = "1.0"
 reqwest = { version = "0.12", features = ["blocking"] }
-schemars = { workspace = true, optional = true }
+schemars = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 shadow-rs = { workspace = true }
@@ -34,9 +34,5 @@ windows = { workspace = true }
 reqwest = { version = "0.12", features = ["blocking"] }
 shadow-rs = { workspace = true }

-[features]
-default = ["schemars"]
-schemars = ["dep:schemars"]
-
 [lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(FALSE)'] }
--- a/komorebic/src/main.rs
+++ b/komorebic/src/main.rs
@@ -26,12 +26,15 @@ use komorebi_client::resolve_home_path;
 use komorebi_client::send_message;
 use komorebi_client::send_query;
 use komorebi_client::ApplicationSpecificConfiguration;
+use komorebi_client::Notification;
 use lazy_static::lazy_static;
 use miette::NamedSource;
 use miette::Report;
 use miette::SourceOffset;
 use miette::SourceSpan;
 use paste::paste;
+use schemars::gen::SchemaSettings;
+use schemars::schema_for;
 use serde::Deserialize;
 use sysinfo::ProcessesToUpdate;
 use which::which;
@@ -155,7 +158,6 @@ gen_enum_subcommand_args! {
    CycleMoveToMonitor: CycleDirection,
    CycleMonitor: CycleDirection,
    CycleWorkspace: CycleDirection,
-    CycleEmptyWorkspace: CycleDirection,
    CycleMoveWorkspaceToMonitor: CycleDirection,
    Stack: OperationDirection,
    CycleStack: CycleDirection,
@@ -1130,9 +1132,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 +2627,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)?;
        }
@@ -2979,43 +2973,31 @@ if (Get-Command Get-CimInstance -ErrorAction SilentlyContinue) {
            );
        }
        SubCommand::ApplicationSpecificConfigurationSchema => {
-            #[cfg(feature = "schemars")]
-            {
-                let asc = schemars::schema_for!(ApplicationSpecificConfiguration);
-                let schema = serde_json::to_string_pretty(&asc)?;
-                println!("{schema}");
-            }
+            let asc = schema_for!(ApplicationSpecificConfiguration);
+            let schema = serde_json::to_string_pretty(&asc)?;
+            println!("{schema}");
        }
        SubCommand::NotificationSchema => {
-            #[cfg(feature = "schemars")]
-            {
-                let notification = schemars::schema_for!(komorebi_client::Notification);
-                let schema = serde_json::to_string_pretty(&notification)?;
-                println!("{schema}");
-            }
+            let notification = schema_for!(Notification);
+            let schema = serde_json::to_string_pretty(&notification)?;
+            println!("{schema}");
        }
        SubCommand::SocketSchema => {
-            #[cfg(feature = "schemars")]
-            {
-                let socket_message = schemars::schema_for!(SocketMessage);
-                let schema = serde_json::to_string_pretty(&socket_message)?;
-                println!("{schema}");
-            }
+            let socket_message = schema_for!(SocketMessage);
+            let schema = serde_json::to_string_pretty(&socket_message)?;
+            println!("{schema}");
        }
        SubCommand::StaticConfigSchema => {
-            #[cfg(feature = "schemars")]
-            {
-                let settings = schemars::gen::SchemaSettings::default().with(|s| {
-                    s.option_nullable = false;
-                    s.option_add_null_type = false;
-                    s.inline_subschemas = true;
-                });
+            let settings = SchemaSettings::default().with(|s| {
+                s.option_nullable = false;
+                s.option_add_null_type = false;
+                s.inline_subschemas = true;
+            });

-                let gen = settings.into_generator();
-                let socket_message = gen.into_root_schema_for::<StaticConfig>();
-                let schema = serde_json::to_string_pretty(&socket_message)?;
-                println!("{schema}");
-            }
+            let gen = settings.into_generator();
+            let socket_message = gen.into_root_schema_for::<StaticConfig>();
+            let schema = serde_json::to_string_pretty(&socket_message)?;
+            println!("{schema}");
        }
        SubCommand::GenerateStaticConfig => {
            print_query(&SocketMessage::GenerateStaticConfig);
--- 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
Author	SHA1	Message	Date
alex-ds13	89d67507c7	fix(reaper): avoid deadlocks at startup Previously the reaper at startup would lock it's own `HWNDS_CACHE` and then try to lock the WM to get its `known_hwnds`. However if there was an event in the meantime, process_event would lock the WM first and then it would try to lock the reaper's `HWNDS_CACHE` to update it. This would deadlock since that would be locked by the reaper waiting for the WM lock to be released. This commit now makes it so we pass the `known_hwnds` to the reaper as an argument at startup and it also rearranges the order of loading the listeners. Now komorebi first loads all the manager-type listeners, and only afterwards does it load the commands and events listeners. After some testing this seems to be the best order that doesn't cause any issues at all! There were some other issues that I've noticed before when starting komorebi while having other 3rd parties trying to subscribe to it (like komorebi-bar and YASB), which would make those subscribers lock the `process_command` thread. This doesn't seem to be happening on my tests anymore with this new order.	2025-03-02 18:28:07 -08:00
alex-ds13	83538be46e	perf(reaper): switch to channel notifications This commit changes the way the reaper works. First this commit changed the `known_hwnds` held by the `WindowManager` to be a HashMap of window handles (isize) to a pair of monitor_idx, workspace_idx (usize, usize). This commit then changes the reaper to have a cache of hwnds which is updated by the `WindowManager` when they change. The reaper has a thread that is continuously checking this cache to see if there is any window handle that no longer exists. When it finds them, the thread sends a notification to a channel which is then received by the reaper on another thread that actually does the work on the `WindowManager` by removing said windows. This means that the reaper no longer tries to access and lock the `WindowManager` every second like it used to, but instead it only does it when it actually needs, when a window actually needs to be reaped. This means that we can make the thread that checks for orphan windows run much more frequently since it won't influence the rest of komorebi. Since now the `known_hwnds` have the monitor/workspace index pair of the window, we can simply get that info from the map and immediately access that monitor/workspace or use that index info.	2025-03-02 18:28:07 -08:00
Csaba	8f98cc6be5	feat(bar): add icons to workspace-layer widget This commits adds the ability to set icons for the `workspace-layer` with the `DisplayFormat` and a setting to specify if it should `show_when_tiling` or not. collab with @alex-ds13	2025-03-02 15:39:49 -08:00
LGUG2Z	06d469f1da	fix(wm): preserve resize dimensions on offset toggle This commit ensures that the resize dimensions will be reserved for other monitors and workspaces when the toggle-window-based-work-area-offset command is used.	2025-03-02 14:43:13 -08:00
Csaba	1115db65e7	fix(bar): always add stroke on selected_frame This commit fixes a breaking change on the selected_frame that was introduced by eframe version 0.31. In this version, the stroke is drawn on the inside of a Frame instead it being drawn on the outside like before. This now means that a stroke needs to be added on all the states of the Frame in order to avoid all the elements to be moving around on hover.	2025-03-02 14:43:13 -08:00
LGUG2Z	a785d7b7b1	docs(readme): add active individual commercial use licenses count	2025-03-02 14:43:13 -08:00
LGUG2Z	01a417605c	chore(deps): bump eframe to 0.31	2025-03-02 14:43:13 -08:00
alex-ds13	6e7f42be87	fix(wm): allow stacking in all dirs, improve stack border rendering Previously the stacking logic would sometimes change the focused container without actually changing focus to said container. This resulted in the stack showing up with an unfocused border even though we had focus on one windows belonging to the stack (just not the right one). Also before it wasn't possible to stack windows on some directions when we were already on a stack. This commit fixes both issues.	2025-03-02 14:43:13 -08:00
alex-ds13	64d856169b	fix(borders): address memory leaks This commit fixes multiple issues with the borders which were resulting in multiple borders being created and not completely destroyed which meant that the amount of borders in memory kept increasing indefinitely the more we used komorebi. To do so this commit does the following: - Clear all the maps on `destroy_all_borders`. - Create function `remove_border` which should always be used when we want to remove a border since this function destroys the border window and removes all its related data and clones from all the maps. - Create function `remove_borders` which should always be used when we want to remove multiple borders or filter the current existing borders. It takes in a `condition` function that takes a ref to the border's container id and a ref to the border and should return a bool. This function is then applied to each existing border and if it evaluates to true it will call `remove_border` on it. - Apply these new functions on all the code that was previously manually removing borders. - When a container is a stack, we now check it's unfocused windows, in case they had borders attached to them we remove them, otherwise these borders would persist and be drawn below other borders. - We now check if a container's border was previously tracking a different window, if it was we destroy that border and remove it's hwnd from the `FOCUS_STATE` and then we check if its `tracking_hwnd` still points to the same border and remove it if it does (if it doesn't that means that a new border was already attached to that window so we don't remove it). We don't call `remove_border` here since we don't want to actually remove the border but instead we replace it with a new one tracking the correct window. (I've tried updating the `tracking_hwnd` instead of destroying the border and creating a new one but that didn't work since it still kept tracking the previous window...).	2025-03-02 14:43:13 -08:00
alex-ds13	67cb5d044a	feat(wm): move all windows on ws layer toggle This commit makes it so when you toggle between workspace layers it moves all windows of that layer to the top of the z-order. So if you move to `Floating` layer, then all floating windows are moved to the top, and if you go back to the `Tiling` layer, all tiled containers are moved to the top.	2025-03-02 14:43:13 -08:00
LGUG2Z	4a19336974	chore(deps): bump shadow-rs from 0.38 to 1	2025-03-02 14:43:13 -08:00
Csaba	3a1e73918d	fix(bar): use accent color for active widget components This commit makes sure that the accent color is used on certain bar components, such as active workspace, selected layout and focused window. This will now make these components stand out even more for a better visual indication. fix #1288	2025-03-02 14:43:13 -08:00
LGUG2Z	60ed10e6e6	chore(deps): bump win32-display-data	2025-03-02 14:43:13 -08:00
Csaba	2e90a3a75d	feat(bar): add opts to show all icons on workspace widget This commit adds 3 new display options on the komorebi workspace widget to show all icons.	2025-03-02 14:43:13 -08:00
LGUG2Z	0289b02d97	chore(just): add wpm target	2025-03-02 14:43:13 -08:00
alex-ds13	d351e910e5	fix(wm): prevent floating focus change event infinite loops This commit stops the `FocusChange` event from focusing a floating window when it is the one emitting said `FocusChange` event, since it's not needed and is the cause of some flicker bugs reported! If that floating window was the one emitting the `FocusChange` event then it means it is already the foreground window, and there is no reason for us to focus the window again (since that will create an infinite loop of events). When the window emitting this event is not floating we don't try to focus the window, we simply set the focus index for the container of that window and the focused index for the window of that container. Except in one case, which is if the workspace has a monocle container, then it does focus a window, it focuses the monocle window to make sure the monocle keeps showing in front of everything and doesn't let anything come in front of it.	2025-03-02 14:43:13 -08:00
alex-ds13	c25750b691	fix(bar): apply work area offset on monitor reconnect This commit makes sure the bar applies the the `work_area_offset` correctly after a monitor reconnects; if it is the first time a monitor is connecting, the cached offset won't exist yet.	2025-03-02 14:43:12 -08:00
alex-ds13	c37a0aa8a6	fix(wm): properly load monitor on first connect This commit fixes an issue where if you started komorebi without a monitor connected, and then connected it later, it wasn't properly loading the data returned from `win32-display-data`.	2025-03-02 14:43:12 -08:00
LGUG2Z	fc0da2c1d3	refactor(bar): add extend_enum! macro This commit adds an extend_enum! macro and some unit tests to provide an ergonomic way to specialize configs for specific (sub)widgets. The macro takes the name of the existing enum, the desired name of the new, extended enum, and a list of variants which should be added to the extended enum. The macro will add new variants to a new enum definition first, before wrapping the existing enum in an Existing variant and tagging it with the `#[serde(untagged)]` annotation. From is also implemented for ergonomic from/into calls between shared variants of the existing and extended enums.	2025-03-02 14:43:12 -08:00
alex-ds13	47f4f47d3f	feat(wm): add padding per monitor This commit adds the ability to set container and workspace padding per monitor. To do so (and to simplify any future need of changing some value per monitor), and have it pass through to each workspace a new field was added to `Workspace` called `globals` which has a new struct called `WorkspaceGlobals`. `WorkspaceGlobals` includes any global values that might be needed by the workspace. This field is updated by the monitor for all its workspaces whenever the config is loaded or reloaded. It is also updated on `RetileAll` and on the function `update_focused_workspace`. This should make sure that every time a workspace needs to use it's `update` function, it has all the `globals` up to date! This also means that now the `update` function from workspaces doesn't take any argument at all, reducing all the need to get all the `work_area`, `work_area_offset`, `window_based_work_area_offset` or `window_based_work_area_offset_limit` simplifying the callers of this function quite a bit. Lastly this commit has also (sort of accidentaly) fixed an existing bug with the `move_workspace_to_monitor` function. This was previous removing the workspace from a monitor, but wasn't changing it's `focused_workspace_idx`, meaning that komorebi would get all messed up after that command. For example, the `border_manager` would get stuck and the komorebi-bar would crash. Now, the `remove_focused_workspace` function also focuses the previous workspace (which in turn will create a new workspace in case the removed workspace was the last workspace).	2025-03-02 14:43:11 -08:00
alex-ds13	0f59820419	fix(wm): hide/restore floating windows on monocle toggle	2025-03-02 14:42:04 -08:00
alex-ds13	ba1ef22204	fix(wm): take layer into account on ws restore Previously if a workspace had any floating windows it would always focus the first one when restoring. Now it only focus the floating window if the workspace layer is `Floating`.	2025-03-02 14:42:04 -08:00
LGUG2Z	f7c9712706	feat(wm): add tiling and floating ws layers This commit introduces an implementation of workspace layers to komorebi. Workspace layers change the kinds of windows that certain commands operate on. This implementation features two variants, WorkspaceLayer::Tiling and WorkspaceLayer::Floating. The default behaviour until now has been WorkspaceLayer::Tiling. When the user sets WorkspaceLayer::Floating, either through the 'toggle-workspace-layer' command or the new bar widget, the 'move', 'focus', 'cycle-focus' and 'resize-axis' commands will operate on floating windows, if the currently focused window is a floating window. As I don't have 'cycle-focus' bound to anything, 'focus up' and 'focus down' double as incrementing and decrementing cycle focus commands, iterating focus through the floating windows assigned to a workspace. Floating windows in komorebi belong to specific workspaces, therefore commands such as 'move' and 'resize-axis' will restrict movement and resizing to the bounds of their workspace's work area (or more accurately, the work area of the monitor that the workspace belongs to, as floating windows are never constrained by workspace-specific work area restrictions).	2025-03-02 14:42:04 -08:00
LGUG2Z	01a832027d	build(cargo): add custom build profiles	2025-03-02 14:42:04 -08:00