chore(release): v0.1.20

docs(readme): add references to docs website
docs(mkdocs): add common workflows section
2026-01-14 06:13:36 +01:00 · 2024-02-15 12:11:05 -08:00 · 2024-02-15 12:11:05 -08:00 · 2024-02-15 12:11:05 -08:00 · 2024-02-15 12:11:05 -08:00 · 2024-02-15 12:11:05 -08:00
40 changed files with 1163 additions and 1863 deletions
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -87,10 +87,8 @@ jobs:
          path: |
            target/${{ matrix.target }}/release/komorebi.exe
            target/${{ matrix.target }}/release/komorebic.exe
-            target/${{ matrix.target }}/release/komorebic-no-console.exe
            target/${{ matrix.target }}/release/komorebi.pdb
            target/${{ matrix.target }}/release/komorebic.pdb
-            target/${{ matrix.target }}/release/komorebic-no-console.pdb
            target/wix/komorebi-*.msi
          retention-days: 7

--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -34,7 +34,7 @@ builds:
    hooks:
      post:
        - mkdir -p dist/windows_amd64
-        - cp ".\target\x86_64-pc-windows-msvc\release\komorebic-no-console.exe" ".\dist\komorebic-no-console_windows_amd64_v1\komorebic-no-console.exe"
+        - cp ".\target\x86_64-pc-windows-msvc\release\komorebic-no-console.exe" ".\dist\komorebic_no_console_windows_amd64_v1\komorebic-no-console.exe"

 archives:
  - name_template: "{{ .ProjectName }}-{{ .Version }}-x86_64-pc-windows-msvc"
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -28,9 +28,9 @@ dependencies = [

 [[package]]
 name = "anstream"
-version = "0.6.12"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b09b5178381e0874812a9b157f7fe84982617e48f71f4e3235482775e5b540"
+checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
 dependencies = [
 "anstyle",
 "anstyle-parse",
@@ -74,12 +74,6 @@ dependencies = [
 "windows-sys 0.52.0",
 ]

-[[package]]
-name = "arrayvec"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
-
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -130,9 +124,9 @@ checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"

 [[package]]
 name = "bumpalo"
-version = "3.15.3"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"

 [[package]]
 name = "bytes"
@@ -142,9 +136,12 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"

 [[package]]
 name = "cc"
-version = "1.0.87"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3286b845d0fccbdd15af433f61c5970e711987036cb468f437ff6badd70f4e24"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]

 [[package]]
 name = "cfg-if"
@@ -160,9 +157,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "clap"
-version = "4.5.1"
+version = "4.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da"
+checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f"
 dependencies = [
 "clap_builder",
 "clap_derive",
@@ -170,9 +167,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.1"
+version = "4.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb"
+checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99"
 dependencies = [
 "anstream",
 "anstyle",
@@ -190,7 +187,7 @@ dependencies = [
 "heck",
 "proc-macro2",
 "quote",
- "syn 2.0.50",
+ "syn 2.0.48",
 ]

 [[package]]
@@ -592,20 +589,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"

 [[package]]
 name = "hermit-abi"
-version = "0.3.8"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "379dada1584ad501b383485dd706b8afb7a70fcbc7f4da7d780638a5a6124a60"
-
-[[package]]
-name = "hex_color"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d37f101bf4c633f7ca2e4b5e136050314503dd198e78e325ea602c327c484ef0"
-dependencies = [
- "arrayvec",
- "rand",
- "serde",
-]
+checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd"

 [[package]]
 name = "home"
@@ -802,7 +788,7 @@ dependencies = [

 [[package]]
 name = "komorebi"
-version = "0.1.22-dev.0"
+version = "0.1.20"
 dependencies = [
 "bitflags 2.4.2",
 "clap",
@@ -812,7 +798,6 @@ dependencies = [
 "ctrlc",
 "dirs",
 "getset",
- "hex_color",
 "hotwatch",
 "komorebi-core",
 "lazy_static",
@@ -841,19 +826,9 @@ dependencies = [
 "winreg 0.52.0",
 ]

-[[package]]
-name = "komorebi-client"
-version = "0.1.22-dev.0"
-dependencies = [
- "komorebi",
- "komorebi-core",
- "serde_json",
- "uds_windows",
-]
-
 [[package]]
 name = "komorebi-core"
-version = "0.1.22-dev.0"
+version = "0.1.20"
 dependencies = [
 "clap",
 "color-eyre",
@@ -869,7 +844,7 @@ dependencies = [

 [[package]]
 name = "komorebic"
-version = "0.1.22-dev.0"
+version = "0.1.20"
 dependencies = [
 "clap",
 "color-eyre",
@@ -896,7 +871,7 @@ dependencies = [

 [[package]]
 name = "komorebic-no-console"
-version = "0.1.22-dev.0"
+version = "0.1.19"

 [[package]]
 name = "lazy_static"
@@ -1002,7 +977,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.50",
+ "syn 2.0.48",
 ]

 [[package]]
@@ -1202,9 +1177,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"

 [[package]]
 name = "openssl"
-version = "0.10.64"
+version = "0.10.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
+checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8"
 dependencies = [
 "bitflags 2.4.2",
 "cfg-if 1.0.0",
@@ -1223,7 +1198,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.50",
+ "syn 2.0.48",
 ]

 [[package]]
@@ -1234,9 +1209,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"

 [[package]]
 name = "openssl-sys"
-version = "0.9.101"
+version = "0.9.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff"
+checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae"
 dependencies = [
 "cc",
 "libc",
@@ -1589,9 +1564,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"

 [[package]]
 name = "ryu"
-version = "1.0.17"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"

 [[package]]
 name = "same-file"
@@ -1666,22 +1641,22 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.197"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
+checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.197"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
+checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.50",
+ "syn 2.0.48",
 ]

 [[package]]
@@ -1697,9 +1672,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.114"
+version = "1.0.113"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
+checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
 dependencies = [
 "itoa",
 "ryu",
@@ -1720,9 +1695,9 @@ dependencies = [

 [[package]]
 name = "serde_yaml"
-version = "0.9.32"
+version = "0.9.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f"
+checksum = "adf8a49373e98a4c5f0ceb5d05aa7c648d75f63774981ed95b7c7443bbd50c6e"
 dependencies = [
 "indexmap",
 "itoa",
@@ -1763,12 +1738,12 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"

 [[package]]
 name = "socket2"
-version = "0.5.6"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
 dependencies = [
 "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]

 [[package]]
@@ -1796,7 +1771,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "rustversion",
- "syn 2.0.50",
+ "syn 2.0.48",
 ]

 [[package]]
@@ -1840,9 +1815,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.50"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1951,7 +1926,7 @@ checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.50",
+ "syn 2.0.48",
 ]

 [[package]]
@@ -1966,9 +1941,9 @@ dependencies = [

 [[package]]
 name = "thread_local"
-version = "1.1.8"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
 dependencies = [
 "cfg-if 1.0.0",
 "once_cell",
@@ -2097,7 +2072,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.50",
+ "syn 2.0.48",
 ]

 [[package]]
@@ -2186,9 +2161,9 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"

 [[package]]
 name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
 dependencies = [
 "tinyvec",
 ]
@@ -2286,7 +2261,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "syn 2.0.50",
+ "syn 2.0.48",
 "wasm-bindgen-shared",
 ]

@@ -2320,7 +2295,7 @@ checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.50",
+ "syn 2.0.48",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
@@ -2343,15 +2318,15 @@ dependencies = [

 [[package]]
 name = "which"
-version = "6.0.0"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fa5e0c10bf77f44aac573e498d1a82d5fbd5e91f6fc0a99e7be4b38e85e101c"
+checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14"
 dependencies = [
 "either",
 "home",
 "once_cell",
 "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]

 [[package]]
@@ -2412,7 +2387,7 @@ dependencies = [
 "windows-core",
 "windows-implement",
 "windows-interface",
- "windows-targets 0.52.3",
+ "windows-targets 0.52.0",
 ]

 [[package]]
@@ -2421,7 +2396,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.3",
+ "windows-targets 0.52.0",
 ]

 [[package]]
@@ -2432,7 +2407,7 @@ checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.50",
+ "syn 2.0.48",
 ]

 [[package]]
@@ -2443,7 +2418,7 @@ checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.50",
+ "syn 2.0.48",
 ]

 [[package]]
@@ -2476,7 +2451,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.3",
+ "windows-targets 0.52.0",
 ]

 [[package]]
@@ -2496,17 +2471,17 @@ dependencies = [

 [[package]]
 name = "windows-targets"
-version = "0.52.3"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d380ba1dc7187569a8a9e91ed34b8ccfc33123bbacb8c0aed2d1ad7f3ef2dc5f"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.3",
- "windows_aarch64_msvc 0.52.3",
- "windows_i686_gnu 0.52.3",
- "windows_i686_msvc 0.52.3",
- "windows_x86_64_gnu 0.52.3",
- "windows_x86_64_gnullvm 0.52.3",
- "windows_x86_64_msvc 0.52.3",
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
 ]

 [[package]]
@@ -2523,9 +2498,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"

 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.3"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68e5dcfb9413f53afd9c8f86e56a7b4d86d9a2fa26090ea2dc9e40fba56c6ec6"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"

 [[package]]
 name = "windows_aarch64_msvc"
@@ -2541,9 +2516,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"

 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.3"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dab469ebbc45798319e69eebf92308e541ce46760b49b18c6b3fe5e8965b30f"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"

 [[package]]
 name = "windows_i686_gnu"
@@ -2559,9 +2534,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"

 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.3"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a4e9b6a7cac734a8b4138a4e1044eac3404d8326b6c0f939276560687a033fb"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"

 [[package]]
 name = "windows_i686_msvc"
@@ -2577,9 +2552,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"

 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.3"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b0ec9c422ca95ff34a78755cfa6ad4a51371da2a5ace67500cf7ca5f232c58"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"

 [[package]]
 name = "windows_x86_64_gnu"
@@ -2595,9 +2570,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"

 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.3"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "704131571ba93e89d7cd43482277d6632589b18ecf4468f591fbae0a8b101614"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"

 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -2613,9 +2588,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"

 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.3"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42079295511643151e98d61c38c0acc444e52dd42ab456f7ccfd5152e8ecf21c"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"

 [[package]]
 name = "windows_x86_64_msvc"
@@ -2631,9 +2606,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"

 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.3"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0770833d60a970638e989b3fa9fd2bb1aaadcf88963d1659fd7d9990196ed2d6"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"

 [[package]]
 name = "winput"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,6 @@ resolver = "2"
 members = [
    "derive-ahk",
    "komorebi",
-    "komorebi-client",
    "komorebi-core",
    "komorebic",
    "komorebic-no-console",
--- a/README.md
+++ b/README.md
@@ -82,8 +82,6 @@ A [detailed installation and quickstart
 guide](https://lgug2z.github.io/komorebi/installation.html) is available which shows how to get started
 using `scoop`, `winget` or building from source.

-[![Watch the quickstart walkthrough video](https://img.youtube.com/vi/H9-_c1egQ4g/hqdefault.jpg)](https://www.youtube.com/watch?v=H9-_c1egQ4g)
-
 # Demonstrations

 [@haxibami](https://github.com/haxibami) showing _komorebi_ running on Windows
@@ -101,76 +99,20 @@ widget enabled. The original video can be viewed

 https://user-images.githubusercontent.com/13164844/163496414-a9cde3d1-b8a7-4a7a-96fb-a8985380bc70.mp4

-# Contribution Guidelines
+# Development

-If you would like to contribute to `komorebi` please take the time to carefully read the guidelines below.
-
-## Commit hygiene
+If you would like to contribute code to this repository, there are a few requests that I have to ensure a foundation of
+code quality, consistency and commit hygiene:

 - Flatten all `use` statements
- Run `cargo +stable clippy` and ensure that all lints and suggestions have been addressed before committing
+- Run `cargo +nightly clippy` and ensure that all lints and suggestions have been addressed before committing
 - Run `cargo +nightly fmt --all` to ensure consistent formatting before committing
 - Use `git cz` with
  the [Commitizen CLI](https://github.com/commitizen/cz-cli#conventional-commit-messages-as-a-global-utility) to prepare
  commit messages
- Provide **at least** one short sentence or paragraph in your commit message body to describe your thought process for the
+- Provide at least one short sentence or paragraph in your commit message body to describe your thought process for the
  changes being committed

-## PRs should contain only a single feature or bug fix
-
-It is very difficult to review pull requests which touch multiple unrelated features and parts of the codebase.
-
-Please do not submit pull requests like this; you will be asked to separate them into smaller PRs that deal only with
-one feature or bug fix at a time.
-
-If you are working on multiple features and bug fixes, I suggest that you cut a branch called `local-trunk`
-from `master` which you keep up to date, and rebase the various independent branches you are working on onto that branch
-if you want to test them together or create a build with everything integrated.
-
-## Refactors to the codebase must have prior approval
-
-`komorebi` is a mature codebase with an internal consistency and structure that has developed organically over close to
-half a decade.
-
-There are [countless hours of live coding videos](https://youtube.com/@LGUG2Z) demonstrating work on this project and
-showing new contributors how to do everything from basic tasks like implementing new `komorebic` commands to
-distinguishing monitors by manufacturer hardware identifiers and video card ports.
-
-Refactors to the structure of the codebase are not taken lightly and require prior discussion and approval.
-
-Please do not start refactoring the codebase with the expectation of having your changes integrated until you receive an
-explicit approval or a request to do so.
-
-Similarly, when implementing features and bug fixes, please stick to the structure of the codebase as much as possible
-and do not take this as an opportunity to do some "refactoring along the way".
-
-It is extremely difficult to review PRs for features and bug fixes if they are lost in sweeping changes to the structure
-of the codebase.
-
-## Breaking changes to user-facing interfaces are unacceptable
-
-This includes but is not limited to:
-
- All `komorebic` commands
- The `komorebi.json` schema
- The [`komorebi-application-specific-configuration`](https://github.com/LGUG2Z/komorebi-application-specific-configuration)
-  schema
-
-No user should ever find that their configuration file has stopped working after upgrading to a new version
-of `komorebi`.
-
-More often than not there are ways to reformulate changes that may initially seem like they require breaking user-facing
-interfaces into additive changes.
-
-For some inspiration please take a look
-at [this commit](https://github.com/LGUG2Z/komorebi/commit/e7d928a065eb63bb4ea1fb864c69c1cae8cc763b) which added the
-ability for users to specify colours in `komorebi.json` in Hex format alongside RGB.
-
-There is also a process in place for graceful, non-breaking, deprecation of configuration options that are no longer
-required.
-
-# Development
-
 If you use IntelliJ, you should enable the following settings to ensure that code generated by macros is recognised by
 the IDE for completions and navigation:

@@ -209,21 +151,20 @@ found, information about it will appear in the log which can be shared when open
 # Window Manager State and Integrations

 The current state of the window manager can be queried using the `komorebic state` command, which returns a JSON
-representation of the `State` struct.
+representation of the `State` struct, which includes the current state of `WindowManager`.

-This may also be polled to build further integrations and widgets on top of.
+This may also be polled to build further integrations and widgets on top of (if you ever wanted to build something
+like [Stackline](https://github.com/AdamWagner/stackline) for Windows, you could do it by polling this command).

 # Window Manager Event Subscriptions

-## Named Pipes
-
-It is possible to subscribe to notifications of every `WindowManagerEvent` and `SocketMessage` handled
+It is also possible to subscribe to notifications of every `WindowManagerEvent` and `SocketMessage` handled
 by `komorebi` using [Named Pipes](https://docs.microsoft.com/en-us/windows/win32/ipc/named-pipes).

 First, your application must create a named pipe. Once the named pipe has been created, run the following command:

 ```powershell
-komorebic.exe subscribe-pipe <your pipe name>
+komorebic.exe subscribe <your pipe name>
 ```

 Note that you do not have to include the full path of the named pipe, just the name.
@@ -247,125 +188,12 @@ You may then filter on the `type` key to listen to the events that you are inter
 notification types, refer to the enum variants of `WindowManagerEvent` in `komorebi` and `SocketMessage`
 in `komorebi-core`.

-Below is an example of how you can subscribe to and filter on events using a named pipe in `nodejs`.
+An example of how to create a named pipe and a subscription to `komorebi`'s handled events in Python
+by [@denBot](https://github.com/denBot) can be
+found [here](https://gist.github.com/denBot/4136279812f87819f86d99eba77c1ee0).

-```javascript
-const { exec } = require("child_process");
-const net = require("net");
-
-const pipeName = "\\\\.\\pipe\\komorebi-js";
-const server = net.createServer((stream) => {
-  console.log("Client connected");
-
-  // Every time there is a workspace-related event, let's log the names of all
-  // workspaces on the currently focused monitor, and then log the name of the
-  // currently focused workspace on that monitor
-
-  stream.on("data", (data) => {
-    let json = JSON.parse(data.toString());
-    let event = json.event;
-
-    if (event.type.includes("Workspace")) {
-      let monitors = json.state.monitors;
-      let current_monitor = monitors.elements[monitors.focused];
-      let workspaces = monitors.elements[monitors.focused].workspaces;
-      let current_workspace = workspaces.elements[workspaces.focused];
-
-      console.log(
-        workspaces.elements
-          .map((workspace) => workspace.name)
-          .filter((name) => name !== null)
-      );
-      console.log(current_workspace.name);
-    }
-  });
-
-  stream.on("end", () => {
-    console.log("Client disconnected");
-  });
-});
-
-server.listen(pipeName, () => {
-  console.log("Named pipe server listening");
-});
-
-const command = "komorebic subscribe-pipe komorebi-js";
-
-exec(command, (error, stdout, stderr) => {
-  if (error) {
-    console.error(`Error executing command: ${error}`);
-    return;
-  }
-});
-```
-
-## Unix Domain Sockets
-
-It is possible to subscribe to notifications of every `WindowManagerEvent` and `SocketMessage` handled
-by `komorebi` using [Unix Domain Sockets](https://devblogs.microsoft.com/commandline/af_unix-comes-to-windows/).
-
-UDS are also the only mode of communication between `komorebi` and `komorebic`.
-
-First, your application must create a socket in `$ENV:LocalAppData\komorebi`. Once the socket has been created, run the
-following command:
-
-```powershell
-komorebic.exe subscribe-socket <your socket name>
-```
-
-If the socket exists, komorebi will start pushing JSON data of successfully handled events and messages as in the
-example above in the Named Pipes section.
-
-## Rust Client
-
-As of `v0.1.22` it is possible to use the `komorebi-client` crate to subscribe to notifications of
-every `WindowManagerEvent` and `SocketMessage` handled by `komorebi` in a Rust codebase.
-
-Below is a simple example of how to use `komorebi-client` in a basic Rust application.
-
-```rust
-// komorebi-client = { git = "https://github.com/LGUG2Z/komorebi", tag = "v0.1.22"}
-
-use anyhow::Result;
-use komorebi_client::Notification;
-use komorebi_client::NotificationEvent;
-use komorebi_client::UnixListener;
-use komorebi_client::WindowManagerEvent;
-use std::io::BufRead;
-use std::io::BufReader;
-use std::io::Read;
-
-pub fn main() -> anyhow::Result<()> {
-  let socket = komorebi_client::subscribe(NAME)?;
-
-  for incoming in socket.incoming() {
-    match incoming {
-      Ok(data) => {
-        let reader = BufReader::new(data.try_clone()?);
-
-        for line in reader.lines().flatten() {
-          let notification: Notification = match serde_json::from_str(&line) {
-            Ok(notification) => notification,
-            Err(error) => {
-              log::debug!("discarding malformed komorebi notification: {error}");
-              continue;
-            }
-          };
-
-          // match and filter on desired notifications
-        }
-      }
-      Err(error) => {
-        log::debug!("{error}");
-      }
-    }
-  }
-
-}
-```
-
-A read-world example can be found
-in [komokana](https://github.com/LGUG2Z/komokana/blob/feature/komorebi-uds/src/main.rs).
+An example of how to create a named pipe and a subscription to `komorebi`'s handled events in Rust can also be found
+in the [`komokana`](https://github.com/LGUG2Z/komokana) repository.

 ## Subscription Event Notification Schema

--- a/docs/common-workflows/active-window-border.md
+++ b/docs/common-workflows/active-window-border.md
@@ -34,5 +34,7 @@ windows managed by `komorebi`.
 This feature is not considered stable and you may encounter visual artifacts
 from time to time.

+<!-- TODO: Record a new video -->
+
 [![Watch the tutorial
-video](https://img.youtube.com/vi/7_9D22t7KK4/hqdefault.jpg)](https://www.youtube.com/watch?v=7_9D22t7KK4)
+video](https://img.youtube.com/vi/ywiAvoMV_gE/hqdefault.jpg)](https://www.youtube.com/watch?v=ywiAvoMV_gE)
--- a/docs/common-workflows/komorebi-config-home.md
+++ b/docs/common-workflows/komorebi-config-home.md
@@ -25,6 +25,3 @@ If you already have configuration files that you wish to keep, move them to the

 The next time you run `komorebic start`, any files created by or loaded by
 _komorebi_ will be placed or expected to exist in this folder.
-
-[![Watch the tutorial
-video](https://img.youtube.com/vi/C_KWUqQ6kko/hqdefault.jpg)](https://www.youtube.com/watch?v=C_KWUqQ6kko)
--- a/docs/common-workflows/remove-gaps.md
+++ b/docs/common-workflows/remove-gaps.md
@@ -12,6 +12,6 @@ file.
 }
 ```

-A restart of `komorebi` is required after changing these settings.
+<!-- TODO: Record a new video -->

-[![Watch the tutorial video](https://img.youtube.com/vi/6QYLao953XE/hqdefault.jpg)](https://www.youtube.com/watch?v=6QYLao953XE)
+[![Watch the tutorial video](https://img.youtube.com/vi/eGr07mymgWE/hqdefault.jpg)](https://www.youtube.com/watch?v=eGr07mymgWE)
--- a/komorebi-client/Cargo.toml
+++ b/komorebi-client/Cargo.toml
@@ -1,12 +0,0 @@
-[package]
-name = "komorebi-client"
-version = "0.1.22-dev.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-komorebi = { path = "../komorebi" }
-komorebi-core = { path = "../komorebi-core" }
-uds_windows = "1"
-serde_json = "1"
--- a/komorebi-client/src/lib.rs
+++ b/komorebi-client/src/lib.rs
@@ -1,79 +0,0 @@
-#![warn(clippy::all, clippy::nursery, clippy::pedantic)]
-#![allow(clippy::missing_errors_doc)]
-
-pub use komorebi::container::Container;
-pub use komorebi::monitor::Monitor;
-pub use komorebi::ring::Ring;
-pub use komorebi::window::Window;
-pub use komorebi::window_manager_event::WindowManagerEvent;
-pub use komorebi::workspace::Workspace;
-pub use komorebi::Notification;
-pub use komorebi::NotificationEvent;
-pub use komorebi::State;
-pub use komorebi_core::Arrangement;
-pub use komorebi_core::Axis;
-pub use komorebi_core::CustomLayout;
-pub use komorebi_core::CycleDirection;
-pub use komorebi_core::DefaultLayout;
-pub use komorebi_core::Direction;
-pub use komorebi_core::Layout;
-pub use komorebi_core::OperationDirection;
-pub use komorebi_core::Rect;
-pub use komorebi_core::SocketMessage;
-
-use komorebi::DATA_DIR;
-
-use std::io::BufReader;
-use std::io::Read;
-use std::io::Write;
-use std::net::Shutdown;
-pub use uds_windows::UnixListener;
-use uds_windows::UnixStream;
-
-const KOMOREBI: &str = "komorebi.sock";
-
-pub fn send_message(message: &SocketMessage) -> std::io::Result<()> {
-    let socket = DATA_DIR.join(KOMOREBI);
-    let mut connected = false;
-    while !connected {
-        if let Ok(mut stream) = UnixStream::connect(&socket) {
-            connected = true;
-            stream.write_all(serde_json::to_string(message)?.as_bytes())?;
-        }
-    }
-
-    Ok(())
-}
-pub fn send_query(message: &SocketMessage) -> std::io::Result<String> {
-    let socket = DATA_DIR.join(KOMOREBI);
-
-    let mut stream = UnixStream::connect(socket)?;
-    stream.write_all(serde_json::to_string(message)?.as_bytes())?;
-    stream.shutdown(Shutdown::Write)?;
-
-    let mut reader = BufReader::new(stream);
-    let mut response = String::new();
-    reader.read_to_string(&mut response)?;
-
-    Ok(response)
-}
-
-pub fn subscribe(name: &str) -> std::io::Result<UnixListener> {
-    let socket = DATA_DIR.join(name);
-
-    match std::fs::remove_file(&socket) {
-        Ok(()) => {}
-        Err(error) => match error.kind() {
-            std::io::ErrorKind::NotFound => {}
-            _ => {
-                return Err(error);
-            }
-        },
-    };
-
-    let listener = UnixListener::bind(&socket)?;
-
-    send_message(&SocketMessage::AddSubscriberSocket(name.to_string()))?;
-
-    Ok(listener)
-}
--- a/komorebi-core/Cargo.toml
+++ b/komorebi-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komorebi-core"
-version = "0.1.22-dev.0"
+version = "0.1.20"
 edition = "2021"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
--- a/komorebi-core/src/arrangement.rs
+++ b/komorebi-core/src/arrangement.rs
@@ -131,65 +131,11 @@ impl Arrangement for DefaultLayout {
                layouts
            }
            Self::UltrawideVerticalStack => ultrawide(area, len, layout_flip, resize_dimensions),
-            #[allow(
-                clippy::cast_precision_loss,
-                clippy::cast_possible_truncation,
-                clippy::cast_possible_wrap
-            )]
-            Self::Grid => {
-                // Shamelessly lifted from LeftWM
-                // https://github.com/leftwm/leftwm/blob/18675067b8450e520ef75db2ebbb0d973aa1199e/leftwm-core/src/layouts/grid_horizontal.rs
-                let mut layouts: Vec<Rect> = vec![];
-                layouts.resize(len, Rect::default());
-
-                let len = len as i32;
-
-                let num_cols = (len as f32).sqrt().ceil() as i32;
-                let mut iter = layouts.iter_mut().enumerate().peekable();
-
-                for col in 0..num_cols {
-                    let iter_peek = iter.peek().map(|x| x.0).unwrap_or_default() as i32;
-                    let remaining_windows = len - iter_peek;
-                    let remaining_columns = num_cols - col;
-                    let num_rows_in_this_col = remaining_windows / remaining_columns;
-
-                    let win_height = area.bottom / num_rows_in_this_col;
-                    let win_width = area.right / num_cols;
-
-                    for row in 0..num_rows_in_this_col {
-                        if let Some((_idx, win)) = iter.next() {
-                            let mut left = area.left + win_width * col;
-                            let mut top = area.top + win_height * row;
-
-                            match layout_flip {
-                                Some(Axis::Horizontal) => {
-                                    left = area.right - win_width * (col + 1) + area.left;
-                                }
-                                Some(Axis::Vertical) => {
-                                    top = area.bottom - win_height * (row + 1) + area.top;
-                                }
-                                Some(Axis::HorizontalAndVertical) => {
-                                    left = area.right - win_width * (col + 1) + area.left;
-                                    top = area.bottom - win_height * (row + 1) + area.top;
-                                }
-                                None => {} // No flip
-                            }
-
-                            win.bottom = win_height;
-                            win.right = win_width;
-                            win.left = left;
-                            win.top = top;
-                        }
-                    }
-                }
-
-                layouts
-            }
        };

        dimensions
            .iter_mut()
-            .for_each(|l| l.add_padding(container_padding.unwrap_or_default()));
+            .for_each(|l| l.add_padding(container_padding));

        dimensions
    }
@@ -312,7 +258,7 @@ impl Arrangement for CustomLayout {

        dimensions
            .iter_mut()
-            .for_each(|l| l.add_padding(container_padding.unwrap_or_default()));
+            .for_each(|l| l.add_padding(container_padding));

        dimensions
    }
--- a/komorebi-core/src/default_layout.rs
+++ b/komorebi-core/src/default_layout.rs
@@ -20,7 +20,6 @@ pub enum DefaultLayout {
    VerticalStack,
    HorizontalStack,
    UltrawideVerticalStack,
-    Grid,
    // NOTE: If any new layout is added, please make sure to register the same in `DefaultLayout::cycle`
 }

@@ -136,8 +135,7 @@ impl DefaultLayout {
            Self::Rows => Self::VerticalStack,
            Self::VerticalStack => Self::HorizontalStack,
            Self::HorizontalStack => Self::UltrawideVerticalStack,
-            Self::UltrawideVerticalStack => Self::Grid,
-            Self::Grid => Self::BSP,
+            Self::UltrawideVerticalStack => Self::BSP,
        }
    }

@@ -149,8 +147,7 @@ impl DefaultLayout {
            Self::HorizontalStack => Self::VerticalStack,
            Self::VerticalStack => Self::Rows,
            Self::Rows => Self::Columns,
-            Self::Columns => Self::Grid,
-            Self::Grid => Self::BSP,
+            Self::Columns => Self::BSP,
        }
    }
 }
--- a/komorebi-core/src/direction.rs
+++ b/komorebi-core/src/direction.rs
@@ -19,30 +19,10 @@ pub trait Direction {
        idx: usize,
        count: usize,
    ) -> bool;
-    fn up_index(
-        &self,
-        op_direction: Option<OperationDirection>,
-        idx: usize,
-        count: Option<usize>,
-    ) -> usize;
-    fn down_index(
-        &self,
-        op_direction: Option<OperationDirection>,
-        idx: usize,
-        count: Option<usize>,
-    ) -> usize;
-    fn left_index(
-        &self,
-        op_direction: Option<OperationDirection>,
-        idx: usize,
-        count: Option<usize>,
-    ) -> usize;
-    fn right_index(
-        &self,
-        op_direction: Option<OperationDirection>,
-        idx: usize,
-        count: Option<usize>,
-    ) -> usize;
+    fn up_index(&self, idx: usize) -> usize;
+    fn down_index(&self, idx: usize) -> usize;
+    fn left_index(&self, idx: usize) -> usize;
+    fn right_index(&self, idx: usize) -> usize;
 }

 impl Direction for DefaultLayout {
@@ -55,28 +35,28 @@ impl Direction for DefaultLayout {
        match op_direction {
            OperationDirection::Left => {
                if self.is_valid_direction(op_direction, idx, count) {
-                    Option::from(self.left_index(Some(op_direction), idx, Some(count)))
+                    Option::from(self.left_index(idx))
                } else {
                    None
                }
            }
            OperationDirection::Right => {
                if self.is_valid_direction(op_direction, idx, count) {
-                    Option::from(self.right_index(Some(op_direction), idx, Some(count)))
+                    Option::from(self.right_index(idx))
                } else {
                    None
                }
            }
            OperationDirection::Up => {
                if self.is_valid_direction(op_direction, idx, count) {
-                    Option::from(self.up_index(Some(op_direction), idx, Some(count)))
+                    Option::from(self.up_index(idx))
                } else {
                    None
                }
            }
            OperationDirection::Down => {
                if self.is_valid_direction(op_direction, idx, count) {
-                    Option::from(self.down_index(Some(op_direction), idx, Some(count)))
+                    Option::from(self.down_index(idx))
                } else {
                    None
                }
@@ -97,7 +77,6 @@ impl Direction for DefaultLayout {
                Self::Rows | Self::HorizontalStack => idx != 0,
                Self::VerticalStack => idx != 0 && idx != 1,
                Self::UltrawideVerticalStack => idx > 2,
-                Self::Grid => !is_grid_edge(op_direction, idx, count),
            },
            OperationDirection::Down => match self {
                Self::BSP => count > 2 && idx != count - 1 && idx % 2 != 0,
@@ -106,7 +85,6 @@ impl Direction for DefaultLayout {
                Self::VerticalStack => idx != 0 && idx != count - 1,
                Self::HorizontalStack => idx == 0,
                Self::UltrawideVerticalStack => idx > 1 && idx != count - 1,
-                Self::Grid => !is_grid_edge(op_direction, idx, count),
            },
            OperationDirection::Left => match self {
                Self::BSP => count > 1 && idx != 0,
@@ -114,7 +92,6 @@ impl Direction for DefaultLayout {
                Self::Rows => false,
                Self::HorizontalStack => idx != 0 && idx != 1,
                Self::UltrawideVerticalStack => count > 1 && idx != 1,
-                Self::Grid => !is_grid_edge(op_direction, idx, count),
            },
            OperationDirection::Right => match self {
                Self::BSP => count > 1 && idx % 2 == 0 && idx != count - 1,
@@ -127,17 +104,11 @@ impl Direction for DefaultLayout {
                    2 => idx != 0,
                    _ => idx < 2,
                },
-                Self::Grid => !is_grid_edge(op_direction, idx, count),
            },
        }
    }

-    fn up_index(
-        &self,
-        op_direction: Option<OperationDirection>,
-        idx: usize,
-        count: Option<usize>,
-    ) -> usize {
+    fn up_index(&self, idx: usize) -> usize {
        match self {
            Self::BSP => {
                if idx % 2 == 0 {
@@ -149,30 +120,18 @@ impl Direction for DefaultLayout {
            Self::Columns => unreachable!(),
            Self::Rows | Self::VerticalStack | Self::UltrawideVerticalStack => idx - 1,
            Self::HorizontalStack => 0,
-            Self::Grid => grid_neighbor(op_direction, idx, count),
        }
    }

-    fn down_index(
-        &self,
-        op_direction: Option<OperationDirection>,
-        idx: usize,
-        count: Option<usize>,
-    ) -> usize {
+    fn down_index(&self, idx: usize) -> usize {
        match self {
            Self::BSP | Self::Rows | Self::VerticalStack | Self::UltrawideVerticalStack => idx + 1,
            Self::Columns => unreachable!(),
            Self::HorizontalStack => 1,
-            Self::Grid => grid_neighbor(op_direction, idx, count),
        }
    }

-    fn left_index(
-        &self,
-        op_direction: Option<OperationDirection>,
-        idx: usize,
-        count: Option<usize>,
-    ) -> usize {
+    fn left_index(&self, idx: usize) -> usize {
        match self {
            Self::BSP => {
                if idx % 2 == 0 {
@@ -189,16 +148,10 @@ impl Direction for DefaultLayout {
                1 => unreachable!(),
                _ => 0,
            },
-            Self::Grid => grid_neighbor(op_direction, idx, count),
        }
    }

-    fn right_index(
-        &self,
-        op_direction: Option<OperationDirection>,
-        idx: usize,
-        count: Option<usize>,
-    ) -> usize {
+    fn right_index(&self, idx: usize) -> usize {
        match self {
            Self::BSP | Self::Columns | Self::HorizontalStack => idx + 1,
            Self::Rows => unreachable!(),
@@ -208,126 +161,10 @@ impl Direction for DefaultLayout {
                0 => 2,
                _ => unreachable!(),
            },
-            Self::Grid => grid_neighbor(op_direction, idx, count),
        }
    }
 }

-struct GridItem {
-    state: GridItemState,
-    row: usize,
-    num_rows: usize,
-    touching_edges: GridTouchingEdges,
-}
-
-enum GridItemState {
-    Valid,
-    Invalid,
-}
-
-#[allow(clippy::struct_excessive_bools)]
-struct GridTouchingEdges {
-    left: bool,
-    right: bool,
-    up: bool,
-    down: bool,
-}
-
-#[allow(
-    clippy::cast_possible_truncation,
-    clippy::cast_precision_loss,
-    clippy::cast_sign_loss
-)]
-fn get_grid_item(idx: usize, count: usize) -> GridItem {
-    let num_cols = (count as f32).sqrt().ceil() as usize;
-    let mut iter = 0;
-
-    for col in 0..num_cols {
-        let remaining_windows = count - iter;
-        let remaining_columns = num_cols - col;
-        let num_rows_in_this_col = remaining_windows / remaining_columns;
-
-        for row in 0..num_rows_in_this_col {
-            if iter == idx {
-                return GridItem {
-                    state: GridItemState::Valid,
-                    row: row + 1,
-                    num_rows: num_rows_in_this_col,
-                    touching_edges: GridTouchingEdges {
-                        left: col == 0,
-                        right: col == num_cols - 1,
-                        up: row == 0,
-                        down: row == num_rows_in_this_col - 1,
-                    },
-                };
-            }
-
-            iter += 1;
-        }
-    }
-
-    GridItem {
-        state: GridItemState::Invalid,
-        row: 0,
-        num_rows: 0,
-        touching_edges: GridTouchingEdges {
-            left: true,
-            right: true,
-            up: true,
-            down: true,
-        },
-    }
-}
-
-fn is_grid_edge(op_direction: OperationDirection, idx: usize, count: usize) -> bool {
-    let item = get_grid_item(idx, count);
-
-    match item.state {
-        GridItemState::Invalid => false,
-        GridItemState::Valid => match op_direction {
-            OperationDirection::Left => item.touching_edges.left,
-            OperationDirection::Right => item.touching_edges.right,
-            OperationDirection::Up => item.touching_edges.up,
-            OperationDirection::Down => item.touching_edges.down,
-        },
-    }
-}
-
-fn grid_neighbor(
-    op_direction: Option<OperationDirection>,
-    idx: usize,
-    count: Option<usize>,
-) -> usize {
-    let Some(op_direction) = op_direction else {
-        return 0;
-    };
-
-    let Some(count) = count else {
-        return 0;
-    };
-
-    let item = get_grid_item(idx, count);
-
-    match op_direction {
-        OperationDirection::Left => {
-            let item_from_prev_col = get_grid_item(idx - item.row, count);
-
-            if item.touching_edges.up && item.num_rows != item_from_prev_col.num_rows {
-                return idx - (item.num_rows - 1);
-            }
-
-            if item.num_rows != item_from_prev_col.num_rows && !item.touching_edges.down {
-                return idx - (item.num_rows - 1);
-            }
-
-            idx - item.num_rows
-        }
-        OperationDirection::Right => idx + item.num_rows,
-        OperationDirection::Up => idx - 1,
-        OperationDirection::Down => idx + 1,
-    }
-}
-
 impl Direction for CustomLayout {
    fn index_in_direction(
        &self,
@@ -342,28 +179,28 @@ impl Direction for CustomLayout {
        match op_direction {
            OperationDirection::Left => {
                if self.is_valid_direction(op_direction, idx, count) {
-                    Option::from(self.left_index(None, idx, None))
+                    Option::from(self.left_index(idx))
                } else {
                    None
                }
            }
            OperationDirection::Right => {
                if self.is_valid_direction(op_direction, idx, count) {
-                    Option::from(self.right_index(None, idx, None))
+                    Option::from(self.right_index(idx))
                } else {
                    None
                }
            }
            OperationDirection::Up => {
                if self.is_valid_direction(op_direction, idx, count) {
-                    Option::from(self.up_index(None, idx, None))
+                    Option::from(self.up_index(idx))
                } else {
                    None
                }
            }
            OperationDirection::Down => {
                if self.is_valid_direction(op_direction, idx, count) {
-                    Option::from(self.down_index(None, idx, None))
+                    Option::from(self.down_index(idx))
                } else {
                    None
                }
@@ -417,30 +254,15 @@ impl Direction for CustomLayout {
        }
    }

-    fn up_index(
-        &self,
-        _op_direction: Option<OperationDirection>,
-        idx: usize,
-        _count: Option<usize>,
-    ) -> usize {
+    fn up_index(&self, idx: usize) -> usize {
        idx - 1
    }

-    fn down_index(
-        &self,
-        _op_direction: Option<OperationDirection>,
-        idx: usize,
-        _count: Option<usize>,
-    ) -> usize {
+    fn down_index(&self, idx: usize) -> usize {
        idx + 1
    }

-    fn left_index(
-        &self,
-        _op_direction: Option<OperationDirection>,
-        idx: usize,
-        _count: Option<usize>,
-    ) -> usize {
+    fn left_index(&self, idx: usize) -> usize {
        let column_idx = self.column_for_container_idx(idx);
        if column_idx - 1 == 0 {
            0
@@ -449,12 +271,7 @@ impl Direction for CustomLayout {
        }
    }

-    fn right_index(
-        &self,
-        _op_direction: Option<OperationDirection>,
-        idx: usize,
-        _count: Option<usize>,
-    ) -> usize {
+    fn right_index(&self, idx: usize) -> usize {
        let column_idx = self.column_for_container_idx(idx);
        self.first_container_idx(column_idx + 1)
    }
--- a/komorebi-core/src/lib.rs
+++ b/komorebi-core/src/lib.rs
@@ -156,10 +156,8 @@ pub enum SocketMessage {
    ToggleMouseFollowsFocus,
    RemoveTitleBar(ApplicationIdentifier, String),
    ToggleTitleBars,
-    AddSubscriberSocket(String),
-    RemoveSubscriberSocket(String),
-    AddSubscriberPipe(String),
-    RemoveSubscriberPipe(String),
+    AddSubscriber(String),
+    RemoveSubscriber(String),
    ApplicationSpecificConfigurationSchema,
    NotificationSchema,
    SocketSchema,
--- a/komorebi-core/src/rect.rs
+++ b/komorebi-core/src/rect.rs
@@ -27,20 +27,13 @@ impl From<RECT> for Rect {
 }

 impl Rect {
-    /// decrease the size of self by the padding amount.
-    pub fn add_padding(&mut self, padding: i32) {
-        self.left += padding;
-        self.top += padding;
-        self.right -= padding * 2;
-        self.bottom -= padding * 2;
-    }
-
-    /// increase the size of self by the margin amount.
-    pub fn add_margin(&mut self, margin: i32) {
-        self.left -= margin;
-        self.top -= margin;
-        self.right += margin * 2;
-        self.bottom += margin * 2;
+    pub fn add_padding(&mut self, padding: Option<i32>) {
+        if let Some(padding) = padding {
+            self.left += padding;
+            self.top += padding;
+            self.right -= padding * 2;
+            self.bottom -= padding * 2;
+        }
    }

    #[must_use]
@@ -50,14 +43,4 @@ impl Rect {
            && point.1 >= self.top
            && point.1 <= self.top + self.bottom
    }
-
-    #[must_use]
-    pub const fn scale(&self, system_dpi: i32, rect_dpi: i32) -> Rect {
-        Rect {
-            left: (self.left * rect_dpi) / system_dpi,
-            top: (self.top * rect_dpi) / system_dpi,
-            right: (self.right * rect_dpi) / system_dpi,
-            bottom: (self.bottom * rect_dpi) / system_dpi,
-        }
-    }
 }
--- a/komorebi/Cargo.toml
+++ b/komorebi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komorebi"
-version = "0.1.22-dev.0"
+version = "0.1.20"
 authors = ["Jade Iqbal <jadeiqbal@fastmail.com>"]
 description = "A tiling window manager for Windows"
 categories = ["tiling-window-manager", "windows"]
@@ -15,13 +15,10 @@ komorebi-core = { path = "../komorebi-core" }

 bitflags = "2"
 clap = { version = "4", features = ["derive"] }
-color-eyre = { workspace = true }
 crossbeam-channel = "0.5"
 crossbeam-utils = "0.8"
 ctrlc = "3"
-dirs = { workspace = true }
 getset = "0.1"
-hex_color = { version = "3", features = ["serde"] }
 hotwatch = "0.4"
 lazy_static = "1"
 miow = "0.5"
@@ -40,13 +37,15 @@ tracing = "0.1"
 tracing-appender = "0.2"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 uds_windows = "1"
-which = "6"
-widestring = "1"
-windows = { workspace = true }
-windows-implement = { workspace = true }
-windows-interface = { workspace = true }
+which = "5"
 winput = "0.2"
 winreg = "0.52"
+windows-interface = { workspace = true }
+windows-implement = { workspace = true }
+windows = { workspace = true }
+color-eyre = { workspace = true }
+dirs = { workspace = true }
+widestring = "1"

 [features]
 deadlock_detection = []
--- a/komorebi/src/border.rs
+++ b/komorebi/src/border.rs
@@ -1,4 +1,5 @@
 use std::sync::atomic::Ordering;
+use std::time::Duration;

 use color_eyre::Result;
 use windows::core::PCWSTR;
@@ -11,14 +12,19 @@ use windows::Win32::UI::WindowsAndMessaging::CS_VREDRAW;
 use windows::Win32::UI::WindowsAndMessaging::MSG;
 use windows::Win32::UI::WindowsAndMessaging::WNDCLASSW;

+use komorebi_core::Rect;
+
+use crate::window::should_act;
 use crate::window::Window;
 use crate::windows_callbacks;
 use crate::WindowsApi;
 use crate::BORDER_HWND;
 use crate::BORDER_OFFSET;
+use crate::BORDER_OVERFLOW_IDENTIFIERS;
 use crate::BORDER_RECT;
-use crate::BORDER_WIDTH;
+use crate::REGEX_IDENTIFIERS;
 use crate::TRANSPARENCY_COLOUR;
+use crate::WINDOWS_11;

 #[derive(Debug, Clone, Copy)]
 pub struct Border {
@@ -62,6 +68,7 @@ impl Border {
            unsafe {
                while GetMessageW(&mut message, border.hwnd(), 0, 0).into() {
                    DispatchMessageW(&message);
+                    std::thread::sleep(Duration::from_millis(10));
                }
            }

@@ -75,6 +82,10 @@ impl Border {

        BORDER_HWND.store(hwnd.0, Ordering::SeqCst);

+        if *WINDOWS_11 {
+            WindowsApi::round_corners(hwnd.0)?;
+        }
+
        Ok(())
    }

@@ -86,7 +97,12 @@ impl Border {
        }
    }

-    pub fn set_position(self, window: Window, activate: bool) -> Result<()> {
+    pub fn set_position(
+        self,
+        window: Window,
+        invisible_borders: &Rect,
+        activate: bool,
+    ) -> Result<()> {
        if self.hwnd == 0 {
            Ok(())
        } else {
@@ -95,10 +111,38 @@ impl Border {
            }

            let mut rect = WindowsApi::window_rect(window.hwnd())?;
-            rect.add_padding(-BORDER_OFFSET.load(Ordering::SeqCst));
+            rect.top -= invisible_borders.bottom;
+            rect.bottom += invisible_borders.bottom;

-            let border_width = BORDER_WIDTH.load(Ordering::SeqCst);
-            rect.add_margin(border_width);
+            let border_overflows = BORDER_OVERFLOW_IDENTIFIERS.lock();
+            let regex_identifiers = REGEX_IDENTIFIERS.lock();
+
+            let title = &window.title()?;
+            let exe_name = &window.exe()?;
+            let class = &window.class()?;
+
+            let should_expand_border = should_act(
+                title,
+                exe_name,
+                class,
+                &border_overflows,
+                &regex_identifiers,
+            );
+
+            if should_expand_border {
+                rect.left -= invisible_borders.left;
+                rect.top -= invisible_borders.top;
+                rect.right += invisible_borders.right;
+                rect.bottom += invisible_borders.bottom;
+            }
+
+            let border_offset = BORDER_OFFSET.lock();
+            if let Some(border_offset) = *border_offset {
+                rect.left -= border_offset.left;
+                rect.top -= border_offset.top;
+                rect.right += border_offset.right;
+                rect.bottom += border_offset.bottom;
+            }

            *BORDER_RECT.lock() = rect;

--- a/komorebi/src/colour.rs
+++ b/komorebi/src/colour.rs
@@ -1,103 +0,0 @@
-use hex_color::HexColor;
-use schemars::gen::SchemaGenerator;
-use schemars::schema::InstanceType;
-use schemars::schema::Schema;
-use schemars::schema::SchemaObject;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use serde::Serialize;
-
-#[derive(Debug, Copy, Clone, Serialize, Deserialize, JsonSchema)]
-#[serde(untagged)]
-pub enum Colour {
-    /// Colour represented as RGB
-    Rgb(Rgb),
-    /// Colour represented as Hex
-    Hex(Hex),
-}
-
-impl From<Rgb> for Colour {
-    fn from(value: Rgb) -> Self {
-        Self::Rgb(value)
-    }
-}
-
-impl From<u32> for Colour {
-    fn from(value: u32) -> Self {
-        Self::Rgb(Rgb::from(value))
-    }
-}
-
-#[derive(Debug, Copy, Clone, Serialize, Deserialize)]
-pub struct Hex(HexColor);
-
-impl JsonSchema for Hex {
-    fn schema_name() -> String {
-        String::from("Hex")
-    }
-
-    fn json_schema(_: &mut SchemaGenerator) -> Schema {
-        SchemaObject {
-            instance_type: Some(InstanceType::String.into()),
-            ..Default::default()
-        }
-        .into()
-    }
-}
-
-impl From<Colour> for u32 {
-    fn from(value: Colour) -> Self {
-        match value {
-            Colour::Rgb(val) => val.into(),
-            Colour::Hex(val) => (Rgb::from(val)).into(),
-        }
-    }
-}
-
-#[derive(Debug, Copy, Clone, Serialize, Deserialize, JsonSchema)]
-pub struct Rgb {
-    /// Red
-    pub r: u32,
-    /// Green
-    pub g: u32,
-    /// Blue
-    pub b: u32,
-}
-
-impl Rgb {
-    pub fn new(r: u32, g: u32, b: u32) -> Self {
-        Self { r, g, b }
-    }
-}
-
-impl From<Hex> for Rgb {
-    fn from(value: Hex) -> Self {
-        value.0.into()
-    }
-}
-
-impl From<HexColor> for Rgb {
-    fn from(value: HexColor) -> Self {
-        Self {
-            r: value.r as u32,
-            g: value.g as u32,
-            b: value.b as u32,
-        }
-    }
-}
-
-impl From<Rgb> for u32 {
-    fn from(value: Rgb) -> Self {
-        value.r | (value.g << 8) | (value.b << 16)
-    }
-}
-
-impl From<u32> for Rgb {
-    fn from(value: u32) -> Self {
-        Self {
-            r: value & 0xff,
-            g: value >> 8 & 0xff,
-            b: value >> 16 & 0xff,
-        }
-    }
-}
--- a/komorebi/src/container.rs
+++ b/komorebi/src/container.rs
@@ -3,14 +3,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, Serialize, Deserialize, Getters, JsonSchema)]
+#[derive(Debug, Clone, Serialize, Getters, JsonSchema)]
 pub struct Container {
+    #[serde(skip_serializing)]
    #[getset(get = "pub")]
    id: String,
    windows: Ring<Window>,
--- a/komorebi/src/hidden.rs
+++ b/komorebi/src/hidden.rs
@@ -1,4 +1,5 @@
 use std::sync::atomic::Ordering;
+use std::time::Duration;

 use color_eyre::Result;
 use windows::core::PCWSTR;
@@ -58,6 +59,7 @@ impl Hidden {
            unsafe {
                while GetMessageW(&mut message, hidden.hwnd(), 0, 0).into() {
                    DispatchMessageW(&message);
+                    std::thread::sleep(Duration::from_millis(10));
                }
            }

--- a/komorebi/src/lib.rs
+++ b/komorebi/src/lib.rs
@@ -1,357 +0,0 @@
-pub mod border;
-pub mod com;
-#[macro_use]
-pub mod ring;
-pub mod colour;
-pub mod container;
-pub mod hidden;
-pub mod monitor;
-pub mod process_command;
-pub mod process_event;
-pub mod process_movement;
-pub mod set_window_position;
-pub mod static_config;
-pub mod styles;
-pub mod window;
-pub mod window_manager;
-pub mod window_manager_event;
-pub mod windows_api;
-pub mod windows_callbacks;
-pub mod winevent;
-pub mod winevent_listener;
-pub mod workspace;
-
-use lazy_static::lazy_static;
-use std::collections::HashMap;
-use std::fs::File;
-use std::io::Write;
-use std::net::TcpStream;
-use std::path::PathBuf;
-use std::process::Command;
-use std::sync::atomic::AtomicBool;
-use std::sync::atomic::AtomicI32;
-use std::sync::atomic::AtomicIsize;
-use std::sync::atomic::AtomicU32;
-use std::sync::atomic::Ordering;
-use std::sync::Arc;
-
-pub use hidden::*;
-pub use process_command::*;
-pub use process_event::*;
-pub use static_config::*;
-pub use window_manager::*;
-pub use window_manager_event::*;
-pub use windows_api::WindowsApi;
-pub use windows_api::*;
-
-use color_eyre::Result;
-use komorebi_core::config_generation::IdWithIdentifier;
-use komorebi_core::config_generation::MatchingStrategy;
-use komorebi_core::ApplicationIdentifier;
-use komorebi_core::HidingBehaviour;
-use komorebi_core::Rect;
-use komorebi_core::SocketMessage;
-use os_info::Version;
-use parking_lot::Mutex;
-use regex::Regex;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use serde::Serialize;
-use uds_windows::UnixStream;
-use which::which;
-use winreg::enums::HKEY_CURRENT_USER;
-use winreg::RegKey;
-
-type WorkspaceRule = (usize, usize, bool);
-
-lazy_static! {
-    static ref HIDDEN_HWNDS: Arc<Mutex<Vec<isize>>> = Arc::new(Mutex::new(vec![]));
-    static ref LAYERED_WHITELIST: Arc<Mutex<Vec<IdWithIdentifier>>> = Arc::new(Mutex::new(vec![
-        IdWithIdentifier {
-            kind: ApplicationIdentifier::Exe,
-            id: String::from("steam.exe"),
-            matching_strategy: Option::from(MatchingStrategy::Equals),
-        },
-    ]));
-    static ref TRAY_AND_MULTI_WINDOW_IDENTIFIERS: Arc<Mutex<Vec<IdWithIdentifier>>> =
-        Arc::new(Mutex::new(vec![
-            IdWithIdentifier {
-                kind: ApplicationIdentifier::Exe,
-                id: String::from("explorer.exe"),
-                matching_strategy: Option::from(MatchingStrategy::Equals),
-            },
-            IdWithIdentifier {
-                kind: ApplicationIdentifier::Exe,
-                id: String::from("firefox.exe"),
-                matching_strategy: Option::from(MatchingStrategy::Equals),
-            },
-            IdWithIdentifier {
-                kind: ApplicationIdentifier::Exe,
-                id: String::from("chrome.exe"),
-                matching_strategy: Option::from(MatchingStrategy::Equals),
-            },
-            IdWithIdentifier {
-                kind: ApplicationIdentifier::Exe,
-                id: String::from("idea64.exe"),
-                matching_strategy: Option::from(MatchingStrategy::Equals),
-            },
-            IdWithIdentifier {
-                kind: ApplicationIdentifier::Exe,
-                id: String::from("ApplicationFrameHost.exe"),
-                matching_strategy: Option::from(MatchingStrategy::Equals),
-            },
-            IdWithIdentifier {
-                kind: ApplicationIdentifier::Exe,
-                id: String::from("steam.exe"),
-                matching_strategy: Option::from(MatchingStrategy::Equals),
-            }
-        ]));
-    static ref OBJECT_NAME_CHANGE_ON_LAUNCH: Arc<Mutex<Vec<IdWithIdentifier>>> = Arc::new(Mutex::new(vec![
-        IdWithIdentifier {
-            kind: ApplicationIdentifier::Exe,
-            id: String::from("firefox.exe"),
-            matching_strategy: Option::from(MatchingStrategy::Equals),
-        },
-        IdWithIdentifier {
-            kind: ApplicationIdentifier::Exe,
-            id: String::from("idea64.exe"),
-            matching_strategy: Option::from(MatchingStrategy::Equals),
-        },
-    ]));
-    static ref MONITOR_INDEX_PREFERENCES: Arc<Mutex<HashMap<usize, Rect>>> =
-        Arc::new(Mutex::new(HashMap::new()));
-    static ref DISPLAY_INDEX_PREFERENCES: Arc<Mutex<HashMap<usize, String>>> =
-        Arc::new(Mutex::new(HashMap::new()));
-    static ref WORKSPACE_RULES: Arc<Mutex<HashMap<String, WorkspaceRule>>> =
-        Arc::new(Mutex::new(HashMap::new()));
-    static ref REGEX_IDENTIFIERS: Arc<Mutex<HashMap<String, Regex>>> =
-        Arc::new(Mutex::new(HashMap::new()));
-    static ref MANAGE_IDENTIFIERS: Arc<Mutex<Vec<IdWithIdentifier>>> = Arc::new(Mutex::new(vec![]));
-    static ref FLOAT_IDENTIFIERS: Arc<Mutex<Vec<IdWithIdentifier>>> = Arc::new(Mutex::new(vec![
-        // mstsc.exe creates these on Windows 11 when a WSL process is launched
-        // https://github.com/LGUG2Z/komorebi/issues/74
-        IdWithIdentifier {
-            kind: ApplicationIdentifier::Class,
-            id: String::from("OPContainerClass"),
-            matching_strategy: Option::from(MatchingStrategy::Equals),
-        },
-        IdWithIdentifier {
-            kind: ApplicationIdentifier::Class,
-            id: String::from("IHWindowClass"),
-            matching_strategy: Option::from(MatchingStrategy::Equals),
-        }
-    ]));
-    static ref PERMAIGNORE_CLASSES: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![
-        "Chrome_RenderWidgetHostHWND".to_string(),
-    ]));
-    static ref BORDER_OVERFLOW_IDENTIFIERS: Arc<Mutex<Vec<IdWithIdentifier>>> = Arc::new(Mutex::new(vec![]));
-    static ref WSL2_UI_PROCESSES: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![
-        "X410.exe".to_string(),
-        "vcxsrv.exe".to_string(),
-    ]));
-    static ref SUBSCRIPTION_PIPES: Arc<Mutex<HashMap<String, File>>> =
-        Arc::new(Mutex::new(HashMap::new()));
-    static ref SUBSCRIPTION_SOCKETS: Arc<Mutex<HashMap<String, PathBuf>>> =
-        Arc::new(Mutex::new(HashMap::new()));
-    static ref TCP_CONNECTIONS: Arc<Mutex<HashMap<String, TcpStream>>> =
-        Arc::new(Mutex::new(HashMap::new()));
-    static ref HIDING_BEHAVIOUR: Arc<Mutex<HidingBehaviour>> =
-        Arc::new(Mutex::new(HidingBehaviour::Minimize));
-    pub static ref HOME_DIR: PathBuf = {
-        std::env::var("KOMOREBI_CONFIG_HOME").map_or_else(|_| dirs::home_dir().expect("there is no home directory"), |home_path| {
-            let home = PathBuf::from(&home_path);
-
-            if home.as_path().is_dir() {
-                home
-            } else {
-                panic!(
-                    "$Env:KOMOREBI_CONFIG_HOME is set to '{home_path}', which is not a valid directory",
-                );
-            }
-        })
-    };
-    pub static ref DATA_DIR: PathBuf = dirs::data_local_dir().expect("there is no local data directory").join("komorebi");
-    pub static ref AHK_EXE: String = {
-        let mut ahk: String = String::from("autohotkey.exe");
-
-        if let Ok(komorebi_ahk_exe) = std::env::var("KOMOREBI_AHK_EXE") {
-            if which(&komorebi_ahk_exe).is_ok() {
-                ahk = komorebi_ahk_exe;
-            }
-        }
-
-        ahk
-    };
-    static ref WINDOWS_11: bool = {
-        matches!(
-            os_info::get().version(),
-            Version::Semantic(_, _, x) if x >= &22000
-        )
-    };
-
-    static ref BORDER_RECT: Arc<Mutex<Rect>> =
-        Arc::new(Mutex::new(Rect::default()));
-
-    static ref BORDER_OFFSET: AtomicI32 = Default::default();
-
-    // Use app-specific titlebar removal options where possible
-    // eg. Windows Terminal, IntelliJ IDEA, Firefox
-    static ref NO_TITLEBAR: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![]));
-}
-
-pub static DEFAULT_WORKSPACE_PADDING: AtomicI32 = AtomicI32::new(10);
-pub static DEFAULT_CONTAINER_PADDING: AtomicI32 = AtomicI32::new(10);
-
-pub static INITIAL_CONFIGURATION_LOADED: AtomicBool = AtomicBool::new(false);
-pub static CUSTOM_FFM: AtomicBool = AtomicBool::new(false);
-pub static SESSION_ID: AtomicU32 = AtomicU32::new(0);
-pub static BORDER_ENABLED: AtomicBool = AtomicBool::new(false);
-pub static BORDER_HWND: AtomicIsize = AtomicIsize::new(0);
-pub static BORDER_HIDDEN: AtomicBool = AtomicBool::new(false);
-pub static BORDER_COLOUR_SINGLE: AtomicU32 = AtomicU32::new(0);
-pub static BORDER_COLOUR_STACK: AtomicU32 = AtomicU32::new(0);
-pub static BORDER_COLOUR_MONOCLE: AtomicU32 = AtomicU32::new(0);
-pub static BORDER_COLOUR_CURRENT: AtomicU32 = AtomicU32::new(0);
-pub static BORDER_WIDTH: AtomicI32 = AtomicI32::new(20);
-// 0 0 0 aka pure black, I doubt anyone will want this as a border colour
-pub const TRANSPARENCY_COLOUR: u32 = 0;
-pub static REMOVE_TITLEBARS: AtomicBool = AtomicBool::new(false);
-
-pub static HIDDEN_HWND: AtomicIsize = AtomicIsize::new(0);
-
-#[must_use]
-pub fn current_virtual_desktop() -> Option<Vec<u8>> {
-    let hkcu = RegKey::predef(HKEY_CURRENT_USER);
-
-    // This is the path on Windows 10
-    let mut current = hkcu
-        .open_subkey(format!(
-            r#"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\SessionInfo\{}\VirtualDesktops"#,
-            SESSION_ID.load(Ordering::SeqCst)
-        ))
-        .ok()
-        .and_then(
-            |desktops| match desktops.get_raw_value("CurrentVirtualDesktop") {
-                Ok(current) => Option::from(current.bytes),
-                Err(_) => None,
-            },
-        );
-
-    // This is the path on Windows 11
-    if current.is_none() {
-        current = hkcu
-            .open_subkey(r"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VirtualDesktops")
-            .ok()
-            .and_then(
-                |desktops| match desktops.get_raw_value("CurrentVirtualDesktop") {
-                    Ok(current) => Option::from(current.bytes),
-                    Err(_) => None,
-                },
-            );
-    }
-
-    // For Win10 users that do not use virtual desktops, the CurrentVirtualDesktop value will not
-    // exist until one has been created in the task view
-
-    // The registry value will also not exist on user login if virtual desktops have been created
-    // but the task view has not been initiated
-
-    // In both of these cases, we return None, and the virtual desktop validation will never run. In
-    // the latter case, if the user desires this validation after initiating the task view, komorebi
-    // should be restarted, and then when this // fn runs again for the first time, it will pick up
-    // the value of CurrentVirtualDesktop and validate against it accordingly
-    current
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-#[serde(untagged)]
-pub enum NotificationEvent {
-    WindowManager(WindowManagerEvent),
-    Socket(SocketMessage),
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct Notification {
-    pub event: NotificationEvent,
-    pub state: State,
-}
-
-pub fn notify_subscribers(notification: &str) -> Result<()> {
-    let mut stale_sockets = vec![];
-    let mut sockets = SUBSCRIPTION_SOCKETS.lock();
-
-    for (socket, path) in &mut *sockets {
-        match UnixStream::connect(path) {
-            Ok(mut stream) => {
-                tracing::debug!("pushed notification to subscriber: {socket}");
-                stream.write_all(notification.as_bytes())?;
-            }
-            Err(_) => {
-                stale_sockets.push(socket.clone());
-            }
-        }
-    }
-
-    for socket in stale_sockets {
-        tracing::warn!("removing stale subscription: {socket}");
-        sockets.remove(&socket);
-    }
-
-    let mut stale_pipes = vec![];
-    let mut pipes = SUBSCRIPTION_PIPES.lock();
-    for (subscriber, pipe) in &mut *pipes {
-        match writeln!(pipe, "{notification}") {
-            Ok(()) => {
-                tracing::debug!("pushed notification to subscriber: {subscriber}");
-            }
-            Err(error) => {
-                // ERROR_FILE_NOT_FOUND
-                // 2 (0x2)
-                // The system cannot find the file specified.
-
-                // ERROR_NO_DATA
-                // 232 (0xE8)
-                // The pipe is being closed.
-
-                // Remove the subscription; the process will have to subscribe again
-                if let Some(2 | 232) = error.raw_os_error() {
-                    stale_pipes.push(subscriber.clone());
-                }
-            }
-        }
-    }
-
-    for subscriber in stale_pipes {
-        tracing::warn!("removing stale subscription: {}", subscriber);
-        pipes.remove(&subscriber);
-    }
-
-    Ok(())
-}
-
-pub fn load_configuration() -> Result<()> {
-    let config_pwsh = HOME_DIR.join("komorebi.ps1");
-    let config_ahk = HOME_DIR.join("komorebi.ahk");
-
-    if config_pwsh.exists() {
-        let powershell_exe = if which("pwsh.exe").is_ok() {
-            "pwsh.exe"
-        } else {
-            "powershell.exe"
-        };
-
-        tracing::info!("loading configuration file: {}", config_pwsh.display());
-
-        Command::new(powershell_exe)
-            .arg(config_pwsh.as_os_str())
-            .output()?;
-    } else if config_ahk.exists() && which(&*AHK_EXE).is_ok() {
-        tracing::info!("loading configuration file: {}", config_ahk.display());
-
-        Command::new(&*AHK_EXE)
-            .arg(config_ahk.as_os_str())
-            .output()?;
-    }
-
-    Ok(())
-}
--- a/komorebi/src/main.rs
+++ b/komorebi/src/main.rs
@@ -6,7 +6,16 @@
    clippy::significant_drop_in_scrutinee
 )]

+use std::collections::HashMap;
+use std::fs::File;
+use std::io::Write;
+use std::net::TcpStream;
 use std::path::PathBuf;
+use std::process::Command;
+use std::sync::atomic::AtomicBool;
+use std::sync::atomic::AtomicI32;
+use std::sync::atomic::AtomicIsize;
+use std::sync::atomic::AtomicU32;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
 #[cfg(feature = "deadlock_detection")]
@@ -14,29 +23,222 @@ use std::time::Duration;

 use clap::Parser;
 use color_eyre::Result;
+use crossbeam_channel::Receiver;
+use crossbeam_channel::Sender;
 use crossbeam_utils::Backoff;
+use lazy_static::lazy_static;
+use os_info::Version;
 #[cfg(feature = "deadlock_detection")]
 use parking_lot::deadlock;
 use parking_lot::Mutex;
+use regex::Regex;
+use schemars::JsonSchema;
+use serde::Serialize;
 use sysinfo::Process;
 use tracing_appender::non_blocking::WorkerGuard;
 use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::EnvFilter;
+use which::which;
+use winreg::enums::HKEY_CURRENT_USER;
+use winreg::RegKey;

-use komorebi::hidden::Hidden;
-use komorebi::load_configuration;
-use komorebi::process_command::listen_for_commands;
-use komorebi::process_command::listen_for_commands_tcp;
-use komorebi::process_event::listen_for_events;
-use komorebi::process_movement::listen_for_movements;
-use komorebi::static_config::StaticConfig;
-use komorebi::window_manager::WindowManager;
-use komorebi::windows_api::WindowsApi;
-use komorebi::winevent_listener;
-use komorebi::CUSTOM_FFM;
-use komorebi::HOME_DIR;
-use komorebi::INITIAL_CONFIGURATION_LOADED;
-use komorebi::SESSION_ID;
+use crate::hidden::Hidden;
+use komorebi_core::config_generation::IdWithIdentifier;
+use komorebi_core::config_generation::MatchingStrategy;
+use komorebi_core::ApplicationIdentifier;
+use komorebi_core::HidingBehaviour;
+use komorebi_core::Rect;
+use komorebi_core::SocketMessage;
+
+use crate::process_command::listen_for_commands;
+use crate::process_command::listen_for_commands_tcp;
+use crate::process_event::listen_for_events;
+use crate::process_movement::listen_for_movements;
+use crate::static_config::StaticConfig;
+use crate::window_manager::State;
+use crate::window_manager::WindowManager;
+use crate::window_manager_event::WindowManagerEvent;
+use crate::windows_api::WindowsApi;
+
+#[macro_use]
+mod ring;
+
+mod border;
+mod com;
+mod container;
+mod hidden;
+mod monitor;
+mod process_command;
+mod process_event;
+mod process_movement;
+mod set_window_position;
+mod static_config;
+mod styles;
+mod window;
+mod window_manager;
+mod window_manager_event;
+mod windows_api;
+mod windows_callbacks;
+mod winevent;
+mod winevent_listener;
+mod workspace;
+
+type WorkspaceRule = (usize, usize, bool);
+
+lazy_static! {
+    static ref HIDDEN_HWNDS: Arc<Mutex<Vec<isize>>> = Arc::new(Mutex::new(vec![]));
+    static ref LAYERED_WHITELIST: Arc<Mutex<Vec<IdWithIdentifier>>> = Arc::new(Mutex::new(vec![
+        IdWithIdentifier {
+            kind: ApplicationIdentifier::Exe,
+            id: String::from("steam.exe"),
+            matching_strategy: Option::from(MatchingStrategy::Equals),
+        },
+    ]));
+    static ref TRAY_AND_MULTI_WINDOW_IDENTIFIERS: Arc<Mutex<Vec<IdWithIdentifier>>> =
+        Arc::new(Mutex::new(vec![
+            IdWithIdentifier {
+                kind: ApplicationIdentifier::Exe,
+                id: String::from("explorer.exe"),
+                matching_strategy: Option::from(MatchingStrategy::Equals),
+            },
+            IdWithIdentifier {
+                kind: ApplicationIdentifier::Exe,
+                id: String::from("firefox.exe"),
+                matching_strategy: Option::from(MatchingStrategy::Equals),
+            },
+            IdWithIdentifier {
+                kind: ApplicationIdentifier::Exe,
+                id: String::from("chrome.exe"),
+                matching_strategy: Option::from(MatchingStrategy::Equals),
+            },
+            IdWithIdentifier {
+                kind: ApplicationIdentifier::Exe,
+                id: String::from("idea64.exe"),
+                matching_strategy: Option::from(MatchingStrategy::Equals),
+            },
+            IdWithIdentifier {
+                kind: ApplicationIdentifier::Exe,
+                id: String::from("ApplicationFrameHost.exe"),
+                matching_strategy: Option::from(MatchingStrategy::Equals),
+            },
+            IdWithIdentifier {
+                kind: ApplicationIdentifier::Exe,
+                id: String::from("steam.exe"),
+                matching_strategy: Option::from(MatchingStrategy::Equals),
+            }
+        ]));
+    static ref OBJECT_NAME_CHANGE_ON_LAUNCH: Arc<Mutex<Vec<IdWithIdentifier>>> = Arc::new(Mutex::new(vec![
+        IdWithIdentifier {
+            kind: ApplicationIdentifier::Exe,
+            id: String::from("firefox.exe"),
+            matching_strategy: Option::from(MatchingStrategy::Equals),
+        },
+        IdWithIdentifier {
+            kind: ApplicationIdentifier::Exe,
+            id: String::from("idea64.exe"),
+            matching_strategy: Option::from(MatchingStrategy::Equals),
+        },
+    ]));
+    static ref MONITOR_INDEX_PREFERENCES: Arc<Mutex<HashMap<usize, Rect>>> =
+        Arc::new(Mutex::new(HashMap::new()));
+    static ref DISPLAY_INDEX_PREFERENCES: Arc<Mutex<HashMap<usize, String>>> =
+        Arc::new(Mutex::new(HashMap::new()));
+    static ref WORKSPACE_RULES: Arc<Mutex<HashMap<String, WorkspaceRule>>> =
+        Arc::new(Mutex::new(HashMap::new()));
+    static ref REGEX_IDENTIFIERS: Arc<Mutex<HashMap<String, Regex>>> =
+        Arc::new(Mutex::new(HashMap::new()));
+    static ref MANAGE_IDENTIFIERS: Arc<Mutex<Vec<IdWithIdentifier>>> = Arc::new(Mutex::new(vec![]));
+    static ref FLOAT_IDENTIFIERS: Arc<Mutex<Vec<IdWithIdentifier>>> = Arc::new(Mutex::new(vec![
+        // mstsc.exe creates these on Windows 11 when a WSL process is launched
+        // https://github.com/LGUG2Z/komorebi/issues/74
+        IdWithIdentifier {
+            kind: ApplicationIdentifier::Class,
+            id: String::from("OPContainerClass"),
+            matching_strategy: Option::from(MatchingStrategy::Equals),
+        },
+        IdWithIdentifier {
+            kind: ApplicationIdentifier::Class,
+            id: String::from("IHWindowClass"),
+            matching_strategy: Option::from(MatchingStrategy::Equals),
+        }
+    ]));
+    static ref PERMAIGNORE_CLASSES: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![
+        "Chrome_RenderWidgetHostHWND".to_string(),
+    ]));
+    static ref BORDER_OVERFLOW_IDENTIFIERS: Arc<Mutex<Vec<IdWithIdentifier>>> = Arc::new(Mutex::new(vec![]));
+    static ref WSL2_UI_PROCESSES: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![
+        "X410.exe".to_string(),
+        "vcxsrv.exe".to_string(),
+    ]));
+    static ref SUBSCRIPTION_PIPES: Arc<Mutex<HashMap<String, File>>> =
+        Arc::new(Mutex::new(HashMap::new()));
+    static ref TCP_CONNECTIONS: Arc<Mutex<HashMap<String, TcpStream>>> =
+        Arc::new(Mutex::new(HashMap::new()));
+    static ref HIDING_BEHAVIOUR: Arc<Mutex<HidingBehaviour>> =
+        Arc::new(Mutex::new(HidingBehaviour::Minimize));
+    static ref HOME_DIR: PathBuf = {
+        std::env::var("KOMOREBI_CONFIG_HOME").map_or_else(|_| dirs::home_dir().expect("there is no home directory"), |home_path| {
+            let home = PathBuf::from(&home_path);
+
+            if home.as_path().is_dir() {
+                home
+            } else {
+                panic!(
+                    "$Env:KOMOREBI_CONFIG_HOME is set to '{home_path}', which is not a valid directory",
+                );
+            }
+        })
+    };
+    static ref DATA_DIR: PathBuf = dirs::data_local_dir().expect("there is no local data directory").join("komorebi");
+    static ref AHK_EXE: String = {
+        let mut ahk: String = String::from("autohotkey.exe");
+
+        if let Ok(komorebi_ahk_exe) = std::env::var("KOMOREBI_AHK_EXE") {
+            if which(&komorebi_ahk_exe).is_ok() {
+                ahk = komorebi_ahk_exe;
+            }
+        }
+
+        ahk
+    };
+    static ref WINDOWS_11: bool = {
+        matches!(
+            os_info::get().version(),
+            Version::Semantic(_, _, x) if x >= &22000
+        )
+    };
+
+    static ref BORDER_RECT: Arc<Mutex<Rect>> =
+        Arc::new(Mutex::new(Rect::default()));
+
+    static ref BORDER_OFFSET: Arc<Mutex<Option<Rect>>> =
+        Arc::new(Mutex::new(None));
+
+    // Use app-specific titlebar removal options where possible
+    // eg. Windows Terminal, IntelliJ IDEA, Firefox
+    static ref NO_TITLEBAR: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![]));
+}
+
+pub static DEFAULT_WORKSPACE_PADDING: AtomicI32 = AtomicI32::new(10);
+pub static DEFAULT_CONTAINER_PADDING: AtomicI32 = AtomicI32::new(10);
+
+pub static INITIAL_CONFIGURATION_LOADED: AtomicBool = AtomicBool::new(false);
+pub static CUSTOM_FFM: AtomicBool = AtomicBool::new(false);
+pub static SESSION_ID: AtomicU32 = AtomicU32::new(0);
+pub static ALT_FOCUS_HACK: AtomicBool = AtomicBool::new(false);
+pub static BORDER_ENABLED: AtomicBool = AtomicBool::new(false);
+pub static BORDER_HWND: AtomicIsize = AtomicIsize::new(0);
+pub static BORDER_HIDDEN: AtomicBool = AtomicBool::new(false);
+pub static BORDER_COLOUR_SINGLE: AtomicU32 = AtomicU32::new(0);
+pub static BORDER_COLOUR_STACK: AtomicU32 = AtomicU32::new(0);
+pub static BORDER_COLOUR_MONOCLE: AtomicU32 = AtomicU32::new(0);
+pub static BORDER_COLOUR_CURRENT: AtomicU32 = AtomicU32::new(0);
+pub static BORDER_WIDTH: AtomicI32 = AtomicI32::new(20);
+// 0 0 0 aka pure black, I doubt anyone will want this as a border colour
+pub const TRANSPARENCY_COLOUR: u32 = 0;
+pub static REMOVE_TITLEBARS: AtomicBool = AtomicBool::new(false);
+
+pub static HIDDEN_HWND: AtomicIsize = AtomicIsize::new(0);

 fn setup() -> Result<(WorkerGuard, WorkerGuard)> {
    if std::env::var("RUST_LIB_BACKTRACE").is_err() {
@@ -101,6 +303,124 @@ fn setup() -> Result<(WorkerGuard, WorkerGuard)> {
    Ok((guard, color_guard))
 }

+pub fn load_configuration() -> Result<()> {
+    let config_pwsh = HOME_DIR.join("komorebi.ps1");
+    let config_ahk = HOME_DIR.join("komorebi.ahk");
+
+    if config_pwsh.exists() {
+        let powershell_exe = if which("pwsh.exe").is_ok() {
+            "pwsh.exe"
+        } else {
+            "powershell.exe"
+        };
+
+        tracing::info!("loading configuration file: {}", config_pwsh.display());
+
+        Command::new(powershell_exe)
+            .arg(config_pwsh.as_os_str())
+            .output()?;
+    } else if config_ahk.exists() && which(&*AHK_EXE).is_ok() {
+        tracing::info!("loading configuration file: {}", config_ahk.display());
+
+        Command::new(&*AHK_EXE)
+            .arg(config_ahk.as_os_str())
+            .output()?;
+    }
+
+    Ok(())
+}
+
+#[must_use]
+pub fn current_virtual_desktop() -> Option<Vec<u8>> {
+    let hkcu = RegKey::predef(HKEY_CURRENT_USER);
+
+    // This is the path on Windows 10
+    let mut current = hkcu
+        .open_subkey(format!(
+            r#"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\SessionInfo\{}\VirtualDesktops"#,
+            SESSION_ID.load(Ordering::SeqCst)
+        ))
+        .ok()
+        .and_then(
+            |desktops| match desktops.get_raw_value("CurrentVirtualDesktop") {
+                Ok(current) => Option::from(current.bytes),
+                Err(_) => None,
+            },
+        );
+
+    // This is the path on Windows 11
+    if current.is_none() {
+        current = hkcu
+            .open_subkey(r"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VirtualDesktops")
+            .ok()
+            .and_then(
+                |desktops| match desktops.get_raw_value("CurrentVirtualDesktop") {
+                    Ok(current) => Option::from(current.bytes),
+                    Err(_) => None,
+                },
+            );
+    }
+
+    // For Win10 users that do not use virtual desktops, the CurrentVirtualDesktop value will not
+    // exist until one has been created in the task view
+
+    // The registry value will also not exist on user login if virtual desktops have been created
+    // but the task view has not been initiated
+
+    // In both of these cases, we return None, and the virtual desktop validation will never run. In
+    // the latter case, if the user desires this validation after initiating the task view, komorebi
+    // should be restarted, and then when this // fn runs again for the first time, it will pick up
+    // the value of CurrentVirtualDesktop and validate against it accordingly
+    current
+}
+
+#[derive(Debug, Serialize, JsonSchema)]
+#[serde(untagged)]
+pub enum NotificationEvent {
+    WindowManager(WindowManagerEvent),
+    Socket(SocketMessage),
+}
+
+#[derive(Debug, Serialize, JsonSchema)]
+pub struct Notification {
+    pub event: NotificationEvent,
+    pub state: State,
+}
+
+pub fn notify_subscribers(notification: &str) -> Result<()> {
+    let mut stale_subscriptions = vec![];
+    let mut subscriptions = SUBSCRIPTION_PIPES.lock();
+    for (subscriber, pipe) in &mut *subscriptions {
+        match writeln!(pipe, "{notification}") {
+            Ok(()) => {
+                tracing::debug!("pushed notification to subscriber: {}", subscriber);
+            }
+            Err(error) => {
+                // ERROR_FILE_NOT_FOUND
+                // 2 (0x2)
+                // The system cannot find the file specified.
+
+                // ERROR_NO_DATA
+                // 232 (0xE8)
+                // The pipe is being closed.
+
+                // Remove the subscription; the process will have to subscribe again
+                if let Some(2 | 232) = error.raw_os_error() {
+                    let subscriber_cl = subscriber.clone();
+                    stale_subscriptions.push(subscriber_cl);
+                }
+            }
+        }
+    }
+
+    for subscriber in stale_subscriptions {
+        tracing::warn!("removing stale subscription: {}", subscriber);
+        subscriptions.remove(&subscriber);
+    }
+
+    Ok(())
+}
+
 #[cfg(feature = "deadlock_detection")]
 #[tracing::instrument]
 fn detect_deadlocks() {
@@ -162,8 +482,8 @@ fn main() -> Result<()> {
    if matched_procs.len() > 1 {
        let mut len = matched_procs.len();
        for proc in matched_procs {
-            if let Some(executable_path) = proc.exe() {
-                if executable_path.to_string_lossy().contains("shims") {
+            if let Some(root) = proc.root() {
+                if root.ends_with("shims") {
                    len -= 1;
                }
            }
@@ -180,11 +500,15 @@ fn main() -> Result<()> {

    WindowsApi::foreground_lock_timeout()?;

-    winevent_listener::start();
-
    #[cfg(feature = "deadlock_detection")]
    detect_deadlocks();

+    let (outgoing, incoming): (Sender<WindowManagerEvent>, Receiver<WindowManagerEvent>) =
+        crossbeam_channel::unbounded();
+
+    let winevent_listener = winevent_listener::new(Arc::new(Mutex::new(outgoing)));
+    winevent_listener.start();
+
    Hidden::create("komorebi-hidden")?;

    let static_config = opts.config.map_or_else(
@@ -207,12 +531,12 @@ fn main() -> Result<()> {

        Arc::new(Mutex::new(StaticConfig::preload(
            config,
-            winevent_listener::event_rx(),
+            Arc::new(Mutex::new(incoming)),
        )?))
    } else {
-        Arc::new(Mutex::new(WindowManager::new(
-            winevent_listener::event_rx(),
-        )?))
+        Arc::new(Mutex::new(WindowManager::new(Arc::new(Mutex::new(
+            incoming,
+        )))?))
    };

    wm.lock().init()?;
--- a/komorebi/src/monitor.rs
+++ b/komorebi/src/monitor.rs
@@ -9,7 +9,6 @@ use getset::Getters;
 use getset::MutGetters;
 use getset::Setters;
 use schemars::JsonSchema;
-use serde::Deserialize;
 use serde::Serialize;

 use komorebi_core::Rect;
@@ -18,9 +17,7 @@ use crate::container::Container;
 use crate::ring::Ring;
 use crate::workspace::Workspace;

-#[derive(
-    Debug, Clone, Serialize, Deserialize, Getters, CopyGetters, MutGetters, Setters, JsonSchema,
-)]
+#[derive(Debug, Clone, Serialize, Getters, CopyGetters, MutGetters, Setters, JsonSchema)]
 pub struct Monitor {
    #[getset(get_copy = "pub", set = "pub")]
    id: isize,
@@ -37,9 +34,10 @@ pub struct Monitor {
    #[getset(get_copy = "pub", set = "pub")]
    work_area_offset: Option<Rect>,
    workspaces: Ring<Workspace>,
-    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(skip_serializing)]
    #[getset(get_copy = "pub", set = "pub")]
    last_focused_workspace: Option<usize>,
+    #[serde(skip_serializing)]
    #[getset(get_mut = "pub")]
    workspace_names: HashMap<usize, String>,
 }
@@ -192,7 +190,11 @@ impl Monitor {
        self.workspaces().len()
    }

-    pub fn update_focused_workspace(&mut self, offset: Option<Rect>) -> Result<()> {
+    pub fn update_focused_workspace(
+        &mut self,
+        offset: Option<Rect>,
+        invisible_borders: &Rect,
+    ) -> Result<()> {
        let work_area = *self.work_area_size();
        let offset = if self.work_area_offset().is_some() {
            self.work_area_offset()
@@ -202,7 +204,7 @@ impl Monitor {

        self.focused_workspace_mut()
            .ok_or_else(|| anyhow!("there is no workspace"))?
-            .update(&work_area, offset)?;
+            .update(&work_area, offset, invisible_borders)?;

        Ok(())
    }
--- a/komorebi/src/process_command.rs
+++ b/komorebi/src/process_command.rs
@@ -4,6 +4,7 @@ use std::fs::OpenOptions;
 use std::io::BufRead;
 use std::io::BufReader;
 use std::io::Read;
+use std::io::Write;
 use std::net::TcpListener;
 use std::net::TcpStream;
 use std::num::NonZeroUsize;
@@ -38,7 +39,6 @@ use komorebi_core::WindowContainerBehaviour;
 use komorebi_core::WindowKind;

 use crate::border::Border;
-use crate::colour::Rgb;
 use crate::current_virtual_desktop;
 use crate::notify_subscribers;
 use crate::static_config::StaticConfig;
@@ -48,6 +48,7 @@ use crate::window_manager::WindowManager;
 use crate::windows_api::WindowsApi;
 use crate::Notification;
 use crate::NotificationEvent;
+use crate::ALT_FOCUS_HACK;
 use crate::BORDER_COLOUR_CURRENT;
 use crate::BORDER_COLOUR_MONOCLE;
 use crate::BORDER_COLOUR_SINGLE;
@@ -71,7 +72,6 @@ use crate::NO_TITLEBAR;
 use crate::OBJECT_NAME_CHANGE_ON_LAUNCH;
 use crate::REMOVE_TITLEBARS;
 use crate::SUBSCRIPTION_PIPES;
-use crate::SUBSCRIPTION_SOCKETS;
 use crate::TCP_CONNECTIONS;
 use crate::TRAY_AND_MULTI_WINDOW_IDENTIFIERS;
 use crate::WORKSPACE_RULES;
@@ -144,15 +144,8 @@ pub fn listen_for_commands_tcp(wm: Arc<Mutex<WindowManager>>, port: usize) {
 }

 impl WindowManager {
-    // TODO(raggi): wrap reply in a newtype that can decorate a human friendly
-    // name for the peer, such as getting the pid of the komorebic process for
-    // the UDS or the IP:port for TCP.
-    #[tracing::instrument(skip(self, reply))]
-    pub fn process_command(
-        &mut self,
-        message: SocketMessage,
-        mut reply: impl std::io::Write,
-    ) -> Result<()> {
+    #[tracing::instrument(skip(self))]
+    pub fn process_command(&mut self, message: SocketMessage) -> Result<()> {
        if let Some(virtual_desktop_id) = &self.virtual_desktop_id {
            if let Some(id) = current_virtual_desktop() {
                if id != *virtual_desktop_id {
@@ -304,6 +297,7 @@ impl WindowManager {
                    });
                }

+                let invisible_borders = self.invisible_borders;
                let offset = self.work_area_offset;

                let mut hwnds_to_purge = vec![];
@@ -346,7 +340,7 @@ impl WindowManager {
                        .ok_or_else(|| anyhow!("there is no focused workspace"))?
                        .remove_window(hwnd)?;

-                    monitor.update_focused_workspace(offset)?;
+                    monitor.update_focused_workspace(offset, &invisible_borders)?;
                }
            }
            SocketMessage::FocusedWorkspaceContainerPadding(adjustment) => {
@@ -749,11 +743,15 @@ impl WindowManager {
                    Err(error) => error.to_string(),
                };

-                tracing::info!("replying to state");
+                let socket = DATA_DIR.join("komorebic.sock");

-                reply.write_all(state.as_bytes())?;
-
-                tracing::info!("replying to state done");
+                let mut connected = false;
+                while !connected {
+                    if let Ok(mut stream) = UnixStream::connect(&socket) {
+                        connected = true;
+                        stream.write_all(state.as_bytes())?;
+                    }
+                }
            }
            SocketMessage::VisibleWindows => {
                let mut monitor_visible_windows = HashMap::new();
@@ -776,7 +774,15 @@ impl WindowManager {
                        Err(error) => error.to_string(),
                    };

-                reply.write_all(visible_windows_state.as_bytes())?;
+                let socket = DATA_DIR.join("komorebic.sock");
+
+                let mut connected = false;
+                while !connected {
+                    if let Ok(mut stream) = UnixStream::connect(&socket) {
+                        connected = true;
+                        stream.write_all(visible_windows_state.as_bytes())?;
+                    }
+                }
            }

            SocketMessage::Query(query) => {
@@ -795,7 +801,15 @@ impl WindowManager {
                }
                .to_string();

-                reply.write_all(response.as_bytes())?;
+                let socket = DATA_DIR.join("komorebic.sock");
+
+                let mut connected = false;
+                while !connected {
+                    if let Ok(mut stream) = UnixStream::connect(&socket) {
+                        connected = true;
+                        stream.write_all(response.as_bytes())?;
+                    }
+                }
            }
            SocketMessage::ResizeWindowEdge(direction, sizing) => {
                self.resize_window(direction, sizing, self.resize_delta, true)?;
@@ -1092,7 +1106,10 @@ impl WindowManager {
            SocketMessage::UnmanageFocusedWindow => {
                self.unmanage_focused_window()?;
            }
-            SocketMessage::InvisibleBorders(_rect) => {}
+            SocketMessage::InvisibleBorders(rect) => {
+                self.invisible_borders = rect;
+                self.retile_all(false)?;
+            }
            SocketMessage::WorkAreaOffset(rect) => {
                self.work_area_offset = Option::from(rect);
                self.retile_all(false)?;
@@ -1153,16 +1170,7 @@ impl WindowManager {
                workspace.set_resize_dimensions(resize);
                self.update_focused_workspace(false)?;
            }
-            SocketMessage::AddSubscriberSocket(ref socket) => {
-                let mut sockets = SUBSCRIPTION_SOCKETS.lock();
-                let socket_path = DATA_DIR.join(socket);
-                sockets.insert(socket.clone(), socket_path);
-            }
-            SocketMessage::RemoveSubscriberSocket(ref socket) => {
-                let mut sockets = SUBSCRIPTION_SOCKETS.lock();
-                sockets.remove(socket);
-            }
-            SocketMessage::AddSubscriberPipe(ref subscriber) => {
+            SocketMessage::AddSubscriber(ref subscriber) => {
                let mut pipes = SUBSCRIPTION_PIPES.lock();
                let pipe_path = format!(r"\\.\pipe\{subscriber}");
                let pipe = connect(&pipe_path).map_err(|_| {
@@ -1171,7 +1179,7 @@ impl WindowManager {

                pipes.insert(subscriber.clone(), pipe);
            }
-            SocketMessage::RemoveSubscriberPipe(ref subscriber) => {
+            SocketMessage::RemoveSubscriber(ref subscriber) => {
                let mut pipes = SUBSCRIPTION_PIPES.lock();
                pipes.remove(subscriber);
            }
@@ -1230,14 +1238,14 @@ impl WindowManager {
            SocketMessage::ActiveWindowBorderColour(kind, r, g, b) => {
                match kind {
                    WindowKind::Single => {
-                        BORDER_COLOUR_SINGLE.store(Rgb::new(r, g, b).into(), Ordering::SeqCst);
-                        BORDER_COLOUR_CURRENT.store(Rgb::new(r, g, b).into(), Ordering::SeqCst);
+                        BORDER_COLOUR_SINGLE.store(r | (g << 8) | (b << 16), Ordering::SeqCst);
+                        BORDER_COLOUR_CURRENT.store(r | (g << 8) | (b << 16), Ordering::SeqCst);
                    }
                    WindowKind::Stack => {
-                        BORDER_COLOUR_STACK.store(Rgb::new(r, g, b).into(), Ordering::SeqCst);
+                        BORDER_COLOUR_STACK.store(r | (g << 8) | (b << 16), Ordering::SeqCst);
                    }
                    WindowKind::Monocle => {
-                        BORDER_COLOUR_MONOCLE.store(Rgb::new(r, g, b).into(), Ordering::SeqCst);
+                        BORDER_COLOUR_MONOCLE.store(r | (g << 8) | (b << 16), Ordering::SeqCst);
                    }
                }

@@ -1248,29 +1256,60 @@ impl WindowManager {
                WindowsApi::invalidate_border_rect()?;
            }
            SocketMessage::ActiveWindowBorderOffset(offset) => {
-                BORDER_OFFSET.store(offset, Ordering::SeqCst);
+                let mut current_border_offset = BORDER_OFFSET.lock();
+
+                let new_border_offset = Rect {
+                    left: offset,
+                    top: offset,
+                    right: offset * 2,
+                    bottom: offset * 2,
+                };
+
+                *current_border_offset = Option::from(new_border_offset);
+
                WindowsApi::invalidate_border_rect()?;
            }
-            SocketMessage::AltFocusHack(_) => {
-                tracing::info!("this action is deprecated");
+            SocketMessage::AltFocusHack(enable) => {
+                ALT_FOCUS_HACK.store(enable, Ordering::SeqCst);
            }
            SocketMessage::ApplicationSpecificConfigurationSchema => {
                let asc = schema_for!(Vec<ApplicationConfiguration>);
                let schema = serde_json::to_string_pretty(&asc)?;
+                let socket = DATA_DIR.join("komorebic.sock");

-                reply.write_all(schema.as_bytes())?;
+                let mut connected = false;
+                while !connected {
+                    if let Ok(mut stream) = UnixStream::connect(&socket) {
+                        connected = true;
+                        stream.write_all(schema.as_bytes())?;
+                    }
+                }
            }
            SocketMessage::NotificationSchema => {
                let notification = schema_for!(Notification);
                let schema = serde_json::to_string_pretty(&notification)?;
+                let socket = DATA_DIR.join("komorebic.sock");

-                reply.write_all(schema.as_bytes())?;
+                let mut connected = false;
+                while !connected {
+                    if let Ok(mut stream) = UnixStream::connect(&socket) {
+                        connected = true;
+                        stream.write_all(schema.as_bytes())?;
+                    }
+                }
            }
            SocketMessage::SocketSchema => {
                let socket_message = schema_for!(SocketMessage);
                let schema = serde_json::to_string_pretty(&socket_message)?;
+                let socket = DATA_DIR.join("komorebic.sock");

-                reply.write_all(schema.as_bytes())?;
+                let mut connected = false;
+                while !connected {
+                    if let Ok(mut stream) = UnixStream::connect(&socket) {
+                        connected = true;
+                        stream.write_all(schema.as_bytes())?;
+                    }
+                }
            }
            SocketMessage::StaticConfigSchema => {
                let settings = SchemaSettings::default().with(|s| {
@@ -1282,13 +1321,27 @@ impl WindowManager {
                let gen = settings.into_generator();
                let socket_message = gen.into_root_schema_for::<StaticConfig>();
                let schema = serde_json::to_string_pretty(&socket_message)?;
+                let socket = DATA_DIR.join("komorebic.sock");

-                reply.write_all(schema.as_bytes())?;
+                let mut connected = false;
+                while !connected {
+                    if let Ok(mut stream) = UnixStream::connect(&socket) {
+                        connected = true;
+                        stream.write_all(schema.as_bytes())?;
+                    }
+                }
            }
            SocketMessage::GenerateStaticConfig => {
                let config = serde_json::to_string_pretty(&StaticConfig::from(&*self))?;
+                let socket = DATA_DIR.join("komorebic.sock");

-                reply.write_all(config.as_bytes())?;
+                let mut connected = false;
+                while !connected {
+                    if let Ok(mut stream) = UnixStream::connect(&socket) {
+                        connected = true;
+                        stream.write_all(config.as_bytes())?;
+                    }
+                }
            }
            SocketMessage::RemoveTitleBar(_, ref id) => {
                let mut identifiers = NO_TITLEBAR.lock();
@@ -1375,6 +1428,9 @@ impl WindowManager {
            | SocketMessage::FocusWorkspaceNumber(_) => {
                let foreground = WindowsApi::foreground_window()?;
                let foreground_window = Window { hwnd: foreground };
+                let mut rect = WindowsApi::window_rect(foreground_window.hwnd())?;
+                rect.top -= self.invisible_borders.bottom;
+                rect.bottom += self.invisible_borders.bottom;

                let monocle = BORDER_COLOUR_MONOCLE.load(Ordering::SeqCst);
                if monocle != 0 && self.focused_workspace()?.monocle_container().is_some() {
@@ -1391,7 +1447,7 @@ impl WindowManager {
                }

                let border = Border::from(BORDER_HWND.load(Ordering::SeqCst));
-                border.set_position(foreground_window, false)?;
+                border.set_position(foreground_window, &self.invisible_borders, false)?;
            }
            SocketMessage::TogglePause => {
                let is_paused = self.is_paused;
@@ -1401,7 +1457,7 @@ impl WindowManager {
                    border.hide()?;
                } else {
                    let focused = self.focused_window()?;
-                    border.set_position(*focused, true)?;
+                    border.set_position(*focused, &self.invisible_borders, true)?;
                    focused.focus(false)?;
                }
            }
@@ -1411,7 +1467,7 @@ impl WindowManager {

                if tiling_enabled {
                    let focused = self.focused_window()?;
-                    border.set_position(*focused, true)?;
+                    border.set_position(*focused, &self.invisible_borders, true)?;
                    focused.focus(false)?;
                } else {
                    border.hide()?;
@@ -1470,13 +1526,9 @@ impl WindowManager {
    }
 }

-pub fn read_commands_uds(wm: &Arc<Mutex<WindowManager>>, mut stream: UnixStream) -> Result<()> {
-    let reader = BufReader::new(stream.try_clone()?);
-    // TODO(raggi): while this processes more than one command, if there are
-    // replies there is no clearly defined protocol for framing yet - it's
-    // perhaps whole-json objects for now, but termination is signalled by
-    // socket shutdown.
-    for line in reader.lines() {
+pub fn read_commands_uds(wm: &Arc<Mutex<WindowManager>>, stream: UnixStream) -> Result<()> {
+    let stream = BufReader::new(stream);
+    for line in stream.lines() {
        let message = SocketMessage::from_str(&line?)?;

        let mut wm = wm.lock();
@@ -1484,7 +1536,7 @@ pub fn read_commands_uds(wm: &Arc<Mutex<WindowManager>>, mut stream: UnixStream)
        if wm.is_paused {
            return match message {
                SocketMessage::TogglePause | SocketMessage::State | SocketMessage::Stop => {
-                    Ok(wm.process_command(message, &mut stream)?)
+                    Ok(wm.process_command(message)?)
                }
                _ => {
                    tracing::trace!("ignoring while paused");
@@ -1493,7 +1545,7 @@ pub fn read_commands_uds(wm: &Arc<Mutex<WindowManager>>, mut stream: UnixStream)
            };
        }

-        wm.process_command(message.clone(), &mut stream)?;
+        wm.process_command(message.clone())?;
        notify_subscribers(&serde_json::to_string(&Notification {
            event: NotificationEvent::Socket(message.clone()),
            state: wm.as_ref().into(),
@@ -1508,11 +1560,11 @@ pub fn read_commands_tcp(
    stream: &mut TcpStream,
    addr: &str,
 ) -> Result<()> {
-    let mut reader = BufReader::new(stream.try_clone()?);
+    let mut stream = BufReader::new(stream);

    loop {
        let mut buf = vec![0; 1024];
-        match reader.read(&mut buf) {
+        match stream.read(&mut buf) {
            Err(..) => {
                tracing::warn!("removing disconnected tcp client: {addr}");
                let mut connections = TCP_CONNECTIONS.lock();
@@ -1533,7 +1585,7 @@ pub fn read_commands_tcp(
                if wm.is_paused {
                    return match message {
                        SocketMessage::TogglePause | SocketMessage::State | SocketMessage::Stop => {
-                            Ok(wm.process_command(message, stream)?)
+                            Ok(wm.process_command(message)?)
                        }
                        _ => {
                            tracing::trace!("ignoring while paused");
@@ -1542,7 +1594,7 @@ pub fn read_commands_tcp(
                    };
                }

-                wm.process_command(message.clone(), &mut *stream)?;
+                wm.process_command(message.clone())?;
                notify_subscribers(&serde_json::to_string(&Notification {
                    event: NotificationEvent::Socket(message.clone()),
                    state: wm.as_ref().into(),
--- a/komorebi/src/process_event.rs
+++ b/komorebi/src/process_event.rs
@@ -35,7 +35,7 @@ use crate::TRAY_AND_MULTI_WINDOW_IDENTIFIERS;

 #[tracing::instrument]
 pub fn listen_for_events(wm: Arc<Mutex<WindowManager>>) {
-    let receiver = wm.lock().incoming_events.clone();
+    let receiver = wm.lock().incoming_events.lock().clone();

    std::thread::spawn(move || {
        tracing::info!("listening");
@@ -109,6 +109,7 @@ impl WindowManager {
            _ => {}
        }

+        let invisible_borders = self.invisible_borders;
        let offset = self.work_area_offset;

        for (i, monitor) in self.monitors_mut().iter_mut().enumerate() {
@@ -122,7 +123,7 @@ impl WindowManager {
            for (j, workspace) in monitor.workspaces_mut().iter_mut().enumerate() {
                let reaped_orphans = workspace.reap_orphans()?;
                if reaped_orphans.0 > 0 || reaped_orphans.1 > 0 {
-                    workspace.update(&work_area, offset)?;
+                    workspace.update(&work_area, offset, &invisible_borders)?;
                    tracing::info!(
                        "reaped {} orphan window(s) and {} orphaned container(s) on monitor: {}, workspace: {}",
                        reaped_orphans.0,
@@ -302,24 +303,21 @@ impl WindowManager {
                }
            }
            WindowManagerEvent::MoveResizeStart(_, window) => {
-                if *self.focused_workspace()?.tile() {
-                    let monitor_idx = self.focused_monitor_idx();
-                    let workspace_idx = self
-                        .focused_monitor()
-                        .ok_or_else(|| anyhow!("there is no monitor with this idx"))?
-                        .focused_workspace_idx();
-                    let container_idx = self
-                        .focused_monitor()
-                        .ok_or_else(|| anyhow!("there is no monitor with this idx"))?
-                        .focused_workspace()
-                        .ok_or_else(|| anyhow!("there is no workspace with this idx"))?
-                        .focused_container_idx();
+                let monitor_idx = self.focused_monitor_idx();
+                let workspace_idx = self
+                    .focused_monitor()
+                    .ok_or_else(|| anyhow!("there is no monitor with this idx"))?
+                    .focused_workspace_idx();
+                let container_idx = self
+                    .focused_monitor()
+                    .ok_or_else(|| anyhow!("there is no monitor with this idx"))?
+                    .focused_workspace()
+                    .ok_or_else(|| anyhow!("there is no workspace with this idx"))?
+                    .focused_container_idx();

-                    WindowsApi::bring_window_to_top(window.hwnd())?;
+                WindowsApi::bring_window_to_top(window.hwnd())?;

-                    self.pending_move_op =
-                        Option::from((monitor_idx, workspace_idx, container_idx));
-                }
+                self.pending_move_op = Option::from((monitor_idx, workspace_idx, container_idx));
            }
            WindowManagerEvent::MoveResizeEnd(_, window) => {
                // We need this because if the event ends on a different monitor,
@@ -333,6 +331,7 @@ impl WindowManager {
                    .ok_or_else(|| anyhow!("cannot get monitor idx from current position"))?;

                let new_window_behaviour = self.window_container_behaviour;
+                let invisible_borders = self.invisible_borders;

                let workspace = self.focused_workspace_mut()?;
                if !workspace
@@ -342,7 +341,7 @@ impl WindowManager {
                {
                    let focused_container_idx = workspace.focused_container_idx();

-                    let new_position = WindowsApi::window_rect(window.hwnd())?;
+                    let mut new_position = WindowsApi::window_rect(window.hwnd())?;

                    let old_position = *workspace
                        .latest_layout()
@@ -367,6 +366,12 @@ impl WindowManager {
                        }
                    }

+                    // Adjust for the invisible borders
+                    new_position.left += invisible_borders.left;
+                    new_position.top += invisible_borders.top;
+                    new_position.right -= invisible_borders.right;
+                    new_position.bottom -= invisible_borders.bottom;
+
                    let resize = Rect {
                        left: new_position.left - old_position.left,
                        top: new_position.top - old_position.top,
@@ -376,7 +381,10 @@ impl WindowManager {

                    // If we have moved across the monitors, use that override, otherwise determine
                    // if a move has taken place by ruling out a resize
-                    let is_move = moved_across_monitors || resize.right == 0 && resize.bottom == 0;
+                    let is_move = moved_across_monitors
+                        || resize.right == 0 && resize.bottom == 0
+                        || resize.right.abs() == invisible_borders.right
+                            && resize.bottom.abs() == invisible_borders.bottom;

                    if is_move {
                        tracing::info!("moving with mouse");
@@ -510,12 +518,6 @@ impl WindowManager {
            | WindowManagerEvent::Uncloak(..) => {}
        };

-        if !self.focused_workspace()?.tile() {
-            let border = Border::from(BORDER_HWND.load(Ordering::SeqCst));
-            border.hide()?;
-            BORDER_HIDDEN.store(true, Ordering::SeqCst);
-        }
-
        if *self.focused_workspace()?.tile() && BORDER_ENABLED.load(Ordering::SeqCst) {
            match event {
                WindowManagerEvent::MoveResizeStart(_, _) => {
@@ -527,7 +529,6 @@ impl WindowManager {
                | WindowManagerEvent::Show(_, window)
                | WindowManagerEvent::FocusChange(_, window)
                | WindowManagerEvent::Hide(_, window)
-                | WindowManagerEvent::Uncloak(_, window)
                | WindowManagerEvent::Minimize(_, window) => {
                    let border = Border::from(BORDER_HWND.load(Ordering::SeqCst));
                    let mut target_window = None;
@@ -584,10 +585,15 @@ impl WindowManager {
                    }

                    if let Some(target_window) = target_window {
+                        let window = target_window;
+                        let mut rect = WindowsApi::window_rect(window.hwnd())?;
+                        rect.top -= self.invisible_borders.bottom;
+                        rect.bottom += self.invisible_borders.bottom;
+
                        let activate = BORDER_HIDDEN.load(Ordering::SeqCst);

                        WindowsApi::invalidate_border_rect()?;
-                        border.set_position(target_window, activate)?;
+                        border.set_position(target_window, &self.invisible_borders, activate)?;

                        if activate {
                            BORDER_HIDDEN.store(false, Ordering::SeqCst);
@@ -600,7 +606,7 @@ impl WindowManager {

        // If we unmanaged a window, it shouldn't be immediately hidden behind managed windows
        if let WindowManagerEvent::Unmanage(window) = event {
-            window.center(&self.focused_monitor_work_area()?)?;
+            window.center(&self.focused_monitor_work_area()?, &invisible_borders)?;
        }

        // If there are no more windows on the workspace, we shouldn't show the border window
--- a/komorebi/src/ring.rs
+++ b/komorebi/src/ring.rs
@@ -1,10 +1,9 @@
 use std::collections::VecDeque;

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

-#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
+#[derive(Debug, Clone, Serialize, JsonSchema)]
 pub struct Ring<T> {
    elements: VecDeque<T>,
    focused: usize,
--- a/komorebi/src/static_config.rs
+++ b/komorebi/src/static_config.rs
@@ -1,5 +1,4 @@
 use crate::border::Border;
-use crate::colour::Colour;
 use crate::current_virtual_desktop;
 use crate::monitor::Monitor;
 use crate::ring::Ring;
@@ -29,7 +28,6 @@ use crate::OBJECT_NAME_CHANGE_ON_LAUNCH;
 use crate::REGEX_IDENTIFIERS;
 use crate::TRAY_AND_MULTI_WINDOW_IDENTIFIERS;
 use crate::WORKSPACE_RULES;
-
 use color_eyre::Result;
 use crossbeam_channel::Receiver;
 use hotwatch::notify::DebouncedEvent;
@@ -64,14 +62,34 @@ use std::sync::Arc;
 use uds_windows::UnixListener;
 use uds_windows::UnixStream;

+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+pub struct Rgb {
+    /// Red
+    pub r: u32,
+    /// Green
+    pub g: u32,
+    /// Blue
+    pub b: u32,
+}
+
+impl From<u32> for Rgb {
+    fn from(value: u32) -> Self {
+        Self {
+            r: value & 0xff,
+            g: value >> 8 & 0xff,
+            b: value >> 16 & 0xff,
+        }
+    }
+}
+
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct ActiveWindowBorderColours {
    /// Border colour when the container contains a single window
-    pub single: Colour,
+    pub single: Rgb,
    /// Border colour when the container contains multiple windows
-    pub stack: Colour,
+    pub stack: Rgb,
    /// Border colour when the container is in monocle mode
-    pub monocle: Colour,
+    pub monocle: Rgb,
 }

 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
@@ -214,7 +232,7 @@ impl From<&Monitor> for MonitorConfig {
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 /// The `komorebi.json` static configuration file reference for `v0.1.20`
 pub struct StaticConfig {
-    /// DEPRECATED from v0.1.22: no longer required
+    /// Dimensions of Windows' own invisible borders; don't set these yourself unless you are told to
    #[serde(skip_serializing_if = "Option::is_none")]
    pub invisible_borders: Option<Rect>,
    /// Delta to resize windows by (default 50)
@@ -238,14 +256,12 @@ pub struct StaticConfig {
    /// Path to applications.yaml from komorebi-application-specific-configurations (default: None)
    #[serde(skip_serializing_if = "Option::is_none")]
    pub app_specific_configuration_path: Option<PathBuf>,
-    /// Width of the window border (default: 8)
+    /// Width of the active window border (default: 20)
    #[serde(skip_serializing_if = "Option::is_none")]
-    #[serde(alias = "active_window_border_width")]
-    pub border_width: Option<i32>,
-    /// Offset of the window border (default: -1)
+    pub active_window_border_width: Option<i32>,
+    /// Offset of the active window border (default: None)
    #[serde(skip_serializing_if = "Option::is_none")]
-    #[serde(alias = "active_window_border_offset")]
-    pub border_offset: Option<i32>,
+    pub active_window_border_offset: Option<i32>,
    /// Display an active window border (default: false)
    #[serde(skip_serializing_if = "Option::is_none")]
    pub active_window_border: Option<bool>,
@@ -261,6 +277,10 @@ pub struct StaticConfig {
    /// Monitor and workspace configurations
    #[serde(skip_serializing_if = "Option::is_none")]
    pub monitors: Option<Vec<MonitorConfig>>,
+    /// DEPRECATED from v0.1.20: no longer required
+    #[schemars(skip)]
+    #[serde(skip_serializing)]
+    pub alt_focus_hack: Option<bool>,
    /// Which Windows signal to use when hiding windows (default: minimize)
    #[serde(skip_serializing_if = "Option::is_none")]
    pub window_hiding_behaviour: Option<HidingBehaviour>,
@@ -296,6 +316,13 @@ pub struct StaticConfig {
 impl From<&WindowManager> for StaticConfig {
    #[allow(clippy::too_many_lines)]
    fn from(value: &WindowManager) -> Self {
+        let default_invisible_borders = Rect {
+            left: 7,
+            top: 0,
+            right: 14,
+            bottom: 7,
+        };
+
        let mut monitors = vec![];
        for m in value.monitors() {
            monitors.push(MonitorConfig::from(m));
@@ -350,13 +377,13 @@ impl From<&WindowManager> for StaticConfig {
            None
        } else {
            Option::from(ActiveWindowBorderColours {
-                single: Colour::from(BORDER_COLOUR_SINGLE.load(Ordering::SeqCst)),
-                stack: Colour::from(if BORDER_COLOUR_STACK.load(Ordering::SeqCst) == 0 {
+                single: Rgb::from(BORDER_COLOUR_SINGLE.load(Ordering::SeqCst)),
+                stack: Rgb::from(if BORDER_COLOUR_STACK.load(Ordering::SeqCst) == 0 {
                    BORDER_COLOUR_SINGLE.load(Ordering::SeqCst)
                } else {
                    BORDER_COLOUR_STACK.load(Ordering::SeqCst)
                }),
-                monocle: Colour::from(if BORDER_COLOUR_MONOCLE.load(Ordering::SeqCst) == 0 {
+                monocle: Rgb::from(if BORDER_COLOUR_MONOCLE.load(Ordering::SeqCst) == 0 {
                    BORDER_COLOUR_SINGLE.load(Ordering::SeqCst)
                } else {
                    BORDER_COLOUR_MONOCLE.load(Ordering::SeqCst)
@@ -365,7 +392,11 @@ impl From<&WindowManager> for StaticConfig {
        };

        Self {
-            invisible_borders: None,
+            invisible_borders: if value.invisible_borders == default_invisible_borders {
+                None
+            } else {
+                Option::from(value.invisible_borders)
+            },
            resize_delta: Option::from(value.resize_delta),
            window_container_behaviour: Option::from(value.window_container_behaviour),
            cross_monitor_move_behaviour: Option::from(value.cross_monitor_move_behaviour),
@@ -375,8 +406,10 @@ impl From<&WindowManager> for StaticConfig {
            focus_follows_mouse: value.focus_follows_mouse,
            mouse_follows_focus: Option::from(value.mouse_follows_focus),
            app_specific_configuration_path: None,
-            border_width: Option::from(BORDER_WIDTH.load(Ordering::SeqCst)),
-            border_offset: Option::from(BORDER_OFFSET.load(Ordering::SeqCst)),
+            active_window_border_width: Option::from(BORDER_WIDTH.load(Ordering::SeqCst)),
+            active_window_border_offset: BORDER_OFFSET
+                .lock()
+                .map_or(None, |offset| Option::from(offset.left)),
            active_window_border: Option::from(BORDER_ENABLED.load(Ordering::SeqCst)),
            active_window_border_colours: border_colours,
            default_workspace_padding: Option::from(
@@ -386,6 +419,7 @@ impl From<&WindowManager> for StaticConfig {
                DEFAULT_CONTAINER_PADDING.load(Ordering::SeqCst),
            ),
            monitors: Option::from(monitors),
+            alt_focus_hack: None,
            window_hiding_behaviour: Option::from(*HIDING_BEHAVIOUR.lock()),
            global_work_area_offset: value.work_area_offset,
            float_rules: None,
@@ -426,22 +460,49 @@ impl StaticConfig {
            DEFAULT_WORKSPACE_PADDING.store(workspace, Ordering::SeqCst);
        }

-        self.border_width.map_or_else(
+        self.active_window_border_width.map_or_else(
            || {
-                BORDER_WIDTH.store(8, Ordering::SeqCst);
+                BORDER_WIDTH.store(20, Ordering::SeqCst);
            },
            |width| {
                BORDER_WIDTH.store(width, Ordering::SeqCst);
            },
        );
+        self.active_window_border_offset.map_or_else(
+            || {
+                let mut border_offset = BORDER_OFFSET.lock();
+                *border_offset = None;
+            },
+            |offset| {
+                let new_border_offset = Rect {
+                    left: offset,
+                    top: offset,
+                    right: offset * 2,
+                    bottom: offset * 2,
+                };

-        BORDER_OFFSET.store(self.border_offset.unwrap_or(-1), Ordering::SeqCst);
+                let mut border_offset = BORDER_OFFSET.lock();
+                *border_offset = Some(new_border_offset);
+            },
+        );

        if let Some(colours) = &self.active_window_border_colours {
-            BORDER_COLOUR_SINGLE.store(u32::from(colours.single), Ordering::SeqCst);
-            BORDER_COLOUR_CURRENT.store(u32::from(colours.single), Ordering::SeqCst);
-            BORDER_COLOUR_STACK.store(u32::from(colours.stack), Ordering::SeqCst);
-            BORDER_COLOUR_MONOCLE.store(u32::from(colours.monocle), Ordering::SeqCst);
+            BORDER_COLOUR_SINGLE.store(
+                colours.single.r | (colours.single.g << 8) | (colours.single.b << 16),
+                Ordering::SeqCst,
+            );
+            BORDER_COLOUR_CURRENT.store(
+                colours.single.r | (colours.single.g << 8) | (colours.single.b << 16),
+                Ordering::SeqCst,
+            );
+            BORDER_COLOUR_STACK.store(
+                colours.stack.r | (colours.stack.g << 8) | (colours.stack.b << 16),
+                Ordering::SeqCst,
+            );
+            BORDER_COLOUR_MONOCLE.store(
+                colours.monocle.r | (colours.monocle.g << 8) | (colours.monocle.b << 16),
+                Ordering::SeqCst,
+            );
        }

        let mut float_identifiers = FLOAT_IDENTIFIERS.lock();
@@ -687,7 +748,7 @@ impl StaticConfig {
    #[allow(clippy::too_many_lines)]
    pub fn preload(
        path: &PathBuf,
-        incoming: Receiver<WindowManagerEvent>,
+        incoming: Arc<Mutex<Receiver<WindowManagerEvent>>>,
    ) -> Result<WindowManager> {
        let content = std::fs::read_to_string(path)?;
        let mut value: Self = serde_json::from_str(&content)?;
@@ -714,6 +775,12 @@ impl StaticConfig {
            incoming_events: incoming,
            command_listener: listener,
            is_paused: false,
+            invisible_borders: value.invisible_borders.unwrap_or(Rect {
+                left: 7,
+                top: 0,
+                right: 14,
+                bottom: 7,
+            }),
            virtual_desktop_id: current_virtual_desktop(),
            work_area_offset: value.global_work_area_offset,
            window_container_behaviour: value
@@ -860,6 +927,10 @@ impl StaticConfig {
            wm.hide_border()?;
        }

+        if let Some(val) = value.invisible_borders {
+            wm.invisible_borders = val;
+        }
+
        if let Some(val) = value.window_container_behaviour {
            wm.window_container_behaviour = val;
        }
@@ -892,12 +963,6 @@ impl StaticConfig {

        wm.focus_follows_mouse = value.focus_follows_mouse;

-        let monitor_count = wm.monitors().len();
-
-        for i in 0..monitor_count {
-            wm.update_focused_workspace_by_monitor_idx(i)?;
-        }
-
        Ok(())
    }
 }
--- a/komorebi/src/window.rs
+++ b/komorebi/src/window.rs
@@ -4,6 +4,7 @@ use std::convert::TryFrom;
 use std::fmt::Display;
 use std::fmt::Formatter;
 use std::fmt::Write as _;
+use std::sync::atomic::Ordering;

 use color_eyre::eyre;
 use color_eyre::eyre::anyhow;
@@ -14,10 +15,12 @@ use regex::Regex;
 use schemars::JsonSchema;
 use serde::ser::Error;
 use serde::ser::SerializeStruct;
-use serde::Deserialize;
 use serde::Serialize;
 use serde::Serializer;
 use windows::Win32::Foundation::HWND;
+use winput::press;
+use winput::release;
+use winput::Vk;

 use komorebi_core::ApplicationIdentifier;
 use komorebi_core::HidingBehaviour;
@@ -27,6 +30,8 @@ use crate::styles::ExtendedWindowStyle;
 use crate::styles::WindowStyle;
 use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_api::WindowsApi;
+use crate::ALT_FOCUS_HACK;
+use crate::BORDER_OVERFLOW_IDENTIFIERS;
 use crate::FLOAT_IDENTIFIERS;
 use crate::HIDDEN_HWNDS;
 use crate::HIDING_BEHAVIOUR;
@@ -37,7 +42,7 @@ use crate::PERMAIGNORE_CLASSES;
 use crate::REGEX_IDENTIFIERS;
 use crate::WSL2_UI_PROCESSES;

-#[derive(Debug, Clone, Copy, Deserialize, JsonSchema)]
+#[derive(Debug, Clone, Copy, JsonSchema)]
 pub struct Window {
    pub(crate) hwnd: isize,
 }
@@ -123,7 +128,7 @@ impl Window {
        HWND(self.hwnd)
    }

-    pub fn center(&mut self, work_area: &Rect) -> Result<()> {
+    pub fn center(&mut self, work_area: &Rect, invisible_borders: &Rect) -> Result<()> {
        let half_width = work_area.right / 2;
        let half_weight = work_area.bottom / 2;

@@ -134,23 +139,45 @@ impl Window {
                right: half_width,
                bottom: half_weight,
            },
+            invisible_borders,
            true,
        )
    }

-    pub fn set_position(&mut self, layout: &Rect, top: bool) -> Result<()> {
-        let rect = *layout;
+    pub fn set_position(
+        &mut self,
+        layout: &Rect,
+        invisible_borders: &Rect,
+        top: bool,
+    ) -> Result<()> {
+        let mut rect = *layout;
+
+        let border_overflows = BORDER_OVERFLOW_IDENTIFIERS.lock();
+        let regex_identifiers = REGEX_IDENTIFIERS.lock();
+
+        let title = &self.title()?;
+        let class = &self.class()?;
+        let exe_name = &self.exe()?;
+
+        let should_remove_border = !should_act(
+            title,
+            exe_name,
+            class,
+            &border_overflows,
+            &regex_identifiers,
+        );
+
+        if should_remove_border {
+            // Remove the invisible borders
+            rect.left -= invisible_borders.left;
+            rect.top -= invisible_borders.top;
+            rect.right += invisible_borders.right;
+            rect.bottom += invisible_borders.bottom;
+        }
+
        WindowsApi::position_window(self.hwnd(), &rect, top)
    }

-    pub fn is_maximized(self) -> bool {
-        WindowsApi::is_zoomed(self.hwnd())
-    }
-
-    pub fn is_miminized(self) -> bool {
-        WindowsApi::is_iconic(self.hwnd())
-    }
-
    pub fn hide(self) {
        let mut programmatically_hidden_hwnds = HIDDEN_HWNDS.lock();
        if !programmatically_hidden_hwnds.contains(&self.hwnd) {
@@ -289,7 +316,12 @@ impl Window {
        let mut tried_resetting_foreground_access = false;
        let mut max_attempts = 10;

+        let hotkey_uses_alt = WindowsApi::alt_is_pressed();
        while !foregrounded && max_attempts > 0 {
+            if ALT_FOCUS_HACK.load(Ordering::SeqCst) {
+                press(Vk::Alt);
+            }
+
            match WindowsApi::set_foreground_window(self.hwnd()) {
                Ok(()) => {
                    foregrounded = true;
@@ -310,6 +342,10 @@ impl Window {
                    }
                }
            };
+
+            if ALT_FOCUS_HACK.load(Ordering::SeqCst) && !hotkey_uses_alt {
+                release(Vk::Alt);
+            }
        }

        // Center cursor in Window
--- a/komorebi/src/window_manager.rs
+++ b/komorebi/src/window_manager.rs
@@ -16,7 +16,6 @@ use hotwatch::notify::DebouncedEvent;
 use hotwatch::Hotwatch;
 use parking_lot::Mutex;
 use schemars::JsonSchema;
-use serde::Deserialize;
 use serde::Serialize;
 use uds_windows::UnixListener;

@@ -45,7 +44,7 @@ use crate::static_config::StaticConfig;
 use crate::window::Window;
 use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_api::WindowsApi;
-use crate::winevent_listener;
+use crate::winevent_listener::WINEVENT_CALLBACK_CHANNEL;
 use crate::workspace::Workspace;
 use crate::BORDER_HWND;
 use crate::BORDER_OVERFLOW_IDENTIFIERS;
@@ -66,9 +65,10 @@ use crate::WORKSPACE_RULES;
 pub struct WindowManager {
    pub monitors: Ring<Monitor>,
    pub monitor_cache: HashMap<usize, Monitor>,
-    pub incoming_events: Receiver<WindowManagerEvent>,
+    pub incoming_events: Arc<Mutex<Receiver<WindowManagerEvent>>>,
    pub command_listener: UnixListener,
    pub is_paused: bool,
+    pub invisible_borders: Rect,
    pub work_area_offset: Option<Rect>,
    pub resize_delta: i32,
    pub window_container_behaviour: WindowContainerBehaviour,
@@ -84,10 +84,11 @@ pub struct WindowManager {
 }

 #[allow(clippy::struct_excessive_bools)]
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Debug, Serialize, JsonSchema)]
 pub struct State {
    pub monitors: Ring<Monitor>,
    pub is_paused: bool,
+    pub invisible_borders: Rect,
    pub resize_delta: i32,
    pub new_window_behaviour: WindowContainerBehaviour,
    pub cross_monitor_move_behaviour: MoveBehaviour,
@@ -117,6 +118,7 @@ impl From<&WindowManager> for State {
        Self {
            monitors: wm.monitors.clone(),
            is_paused: wm.is_paused,
+            invisible_borders: wm.invisible_borders,
            work_area_offset: wm.work_area_offset,
            resize_delta: wm.resize_delta,
            new_window_behaviour: wm.window_container_behaviour,
@@ -165,7 +167,7 @@ impl EnforceWorkspaceRuleOp {

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

        match std::fs::remove_file(&socket) {
@@ -187,6 +189,12 @@ impl WindowManager {
            incoming_events: incoming,
            command_listener: listener,
            is_paused: false,
+            invisible_borders: Rect {
+                left: 7,
+                top: 0,
+                right: 14,
+                bottom: 7,
+            },
            virtual_desktop_id: current_virtual_desktop(),
            work_area_offset: None,
            window_container_behaviour: WindowContainerBehaviour::Create,
@@ -213,9 +221,12 @@ impl WindowManager {
    pub fn show_border(&self) -> Result<()> {
        let foreground = WindowsApi::foreground_window()?;
        let foreground_window = Window { hwnd: foreground };
+        let mut rect = WindowsApi::window_rect(foreground_window.hwnd())?;
+        rect.top -= self.invisible_borders.bottom;
+        rect.bottom += self.invisible_borders.bottom;

        let border = Border::from(BORDER_HWND.load(Ordering::SeqCst));
-        border.set_position(foreground_window, true)?;
+        border.set_position(foreground_window, &self.invisible_borders, true)?;
        WindowsApi::invalidate_border_rect()
    }

@@ -391,6 +402,7 @@ impl WindowManager {
            }
        }

+        let invisible_borders = self.invisible_borders;
        let offset = self.work_area_offset;

        for monitor in self.monitors_mut() {
@@ -421,7 +433,7 @@ impl WindowManager {
            }

            if should_update {
-                monitor.update_focused_workspace(offset)?;
+                monitor.update_focused_workspace(offset, &invisible_borders)?;
            }
        }

@@ -623,6 +635,7 @@ impl WindowManager {

    #[tracing::instrument(skip(self))]
    pub fn retile_all(&mut self, preserve_resize_dimensions: bool) -> Result<()> {
+        let invisible_borders = self.invisible_borders;
        let offset = self.work_area_offset;

        for monitor in self.monitors_mut() {
@@ -644,7 +657,7 @@ impl WindowManager {
                }
            }

-            workspace.update(&work_area, offset)?;
+            workspace.update(&work_area, offset, &invisible_borders)?;
        }

        Ok(())
@@ -654,14 +667,14 @@ impl WindowManager {
    pub fn manage_focused_window(&mut self) -> Result<()> {
        let hwnd = WindowsApi::foreground_window()?;
        let event = WindowManagerEvent::Manage(Window { hwnd });
-        Ok(winevent_listener::event_tx().send(event)?)
+        Ok(WINEVENT_CALLBACK_CHANNEL.lock().0.send(event)?)
    }

    #[tracing::instrument(skip(self))]
    pub fn unmanage_focused_window(&mut self) -> Result<()> {
        let hwnd = WindowsApi::foreground_window()?;
        let event = WindowManagerEvent::Unmanage(Window { hwnd });
-        Ok(winevent_listener::event_tx().send(event)?)
+        Ok(WINEVENT_CALLBACK_CHANNEL.lock().0.send(event)?)
    }

    #[tracing::instrument(skip(self))]
@@ -717,7 +730,7 @@ impl WindowManager {
            if known_hwnd {
                let event = WindowManagerEvent::Raise(Window { hwnd });
                self.has_pending_raise_op = true;
-                Ok(winevent_listener::event_tx().send(event)?)
+                Ok(WINEVENT_CALLBACK_CHANNEL.lock().0.send(event)?)
            } else {
                tracing::debug!("not raising unknown window: {}", Window { hwnd });
                Ok(())
@@ -816,11 +829,12 @@ impl WindowManager {
    pub fn update_focused_workspace(&mut self, follow_focus: bool) -> Result<()> {
        tracing::info!("updating");

+        let invisible_borders = self.invisible_borders;
        let offset = self.work_area_offset;

        self.focused_monitor_mut()
            .ok_or_else(|| anyhow!("there is no monitor"))?
-            .update_focused_workspace(offset)?;
+            .update_focused_workspace(offset, &invisible_borders)?;

        if follow_focus {
            if let Some(window) = self.focused_workspace()?.maximized_window() {
@@ -851,29 +865,6 @@ impl WindowManager {
            }
        }

-        // if we passed false for follow_focus
-        if !follow_focus
-            // and we have a stack with >1 windows
-            && self.focused_container_mut()?.windows().len() > 1
-            // and we don't have a maxed window 
-            && self.focused_workspace()?.maximized_window().is_none()
-            // and we don't have a monocle container
-            && self.focused_workspace()?.monocle_container().is_none()
-        {
-            if let Ok(window) = self.focused_window_mut() {
-                window.focus(self.mouse_follows_focus)?;
-            }
-        };
-
-        // This is to correctly restore and focus when switching to a workspace which
-        // contains a managed maximized window
-        if !follow_focus {
-            if let Some(window) = self.focused_workspace()?.maximized_window() {
-                window.restore();
-                window.focus(self.mouse_follows_focus)?;
-            }
-        }
-
        Ok(())
    }

@@ -1008,12 +999,13 @@ impl WindowManager {
    }

    pub fn update_focused_workspace_by_monitor_idx(&mut self, idx: usize) -> Result<()> {
+        let invisible_borders = self.invisible_borders;
        let offset = self.work_area_offset;

        self.monitors_mut()
            .get_mut(idx)
            .ok_or_else(|| anyhow!("there is no monitor"))?
-            .update_focused_workspace(offset)
+            .update_focused_workspace(offset, &invisible_borders)
    }

    #[tracing::instrument(skip(self))]
@@ -1103,6 +1095,7 @@ impl WindowManager {

        tracing::info!("moving container");

+        let invisible_borders = self.invisible_borders;
        let offset = self.work_area_offset;
        let mouse_follows_focus = self.mouse_follows_focus;

@@ -1121,7 +1114,7 @@ impl WindowManager {
            .remove_focused_container()
            .ok_or_else(|| anyhow!("there is no container"))?;

-        monitor.update_focused_workspace(offset)?;
+        monitor.update_focused_workspace(offset, &invisible_borders)?;

        let target_monitor = self
            .monitors_mut()
@@ -1130,7 +1123,7 @@ impl WindowManager {

        target_monitor.add_container(container, workspace_idx)?;
        target_monitor.load_focused_workspace(mouse_follows_focus)?;
-        target_monitor.update_focused_workspace(offset)?;
+        target_monitor.update_focused_workspace(offset, &invisible_borders)?;

        if follow {
            self.focus_monitor(monitor_idx)?;
@@ -1312,11 +1305,12 @@ impl WindowManager {
                // make sure to update the origin monitor workspace layout because it is no
                // longer focused so it won't get updated at the end of this fn
                let offset = self.work_area_offset;
+                let invisible_borders = self.invisible_borders;

                self.monitors_mut()
                    .get_mut(origin_monitor_idx)
                    .ok_or_else(|| anyhow!("there is no monitor at this index"))?
-                    .update_focused_workspace(offset)?;
+                    .update_focused_workspace(offset, &invisible_borders)?;

                let a = self
                    .focused_monitor()
@@ -1466,15 +1460,9 @@ impl WindowManager {
    pub fn promote_container_to_front(&mut self) -> Result<()> {
        self.handle_unmanaged_window_behaviour()?;

-        let workspace = self.focused_workspace_mut()?;
-
-        if matches!(workspace.layout(), Layout::Default(DefaultLayout::Grid)) {
-            tracing::debug!("ignoring promote command for grid layout");
-            return Ok(());
-        }
-
        tracing::info!("promoting container");

+        let workspace = self.focused_workspace_mut()?;
        workspace.promote_container()?;
        self.update_focused_workspace(self.mouse_follows_focus)
    }
@@ -1483,15 +1471,9 @@ impl WindowManager {
    pub fn promote_focus_to_front(&mut self) -> Result<()> {
        self.handle_unmanaged_window_behaviour()?;

-        let workspace = self.focused_workspace_mut()?;
-
-        if matches!(workspace.layout(), Layout::Default(DefaultLayout::Grid)) {
-            tracing::info!("ignoring promote focus command for grid layout");
-            return Ok(());
-        }
-
        tracing::info!("promoting focus");

+        let workspace = self.focused_workspace_mut()?;
        let target_idx = match workspace.layout() {
            Layout::Default(_) => 0,
            Layout::Custom(custom) => custom
@@ -1552,6 +1534,7 @@ impl WindowManager {
        tracing::info!("floating window");

        let work_area = self.focused_monitor_work_area()?;
+        let invisible_borders = self.invisible_borders;

        let workspace = self.focused_workspace_mut()?;
        workspace.new_floating_window()?;
@@ -1561,7 +1544,7 @@ impl WindowManager {
            .last_mut()
            .ok_or_else(|| anyhow!("there is no floating window"))?;

-        window.center(&work_area)?;
+        window.center(&work_area, &invisible_borders)?;
        window.focus(self.mouse_follows_focus)?;

        Ok(())
@@ -1637,10 +1620,10 @@ impl WindowManager {

    #[tracing::instrument(skip(self))]
    pub fn flip_layout(&mut self, layout_flip: Axis) -> Result<()> {
-        let workspace = self.focused_workspace_mut()?;
-
        tracing::info!("flipping layout");

+        let workspace = self.focused_workspace_mut()?;
+
        #[allow(clippy::match_same_arms)]
        match workspace.layout_flip() {
            None => {
@@ -1818,6 +1801,7 @@ impl WindowManager {
    ) -> Result<()> {
        tracing::info!("setting workspace layout");

+        let invisible_borders = self.invisible_borders;
        let offset = self.work_area_offset;
        let focused_monitor_idx = self.focused_monitor_idx();

@@ -1846,7 +1830,7 @@ impl WindowManager {

        // If this is the focused workspace on a non-focused screen, let's update it
        if focused_monitor_idx != monitor_idx && focused_workspace_idx == workspace_idx {
-            workspace.update(&work_area, offset)?;
+            workspace.update(&work_area, offset, &invisible_borders)?;
            Ok(())
        } else {
            Ok(self.update_focused_workspace(false)?)
@@ -1866,6 +1850,7 @@ impl WindowManager {
    {
        tracing::info!("setting workspace layout");

+        let invisible_borders = self.invisible_borders;
        let offset = self.work_area_offset;
        let focused_monitor_idx = self.focused_monitor_idx();

@@ -1896,7 +1881,7 @@ impl WindowManager {

        // If this is the focused workspace on a non-focused screen, let's update it
        if focused_monitor_idx != monitor_idx && focused_workspace_idx == workspace_idx {
-            workspace.update(&work_area, offset)?;
+            workspace.update(&work_area, offset, &invisible_borders)?;
            Ok(())
        } else {
            Ok(self.update_focused_workspace(false)?)
@@ -1911,6 +1896,7 @@ impl WindowManager {
    ) -> Result<()> {
        tracing::info!("setting workspace layout");

+        let invisible_borders = self.invisible_borders;
        let offset = self.work_area_offset;
        let focused_monitor_idx = self.focused_monitor_idx();

@@ -1937,7 +1923,7 @@ impl WindowManager {

        // If this is the focused workspace on a non-focused screen, let's update it
        if focused_monitor_idx != monitor_idx && focused_workspace_idx == workspace_idx {
-            workspace.update(&work_area, offset)?;
+            workspace.update(&work_area, offset, &invisible_borders)?;
            Ok(())
        } else {
            Ok(self.update_focused_workspace(false)?)
@@ -1953,6 +1939,7 @@ impl WindowManager {
    ) -> Result<()> {
        tracing::info!("setting workspace layout");

+        let invisible_borders = self.invisible_borders;
        let offset = self.work_area_offset;
        let focused_monitor_idx = self.focused_monitor_idx();

@@ -1978,7 +1965,7 @@ impl WindowManager {

        // If this is the focused workspace on a non-focused screen, let's update it
        if focused_monitor_idx != monitor_idx && focused_workspace_idx == workspace_idx {
-            workspace.update(&work_area, offset)?;
+            workspace.update(&work_area, offset, &invisible_borders)?;
            Ok(())
        } else {
            Ok(self.update_focused_workspace(false)?)
@@ -1997,6 +1984,7 @@ impl WindowManager {
    {
        tracing::info!("setting workspace layout");
        let layout = CustomLayout::from_path(path)?;
+        let invisible_borders = self.invisible_borders;
        let offset = self.work_area_offset;
        let focused_monitor_idx = self.focused_monitor_idx();

@@ -2023,7 +2011,7 @@ impl WindowManager {

        // If this is the focused workspace on a non-focused screen, let's update it
        if focused_monitor_idx != monitor_idx && focused_workspace_idx == workspace_idx {
-            workspace.update(&work_area, offset)?;
+            workspace.update(&work_area, offset, &invisible_borders)?;
            Ok(())
        } else {
            Ok(self.update_focused_workspace(false)?)
--- a/komorebi/src/window_manager_event.rs
+++ b/komorebi/src/window_manager_event.rs
@@ -2,7 +2,6 @@ use std::fmt::Display;
 use std::fmt::Formatter;

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

 use crate::window::should_act;
@@ -11,7 +10,7 @@ use crate::winevent::WinEvent;
 use crate::OBJECT_NAME_CHANGE_ON_LAUNCH;
 use crate::REGEX_IDENTIFIERS;

-#[derive(Debug, Copy, Clone, Serialize, Deserialize, JsonSchema)]
+#[derive(Debug, Copy, Clone, Serialize, JsonSchema)]
 #[serde(tag = "type", content = "content")]
 pub enum WindowManagerEvent {
    Destroy(WinEvent, Window),
--- a/komorebi/src/windows_api.rs
+++ b/komorebi/src/windows_api.rs
@@ -22,7 +22,6 @@ use windows::Win32::Foundation::WPARAM;
 use windows::Win32::Graphics::Dwm::DwmGetWindowAttribute;
 use windows::Win32::Graphics::Dwm::DwmSetWindowAttribute;
 use windows::Win32::Graphics::Dwm::DWMWA_CLOAKED;
-use windows::Win32::Graphics::Dwm::DWMWA_EXTENDED_FRAME_BOUNDS;
 use windows::Win32::Graphics::Dwm::DWMWA_WINDOW_CORNER_PREFERENCE;
 use windows::Win32::Graphics::Dwm::DWMWCP_ROUND;
 use windows::Win32::Graphics::Dwm::DWMWINDOWATTRIBUTE;
@@ -83,7 +82,6 @@ use windows::Win32::UI::WindowsAndMessaging::GetWindowThreadProcessId;
 use windows::Win32::UI::WindowsAndMessaging::IsIconic;
 use windows::Win32::UI::WindowsAndMessaging::IsWindow;
 use windows::Win32::UI::WindowsAndMessaging::IsWindowVisible;
-use windows::Win32::UI::WindowsAndMessaging::IsZoomed;
 use windows::Win32::UI::WindowsAndMessaging::PostMessageW;
 use windows::Win32::UI::WindowsAndMessaging::RealGetWindowClassW;
 use windows::Win32::UI::WindowsAndMessaging::RegisterClassW;
@@ -102,7 +100,7 @@ use windows::Win32::UI::WindowsAndMessaging::GWL_STYLE;
 use windows::Win32::UI::WindowsAndMessaging::GW_HWNDNEXT;
 use windows::Win32::UI::WindowsAndMessaging::HWND_BOTTOM;
 use windows::Win32::UI::WindowsAndMessaging::HWND_NOTOPMOST;
-use windows::Win32::UI::WindowsAndMessaging::HWND_TOP;
+use windows::Win32::UI::WindowsAndMessaging::HWND_TOPMOST;
 use windows::Win32::UI::WindowsAndMessaging::LWA_ALPHA;
 use windows::Win32::UI::WindowsAndMessaging::LWA_COLORKEY;
 use windows::Win32::UI::WindowsAndMessaging::SET_WINDOW_POS_FLAGS;
@@ -127,7 +125,8 @@ use windows::Win32::UI::WindowsAndMessaging::WS_DISABLED;
 use windows::Win32::UI::WindowsAndMessaging::WS_EX_LAYERED;
 use windows::Win32::UI::WindowsAndMessaging::WS_EX_NOACTIVATE;
 use windows::Win32::UI::WindowsAndMessaging::WS_EX_TOOLWINDOW;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_TOPMOST;
+use windows::Win32::UI::WindowsAndMessaging::WS_MAXIMIZEBOX;
+use windows::Win32::UI::WindowsAndMessaging::WS_MINIMIZEBOX;
 use windows::Win32::UI::WindowsAndMessaging::WS_POPUP;
 use windows::Win32::UI::WindowsAndMessaging::WS_SYSMENU;

@@ -265,7 +264,7 @@ impl WindowsApi {
        }
        .ok()
        {
-            Ok(()) => {}
+            Ok(_) => {}
            Err(error) => {
                tracing::error!("enum_display_devices: {}", error);
                return Err(error.into());
@@ -340,25 +339,14 @@ impl WindowsApi {
        unsafe { MonitorFromPoint(point, MONITOR_DEFAULTTONEAREST) }.0
    }

-    /// position window resizes the target window to the given layout, adjusting
-    /// the layout to account for any window shadow borders (the window painted
-    /// region will match layout on completion).
    pub fn position_window(hwnd: HWND, layout: &Rect, top: bool) -> Result<()> {
        let flags = SetWindowPosition::NO_ACTIVATE
            | SetWindowPosition::NO_SEND_CHANGING
            | SetWindowPosition::NO_COPY_BITS
            | SetWindowPosition::FRAME_CHANGED;

-        let shadow_rect = Self::shadow_rect(hwnd)?;
-        let rect = Rect {
-            left: layout.left + shadow_rect.left,
-            top: layout.top + shadow_rect.top,
-            right: layout.right + shadow_rect.right,
-            bottom: layout.bottom + shadow_rect.bottom,
-        };
-
-        let position = if top { HWND_TOP } else { HWND_BOTTOM };
-        Self::set_window_pos(hwnd, &rect, position, flags.bits())
+        let position = if top { HWND_TOPMOST } else { HWND_BOTTOM };
+        Self::set_window_pos(hwnd, layout, position, flags.bits())
    }

    pub fn bring_window_to_top(hwnd: HWND) -> Result<()> {
@@ -368,7 +356,7 @@ impl WindowsApi {
    pub fn raise_window(hwnd: HWND) -> Result<()> {
        let flags = SetWindowPosition::NO_MOVE;

-        let position = HWND_TOP;
+        let position = HWND_TOPMOST;
        Self::set_window_pos(hwnd, &Rect::default(), position, flags.bits())
    }

@@ -379,18 +367,6 @@ impl WindowsApi {
            SetWindowPosition::NO_ACTIVATE
        };

-        // TODO(raggi): This leaves the window behind the active window, which
-        // can result e.g. single pixel window borders being invisible in the
-        // case of opaque window borders (e.g. EPIC Games Launcher). Ideally
-        // we'd be able to pass a parent window to place ourselves just in front
-        // of, however the SetWindowPos API explicitly ignores that parameter
-        // unless the window being positioned is being activated - and we don't
-        // want to activate the border window here. We can hopefully find a
-        // better workaround in the future.
-        // The trade-off chosen prevents the border window from sitting over the
-        // top of other pop-up dialogs such as a file picker dialog from
-        // Firefox. When adjusting this in the future, it's important to check
-        // those dialog cases.
        let position = HWND_NOTOPMOST;
        Self::set_window_pos(hwnd, layout, position, flags.bits())
    }
@@ -402,8 +378,7 @@ impl WindowsApi {
        Self::set_window_pos(hwnd, &Rect::default(), position, flags.bits())
    }

-    /// set_window_pos calls SetWindowPos without any accounting for Window decorations.
-    fn set_window_pos(hwnd: HWND, layout: &Rect, position: HWND, flags: u32) -> Result<()> {
+    pub fn set_window_pos(hwnd: HWND, layout: &Rect, position: HWND, flags: u32) -> Result<()> {
        unsafe {
            SetWindowPos(
                hwnd,
@@ -495,36 +470,9 @@ impl WindowsApi {

    pub fn window_rect(hwnd: HWND) -> Result<Rect> {
        let mut rect = unsafe { std::mem::zeroed() };
+        unsafe { GetWindowRect(hwnd, &mut rect) }.process()?;

-        if Self::dwm_get_window_attribute(hwnd, DWMWA_EXTENDED_FRAME_BOUNDS, &mut rect).is_ok() {
-            // TODO(raggi): once we declare DPI awareness, we will need to scale the rect.
-            // let window_scale = unsafe { GetDpiForWindow(hwnd) };
-            // let system_scale = unsafe { GetDpiForSystem() };
-            // Ok(Rect::from(rect).scale(system_scale.try_into()?, window_scale.try_into()?))
-            Ok(Rect::from(rect))
-        } else {
-            unsafe { GetWindowRect(hwnd, &mut rect) }.process()?;
-            Ok(Rect::from(rect))
-        }
-    }
-
-    /// shadow_rect computes the offset of the shadow position of the window to
-    /// the window painted region. The four values in the returned Rect can be
-    /// added to a position rect to compute a size for set_window_pos that will
-    /// fill the target area, ignoring shadows.
-    fn shadow_rect(hwnd: HWND) -> Result<Rect> {
-        let window_rect = Self::window_rect(hwnd)?;
-
-        let mut srect = Default::default();
-        unsafe { GetWindowRect(hwnd, &mut srect) }.process()?;
-        let shadow_rect = Rect::from(srect);
-
-        Ok(Rect {
-            left: shadow_rect.left - window_rect.left,
-            top: shadow_rect.top - window_rect.top,
-            right: shadow_rect.right - window_rect.right,
-            bottom: shadow_rect.bottom - window_rect.bottom,
-        })
+        Ok(Rect::from(rect))
    }

    fn set_cursor_pos(x: i32, y: i32) -> Result<()> {
@@ -729,10 +677,6 @@ impl WindowsApi {
        unsafe { IsIconic(hwnd) }.into()
    }

-    pub fn is_zoomed(hwnd: HWND) -> bool {
-        unsafe { IsZoomed(hwnd) }.into()
-    }
-
    pub fn monitor_info_w(hmonitor: HMONITOR) -> Result<MONITORINFOEXW> {
        let mut ex_info = MONITORINFOEXW::default();
        ex_info.monitorInfo.cbSize = u32::try_from(std::mem::size_of::<MONITORINFOEXW>())?;
@@ -900,10 +844,10 @@ impl WindowsApi {
    pub fn create_border_window(name: PCWSTR, instance: HMODULE) -> Result<isize> {
        unsafe {
            let hwnd = CreateWindowExW(
-                WS_EX_TOOLWINDOW | WS_EX_LAYERED | WS_EX_TOPMOST | WS_EX_NOACTIVATE,
+                WS_EX_TOOLWINDOW | WS_EX_LAYERED,
                name,
                name,
-                WS_POPUP | WS_SYSMENU,
+                WS_POPUP | WS_SYSMENU | WS_MAXIMIZEBOX | WS_MINIMIZEBOX,
                CW_USEDEFAULT,
                CW_USEDEFAULT,
                CW_USEDEFAULT,
--- a/komorebi/src/windows_callbacks.rs
+++ b/komorebi/src/windows_callbacks.rs
@@ -13,13 +13,11 @@ use windows::Win32::Graphics::Gdi::BeginPaint;
 use windows::Win32::Graphics::Gdi::CreatePen;
 use windows::Win32::Graphics::Gdi::EndPaint;
 use windows::Win32::Graphics::Gdi::Rectangle;
-use windows::Win32::Graphics::Gdi::RoundRect;
 use windows::Win32::Graphics::Gdi::SelectObject;
 use windows::Win32::Graphics::Gdi::ValidateRect;
 use windows::Win32::Graphics::Gdi::HDC;
 use windows::Win32::Graphics::Gdi::HMONITOR;
 use windows::Win32::Graphics::Gdi::PAINTSTRUCT;
-use windows::Win32::Graphics::Gdi::PS_INSIDEFRAME;
 use windows::Win32::Graphics::Gdi::PS_SOLID;
 use windows::Win32::UI::Accessibility::HWINEVENTHOOK;
 use windows::Win32::UI::WindowsAndMessaging::DefWindowProcW;
@@ -39,15 +37,13 @@ use crate::ring::Ring;
 use crate::window::Window;
 use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_api::WindowsApi;
-use crate::winevent::WinEvent;
-use crate::winevent_listener;
+use crate::winevent_listener::WINEVENT_CALLBACK_CHANNEL;
 use crate::BORDER_COLOUR_CURRENT;
 use crate::BORDER_RECT;
 use crate::BORDER_WIDTH;
 use crate::DISPLAY_INDEX_PREFERENCES;
 use crate::MONITOR_INDEX_PREFERENCES;
 use crate::TRANSPARENCY_COLOUR;
-use crate::WINDOWS_11;

 pub extern "system" fn valid_display_monitors(
    hmonitor: HMONITOR,
@@ -150,17 +146,12 @@ pub extern "system" fn enum_window(hwnd: HWND, lparam: LPARAM) -> BOOL {
    let is_visible = WindowsApi::is_window_visible(hwnd);
    let is_window = WindowsApi::is_window(hwnd);
    let is_minimized = WindowsApi::is_iconic(hwnd);
-    let is_maximized = WindowsApi::is_zoomed(hwnd);

    if is_visible && is_window && !is_minimized {
        let window = Window { hwnd: hwnd.0 };

        if let Ok(should_manage) = window.should_manage(None) {
            if should_manage {
-                if is_maximized {
-                    WindowsApi::restore_window(hwnd);
-                }
-
                let mut container = Container::default();
                container.windows_mut().push_back(window);
                containers.push_back(container);
@@ -187,10 +178,7 @@ pub extern "system" fn win_event_hook(

    let window = Window { hwnd: hwnd.0 };

-    let winevent = match WinEvent::try_from(event) {
-        Ok(event) => event,
-        Err(_) => return,
-    };
+    let winevent = unsafe { ::std::mem::transmute(event) };
    let event_type = match WindowManagerEvent::from_win_event(winevent, window) {
        None => return,
        Some(event) => event,
@@ -198,9 +186,11 @@ pub extern "system" fn win_event_hook(

    if let Ok(should_manage) = window.should_manage(Option::from(event_type)) {
        if should_manage {
-            winevent_listener::event_tx()
+            WINEVENT_CALLBACK_CHANNEL
+                .lock()
+                .0
                .send(event_type)
-                .expect("could not send message on winevent_listener::event_tx");
+                .expect("could not send message on WINEVENT_CALLBACK_CHANNEL");
        }
    }
 }
@@ -218,7 +208,7 @@ pub extern "system" fn border_window(
                let mut ps = PAINTSTRUCT::default();
                let hdc = BeginPaint(window, &mut ps);
                let hpen = CreatePen(
-                    PS_SOLID | PS_INSIDEFRAME,
+                    PS_SOLID,
                    BORDER_WIDTH.load(Ordering::SeqCst),
                    COLORREF(BORDER_COLOUR_CURRENT.load(Ordering::SeqCst)),
                );
@@ -226,17 +216,7 @@ pub extern "system" fn border_window(

                SelectObject(hdc, hpen);
                SelectObject(hdc, hbrush);
-                // TODO(raggi): this is approximately the correct curvature for
-                // the top left of a Windows 11 window (DWMWCP_DEFAULT), but
-                // often the bottom right has a different shape. Furthermore if
-                // the window was made with DWMWCP_ROUNDSMALL then this is the
-                // wrong size.  In the future we should read the DWM properties
-                // of windows and attempt to match appropriately.
-                if *WINDOWS_11 {
-                    RoundRect(hdc, 0, 0, border_rect.right, border_rect.bottom, 20, 20);
-                } else {
-                    Rectangle(hdc, 0, 0, border_rect.right, border_rect.bottom);
-                }
+                Rectangle(hdc, 0, 0, border_rect.right, border_rect.bottom);
                EndPaint(window, &ps);
                ValidateRect(window, None);

@@ -261,9 +241,11 @@ pub extern "system" fn hidden_window(
        match message {
            WM_DISPLAYCHANGE => {
                let event_type = WindowManagerEvent::DisplayChange(Window { hwnd: window.0 });
-                winevent_listener::event_tx()
+                WINEVENT_CALLBACK_CHANNEL
+                    .lock()
+                    .0
                    .send(event_type)
-                    .expect("could not send message on winevent_listener::event_tx");
+                    .expect("could not send message on WINEVENT_CALLBACK_CHANNEL");

                LRESULT(0)
            }
@@ -274,9 +256,11 @@ pub extern "system" fn hidden_window(
                    || wparam.0 as u32 == SPI_ICONVERTICALSPACING.0
                {
                    let event_type = WindowManagerEvent::DisplayChange(Window { hwnd: window.0 });
-                    winevent_listener::event_tx()
+                    WINEVENT_CALLBACK_CHANNEL
+                        .lock()
+                        .0
                        .send(event_type)
-                        .expect("could not send message on winevent_listener::event_tx");
+                        .expect("could not send message on WINEVENT_CALLBACK_CHANNEL");
                }
                LRESULT(0)
            }
@@ -285,9 +269,11 @@ pub extern "system" fn hidden_window(
                #[allow(clippy::cast_possible_truncation)]
                if wparam.0 as u32 == DBT_DEVNODES_CHANGED {
                    let event_type = WindowManagerEvent::DisplayChange(Window { hwnd: window.0 });
-                    winevent_listener::event_tx()
+                    WINEVENT_CALLBACK_CHANNEL
+                        .lock()
+                        .0
                        .send(event_type)
-                        .expect("could not send message on winevent_listener::event_tx");
+                        .expect("could not send message on WINEVENT_CALLBACK_CHANNEL");
                }
                LRESULT(0)
            }
--- a/komorebi/src/winevent.rs
+++ b/komorebi/src/winevent.rs
@@ -1,7 +1,6 @@
 #![allow(clippy::use_self)]

 use schemars::JsonSchema;
-use serde::Deserialize;
 use serde::Serialize;
 use strum::Display;
 use windows::Win32::UI::WindowsAndMessaging::EVENT_AIA_END;
@@ -89,7 +88,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, JsonSchema)]
+#[derive(Clone, Copy, PartialEq, Eq, Debug, Serialize, Display, JsonSchema)]
 #[repr(u32)]
 #[allow(dead_code)]
 pub enum WinEvent {
@@ -178,100 +177,3 @@ pub enum WinEvent {
    UiaPropIdSEnd = EVENT_UIA_PROPID_END,
    UiaPropIdStart = EVENT_UIA_PROPID_START,
 }
-
-impl TryFrom<u32> for WinEvent {
-    type Error = ();
-
-    fn try_from(value: u32) -> Result<Self, Self::Error> {
-        match value {
-            EVENT_AIA_END => Ok(Self::AiaEnd),
-            EVENT_AIA_START => Ok(Self::AiaStart),
-            EVENT_CONSOLE_CARET => Ok(Self::ConsoleCaret),
-            EVENT_CONSOLE_END => Ok(Self::ConsoleEnd),
-            EVENT_CONSOLE_END_APPLICATION => Ok(Self::ConsoleEndApplication),
-            EVENT_CONSOLE_LAYOUT => Ok(Self::ConsoleLayout),
-            EVENT_CONSOLE_START_APPLICATION => Ok(Self::ConsoleStartApplication),
-            EVENT_CONSOLE_UPDATE_REGION => Ok(Self::ConsoleUpdateRegion),
-            EVENT_CONSOLE_UPDATE_SCROLL => Ok(Self::ConsoleUpdateScroll),
-            EVENT_CONSOLE_UPDATE_SIMPLE => Ok(Self::ConsoleUpdateSimple),
-            EVENT_OBJECT_ACCELERATORCHANGE => Ok(Self::ObjectAcceleratorChange),
-            EVENT_OBJECT_CLOAKED => Ok(Self::ObjectCloaked),
-            EVENT_OBJECT_CONTENTSCROLLED => Ok(Self::ObjectContentScrolled),
-            EVENT_OBJECT_CREATE => Ok(Self::ObjectCreate),
-            EVENT_OBJECT_DEFACTIONCHANGE => Ok(Self::ObjectDefActionChange),
-            EVENT_OBJECT_DESCRIPTIONCHANGE => Ok(Self::ObjectDescriptionChange),
-            EVENT_OBJECT_DESTROY => Ok(Self::ObjectDestroy),
-            EVENT_OBJECT_DRAGCANCEL => Ok(Self::ObjectDragCancel),
-            EVENT_OBJECT_DRAGCOMPLETE => Ok(Self::ObjectDragComplete),
-            EVENT_OBJECT_DRAGDROPPED => Ok(Self::ObjectDragDropped),
-            EVENT_OBJECT_DRAGENTER => Ok(Self::ObjectDragEnter),
-            EVENT_OBJECT_DRAGLEAVE => Ok(Self::ObjectDragLeave),
-            EVENT_OBJECT_DRAGSTART => Ok(Self::ObjectDragStart),
-            EVENT_OBJECT_END => Ok(Self::ObjectEnd),
-            EVENT_OBJECT_FOCUS => Ok(Self::ObjectFocus),
-            EVENT_OBJECT_HELPCHANGE => Ok(Self::ObjectHelpChange),
-            EVENT_OBJECT_HIDE => Ok(Self::ObjectHide),
-            EVENT_OBJECT_HOSTEDOBJECTSINVALIDATED => Ok(Self::ObjectHostedObjectsInvalidated),
-            EVENT_OBJECT_IME_CHANGE => Ok(Self::ObjectImeChange),
-            EVENT_OBJECT_IME_HIDE => Ok(Self::ObjectImeHide),
-            EVENT_OBJECT_IME_SHOW => Ok(Self::ObjectImeShow),
-            EVENT_OBJECT_INVOKED => Ok(Self::ObjectInvoked),
-            EVENT_OBJECT_LIVEREGIONCHANGED => Ok(Self::ObjectLiveRegionChanged),
-            EVENT_OBJECT_LOCATIONCHANGE => Ok(Self::ObjectLocationChange),
-            EVENT_OBJECT_NAMECHANGE => Ok(Self::ObjectNameChange),
-            EVENT_OBJECT_PARENTCHANGE => Ok(Self::ObjectParentChange),
-            EVENT_OBJECT_REORDER => Ok(Self::ObjectReorder),
-            EVENT_OBJECT_SELECTION => Ok(Self::ObjectSelection),
-            EVENT_OBJECT_SELECTIONADD => Ok(Self::ObjectSelectionAdd),
-            EVENT_OBJECT_SELECTIONREMOVE => Ok(Self::ObjectSelectionRemove),
-            EVENT_OBJECT_SELECTIONWITHIN => Ok(Self::ObjectSelectionWithin),
-            EVENT_OBJECT_SHOW => Ok(Self::ObjectShow),
-            EVENT_OBJECT_STATECHANGE => Ok(Self::ObjectStateChange),
-            EVENT_OBJECT_TEXTEDIT_CONVERSIONTARGETCHANGED => {
-                Ok(Self::ObjectTextEditConversionTargetChanged)
-            }
-            EVENT_OBJECT_TEXTSELECTIONCHANGED => Ok(Self::ObjectTextSelectionChanged),
-            EVENT_OBJECT_UNCLOAKED => Ok(Self::ObjectUncloaked),
-            EVENT_OBJECT_VALUECHANGE => Ok(Self::ObjectValueChange),
-            EVENT_OEM_DEFINED_END => Ok(Self::OemDefinedEnd),
-            EVENT_OEM_DEFINED_START => Ok(Self::OemDefinedStart),
-            EVENT_SYSTEM_ALERT => Ok(Self::SystemAlert),
-            EVENT_SYSTEM_ARRANGMENTPREVIEW => Ok(Self::SystemArrangementPreview),
-            EVENT_SYSTEM_CAPTUREEND => Ok(Self::SystemCaptureEnd),
-            EVENT_SYSTEM_CAPTURESTART => Ok(Self::SystemCaptureStart),
-            EVENT_SYSTEM_CONTEXTHELPEND => Ok(Self::SystemContextHelpEnd),
-            EVENT_SYSTEM_CONTEXTHELPSTART => Ok(Self::SystemContextHelpStart),
-            EVENT_SYSTEM_DESKTOPSWITCH => Ok(Self::SystemDesktopSwitch),
-            EVENT_SYSTEM_DIALOGEND => Ok(Self::SystemDialogEnd),
-            EVENT_SYSTEM_DIALOGSTART => Ok(Self::SystemDialogStart),
-            EVENT_SYSTEM_DRAGDROPEND => Ok(Self::SystemDragDropEnd),
-            EVENT_SYSTEM_DRAGDROPSTART => Ok(Self::SystemDragDropStart),
-            EVENT_SYSTEM_END => Ok(Self::SystemEnd),
-            EVENT_SYSTEM_FOREGROUND => Ok(Self::SystemForeground),
-            EVENT_SYSTEM_IME_KEY_NOTIFICATION => Ok(Self::SystemImeKeyNotification),
-            EVENT_SYSTEM_MENUEND => Ok(Self::SystemMenuEnd),
-            EVENT_SYSTEM_MENUPOPUPEND => Ok(Self::SystemMenuPopupEnd),
-            EVENT_SYSTEM_MENUPOPUPSTART => Ok(Self::SystemMenuPopupStart),
-            EVENT_SYSTEM_MENUSTART => Ok(Self::SystemMenuStart),
-            EVENT_SYSTEM_MINIMIZEEND => Ok(Self::SystemMinimizeEnd),
-            EVENT_SYSTEM_MINIMIZESTART => Ok(Self::SystemMinimizeStart),
-            EVENT_SYSTEM_MOVESIZEEND => Ok(Self::SystemMoveSizeEnd),
-            EVENT_SYSTEM_MOVESIZESTART => Ok(Self::SystemMoveSizeStart),
-            EVENT_SYSTEM_SCROLLINGEND => Ok(Self::SystemScrollingEnd),
-            EVENT_SYSTEM_SCROLLINGSTART => Ok(Self::SystemScrollingStart),
-            EVENT_SYSTEM_SOUND => Ok(Self::SystemSound),
-            EVENT_SYSTEM_SWITCHEND => Ok(Self::SystemSwitchEnd),
-            EVENT_SYSTEM_SWITCHER_APPDROPPED => Ok(Self::SystemSwitcherAppDropped),
-            EVENT_SYSTEM_SWITCHER_APPGRABBED => Ok(Self::SystemSwitcherAppGrabbed),
-            EVENT_SYSTEM_SWITCHER_APPOVERTARGET => Ok(Self::SystemSwitcherAppOverTarget),
-            EVENT_SYSTEM_SWITCHER_CANCELLED => Ok(Self::SystemSwitcherCancelled),
-            EVENT_SYSTEM_SWITCHSTART => Ok(Self::SystemSwitchStart),
-            EVENT_UIA_EVENTID_END => Ok(Self::UiaEventIdSEnd),
-            EVENT_UIA_EVENTID_START => Ok(Self::UiaEventIdStart),
-            EVENT_UIA_PROPID_END => Ok(Self::UiaPropIdSEnd),
-            EVENT_UIA_PROPID_START => Ok(Self::UiaPropIdStart),
-
-            _ => Err(()),
-        }
-    }
-}
--- a/komorebi/src/winevent_listener.rs
+++ b/komorebi/src/winevent_listener.rs
@@ -1,62 +1,105 @@
-use std::sync::OnceLock;
+use std::sync::atomic::AtomicIsize;
+use std::sync::atomic::Ordering;
+use std::sync::Arc;
+use std::time::Duration;

 use crossbeam_channel::Receiver;
 use crossbeam_channel::Sender;
+use lazy_static::lazy_static;
+use parking_lot::Mutex;
 use windows::Win32::Foundation::HWND;
 use windows::Win32::UI::Accessibility::SetWinEventHook;
 use windows::Win32::UI::WindowsAndMessaging::DispatchMessageW;
-use windows::Win32::UI::WindowsAndMessaging::GetMessageW;
+use windows::Win32::UI::WindowsAndMessaging::PeekMessageW;
 use windows::Win32::UI::WindowsAndMessaging::TranslateMessage;
 use windows::Win32::UI::WindowsAndMessaging::EVENT_MAX;
 use windows::Win32::UI::WindowsAndMessaging::EVENT_MIN;
 use windows::Win32::UI::WindowsAndMessaging::MSG;
+use windows::Win32::UI::WindowsAndMessaging::PM_REMOVE;

 use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_callbacks;

-static CHANNEL: OnceLock<(Sender<WindowManagerEvent>, Receiver<WindowManagerEvent>)> =
-    OnceLock::new();
+lazy_static! {
+    pub static ref WINEVENT_CALLBACK_CHANNEL: Arc<Mutex<(Sender<WindowManagerEvent>, Receiver<WindowManagerEvent>)>> =
+        Arc::new(Mutex::new(crossbeam_channel::unbounded()));
+}

-static EVENT_PUMP: OnceLock<std::thread::JoinHandle<()>> = OnceLock::new();
+#[derive(Debug, Clone)]
+pub struct WinEventListener {
+    hook: Arc<AtomicIsize>,
+    outgoing_events: Arc<Mutex<Sender<WindowManagerEvent>>>,
+}

-pub fn start() {
-    EVENT_PUMP.get_or_init(|| {
-        std::thread::spawn(move || {
+pub fn new(outgoing: Arc<Mutex<Sender<WindowManagerEvent>>>) -> WinEventListener {
+    WinEventListener {
+        hook: Arc::new(AtomicIsize::new(0)),
+        outgoing_events: outgoing,
+    }
+}
+
+impl WinEventListener {
+    pub fn start(self) {
+        let hook = self.hook.clone();
+        let outgoing = self.outgoing_events.lock().clone();
+
+        std::thread::spawn(move || unsafe {
+            let hook_ref = SetWinEventHook(
+                EVENT_MIN,
+                EVENT_MAX,
+                None,
+                Some(windows_callbacks::win_event_hook),
+                0,
+                0,
+                0,
+            );
+
+            hook.store(hook_ref.0, Ordering::SeqCst);
+
+            // The code in the callback doesn't work in its own loop, needs to be within
+            // the MessageLoop callback for the winevent callback to even fire
+            MessageLoop::start(10, |_msg| {
+                if let Ok(event) = WINEVENT_CALLBACK_CHANNEL.lock().1.try_recv() {
+                    match outgoing.send(event) {
+                        Ok(()) => {}
+                        Err(error) => {
+                            tracing::error!("{}", error);
+                        }
+                    }
+                }
+
+                true
+            });
+        });
+    }
+}
+
+#[derive(Debug, Copy, Clone)]
+pub struct MessageLoop;
+
+impl MessageLoop {
+    pub fn start(sleep: u64, cb: impl Fn(Option<MSG>) -> bool) {
+        Self::start_with_sleep(sleep, cb);
+    }
+
+    fn start_with_sleep(sleep: u64, cb: impl Fn(Option<MSG>) -> bool) {
+        let mut msg: MSG = MSG::default();
+        loop {
+            let mut value: Option<MSG> = None;
            unsafe {
-                SetWinEventHook(
-                    EVENT_MIN,
-                    EVENT_MAX,
-                    None,
-                    Some(windows_callbacks::win_event_hook),
-                    0,
-                    0,
-                    0,
-                )
-            };
-
-            loop {
-                let mut msg: MSG = MSG::default();
-                unsafe {
-                    if !GetMessageW(&mut msg, HWND(0), 0, 0).as_bool() {
-                        tracing::info!("windows event processing shutdown");
-                        break;
-                    };
+                if !bool::from(!PeekMessageW(&mut msg, HWND(0), 0, 0, PM_REMOVE)) {
                    TranslateMessage(&msg);
                    DispatchMessageW(&msg);
+
+                    value = Some(msg);
                }
            }
-        })
-    });
-}

-fn channel() -> &'static (Sender<WindowManagerEvent>, Receiver<WindowManagerEvent>) {
-    CHANNEL.get_or_init(crossbeam_channel::unbounded)
-}
+            std::thread::sleep(Duration::from_millis(sleep));

-pub fn event_tx() -> Sender<WindowManagerEvent> {
-    channel().0.clone()
-}
-
-pub fn event_rx() -> Receiver<WindowManagerEvent> {
-    channel().1.clone()
+            if !cb(value) {
+                break;
+            }
+        }
+    }
 }
--- a/komorebi/src/workspace.rs
+++ b/komorebi/src/workspace.rs
@@ -9,7 +9,6 @@ use getset::Getters;
 use getset::MutGetters;
 use getset::Setters;
 use schemars::JsonSchema;
-use serde::Deserialize;
 use serde::Serialize;

 use komorebi_core::Axis;
@@ -26,30 +25,25 @@ use crate::static_config::WorkspaceConfig;
 use crate::window::Window;
 use crate::window::WindowDetails;
 use crate::windows_api::WindowsApi;
-use crate::BORDER_OFFSET;
-use crate::BORDER_WIDTH;
 use crate::DEFAULT_CONTAINER_PADDING;
 use crate::DEFAULT_WORKSPACE_PADDING;
 use crate::INITIAL_CONFIGURATION_LOADED;
 use crate::NO_TITLEBAR;
 use crate::REMOVE_TITLEBARS;

-#[allow(clippy::struct_field_names)]
-#[derive(
-    Debug, Clone, Serialize, Deserialize, Getters, CopyGetters, MutGetters, Setters, JsonSchema,
-)]
+#[derive(Debug, Clone, Serialize, Getters, CopyGetters, MutGetters, Setters, JsonSchema)]
 pub struct Workspace {
    #[getset(get = "pub", set = "pub")]
    name: Option<String>,
    containers: Ring<Container>,
    #[getset(get = "pub", get_mut = "pub", set = "pub")]
    monocle_container: Option<Container>,
-    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(skip_serializing)]
    #[getset(get_copy = "pub", set = "pub")]
    monocle_container_restore_idx: Option<usize>,
    #[getset(get = "pub", get_mut = "pub", set = "pub")]
    maximized_window: Option<Window>,
-    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(skip_serializing)]
    #[getset(get_copy = "pub", set = "pub")]
    maximized_window_restore_idx: Option<usize>,
    #[getset(get = "pub", get_mut = "pub")]
@@ -64,6 +58,7 @@ pub struct Workspace {
    workspace_padding: Option<i32>,
    #[getset(get_copy = "pub", set = "pub")]
    container_padding: Option<i32>,
+    #[serde(skip_serializing)]
    #[getset(get = "pub", set = "pub")]
    latest_layout: Vec<Rect>,
    #[getset(get = "pub", get_mut = "pub", set = "pub")]
@@ -203,7 +198,12 @@ impl Workspace {
        Ok(())
    }

-    pub fn update(&mut self, work_area: &Rect, offset: Option<Rect>) -> Result<()> {
+    pub fn update(
+        &mut self,
+        work_area: &Rect,
+        offset: Option<Rect>,
+        invisible_borders: &Rect,
+    ) -> Result<()> {
        if !INITIAL_CONFIGURATION_LOADED.load(Ordering::SeqCst) {
            return Ok(());
        }
@@ -222,7 +222,7 @@ impl Workspace {
            },
        );

-        adjusted_work_area.add_padding(self.workspace_padding().unwrap_or_default());
+        adjusted_work_area.add_padding(self.workspace_padding());

        self.enforce_resize_constraints();

@@ -244,19 +244,11 @@ impl Workspace {
            }
        }

-        let managed_maximized_window = self.maximized_window().is_some();
-
        if *self.tile() {
            if let Some(container) = self.monocle_container_mut() {
                if let Some(window) = container.focused_window_mut() {
-                    adjusted_work_area.add_padding(container_padding.unwrap_or_default());
-                    {
-                        let border_offset = BORDER_OFFSET.load(Ordering::SeqCst);
-                        adjusted_work_area.add_padding(border_offset);
-                        let width = BORDER_WIDTH.load(Ordering::SeqCst);
-                        adjusted_work_area.add_padding(width);
-                    }
-                    window.set_position(&adjusted_work_area, true)?;
+                    adjusted_work_area.add_padding(container_padding);
+                    window.set_position(&adjusted_work_area, invisible_borders, true)?;
                };
            } else if let Some(window) = self.maximized_window_mut() {
                window.maximize();
@@ -285,22 +277,7 @@ impl Workspace {
                            window.add_title_bar()?;
                        }

-                        // If a window has been unmaximized via toggle-maximize, this block
-                        // will make sure that it is unmaximized via restore_window
-                        if window.is_maximized() && !managed_maximized_window {
-                            WindowsApi::restore_window(window.hwnd());
-                        }
-
-                        let mut rect = *layout;
-                        {
-                            let border_offset = BORDER_OFFSET.load(Ordering::SeqCst);
-                            rect.add_padding(border_offset);
-
-                            let width = BORDER_WIDTH.load(Ordering::SeqCst);
-                            rect.add_padding(width);
-                        }
-
-                        window.set_position(&rect, false)?;
+                        window.set_position(layout, invisible_borders, false)?;
                    }
                }

--- a/komorebic-no-console/Cargo.toml
+++ b/komorebic-no-console/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komorebic-no-console"
-version = "0.1.22-dev.0"
+version = "0.1.19"
 authors = ["Jade Iqbal <jadeiqbal@fastmail.com>"]
 description = "The command-line interface (without a console) for Komorebi, a tiling window manager for Windows"
 categories = ["cli", "tiling-window-manager", "windows"]
--- a/komorebic/Cargo.toml
+++ b/komorebic/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komorebic"
-version = "0.1.22-dev.0"
+version = "0.1.20"
 authors = ["Jade Iqbal <jadeiqbal@fastmail.com>"]
 description = "The command-line interface for Komorebi, a tiling window manager for Windows"
 categories = ["cli", "tiling-window-manager", "windows"]
@@ -31,5 +31,5 @@ serde_yaml = "0.9"
 sysinfo = "0.30"
 thiserror = "1"
 uds_windows = "1"
-which = "6"
+which = "5"
 windows = { workspace = true }
--- a/komorebic/src/main.rs
+++ b/komorebic/src/main.rs
@@ -5,9 +5,8 @@ use std::fs::File;
 use std::fs::OpenOptions;
 use std::io::BufRead;
 use std::io::BufReader;
-use std::io::Read;
+use std::io::ErrorKind;
 use std::io::Write;
-use std::net::Shutdown;
 use std::path::Path;
 use std::path::PathBuf;
 use std::process::Command;
@@ -21,7 +20,6 @@ use clap::ValueEnum;
 use color_eyre::eyre::anyhow;
 use color_eyre::eyre::bail;
 use color_eyre::Result;
-use dirs::data_local_dir;
 use fs_tail::TailedFile;
 use heck::ToKebabCase;
 use komorebi_core::resolve_home_path;
@@ -31,6 +29,7 @@ use miette::Report;
 use miette::SourceOffset;
 use miette::SourceSpan;
 use paste::paste;
+use uds_windows::UnixListener;
 use uds_windows::UnixStream;
 use which::which;
 use windows::Win32::Foundation::HWND;
@@ -721,25 +720,13 @@ struct LoadCustomLayout {
 }

 #[derive(Parser, AhkFunction)]
-struct SubscribeSocket {
-    /// Name of the socket to send event notifications to
-    socket: String,
-}
-
-#[derive(Parser, AhkFunction)]
-struct UnsubscribeSocket {
-    /// Name of the socket to stop sending event notifications to
-    socket: String,
-}
-
-#[derive(Parser, AhkFunction)]
-struct SubscribePipe {
+struct Subscribe {
    /// Name of the pipe to send event notifications to (without "\\.\pipe\" prepended)
    named_pipe: String,
 }

 #[derive(Parser, AhkFunction)]
-struct UnsubscribePipe {
+struct Unsubscribe {
    /// Name of the pipe to stop sending event notifications to (without "\\.\pipe\" prepended)
    named_pipe: String,
 }
@@ -805,14 +792,8 @@ enum SubCommand {
    Start(Start),
    /// Stop the komorebi.exe process and restore all hidden windows
    Stop(Stop),
-    /// Check komorebi configuration and related files for common errors
+    /// Output various important komorebi-related environment values
    Check,
-    /// Show the path to komorebi.json
-    #[clap(alias = "config")]
-    Configuration,
-    /// Show the path to whkdrc
-    #[clap(alias = "whkd")]
-    Whkdrc,
    /// Show a JSON representation of the current window manager state
    State,
    /// Show a JSON representation of visible windows
@@ -820,20 +801,12 @@ enum SubCommand {
    /// Query the current window manager state
    #[clap(arg_required_else_help = true)]
    Query(Query),
-    /// Subscribe to komorebi events using a Unix Domain Socket
+    /// Subscribe to komorebi events
    #[clap(arg_required_else_help = true)]
-    SubscribeSocket(SubscribeSocket),
+    Subscribe(Subscribe),
    /// Unsubscribe from komorebi events
    #[clap(arg_required_else_help = true)]
-    UnsubscribeSocket(UnsubscribeSocket),
-    /// Subscribe to komorebi events using a Named Pipe
-    #[clap(arg_required_else_help = true)]
-    #[clap(alias = "subscribe")]
-    SubscribePipe(SubscribePipe),
-    /// Unsubscribe from komorebi events
-    #[clap(arg_required_else_help = true)]
-    #[clap(alias = "unsubscribe")]
-    UnsubscribePipe(UnsubscribePipe),
+    Unsubscribe(Unsubscribe),
    /// Tail komorebi.exe's process logs (cancel with Ctrl-C)
    Log,
    /// Quicksave the current resize layout dimensions
@@ -1077,9 +1050,8 @@ enum SubCommand {
    WatchConfiguration(WatchConfiguration),
    /// Signal that the final configuration option has been sent
    CompleteConfiguration,
-    /// DEPRECATED since v0.1.22
+    /// Enable or disable a hack simulating ALT key presses to ensure focus changes succeed
    #[clap(arg_required_else_help = true)]
-    #[clap(hide = true)]
    AltFocusHack(AltFocusHack),
    /// Set the window behaviour when switching workspaces / cycling stacks
    #[clap(arg_required_else_help = true)]
@@ -1188,31 +1160,46 @@ enum SubCommand {
 pub fn send_message(bytes: &[u8]) -> Result<()> {
    let socket = DATA_DIR.join("komorebi.sock");

-    let mut stream = UnixStream::connect(socket)?;
-    stream.write_all(bytes)?;
-    Ok(stream.shutdown(Shutdown::Write)?)
+    let mut connected = false;
+    while !connected {
+        if let Ok(mut stream) = UnixStream::connect(&socket) {
+            connected = true;
+            stream.write_all(bytes)?;
+        }
+    }
+
+    Ok(())
 }

-pub fn send_query(bytes: &[u8]) -> Result<String> {
-    let socket = DATA_DIR.join("komorebi.sock");
+fn with_komorebic_socket<F: Fn() -> Result<()>>(f: F) -> Result<()> {
+    let socket = DATA_DIR.join("komorebic.sock");

-    let mut stream = UnixStream::connect(socket)?;
-    stream.write_all(bytes)?;
-    stream.shutdown(Shutdown::Write)?;
+    match std::fs::remove_file(&socket) {
+        Ok(()) => {}
+        Err(error) => match error.kind() {
+            // Doing this because ::exists() doesn't work reliably on Windows via IntelliJ
+            ErrorKind::NotFound => {}
+            _ => {
+                return Err(error.into());
+            }
+        },
+    };

-    let mut reader = BufReader::new(stream);
-    let mut response = String::new();
-    reader.read_to_string(&mut response)?;
+    f()?;

-    Ok(response)
-}
+    let listener = UnixListener::bind(socket)?;
+    match listener.accept() {
+        Ok(incoming) => {
+            let stream = BufReader::new(incoming.0);
+            for line in stream.lines() {
+                println!("{}", line?);
+            }

-// print_query is a helper that queries komorebi and prints the response.
-// panics on error.
-fn print_query(bytes: &[u8]) {
-    match send_query(bytes) {
-        Ok(response) => println!("{response}"),
-        Err(error) => panic!("{}", error),
+            Ok(())
+        }
+        Err(error) => {
+            panic!("{}", error);
+        }
    }
 }

@@ -1260,10 +1247,7 @@ fn main() -> Result<()> {

            let home_dir = dirs::home_dir().expect("could not find home dir");
            let config_dir = home_dir.join(".config");
-            let local_appdata_dir = data_local_dir().expect("could not find localdata dir");
-            let data_dir = local_appdata_dir.join("komorebi");
            std::fs::create_dir_all(&config_dir)?;
-            std::fs::create_dir_all(data_dir)?;

            let komorebi_json = reqwest::blocking::get(
                format!("https://raw.githubusercontent.com/LGUG2Z/komorebi/v{version}/komorebi.example.json")
@@ -1421,20 +1405,6 @@ fn main() -> Result<()> {
                println!("If running 'komorebic start --await-configuration', you will manually have to call the following command to begin tiling: komorebic complete-configuration\n");
            }
        }
-        SubCommand::Configuration => {
-            let static_config = HOME_DIR.join("komorebi.json");
-
-            if static_config.exists() {
-                println!("{}", static_config.display());
-            }
-        }
-        SubCommand::Whkdrc => {
-            let whkdrc = WHKD_CONFIG_DIR.join("whkdrc");
-
-            if whkdrc.exists() {
-                println!("{}", whkdrc.display());
-            }
-        }
        SubCommand::AhkLibrary => {
            let library = HOME_DIR.join("komorebic.lib.ahk");
            let mut file = OpenOptions::new()
@@ -1468,7 +1438,7 @@ fn main() -> Result<()> {
            let color_log = std::env::temp_dir().join("komorebi.log");
            let file = TailedFile::new(File::open(color_log)?);
            let locked = file.lock();
-            #[allow(clippy::significant_drop_in_scrutinee, clippy::lines_filter_map_ok)]
+            #[allow(clippy::significant_drop_in_scrutinee)]
            for line in locked.lines().flatten() {
                println!("{line}");
            }
@@ -1765,7 +1735,7 @@ fn main() -> Result<()> {
            let exec = if let Ok(output) = Command::new("where.exe").arg("komorebi.ps1").output() {
                let stdout = String::from_utf8(output.stdout)?;
                match stdout.trim() {
-                    "" => None,
+                    stdout if stdout.is_empty() => None,
                    // It's possible that a komorebi.ps1 config will be in %USERPROFILE% - ignore this
                    stdout if !stdout.contains("scoop") => None,
                    stdout => {
@@ -2026,13 +1996,15 @@ Stop-Process -Name:whkd -ErrorAction SilentlyContinue
            )?;
        }
        SubCommand::State => {
-            print_query(&SocketMessage::State.as_bytes()?);
+            with_komorebic_socket(|| send_message(&SocketMessage::State.as_bytes()?))?;
        }
        SubCommand::VisibleWindows => {
-            print_query(&SocketMessage::VisibleWindows.as_bytes()?);
+            with_komorebic_socket(|| send_message(&SocketMessage::VisibleWindows.as_bytes()?))?;
        }
        SubCommand::Query(arg) => {
-            print_query(&SocketMessage::Query(arg.state_query).as_bytes()?);
+            with_komorebic_socket(|| {
+                send_message(&SocketMessage::Query(arg.state_query).as_bytes()?)
+            })?;
        }
        SubCommand::RestoreWindows => {
            let hwnd_json = DATA_DIR.join("komorebi.hwnd.json");
@@ -2123,17 +2095,11 @@ Stop-Process -Name:whkd -ErrorAction SilentlyContinue
        SubCommand::LoadResize(arg) => {
            send_message(&SocketMessage::Load(resolve_home_path(arg.path)?).as_bytes()?)?;
        }
-        SubCommand::SubscribeSocket(arg) => {
-            send_message(&SocketMessage::AddSubscriberSocket(arg.socket).as_bytes()?)?;
+        SubCommand::Subscribe(arg) => {
+            send_message(&SocketMessage::AddSubscriber(arg.named_pipe).as_bytes()?)?;
        }
-        SubCommand::UnsubscribeSocket(arg) => {
-            send_message(&SocketMessage::RemoveSubscriberSocket(arg.socket).as_bytes()?)?;
-        }
-        SubCommand::SubscribePipe(arg) => {
-            send_message(&SocketMessage::AddSubscriberPipe(arg.named_pipe).as_bytes()?)?;
-        }
-        SubCommand::UnsubscribePipe(arg) => {
-            send_message(&SocketMessage::RemoveSubscriberPipe(arg.named_pipe).as_bytes()?)?;
+        SubCommand::Unsubscribe(arg) => {
+            send_message(&SocketMessage::RemoveSubscriber(arg.named_pipe).as_bytes()?)?;
        }
        SubCommand::ToggleMouseFollowsFocus => {
            send_message(&SocketMessage::ToggleMouseFollowsFocus.as_bytes()?)?;
@@ -2269,19 +2235,23 @@ Stop-Process -Name:whkd -ErrorAction SilentlyContinue
            );
        }
        SubCommand::ApplicationSpecificConfigurationSchema => {
-            print_query(&SocketMessage::ApplicationSpecificConfigurationSchema.as_bytes()?);
+            with_komorebic_socket(|| {
+                send_message(&SocketMessage::ApplicationSpecificConfigurationSchema.as_bytes()?)
+            })?;
        }
        SubCommand::NotificationSchema => {
-            print_query(&SocketMessage::NotificationSchema.as_bytes()?);
+            with_komorebic_socket(|| send_message(&SocketMessage::NotificationSchema.as_bytes()?))?;
        }
        SubCommand::SocketSchema => {
-            print_query(&SocketMessage::SocketSchema.as_bytes()?);
+            with_komorebic_socket(|| send_message(&SocketMessage::SocketSchema.as_bytes()?))?;
        }
        SubCommand::StaticConfigSchema => {
-            print_query(&SocketMessage::StaticConfigSchema.as_bytes()?);
+            with_komorebic_socket(|| send_message(&SocketMessage::StaticConfigSchema.as_bytes()?))?;
        }
        SubCommand::GenerateStaticConfig => {
-            print_query(&SocketMessage::GenerateStaticConfig.as_bytes()?);
+            with_komorebic_socket(|| {
+                send_message(&SocketMessage::GenerateStaticConfig.as_bytes()?)
+            })?;
        }
    }

--- a/schema.json
+++ b/schema.json
@@ -19,127 +19,100 @@
      "properties": {
        "monocle": {
          "description": "Border colour when the container is in monocle mode",
-          "anyOf": [
-            {
-              "description": "Colour represented as RGB",
-              "type": "object",
-              "required": [
-                "b",
-                "g",
-                "r"
-              ],
-              "properties": {
-                "b": {
-                  "description": "Blue",
-                  "type": "integer",
-                  "format": "uint32",
-                  "minimum": 0.0
-                },
-                "g": {
-                  "description": "Green",
-                  "type": "integer",
-                  "format": "uint32",
-                  "minimum": 0.0
-                },
-                "r": {
-                  "description": "Red",
-                  "type": "integer",
-                  "format": "uint32",
-                  "minimum": 0.0
-                }
-              }
+          "type": "object",
+          "required": [
+            "b",
+            "g",
+            "r"
+          ],
+          "properties": {
+            "b": {
+              "description": "Blue",
+              "type": "integer",
+              "format": "uint32",
+              "minimum": 0.0
            },
-            {
-              "description": "Colour represented as Hex",
-              "type": "string"
+            "g": {
+              "description": "Green",
+              "type": "integer",
+              "format": "uint32",
+              "minimum": 0.0
+            },
+            "r": {
+              "description": "Red",
+              "type": "integer",
+              "format": "uint32",
+              "minimum": 0.0
            }
-          ]
+          }
        },
        "single": {
          "description": "Border colour when the container contains a single window",
-          "anyOf": [
-            {
-              "description": "Colour represented as RGB",
-              "type": "object",
-              "required": [
-                "b",
-                "g",
-                "r"
-              ],
-              "properties": {
-                "b": {
-                  "description": "Blue",
-                  "type": "integer",
-                  "format": "uint32",
-                  "minimum": 0.0
-                },
-                "g": {
-                  "description": "Green",
-                  "type": "integer",
-                  "format": "uint32",
-                  "minimum": 0.0
-                },
-                "r": {
-                  "description": "Red",
-                  "type": "integer",
-                  "format": "uint32",
-                  "minimum": 0.0
-                }
-              }
+          "type": "object",
+          "required": [
+            "b",
+            "g",
+            "r"
+          ],
+          "properties": {
+            "b": {
+              "description": "Blue",
+              "type": "integer",
+              "format": "uint32",
+              "minimum": 0.0
            },
-            {
-              "description": "Colour represented as Hex",
-              "type": "string"
+            "g": {
+              "description": "Green",
+              "type": "integer",
+              "format": "uint32",
+              "minimum": 0.0
+            },
+            "r": {
+              "description": "Red",
+              "type": "integer",
+              "format": "uint32",
+              "minimum": 0.0
            }
-          ]
+          }
        },
        "stack": {
          "description": "Border colour when the container contains multiple windows",
-          "anyOf": [
-            {
-              "description": "Colour represented as RGB",
-              "type": "object",
-              "required": [
-                "b",
-                "g",
-                "r"
-              ],
-              "properties": {
-                "b": {
-                  "description": "Blue",
-                  "type": "integer",
-                  "format": "uint32",
-                  "minimum": 0.0
-                },
-                "g": {
-                  "description": "Green",
-                  "type": "integer",
-                  "format": "uint32",
-                  "minimum": 0.0
-                },
-                "r": {
-                  "description": "Red",
-                  "type": "integer",
-                  "format": "uint32",
-                  "minimum": 0.0
-                }
-              }
+          "type": "object",
+          "required": [
+            "b",
+            "g",
+            "r"
+          ],
+          "properties": {
+            "b": {
+              "description": "Blue",
+              "type": "integer",
+              "format": "uint32",
+              "minimum": 0.0
            },
-            {
-              "description": "Colour represented as Hex",
-              "type": "string"
+            "g": {
+              "description": "Green",
+              "type": "integer",
+              "format": "uint32",
+              "minimum": 0.0
+            },
+            "r": {
+              "description": "Red",
+              "type": "integer",
+              "format": "uint32",
+              "minimum": 0.0
            }
-          ]
+          }
        }
      }
    },
    "active_window_border_offset": {
-      "description": "Offset of the active window border (default: -1)",
+      "description": "Offset of the active window border (default: None)",
      "type": "integer",
      "format": "int32"
    },
    "active_window_border_width": {
-      "description": "Width of the active window border (default: 8)",
+      "description": "Width of the active window border (default: 20)",
      "type": "integer",
      "format": "int32"
    },
Author	SHA1	Message	Date
LGUG2Z	2b1f443f05	chore(release): v0.1.20	2024-02-15 12:11:05 -08:00
LGUG2Z	10301d57d1	docs(readme): add references to docs website	2024-02-15 12:11:05 -08:00
LGUG2Z	2e0c7430ef	docs(mkdocs): add common workflows section	2024-02-15 12:11:05 -08:00
LGUG2Z	9a6f831d51	feat(config): reduce noise in jsonschema output	2024-02-15 12:11:05 -08:00
LGUG2Z	326a29e3ee	docs(mkdocs): link to ext jsonschema docgen	2024-02-15 12:11:05 -08:00
LGUG2Z	daf9eeded1	docs(mkdocs): add cli reference	2024-02-15 12:11:05 -08:00
LGUG2Z	cc4e448741	feat(cli): add docgen cmd for mkdocs pages	2024-02-15 12:11:05 -08:00
LGUG2Z	9d3e0a01b9	docs(mkdocs): add index and getting started sections	2024-02-15 12:11:05 -08:00
LGUG2Z	6f08ec1cb3	docs(mkdocs): start building dedicated site	2024-02-15 12:11:05 -08:00