fix(tcp): use threads to allow multiple conns

2026-02-20 04:07:40 +01:00 · 2022-09-13 16:51:43 -07:00
27 changed files with 501 additions and 988 deletions
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -121,7 +121,8 @@ jobs:
    if: startsWith(github.ref, 'refs/tags/v')

    steps:
-      - uses: vedantmgoyal2009/winget-releaser@v1
+      - uses: vedantmgoyal2009/winget-releaser@latest
        with:
          identifier: LGUG2Z.komorebi
+          release-tag: ${{ github.ref }}
          token: ${{ secrets.WINGET_TOKEN }}
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17,6 +17,15 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"

+[[package]]
+name = "ansi_term"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+dependencies = [
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "atty"
 version = "0.2.14"
@@ -57,9 +66,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

 [[package]]
 name = "cc"
-version = "1.0.76"
+version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f"
+checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"

 [[package]]
 name = "cfg-if"
@@ -75,25 +84,27 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "clap"
-version = "4.0.22"
+version = "3.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91b9970d7505127a162fdaa9b96428d28a479ba78c9ec7550a63a5d9863db682"
+checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd"
 dependencies = [
 "atty",
 "bitflags",
 "clap_derive",
 "clap_lex",
+ "indexmap",
 "once_cell",
 "strsim",
 "termcolor",
 "terminal_size",
+ "textwrap",
 ]

 [[package]]
 name = "clap_derive"
-version = "4.0.21"
+version = "3.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014"
+checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
 dependencies = [
 "heck",
 "proc-macro-error",
@@ -104,9 +115,9 @@ dependencies = [

 [[package]]
 name = "clap_lex"
-version = "0.3.0"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
 dependencies = [
 "os_str_bytes",
 ]
@@ -167,24 +178,26 @@ dependencies = [

 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.11"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348"
+checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1"
 dependencies = [
 "autocfg",
 "cfg-if 1.0.0",
 "crossbeam-utils",
 "memoffset",
+ "once_cell",
 "scopeguard",
 ]

 [[package]]
 name = "crossbeam-utils"
-version = "0.8.12"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"
+checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc"
 dependencies = [
 "cfg-if 1.0.0",
+ "once_cell",
 ]

 [[package]]
@@ -238,27 +251,6 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"

-[[package]]
-name = "errno"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
 [[package]]
 name = "eyre"
 version = "0.6.8"
@@ -280,14 +272,14 @@ dependencies = [

 [[package]]
 name = "filetime"
-version = "0.2.18"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3"
+checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c"
 dependencies = [
 "cfg-if 1.0.0",
 "libc",
 "redox_syscall",
- "windows-sys 0.42.0",
+ "windows-sys 0.36.1",
 ]

 [[package]]
@@ -342,9 +334,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"

 [[package]]
 name = "getrandom"
-version = "0.2.8"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
 dependencies = [
 "cfg-if 1.0.0",
 "libc",
@@ -445,12 +437,6 @@ dependencies = [
 "cfg-if 1.0.0",
 ]

-[[package]]
-name = "io-lifetimes"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074"
-
 [[package]]
 name = "iovec"
 version = "0.1.4"
@@ -462,9 +448,9 @@ dependencies = [

 [[package]]
 name = "itoa"
-version = "1.0.4"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
+checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"

 [[package]]
 name = "kernel32-sys"
@@ -478,7 +464,7 @@ dependencies = [

 [[package]]
 name = "komorebi"
-version = "0.1.14"
+version = "0.1.13"
 dependencies = [
 "bitflags",
 "clap",
@@ -514,7 +500,7 @@ dependencies = [

 [[package]]
 name = "komorebi-core"
-version = "0.1.14"
+version = "0.1.13"
 dependencies = [
 "clap",
 "color-eyre",
@@ -528,7 +514,7 @@ dependencies = [

 [[package]]
 name = "komorebic"
-version = "0.1.14"
+version = "0.1.13"
 dependencies = [
 "clap",
 "color-eyre",
@@ -562,21 +548,15 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"

 [[package]]
 name = "libc"
-version = "0.2.137"
+version = "0.2.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.0.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
+checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"

 [[package]]
 name = "lock_api"
-version = "0.4.9"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
 dependencies = [
 "autocfg",
 "scopeguard",
@@ -617,9 +597,9 @@ dependencies = [

 [[package]]
 name = "miniz_oxide"
-version = "0.5.4"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34"
+checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc"
 dependencies = [
 "adler",
 ]
@@ -687,9 +667,9 @@ dependencies = [

 [[package]]
 name = "net2"
-version = "0.2.38"
+version = "0.2.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631"
+checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
 dependencies = [
 "cfg-if 0.1.10",
 "libc",
@@ -728,33 +708,32 @@ dependencies = [

 [[package]]
 name = "ntapi"
-version = "0.4.0"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc"
+checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"
 dependencies = [
 "winapi 0.3.9",
 ]

-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "num_cpus"
-version = "1.14.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
+checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
 dependencies = [
 "hermit-abi",
 "libc",
 ]

+[[package]]
+name = "num_threads"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "object"
 version = "0.29.0"
@@ -766,15 +745,15 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.16.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
+checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e"

 [[package]]
 name = "os_info"
-version = "3.5.1"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4750134fb6a5d49afc80777394ad5d95b04bc12068c6abb92fae8f43817270f"
+checksum = "5209b2162b2c140df493a93689e04f8deab3a67634f5bc7a553c0a98e5b8d399"
 dependencies = [
 "log",
 "serde",
@@ -783,15 +762,9 @@ dependencies = [

 [[package]]
 name = "os_str_bytes"
-version = "6.3.1"
+version = "6.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3baf96e39c5359d2eb0dd6ccb42c62b91d9678aa68160d261b9e0ccbf9e9dea9"
-
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"

 [[package]]
 name = "owo-colors"
@@ -811,9 +784,9 @@ dependencies = [

 [[package]]
 name = "parking_lot_core"
-version = "0.9.4"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0"
+checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
 dependencies = [
 "backtrace",
 "cfg-if 1.0.0",
@@ -822,7 +795,7 @@ dependencies = [
 "redox_syscall",
 "smallvec",
 "thread-id",
- "windows-sys 0.42.0",
+ "windows-sys 0.36.1",
 ]

 [[package]]
@@ -855,9 +828,9 @@ checksum = "54bde2e1a395c0aee9423072d781610da37b7b120edf17d4da99f83d04f2cd54"

 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"

 [[package]]
 name = "proc-macro-error"
@@ -885,9 +858,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.47"
+version = "1.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
 dependencies = [
 "unicode-ident",
 ]
@@ -924,9 +897,9 @@ dependencies = [

 [[package]]
 name = "rand_core"
-version = "0.6.4"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
 dependencies = [
 "getrandom",
 ]
@@ -977,9 +950,9 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.7.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
+checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
 dependencies = [
 "regex-syntax",
 ]
@@ -995,9 +968,9 @@ dependencies = [

 [[package]]
 name = "regex-syntax"
-version = "0.6.28"
+version = "0.6.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"

 [[package]]
 name = "remove_dir_all"
@@ -1014,20 +987,6 @@ version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"

-[[package]]
-name = "rustix"
-version = "0.35.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9"
-dependencies = [
- "bitflags",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.42.0",
-]
-
 [[package]]
 name = "rustversion"
 version = "1.0.9"
@@ -1051,9 +1010,9 @@ dependencies = [

 [[package]]
 name = "schemars"
-version = "0.8.11"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a5fb6c61f29e723026dc8e923d94c694313212abbecbbe5f55a7748eec5b307"
+checksum = "1847b767a3d62d95cbf3d8a9f0e421cf57a0d8aa4f411d4b16525afb0284d4ed"
 dependencies = [
 "dyn-clone",
 "schemars_derive",
@@ -1063,9 +1022,9 @@ dependencies = [

 [[package]]
 name = "schemars_derive"
-version = "0.8.11"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f188d036977451159430f3b8dc82ec76364a42b7e289c2b18a9a18f4470058e9"
+checksum = "af4d7e1b012cb3d9129567661a63755ea4b8a7386d339dc945ae187e403c6743"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1081,18 +1040,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"

 [[package]]
 name = "serde"
-version = "1.0.147"
+version = "1.0.144"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
+checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.147"
+version = "1.0.144"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
+checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1112,9 +1071,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.87"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45"
+checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
 dependencies = [
 "itoa",
 "ryu",
@@ -1123,9 +1082,9 @@ dependencies = [

 [[package]]
 name = "serde_yaml"
-version = "0.9.14"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d232d893b10de3eb7258ff01974d6ee20663d8e833263c99409d4b13a0209da"
+checksum = "89f31df3f50926cdf2855da5fd8812295c34752cb20438dae42a67f79e021ac3"
 dependencies = [
 "indexmap",
 "itoa",
@@ -1154,9 +1113,9 @@ dependencies = [

 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"

 [[package]]
 name = "strsim"
@@ -1188,9 +1147,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "1.0.103"
+version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d"
+checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1199,9 +1158,9 @@ dependencies = [

 [[package]]
 name = "sysinfo"
-version = "0.26.7"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c375d5fd899e32847b8566e10598d6e9f1d9b55ec6de3cdf9e7da4bdc51371bc"
+checksum = "4ae2421f3e16b3afd4aa692d23b83d0ba42ee9b0081d5deeb7d21428d7195fb1"
 dependencies = [
 "cfg-if 1.0.0",
 "core-foundation-sys",
@@ -1237,28 +1196,37 @@ dependencies = [

 [[package]]
 name = "terminal_size"
-version = "0.2.2"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ca90c434fd12083d1a6bdcbe9f92a14f96c8a1ba600ba451734ac334521f7a"
+checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df"
 dependencies = [
- "rustix",
- "windows-sys 0.42.0",
+ "libc",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
+dependencies = [
+ "terminal_size",
 ]

 [[package]]
 name = "thiserror"
-version = "1.0.37"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
+checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.37"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
+checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1287,36 +1255,20 @@ dependencies = [

 [[package]]
 name = "time"
-version = "0.3.17"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
+checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b"
 dependencies = [
 "itoa",
- "serde",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
-
-[[package]]
-name = "time-macros"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"
-dependencies = [
- "time-core",
+ "libc",
+ "num_threads",
 ]

 [[package]]
 name = "tracing"
-version = "0.1.37"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307"
 dependencies = [
 "cfg-if 1.0.0",
 "pin-project-lite",
@@ -1337,9 +1289,9 @@ dependencies = [

 [[package]]
 name = "tracing-attributes"
-version = "0.1.23"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
+checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1348,9 +1300,9 @@ dependencies = [

 [[package]]
 name = "tracing-core"
-version = "0.1.30"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7"
 dependencies = [
 "once_cell",
 "valuable",
@@ -1379,12 +1331,12 @@ dependencies = [

 [[package]]
 name = "tracing-subscriber"
-version = "0.3.16"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70"
+checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b"
 dependencies = [
+ "ansi_term",
 "matchers",
- "nu-ansi-term",
 "once_cell",
 "regex",
 "sharded-slab",
@@ -1407,15 +1359,15 @@ dependencies = [

 [[package]]
 name = "unicode-ident"
-version = "1.0.5"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"

 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.4"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e5fa573d8ac5f1a856f8d7be41d390ee973daf97c806b2c1a465e4e1406e68"
+checksum = "931179334a56395bcf64ba5e0ff56781381c1a5832178280c7d7f91d1679aeb0"

 [[package]]
 name = "valuable"
@@ -1502,17 +1454,15 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

 [[package]]
 name = "windows"
-version = "0.43.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244"
+checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.0",
- "windows_i686_gnu 0.42.0",
- "windows_i686_msvc 0.42.0",
- "windows_x86_64_gnu 0.42.0",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.0",
+ "windows_aarch64_msvc 0.39.0",
+ "windows_i686_gnu 0.39.0",
+ "windows_i686_msvc 0.39.0",
+ "windows_x86_64_gnu 0.39.0",
+ "windows_x86_64_msvc 0.39.0",
 ]

 [[package]]
@@ -1530,25 +1480,17 @@ dependencies = [

 [[package]]
 name = "windows-sys"
-version = "0.42.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.0",
- "windows_i686_gnu 0.42.0",
- "windows_i686_msvc 0.42.0",
- "windows_x86_64_gnu 0.42.0",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.0",
+ "windows_aarch64_msvc 0.36.1",
+ "windows_i686_gnu 0.36.1",
+ "windows_i686_msvc 0.36.1",
+ "windows_x86_64_gnu 0.36.1",
+ "windows_x86_64_msvc 0.36.1",
 ]

-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.28.0"
@@ -1557,9 +1499,15 @@ checksum = "52695a41e536859d5308cc613b4a022261a274390b25bd29dfff4bf08505f3c2"

 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
+checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2"

 [[package]]
 name = "windows_i686_gnu"
@@ -1569,9 +1517,15 @@ checksum = "f54725ac23affef038fecb177de6c9bf065787c2f432f79e3c373da92f3e1d8a"

 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
+checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b"

 [[package]]
 name = "windows_i686_msvc"
@@ -1581,9 +1535,15 @@ checksum = "51d5158a43cc43623c0729d1ad6647e62fa384a3d135fd15108d37c683461f64"

 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
+checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106"

 [[package]]
 name = "windows_x86_64_gnu"
@@ -1593,15 +1553,15 @@ checksum = "bc31f409f565611535130cfe7ee8e6655d3fa99c1c61013981e491921b5ce954"

 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"

 [[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.0"
+name = "windows_x86_64_gnu"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
+checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65"

 [[package]]
 name = "windows_x86_64_msvc"
@@ -1611,9 +1571,15 @@ checksum = "3f2b8c7cbd3bfdddd9ab98769f9746a7fad1bca236554cd032b78d768bc0e89f"

 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
+checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809"

 [[package]]
 name = "winput"
--- a/README.md
+++ b/README.md
@@ -2,27 +2,12 @@

 Tiling Window Management for Windows.

-<p>
-  <img alt="GitHub Workflow Status" src="https://img.shields.io/github/workflow/status/LGUG2Z/komorebi/Windows">
-  <img alt="GitHub" src="https://img.shields.io/github/license/LGUG2Z/komorebi">
-  <img alt="GitHub all releases" src="https://img.shields.io/github/downloads/LGUG2Z/komorebi/total">
-  <img alt="GitHub commits since latest release (by date) for a branch" src="https://img.shields.io/github/commits-since/LGUG2Z/komorebi/latest">
-  <a href="https://discord.gg/mGkn66PHkx">
-    <img alt="Discord" src="https://img.shields.io/discord/898554690126630914">
-  </a>
-  <a href="https://github.com/sponsors/LGUG2Z">
-    <img alt="GitHub Sponsors" src="https://img.shields.io/github/sponsors/LGUG2Z">
-  </a>
-  <a href="https://notado.app/feeds/jado/software-development">
-    <img alt="Notado Feed" src="https://img.shields.io/badge/Notado-Subscribe-informational">
-  </a>
-  <a href="https://jeezy.substack.com">
-    <img alt="Substack Read" src="https://img.shields.io/badge/Substack-Read-orange">
-  </a>
-  <a href="https://twitter.com/LGUG2Z">
-    <img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/LGUG2Z">
-  </a>
-</p>
+![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/LGUG2Z/komorebi/Windows/master)
+![GitHub](https://img.shields.io/github/license/LGUG2Z/komorebi)
+![GitHub all releases](https://img.shields.io/github/downloads/LGUG2Z/komorebi/total)
+![GitHub commits since latest release (by date) for a branch](https://img.shields.io/github/commits-since/LGUG2Z/komorebi/latest/master)
+![Discord](https://img.shields.io/discord/898554690126630914?label=discord)
+![GitHub Sponsors](https://img.shields.io/github/sponsors/LGUG2Z)

 ![screenshot](https://user-images.githubusercontent.com/13164844/184027064-f5a6cec2-2865-4d65-a549-a1f1da589abf.png)

--- a/derive-ahk/src/lib.rs
+++ b/derive-ahk/src/lib.rs
@@ -129,7 +129,7 @@ pub fn ahk_function(input: ::proc_macro::TokenStream) -> ::proc_macro::TokenStre
                            fn generate_ahk_function() -> String {
                                ::std::format!(r#"
 {}({}) {{
-    RunWait, komorebic.exe {} {} {}, , Hide
+    Run, komorebic.exe {} {} {}, , Hide
 }}"#,
                                    ::std::stringify!(#name),
                                    #all_arguments,
@@ -148,7 +148,7 @@ pub fn ahk_function(input: ::proc_macro::TokenStream) -> ::proc_macro::TokenStre
                            fn generate_ahk_function() -> String {
                                ::std::format!(r#"
 {}({}) {{
-    RunWait, komorebic.exe {} {}, , Hide
+    Run, komorebic.exe {} {}, , Hide
 }}"#, 
                                    ::std::stringify!(#name),
                                    #arguments,
@@ -194,7 +194,7 @@ pub fn ahk_library(input: ::proc_macro::TokenStream) -> ::proc_macro::TokenStrea
                        stream.extend(quote! {
                            v.push(::std::format!(r#"
 {}() {{
-    RunWait, komorebic.exe {}, , Hide
+    Run, komorebic.exe {}, , Hide
 }}"#, 
                                ::std::stringify!(#name),
                                ::std::stringify!(#name).to_kebab_case()
--- a/komorebi-core/Cargo.toml
+++ b/komorebi-core/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "komorebi-core"
-version = "0.1.14"
+version = "0.1.13"
 edition = "2021"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-clap = { version = "4", features = ["derive"] }
+clap = { version = "3", features = ["derive"] }
 color-eyre = "0.6"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
@@ -15,7 +15,7 @@ strum = { version = "0.24", features = ["derive"] }
 schemars = "0.8"

 [dependencies.windows]
-version = "0.43"
+version = "0.39"
 features = [
    "Win32_Foundation",
 ]
--- a/komorebi-core/src/arrangement.rs
+++ b/komorebi-core/src/arrangement.rs
@@ -1,6 +1,6 @@
 use std::num::NonZeroUsize;

-use clap::ValueEnum;
+use clap::ArgEnum;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
@@ -342,9 +342,7 @@ impl Arrangement for CustomLayout {
    }
 }

-#[derive(
-    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 pub enum Axis {
    Horizontal,
--- a/komorebi-core/src/config_generation.rs
+++ b/komorebi-core/src/config_generation.rs
@@ -1,4 +1,4 @@
-use clap::ValueEnum;
+use clap::ArgEnum;
 use color_eyre::Result;
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -8,7 +8,7 @@ use strum::EnumString;

 use crate::ApplicationIdentifier;

-#[derive(Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema)]
+#[derive(Clone, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 #[serde(rename_all = "snake_case")]
 pub enum ApplicationOptions {
--- a/komorebi-core/src/cycle_direction.rs
+++ b/komorebi-core/src/cycle_direction.rs
@@ -1,15 +1,13 @@
 use std::num::NonZeroUsize;

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

-#[derive(
-    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 pub enum CycleDirection {
    Previous,
--- a/komorebi-core/src/default_layout.rs
+++ b/komorebi-core/src/default_layout.rs
@@ -1,4 +1,4 @@
-use clap::ValueEnum;
+use clap::ArgEnum;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
@@ -9,9 +9,7 @@ use crate::OperationDirection;
 use crate::Rect;
 use crate::Sizing;

-#[derive(
-    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 pub enum DefaultLayout {
    BSP,
--- a/komorebi-core/src/lib.rs
+++ b/komorebi-core/src/lib.rs
@@ -4,7 +4,7 @@
 use std::path::PathBuf;
 use std::str::FromStr;

-use clap::ValueEnum;
+use clap::ArgEnum;
 use color_eyre::Result;
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -51,8 +51,6 @@ pub enum SocketMessage {
    SendContainerToWorkspaceNumber(usize),
    SendContainerToMonitorWorkspaceNumber(usize, usize),
    MoveWorkspaceToMonitorNumber(usize),
-    Close,
-    Minimize,
    Promote,
    PromoteFocus,
    ToggleFloat,
@@ -72,7 +70,6 @@ pub enum SocketMessage {
    ChangeLayoutCustom(PathBuf),
    FlipLayout(Axis),
    // Monitor and Workspace Commands
-    MonitorIndexPreference(usize, i32, i32, i32, i32),
    EnsureWorkspaces(usize, usize),
    NewWorkspace,
    ToggleTiling,
@@ -139,18 +136,14 @@ impl FromStr for SocketMessage {
    }
 }

-#[derive(
-    Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 pub enum WindowKind {
    Single,
    Stack,
 }

-#[derive(
-    Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 pub enum StateQuery {
    FocusedMonitorIndex,
@@ -159,9 +152,7 @@ pub enum StateQuery {
    FocusedWindowIndex,
 }

-#[derive(
-    Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 #[serde(rename_all = "snake_case")]
 pub enum ApplicationIdentifier {
@@ -170,54 +161,42 @@ pub enum ApplicationIdentifier {
    Title,
 }

-#[derive(
-    Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 pub enum FocusFollowsMouseImplementation {
    Komorebi,
    Windows,
 }

-#[derive(
-    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 pub enum WindowContainerBehaviour {
    Create,
    Append,
 }

-#[derive(
-    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 pub enum MoveBehaviour {
    Swap,
    Insert,
 }

-#[derive(
-    Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 pub enum HidingBehaviour {
    Hide,
    Minimize,
 }

-#[derive(
-    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 pub enum OperationBehaviour {
    Op,
    NoOp,
 }

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

-use clap::ValueEnum;
+use clap::ArgEnum;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
@@ -10,9 +10,7 @@ use strum::EnumString;
 use crate::direction::Direction;
 use crate::Axis;

-#[derive(
-    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 pub enum OperationDirection {
    Left,
--- a/komorebi.generated.ahk
+++ b/komorebi.generated.ahk
@@ -9,11 +9,6 @@ Run, komorebic.exe float-rule exe "1Password.exe", , Hide
 ; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
 Run, komorebic.exe identify-tray-application class "CreativeCloudDesktopWindowClass", , Hide

-; ArmCord
-Run, komorebic.exe identify-border-overflow-application exe "ArmCord.exe", , Hide
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-Run, komorebic.exe identify-tray-application exe "ArmCord.exe", , Hide
-
 ; AutoHotkey
 ; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
 Run, komorebic.exe identify-tray-application exe "AutoHotkeyU64.exe", , Hide
@@ -51,9 +46,9 @@ Run, komorebic.exe identify-border-overflow-application exe "DiscordCanary.exe",
 Run, komorebic.exe identify-tray-application exe "DiscordCanary.exe", , Hide

 ; DiscordDevelopment
-Run, komorebic.exe identify-border-overflow-application exe "DiscordDevelopment.exe", , Hide
+Run, komorebic.exe identify-border-overflow-application exe "DiscordDeveloper.exe", , Hide
 ; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-Run, komorebic.exe identify-tray-application exe "DiscordDevelopment.exe", , Hide
+Run, komorebic.exe identify-tray-application exe "DiscordDeveloper.exe", , Hide

 ; DiscordPTB
 Run, komorebic.exe identify-border-overflow-application exe "DiscordPTB.exe", , Hide
@@ -72,15 +67,6 @@ Run, komorebic.exe identify-tray-application exe "Element.exe", , Hide
 ; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
 Run, komorebic.exe identify-tray-application exe "ElevenClock.exe", , Hide

-; Elgato Camera Hub
-Run, komorebic.exe float-rule exe "Camera Hub.exe", , Hide
-
-; Elgato Control Center
-Run, komorebic.exe float-rule exe "ControlCenter.exe", , Hide
-
-; Elgato Wave Link
-Run, komorebic.exe float-rule exe "WaveLink.exe", , Hide
-
 ; Epic Games Launcher
 Run, komorebic.exe identify-border-overflow-application exe "EpicGamesLauncher.exe", , Hide
 ; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
@@ -109,9 +95,6 @@ Run, komorebic.exe identify-tray-application exe "chrome.exe", , Hide
 ; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
 Run, komorebic.exe identify-tray-application exe "GoogleDriveFS.exe", , Hide

-; Houdoku
-Run, komorebic.exe identify-border-overflow-application exe "Houdoku.exe", , Hide
-
 ; Inno Setup
 ; Target hidden window spawned by Inno Setup applications
 Run, komorebic.exe float-rule class "TApplication", , Hide
@@ -300,10 +283,6 @@ Run, komorebic.exe manage-rule exe "slack.exe", , Hide
 ; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
 Run, komorebic.exe identify-tray-application exe "slack.exe", , Hide

-; SoulseekQt
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-Run, komorebic.exe identify-tray-application exe "SoulseekQt.exe", , Hide
-
 ; Spotify
 Run, komorebic.exe identify-border-overflow-application exe "Spotify.exe", , Hide
 ; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
@@ -312,9 +291,6 @@ Run, komorebic.exe identify-tray-application exe "Spotify.exe", , Hide
 ; Steam
 Run, komorebic.exe identify-border-overflow-application class "vguiPopupWindow", , Hide

-; SystemSettings
-Run, komorebic.exe float-rule class "Shell_Dialog", , Hide
-
 ; Task Manager
 Run, komorebic.exe float-rule class "TaskManagerWindow", , Hide

@@ -340,17 +316,9 @@ Run, komorebic.exe identify-border-overflow-application exe "UnrealEditor.exe",
 ; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
 Run, komorebic.exe identify-tray-application exe "UnrealEditor.exe", , Hide

-; Visual Studio
-Run, komorebic.exe manage-rule exe "devenv.exe", , Hide
-Run, komorebic.exe float-rule class "GenericPane", , Hide
-
 ; Visual Studio Code
 Run, komorebic.exe identify-border-overflow-application exe "Code.exe", , Hide

-; WebTorrent Desktop
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-Run, komorebic.exe identify-tray-application exe "WebTorrent.exe", , Hide
-
 ; Windows Console (conhost.exe)
 Run, komorebic.exe manage-rule class "ConsoleWindowClass", , Hide

@@ -363,14 +331,6 @@ Run, komorebic.exe float-rule title "Control Panel", , Hide
 ; Targets MSI Installers
 Run, komorebic.exe float-rule class "MsiDialogCloseClass", , Hide

-; WingetUI
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-Run, komorebic.exe identify-tray-application exe "WingetUI.exe", , Hide
-
-; WingetUI
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-Run, komorebic.exe identify-tray-application exe "wingetui.exe", , Hide
-
 ; Wox
 ; Targets a hidden window spawned by Wox
 Run, komorebic.exe float-rule title "Hotkey sink", , Hide
@@ -378,12 +338,6 @@ Run, komorebic.exe float-rule title "Hotkey sink", , Hide
 ; Zoom
 Run, komorebic.exe float-rule exe "Zoom.exe", , Hide

-; mpv.net
-Run, komorebic.exe identify-object-name-change-application exe "mpvnet.exe", , Hide
-
-; paint.net
-Run, komorebic.exe float-rule exe "paintdotnet.exe", , Hide
-
 ; qBittorrent
 ; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
 Run, komorebic.exe identify-tray-application exe "qbittorrent.exe", , Hide
--- a/komorebi.sample.ahk
+++ b/komorebi.sample.ahk
@@ -24,7 +24,7 @@ InvisibleBorders(7, 0, 14, 7)
 WorkspaceName(0, 0, "I")

 ; Uncomment the next two lines if you want a visual border drawn around the focused window
-; ActiveWindowBorderColour(66, 165, 245, "single") ; this is a nice blue colour
+; ActiveWindowBorderColour(66, 165, 245) ; this is a nice blue colour
 ; ActiveWindowBorder("enable")

 ; Allow komorebi to start managing windows
--- a/komorebi/Cargo.toml
+++ b/komorebi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komorebi"
-version = "0.1.14"
+version = "0.1.13"
 authors = ["Jade Iqbal <jadeiqbal@fastmail.com>"]
 description = "A tiling window manager for Windows"
 categories = ["tiling-window-manager", "windows"]
@@ -14,7 +14,7 @@ edition = "2021"
 komorebi-core = { path = "../komorebi-core" }

 bitflags = "1"
-clap = { version = "4", features = ["derive"] }
+clap = { version = "3", features = ["derive"] }
 color-eyre = "0.6"
 crossbeam-channel = "0.5"
 crossbeam-utils = "0.8"
@@ -43,7 +43,7 @@ winput = "0.2"
 winreg = "0.10"

 [dependencies.windows]
-version = "0.43"
+version = "0.39"
 features = [
    "Win32_Foundation",
    "Win32_Graphics_Dwm",
@@ -56,8 +56,7 @@ features = [
    "Win32_UI_Input_KeyboardAndMouse",
    "Win32_UI_Shell",
    "Win32_UI_Shell_Common",
-    "Win32_UI_WindowsAndMessaging",
-    "Win32_System_SystemServices"
+    "Win32_UI_WindowsAndMessaging"
 ]

 [features]
--- a/komorebi/src/hidden.rs
+++ b/komorebi/src/hidden.rs
@@ -1,78 +0,0 @@
-use std::sync::atomic::Ordering;
-use std::time::Duration;
-
-use color_eyre::Result;
-use windows::core::PCSTR;
-use windows::Win32::Foundation::HWND;
-use windows::Win32::UI::WindowsAndMessaging::DispatchMessageA;
-use windows::Win32::UI::WindowsAndMessaging::FindWindowA;
-use windows::Win32::UI::WindowsAndMessaging::GetMessageA;
-use windows::Win32::UI::WindowsAndMessaging::CS_HREDRAW;
-use windows::Win32::UI::WindowsAndMessaging::CS_VREDRAW;
-use windows::Win32::UI::WindowsAndMessaging::MSG;
-use windows::Win32::UI::WindowsAndMessaging::WNDCLASSA;
-
-use crate::windows_callbacks;
-use crate::WindowsApi;
-use crate::HIDDEN_HWND;
-use crate::TRANSPARENCY_COLOUR;
-
-#[derive(Debug, Clone, Copy)]
-pub struct Hidden {
-    pub(crate) hwnd: isize,
-}
-
-impl From<isize> for Hidden {
-    fn from(hwnd: isize) -> Self {
-        Self { hwnd }
-    }
-}
-
-impl Hidden {
-    pub const fn hwnd(self) -> HWND {
-        HWND(self.hwnd)
-    }
-
-    pub fn create(name: &str) -> Result<()> {
-        let name = format!("{name}\0");
-        let instance = WindowsApi::module_handle_w()?;
-        let class_name = PCSTR(name.as_ptr());
-        let brush = WindowsApi::create_solid_brush(TRANSPARENCY_COLOUR);
-        let window_class = WNDCLASSA {
-            hInstance: instance,
-            lpszClassName: class_name,
-            style: CS_HREDRAW | CS_VREDRAW,
-            lpfnWndProc: Some(windows_callbacks::hidden_window),
-            hbrBackground: brush,
-            ..Default::default()
-        };
-
-        let _atom = WindowsApi::register_class_a(&window_class)?;
-
-        let name_cl = name.clone();
-        std::thread::spawn(move || -> Result<()> {
-            let hwnd = WindowsApi::create_hidden_window(PCSTR(name_cl.as_ptr()), instance)?;
-            let hidden = Self::from(hwnd);
-
-            let mut message = MSG::default();
-
-            unsafe {
-                while GetMessageA(&mut message, hidden.hwnd(), 0, 0).into() {
-                    DispatchMessageA(&message);
-                    std::thread::sleep(Duration::from_millis(10));
-                }
-            }
-
-            Ok(())
-        });
-
-        let mut hwnd = HWND(0);
-        while hwnd == HWND(0) {
-            hwnd = unsafe { FindWindowA(PCSTR(name.as_ptr()), PCSTR::null()) };
-        }
-
-        HIDDEN_HWND.store(hwnd.0, Ordering::SeqCst);
-
-        Ok(())
-    }
-}
--- a/komorebi/src/main.rs
+++ b/komorebi/src/main.rs
@@ -38,7 +38,6 @@ use which::which;
 use winreg::enums::HKEY_CURRENT_USER;
 use winreg::RegKey;

-use crate::hidden::Hidden;
 use komorebi_core::HidingBehaviour;
 use komorebi_core::Rect;
 use komorebi_core::SocketMessage;
@@ -57,7 +56,6 @@ mod ring;

 mod border;
 mod container;
-mod hidden;
 mod monitor;
 mod process_command;
 mod process_event;
@@ -90,8 +88,6 @@ lazy_static! {
        "firefox.exe".to_string(),
        "idea64.exe".to_string(),
    ]));
-    static ref MONITOR_INDEX_PREFERENCES: Arc<Mutex<HashMap<usize, Rect>>> =
-        Arc::new(Mutex::new(HashMap::new()));
    static ref WORKSPACE_RULES: Arc<Mutex<HashMap<String, (usize, usize)>>> =
        Arc::new(Mutex::new(HashMap::new()));
    static ref MANAGE_IDENTIFIERS: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![]));
@@ -175,8 +171,6 @@ pub static BORDER_COLOUR_CURRENT: AtomicU32 = AtomicU32::new(0);
 // 0 0 0 aka pure black, I doubt anyone will want this as a border colour
 pub const TRANSPARENCY_COLOUR: u32 = 0;

-pub static HIDDEN_HWND: AtomicIsize = AtomicIsize::new(0);
-
 fn setup() -> Result<(WorkerGuard, WorkerGuard)> {
    if std::env::var("RUST_LIB_BACKTRACE").is_err() {
        std::env::set_var("RUST_LIB_BACKTRACE", "1");
@@ -461,8 +455,6 @@ fn main() -> Result<()> {
        let winevent_listener = winevent_listener::new(Arc::new(Mutex::new(outgoing)));
        winevent_listener.start();

-        Hidden::create("komorebi-hidden")?;
-
        let wm = Arc::new(Mutex::new(WindowManager::new(Arc::new(Mutex::new(
            incoming,
        )))?));
--- a/komorebi/src/monitor.rs
+++ b/komorebi/src/monitor.rs
@@ -21,8 +21,6 @@ pub struct Monitor {
    #[getset(get_copy = "pub", set = "pub")]
    id: isize,
    #[getset(get = "pub", set = "pub")]
-    name: String,
-    #[getset(get = "pub", set = "pub")]
    size: Rect,
    #[getset(get = "pub", set = "pub")]
    work_area_size: Rect,
@@ -34,13 +32,12 @@ pub struct Monitor {

 impl_ring_elements!(Monitor, Workspace);

-pub fn new(id: isize, size: Rect, work_area_size: Rect, name: String) -> Monitor {
+pub fn new(id: isize, size: Rect, work_area_size: Rect) -> Monitor {
    let mut workspaces = Ring::default();
    workspaces.elements_mut().push_back(Workspace::default());

    Monitor {
        id,
-        name,
        size,
        work_area_size,
        workspaces,
--- a/komorebi/src/process_command.rs
+++ b/komorebi/src/process_command.rs
@@ -49,13 +49,12 @@ use crate::BORDER_ENABLED;
 use crate::BORDER_HWND;
 use crate::BORDER_OVERFLOW_IDENTIFIERS;
 use crate::CUSTOM_FFM;
-use crate::DATA_DIR;
 use crate::FLOAT_IDENTIFIERS;
 use crate::HIDING_BEHAVIOUR;
+use crate::HOME_DIR;
 use crate::INITIAL_CONFIGURATION_LOADED;
 use crate::LAYERED_WHITELIST;
 use crate::MANAGE_IDENTIFIERS;
-use crate::MONITOR_INDEX_PREFERENCES;
 use crate::OBJECT_NAME_CHANGE_ON_LAUNCH;
 use crate::SUBSCRIPTION_PIPES;
 use crate::TCP_CONNECTIONS;
@@ -115,10 +114,7 @@ pub fn listen_for_commands_tcp(wm: Arc<Mutex<WindowManager>>, port: usize) {

                    tracing::info!("listening for incoming tcp messages from {}", &addr);

-                    match read_commands_tcp(&wm, &mut stream, &addr) {
-                        Ok(()) => {}
-                        Err(error) => tracing::error!("{}", error),
-                    }
+                    read_commands_tcp(&wm, &mut stream, &addr);
                }
                Err(error) => {
                    tracing::error!("{}", error);
@@ -178,8 +174,6 @@ impl WindowManager {
            SocketMessage::CycleStack(direction) => {
                self.cycle_container_window_in_direction(direction)?;
            }
-            SocketMessage::Close => self.focused_window()?.close()?,
-            SocketMessage::Minimize => self.focused_window()?.minimize(),
            SocketMessage::ToggleFloat => self.toggle_float()?,
            SocketMessage::ToggleMonocle => self.toggle_monocle()?,
            SocketMessage::ToggleMaximize => self.toggle_maximize()?,
@@ -403,18 +397,6 @@ impl WindowManager {

                std::process::exit(0)
            }
-            SocketMessage::MonitorIndexPreference(index_preference, left, top, right, bottom) => {
-                let mut monitor_index_preferences = MONITOR_INDEX_PREFERENCES.lock();
-                monitor_index_preferences.insert(
-                    index_preference,
-                    Rect {
-                        left,
-                        top,
-                        right,
-                        bottom,
-                    },
-                );
-            }
            SocketMessage::EnsureWorkspaces(monitor_idx, workspace_count) => {
                self.ensure_workspaces_for_monitor(monitor_idx, workspace_count)?;
            }
@@ -431,7 +413,7 @@ impl WindowManager {
                    Err(error) => error.to_string(),
                };

-                let mut socket = DATA_DIR.clone();
+                let mut socket = HOME_DIR.clone();
                socket.push("komorebic.sock");
                let socket = socket.as_path();

@@ -454,7 +436,7 @@ impl WindowManager {
                }
                .to_string();

-                let mut socket = DATA_DIR.clone();
+                let mut socket = HOME_DIR.clone();
                socket.push("komorebic.sock");
                let socket = socket.as_path();

@@ -846,7 +828,7 @@ impl WindowManager {
            SocketMessage::NotificationSchema => {
                let notification = schema_for!(Notification);
                let schema = serde_json::to_string_pretty(&notification)?;
-                let mut socket = DATA_DIR.clone();
+                let mut socket = HOME_DIR.clone();
                socket.push("komorebic.sock");
                let socket = socket.as_path();

@@ -856,7 +838,7 @@ impl WindowManager {
            SocketMessage::SocketSchema => {
                let socket_message = schema_for!(SocketMessage);
                let schema = serde_json::to_string_pretty(&socket_message)?;
-                let mut socket = DATA_DIR.clone();
+                let mut socket = HOME_DIR.clone();
                socket.push("komorebic.sock");
                let socket = socket.as_path();

@@ -881,10 +863,6 @@ impl WindowManager {
            | SocketMessage::Promote
            | SocketMessage::PromoteFocus
            | SocketMessage::Retile
-            // Adding this one because sometimes EVENT_SYSTEM_FOREGROUND isn't
-            // getting sent on FocusWindow, meaning the border won't be set
-            // when processing events
-            | SocketMessage::FocusWindow(_)
            | SocketMessage::InvisibleBorders(_)
            | SocketMessage::WorkAreaOffset(_)
            | SocketMessage::MoveWindow(_) => {
@@ -958,56 +936,56 @@ pub fn read_commands_uds(wm: &Arc<Mutex<WindowManager>>, stream: UnixStream) ->
    Ok(())
 }

-pub fn read_commands_tcp(
-    wm: &Arc<Mutex<WindowManager>>,
-    stream: &mut TcpStream,
-    addr: &str,
-) -> Result<()> {
-    let mut stream = BufReader::new(stream);
-
-    loop {
-        let mut buf = vec![0; 1024];
-        match stream.read(&mut buf) {
-            Err(..) => {
-                tracing::warn!("removing disconnected tcp client: {addr}");
-                let mut connections = TCP_CONNECTIONS.lock();
-                connections.remove(addr);
-                break;
-            }
-            Ok(size) => {
-                let message = if let Ok(message) =
-                    SocketMessage::from_str(&String::from_utf8_lossy(&buf[..size]))
-                {
-                    message
-                } else {
-                    tracing::warn!("client sent an invalid message, disconnecting: {addr}");
+pub fn read_commands_tcp(wm: &Arc<Mutex<WindowManager>>, stream: &mut TcpStream, addr: &str) {
+    let addr = addr.to_string();
+    let wm = wm.clone();
+    let stream = stream.try_clone().unwrap();
+    std::thread::spawn(move || -> Result<()> {
+        let mut stream = BufReader::new(stream);
+        loop {
+            let mut buf = vec![0; 1024];
+            match stream.read(&mut buf) {
+                Err(..) => {
+                    tracing::warn!("removing disconnected tcp client: {addr}");
                    let mut connections = TCP_CONNECTIONS.lock();
-                    connections.remove(addr);
+                    connections.remove(&addr);
                    break;
-                };
-
-                let mut wm = wm.lock();
-
-                if wm.is_paused {
-                    return match message {
-                        SocketMessage::TogglePause | SocketMessage::State | SocketMessage::Stop => {
-                            Ok(wm.process_command(message)?)
-                        }
-                        _ => {
-                            tracing::trace!("ignoring while paused");
-                            Ok(())
-                        }
-                    };
                }
+                Ok(size) => {
+                    let message = if let Ok(message) =
+                        SocketMessage::from_str(&String::from_utf8_lossy(&buf[..size]))
+                    {
+                        message
+                    } else {
+                        tracing::warn!("client sent an invalid message, disconnecting: {addr}");
+                        let mut connections = TCP_CONNECTIONS.lock();
+                        connections.remove(&addr);
+                        break;
+                    };

-                wm.process_command(message.clone())?;
-                notify_subscribers(&serde_json::to_string(&Notification {
-                    event: NotificationEvent::Socket(message.clone()),
-                    state: wm.as_ref().into(),
-                })?)?;
+                    let mut wm = wm.lock();
+
+                    if wm.is_paused {
+                        return match message {
+                            SocketMessage::TogglePause
+                            | SocketMessage::State
+                            | SocketMessage::Stop => Ok(wm.process_command(message)?),
+                            _ => {
+                                tracing::trace!("ignoring while paused");
+                                Ok(())
+                            }
+                        };
+                    }
+
+                    wm.process_command(message.clone())?;
+                    notify_subscribers(&serde_json::to_string(&Notification {
+                        event: NotificationEvent::Socket(message.clone()),
+                        state: wm.as_ref().into(),
+                    })?)?;
+                }
            }
        }
-    }

-    Ok(())
+        Ok(())
+    });
 }
--- a/komorebi/src/process_event.rs
+++ b/komorebi/src/process_event.rs
@@ -74,9 +74,9 @@ impl WindowManager {

        // Make sure we have the most recently focused monitor from any event
        match event {
-            WindowManagerEvent::FocusChange(_, window)
+            WindowManagerEvent::MonitorPoll(_, window)
+            | WindowManagerEvent::FocusChange(_, window)
            | WindowManagerEvent::Show(_, window)
-            | WindowManagerEvent::DisplayChange(window)
            | WindowManagerEvent::MoveResizeEnd(_, window) => {
                self.reconcile_monitors()?;

@@ -482,7 +482,7 @@ impl WindowManager {
                    }
                }
            }
-            WindowManagerEvent::DisplayChange(..) | WindowManagerEvent::MouseCapture(..) => {}
+            WindowManagerEvent::MonitorPoll(..) | WindowManagerEvent::MouseCapture(..) => {}
        };

        if *self.focused_workspace()?.tile() && BORDER_ENABLED.load(Ordering::SeqCst) {
--- a/komorebi/src/window.rs
+++ b/komorebi/src/window.rs
@@ -151,14 +151,6 @@ impl Window {
        }
    }

-    pub fn minimize(self) {
-        WindowsApi::minimize_window(self.hwnd());
-    }
-
-    pub fn close(self) -> Result<()> {
-        WindowsApi::close_window(self.hwnd())
-    }
-
    pub fn restore(self) {
        let mut programmatically_hidden_hwnds = HIDDEN_HWNDS.lock();
        if let Some(idx) = programmatically_hidden_hwnds
@@ -265,30 +257,15 @@ impl Window {
        };

        // Raise Window to foreground
-        let mut foregrounded = false;
-        let mut tried_resetting_foreground_access = false;
-        let mut max_attempts = 10;
-        while !foregrounded && max_attempts > 0 {
-            match WindowsApi::set_foreground_window(self.hwnd()) {
-                Ok(_) => {
-                    foregrounded = true;
-                }
-                Err(error) => {
-                    max_attempts -= 1;
-                    tracing::error!(
-                        "could not set as foreground window, but continuing execution of focus(): {}",
-                        error
-                    );
-
-                    // If this still doesn't work then maybe try https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-locksetforegroundwindow
-                    if !tried_resetting_foreground_access {
-                        let process_id = WindowsApi::current_process_id();
-                        WindowsApi::allow_set_foreground_window(process_id)?;
-                        tried_resetting_foreground_access = true;
-                    }
-                }
-            };
-        }
+        match WindowsApi::set_foreground_window(self.hwnd()) {
+            Ok(_) => {}
+            Err(error) => {
+                tracing::error!(
+                    "could not set as foreground window, but continuing execution of focus(): {}",
+                    error
+                );
+            }
+        };

        // Center cursor in Window
        if mouse_follows_focus {
@@ -357,7 +334,7 @@ impl Window {

    #[tracing::instrument(fields(exe, title))]
    pub fn should_manage(self, event: Option<WindowManagerEvent>) -> Result<bool> {
-        if let Some(WindowManagerEvent::DisplayChange(_)) = event {
+        if let Some(WindowManagerEvent::MonitorPoll(_, _)) = event {
            return Ok(true);
        }

--- a/komorebi/src/window_manager.rs
+++ b/komorebi/src/window_manager.rs
@@ -1,4 +1,3 @@
-use std::collections::HashMap;
 use std::collections::VecDeque;
 use std::io::ErrorKind;
 use std::num::NonZeroUsize;
@@ -55,7 +54,6 @@ use crate::WORKSPACE_RULES;
 #[derive(Debug)]
 pub struct WindowManager {
    pub monitors: Ring<Monitor>,
-    pub monitor_cache: HashMap<usize, Monitor>,
    pub incoming_events: Arc<Mutex<Receiver<WindowManagerEvent>>>,
    pub command_listener: UnixListener,
    pub is_paused: bool,
@@ -168,7 +166,6 @@ impl WindowManager {

        Ok(Self {
            monitors: Ring::default(),
-            monitor_cache: HashMap::new(),
            incoming_events: incoming,
            command_listener: listener,
            is_paused: false,
@@ -329,77 +326,44 @@ impl WindowManager {

    #[tracing::instrument(skip(self))]
    pub fn reconcile_monitors(&mut self) -> Result<()> {
-        if self.pending_move_op.is_some() {
-            return Ok(());
-        }
-
        let valid_hmonitors = WindowsApi::valid_hmonitors()?;
-        let mut valid_names = vec![];
-        let before_count = self.monitors().len();
+        let mut invalid = vec![];

        for monitor in self.monitors_mut() {
-            for (valid_name, valid_id) in &valid_hmonitors {
-                let actual_name = monitor.name().clone();
-                if actual_name == *valid_name {
-                    monitor.set_id(*valid_id);
-                    valid_names.push(actual_name);
+            if !valid_hmonitors.contains(&monitor.id()) {
+                let mut mark_as_invalid = true;
+
+                // If an invalid hmonitor has at least one window in the window manager state,
+                // we can attempt to update its hmonitor id in-place so that it doesn't get reaped
+                if let Some(workspace) = monitor.focused_workspace() {
+                    if let Some(container) = workspace.focused_container() {
+                        if let Some(window) = container.focused_window() {
+                            let actual_hmonitor = WindowsApi::monitor_from_window(window.hwnd());
+                            if actual_hmonitor != monitor.id() {
+                                monitor.set_id(actual_hmonitor);
+                                mark_as_invalid = false;
+                            }
+                        }
+                    }
                }
-            }
-        }

-        let mut orphaned_containers = vec![];
-        let mut invalid_indices = vec![];
-
-        for (i, invalid) in self
-            .monitors()
-            .iter()
-            .enumerate()
-            .filter(|(_, m)| !valid_names.contains(m.name()))
-        {
-            invalid_indices.push(i);
-            for workspace in invalid.workspaces() {
-                for container in workspace.containers() {
-                    // Save the orphaned containers from an invalid monitor
-                    // (which has most likely been disconnected)
-                    orphaned_containers.push(container.clone());
+                if mark_as_invalid {
+                    invalid.push(monitor.id());
                }
            }
        }

-        for i in invalid_indices {
-            if let Some(monitor) = self.monitors().get(i) {
-                self.monitor_cache.insert(i, monitor.clone());
-            }
-        }
-
        // Remove any invalid monitors from our state
-        self.monitors_mut()
-            .retain(|m| valid_names.contains(m.name()));
-
-        let after_count = self.monitors().len();
-
-        if let Some(primary) = self.monitors_mut().front_mut() {
-            if let Some(focused_ws) = primary.focused_workspace_mut() {
-                let focused_container_idx = focused_ws.focused_container_idx();
-
-                // Put the orphaned containers somewhere visible
-                for container in orphaned_containers {
-                    focused_ws.add_container(container);
-                }
-
-                // Gotta reset the focus or the movement will feel "off"
-                focused_ws.focus_container(focused_container_idx);
-            }
-        }
+        self.monitors_mut().retain(|m| !invalid.contains(&m.id()));

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

        for monitor in self.monitors_mut() {
-            // If we have lost a monitor, update everything to filter out any jank
-            let mut should_update = before_count != after_count;
-
+            let mut should_update = false;
            let reference = WindowsApi::monitor(monitor.id())?;
+            // TODO: If this is different, force a redraw
+
            if reference.work_area_size() != monitor.work_area_size() {
                monitor.set_work_area_size(Rect {
                    left: reference.work_area_size().left,
@@ -427,51 +391,9 @@ impl WindowManager {
            }
        }

-        #[allow(clippy::needless_collect)]
-        let old_sizes = self
-            .monitors()
-            .iter()
-            .map(Monitor::size)
-            .copied()
-            .collect::<Vec<_>>();
-
        // Check for and add any new monitors that may have been plugged in
        WindowsApi::load_monitor_information(&mut self.monitors)?;

-        let mut check_cache = vec![];
-
-        for (i, m) in self.monitors().iter().enumerate() {
-            if !old_sizes.contains(m.size()) {
-                check_cache.push(i);
-            }
-        }
-
-        for i in check_cache {
-            if let Some(cached) = self.monitor_cache.get(&i).cloned() {
-                if let Some(monitor) = self.monitors_mut().get_mut(i) {
-                    for (w_idx, workspace) in monitor.workspaces_mut().iter_mut().enumerate() {
-                        if let Some(cached_workspace) = cached.workspaces().get(w_idx) {
-                            workspace.set_layout(cached_workspace.layout().clone());
-                            workspace.set_layout_rules(cached_workspace.layout_rules().clone());
-                            workspace.set_layout_flip(cached_workspace.layout_flip());
-                            workspace.set_workspace_padding(cached_workspace.workspace_padding());
-                            workspace.set_container_padding(cached_workspace.container_padding());
-                        }
-                    }
-                }
-            }
-        }
-
-        let final_count = self.monitors().len();
-        if after_count != final_count {
-            self.retile_all(true)?;
-            // Second retile to fix DPI/resolution related jank when a window
-            // moves between monitors with different resolutions - this doesn't
-            // really get seen by the user since the screens are flickering anyway
-            // as a result of the display connections / disconnections
-            self.retile_all(true)?;
-        }
-
        Ok(())
    }

--- a/komorebi/src/window_manager_event.rs
+++ b/komorebi/src/window_manager_event.rs
@@ -22,7 +22,7 @@ pub enum WindowManagerEvent {
    Manage(Window),
    Unmanage(Window),
    Raise(Window),
-    DisplayChange(Window),
+    MonitorPoll(WinEvent, Window),
 }

 impl Display for WindowManagerEvent {
@@ -77,8 +77,12 @@ impl Display for WindowManagerEvent {
            Self::Raise(window) => {
                write!(f, "Raise (Window: {})", window)
            }
-            Self::DisplayChange(window) => {
-                write!(f, "DisplayChange (Window: {})", window)
+            Self::MonitorPoll(winevent, window) => {
+                write!(
+                    f,
+                    "MonitorPoll (WinEvent: {}, Window: {})",
+                    winevent, window
+                )
            }
        }
    }
@@ -95,9 +99,9 @@ impl WindowManagerEvent {
            | Self::MoveResizeStart(_, window)
            | Self::MoveResizeEnd(_, window)
            | Self::MouseCapture(_, window)
+            | Self::MonitorPoll(_, window)
            | Self::Raise(window)
            | Self::Manage(window)
-            | Self::DisplayChange(window)
            | Self::Unmanage(window) => window,
        }
    }
@@ -143,6 +147,17 @@ impl WindowManagerEvent {
                    None
                }
            }
+            WinEvent::ObjectCreate => {
+                if let Ok(title) = window.title() {
+                    // Hidden COM support mechanism window that fires this event on both DPI/scaling
+                    // changes and resolution changes, a good candidate for polling
+                    if title == "OLEChannelWnd" {
+                        return Option::from(Self::MonitorPoll(winevent, window));
+                    }
+                }
+
+                None
+            }
            _ => None,
        }
    }
--- a/komorebi/src/windows_api.rs
+++ b/komorebi/src/windows_api.rs
@@ -1,8 +1,6 @@
 use std::collections::VecDeque;
 use std::convert::TryFrom;
 use std::ffi::c_void;
-use std::ffi::OsString;
-use std::os::windows::ffi::OsStringExt;
 use std::sync::atomic::Ordering;

 use color_eyre::eyre::anyhow;
@@ -12,16 +10,16 @@ use windows::core::Result as WindowsCrateResult;
 use windows::core::PCSTR;
 use windows::core::PWSTR;
 use windows::Win32::Foundation::BOOL;
-use windows::Win32::Foundation::COLORREF;
 use windows::Win32::Foundation::HANDLE;
 use windows::Win32::Foundation::HINSTANCE;
 use windows::Win32::Foundation::HWND;
 use windows::Win32::Foundation::LPARAM;
 use windows::Win32::Foundation::POINT;
-use windows::Win32::Foundation::WPARAM;
+use windows::Win32::Foundation::RECT;
 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;
@@ -38,7 +36,7 @@ use windows::Win32::Graphics::Gdi::HBRUSH;
 use windows::Win32::Graphics::Gdi::HDC;
 use windows::Win32::Graphics::Gdi::HMONITOR;
 use windows::Win32::Graphics::Gdi::MONITORENUMPROC;
-use windows::Win32::Graphics::Gdi::MONITORINFOEXW;
+use windows::Win32::Graphics::Gdi::MONITORINFO;
 use windows::Win32::Graphics::Gdi::MONITOR_DEFAULTTONEAREST;
 use windows::Win32::System::LibraryLoader::GetModuleHandleW;
 use windows::Win32::System::RemoteDesktop::ProcessIdToSessionId;
@@ -71,7 +69,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::PostMessageW;
 use windows::Win32::UI::WindowsAndMessaging::RealGetWindowClassW;
 use windows::Win32::UI::WindowsAndMessaging::RegisterClassA;
 use windows::Win32::UI::WindowsAndMessaging::SetCursorPos;
@@ -103,12 +100,9 @@ use windows::Win32::UI::WindowsAndMessaging::SW_SHOWNOACTIVATE;
 use windows::Win32::UI::WindowsAndMessaging::SYSTEM_PARAMETERS_INFO_ACTION;
 use windows::Win32::UI::WindowsAndMessaging::SYSTEM_PARAMETERS_INFO_UPDATE_FLAGS;
 use windows::Win32::UI::WindowsAndMessaging::WINDOW_LONG_PTR_INDEX;
-use windows::Win32::UI::WindowsAndMessaging::WM_CLOSE;
 use windows::Win32::UI::WindowsAndMessaging::WNDCLASSA;
 use windows::Win32::UI::WindowsAndMessaging::WNDENUMPROC;
-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_MAXIMIZEBOX;
 use windows::Win32::UI::WindowsAndMessaging::WS_MINIMIZEBOX;
@@ -199,17 +193,24 @@ impl WindowsApi {
        callback: MONITORENUMPROC,
        callback_data_address: isize,
    ) -> Result<()> {
-        unsafe { EnumDisplayMonitors(HDC(0), None, callback, LPARAM(callback_data_address)) }
-            .ok()
-            .process()
+        unsafe {
+            EnumDisplayMonitors(
+                HDC(0),
+                std::ptr::null_mut(),
+                callback,
+                LPARAM(callback_data_address),
+            )
+        }
+        .ok()
+        .process()
    }

-    pub fn valid_hmonitors() -> Result<Vec<(String, isize)>> {
-        let mut monitors: Vec<(String, isize)> = vec![];
-        let monitors_ref: &mut Vec<(String, isize)> = monitors.as_mut();
+    pub fn valid_hmonitors() -> Result<Vec<isize>> {
+        let mut monitors: Vec<isize> = vec![];
+        let monitors_ref: &mut Vec<isize> = monitors.as_mut();
        Self::enum_display_monitors(
            Option::Some(windows_callbacks::valid_display_monitors),
-            monitors_ref as *mut Vec<(String, isize)> as isize,
+            monitors_ref as *mut Vec<isize> as isize,
        )?;

        Ok(monitors)
@@ -230,7 +231,7 @@ impl WindowsApi {

    pub fn load_workspace_information(monitors: &mut Ring<Monitor>) -> Result<()> {
        for monitor in monitors.elements_mut() {
-            let monitor_name = monitor.name().clone();
+            let monitor_id = monitor.id();
            if let Some(workspace) = monitor.workspaces_mut().front_mut() {
                // EnumWindows will enumerate through windows on all monitors
                Self::enum_windows(
@@ -248,7 +249,7 @@ impl WindowsApi {

                for container in workspace.containers_mut() {
                    for window in container.windows() {
-                        if Self::monitor_name_from_window(window.hwnd())? != monitor_name {
+                        if Self::monitor_from_window(window.hwnd()) != monitor_id {
                            windows_on_other_monitors.push(window.hwnd().0);
                        }
                    }
@@ -275,16 +276,6 @@ impl WindowsApi {
        unsafe { MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST) }.0
    }

-    pub fn monitor_name_from_window(hwnd: HWND) -> Result<String> {
-        // MONITOR_DEFAULTTONEAREST ensures that the return value will never be NULL
-        // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-monitorfromwindow
-        Ok(
-            Self::monitor(unsafe { MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST) }.0)?
-                .name()
-                .to_string(),
-        )
-    }
-
    pub fn monitor_from_point(point: POINT) -> isize {
        // MONITOR_DEFAULTTONEAREST ensures that the return value will never be NULL
        // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-monitorfromwindow
@@ -353,19 +344,6 @@ impl WindowsApi {
        Self::show_window(hwnd, SW_MINIMIZE);
    }

-    fn post_message(hwnd: HWND, message: u32, wparam: WPARAM, lparam: LPARAM) -> Result<()> {
-        unsafe { PostMessageW(hwnd, message, wparam, lparam) }
-            .ok()
-            .process()
-    }
-
-    pub fn close_window(hwnd: HWND) -> Result<()> {
-        match Self::post_message(hwnd, WM_CLOSE, WPARAM(0), LPARAM(0)) {
-            Ok(_) => Ok(()),
-            Err(_) => Err(anyhow!("could not close window")),
-        }
-    }
-
    pub fn hide_window(hwnd: HWND) {
        Self::show_window(hwnd, SW_HIDE);
    }
@@ -455,9 +433,7 @@ impl WindowsApi {

        // Behaviour is undefined if an invalid HWND is given
        // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getwindowthreadprocessid
-        let thread_id = unsafe {
-            GetWindowThreadProcessId(hwnd, Option::from(std::ptr::addr_of_mut!(process_id)))
-        };
+        let thread_id = unsafe { GetWindowThreadProcessId(hwnd, &mut process_id) };

        (process_id, thread_id)
    }
@@ -558,7 +534,12 @@ impl WindowsApi {
        let text_ptr = path.as_mut_ptr();

        unsafe {
-            QueryFullProcessImageNameW(handle, PROCESS_NAME_WIN32, PWSTR(text_ptr), &mut len)
+            QueryFullProcessImageNameW(
+                handle,
+                PROCESS_NAME_WIN32,
+                PWSTR(text_ptr),
+                std::ptr::addr_of_mut!(len),
+            )
        }
        .ok()
        .process()?;
@@ -602,6 +583,14 @@ impl WindowsApi {
        Ok(())
    }

+    #[allow(dead_code)]
+    pub fn window_rect_with_extended_frame_bounds(hwnd: HWND) -> Result<Rect> {
+        let mut rect = RECT::default();
+        Self::dwm_get_window_attribute(hwnd, DWMWA_EXTENDED_FRAME_BOUNDS, &mut rect)?;
+
+        Ok(Rect::from(rect))
+    }
+
    pub fn is_window_cloaked(hwnd: HWND) -> Result<bool> {
        let mut cloaked: u32 = 0;
        Self::dwm_get_window_attribute(hwnd, DWMWA_CLOAKED, &mut cloaked)?;
@@ -624,30 +613,24 @@ impl WindowsApi {
        unsafe { IsIconic(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>())?;
-        unsafe { GetMonitorInfoW(hmonitor, &mut ex_info.monitorInfo) }
+    pub fn monitor_info_w(hmonitor: HMONITOR) -> Result<MONITORINFO> {
+        let mut monitor_info: MONITORINFO = unsafe { std::mem::zeroed() };
+        monitor_info.cbSize = u32::try_from(std::mem::size_of::<MONITORINFO>())?;
+
+        unsafe { GetMonitorInfoW(hmonitor, std::ptr::addr_of_mut!(monitor_info).cast()) }
            .ok()
            .process()?;

-        Ok(ex_info)
+        Ok(monitor_info)
    }

    pub fn monitor(hmonitor: isize) -> Result<Monitor> {
-        let ex_info = Self::monitor_info_w(HMONITOR(hmonitor))?;
-        let name = OsString::from_wide(&ex_info.szDevice);
-        let name = name
-            .to_string_lossy()
-            .replace('\u{0000}', "")
-            .trim_start_matches(r"\\.\")
-            .to_string();
+        let monitor_info = Self::monitor_info_w(HMONITOR(hmonitor))?;

        Ok(monitor::new(
            hmonitor,
-            ex_info.monitorInfo.rcMonitor.into(),
-            ex_info.monitorInfo.rcWork.into(),
-            name,
+            monitor_info.rcMonitor.into(),
+            monitor_info.rcWork.into(),
        ))
    }

@@ -664,7 +647,7 @@ impl WindowsApi {
        pv_param: *mut c_void,
        update_flags: SYSTEM_PARAMETERS_INFO_UPDATE_FLAGS,
    ) -> Result<()> {
-        unsafe { SystemParametersInfoW(action, ui_param, Option::from(pv_param), update_flags) }
+        unsafe { SystemParametersInfoW(action, ui_param, pv_param, update_flags) }
            .ok()
            .process()
    }
@@ -708,7 +691,7 @@ impl WindowsApi {
    }

    pub fn create_solid_brush(colour: u32) -> HBRUSH {
-        unsafe { CreateSolidBrush(COLORREF(colour)) }
+        unsafe { CreateSolidBrush(colour) }
    }

    pub fn register_class_a(window_class: &WNDCLASSA) -> Result<u16> {
@@ -754,39 +737,25 @@ impl WindowsApi {
                None,
                None,
                instance,
-                None,
+                std::ptr::null(),
            );

-            SetLayeredWindowAttributes(hwnd, COLORREF(TRANSPARENCY_COLOUR), 0, LWA_COLORKEY);
+            SetLayeredWindowAttributes(hwnd, TRANSPARENCY_COLOUR, 0, LWA_COLORKEY);

            hwnd
        }
        .process()
    }

-    pub fn create_hidden_window(name: PCSTR, instance: HINSTANCE) -> Result<isize> {
+    pub fn invalidate_border_rect() -> Result<()> {
        unsafe {
-            CreateWindowExA(
-                WS_EX_NOACTIVATE,
-                name,
-                name,
-                WS_DISABLED,
-                CW_USEDEFAULT,
-                CW_USEDEFAULT,
-                CW_USEDEFAULT,
-                CW_USEDEFAULT,
-                None,
-                None,
-                instance,
-                None,
+            InvalidateRect(
+                HWND(BORDER_HWND.load(Ordering::SeqCst)),
+                std::ptr::null(),
+                false,
            )
        }
+        .ok()
        .process()
    }
-
-    pub fn invalidate_border_rect() -> Result<()> {
-        unsafe { InvalidateRect(HWND(BORDER_HWND.load(Ordering::SeqCst)), None, false) }
-            .ok()
-            .process()
-    }
 }
--- a/komorebi/src/windows_callbacks.rs
+++ b/komorebi/src/windows_callbacks.rs
@@ -2,7 +2,6 @@ use std::collections::VecDeque;
 use std::sync::atomic::Ordering;

 use windows::Win32::Foundation::BOOL;
-use windows::Win32::Foundation::COLORREF;
 use windows::Win32::Foundation::HWND;
 use windows::Win32::Foundation::LPARAM;
 use windows::Win32::Foundation::LRESULT;
@@ -18,17 +17,11 @@ use windows::Win32::Graphics::Gdi::HDC;
 use windows::Win32::Graphics::Gdi::HMONITOR;
 use windows::Win32::Graphics::Gdi::PAINTSTRUCT;
 use windows::Win32::Graphics::Gdi::PS_SOLID;
-use windows::Win32::System::SystemServices::DBT_DEVNODES_CHANGED;
 use windows::Win32::UI::Accessibility::HWINEVENTHOOK;
 use windows::Win32::UI::WindowsAndMessaging::DefWindowProcW;
 use windows::Win32::UI::WindowsAndMessaging::PostQuitMessage;
-use windows::Win32::UI::WindowsAndMessaging::SPI_ICONVERTICALSPACING;
-use windows::Win32::UI::WindowsAndMessaging::SPI_SETWORKAREA;
 use windows::Win32::UI::WindowsAndMessaging::WM_DESTROY;
-use windows::Win32::UI::WindowsAndMessaging::WM_DEVICECHANGE;
-use windows::Win32::UI::WindowsAndMessaging::WM_DISPLAYCHANGE;
 use windows::Win32::UI::WindowsAndMessaging::WM_PAINT;
-use windows::Win32::UI::WindowsAndMessaging::WM_SETTINGCHANGE;

 use crate::container::Container;
 use crate::monitor::Monitor;
@@ -39,7 +32,6 @@ use crate::windows_api::WindowsApi;
 use crate::winevent_listener::WINEVENT_CALLBACK_CHANNEL;
 use crate::BORDER_COLOUR_CURRENT;
 use crate::BORDER_RECT;
-use crate::MONITOR_INDEX_PREFERENCES;
 use crate::TRANSPARENCY_COLOUR;

 pub extern "system" fn valid_display_monitors(
@@ -48,11 +40,8 @@ pub extern "system" fn valid_display_monitors(
    _: *mut RECT,
    lparam: LPARAM,
 ) -> BOOL {
-    let monitors = unsafe { &mut *(lparam.0 as *mut Vec<(String, isize)>) };
-    if let Ok(m) = WindowsApi::monitor(hmonitor.0) {
-        monitors.push((m.name().to_string(), hmonitor.0));
-    }
-
+    let monitors = unsafe { &mut *(lparam.0 as *mut Vec<isize>) };
+    monitors.push(hmonitor.0);
    true.into()
 }

@@ -72,24 +61,7 @@ pub extern "system" fn enum_display_monitor(
    }

    if let Ok(m) = WindowsApi::monitor(hmonitor.0) {
-        let monitor_index_preferences = MONITOR_INDEX_PREFERENCES.lock();
-        let mut index_preference = None;
-        for (index, monitor_size) in &*monitor_index_preferences {
-            if m.size() == monitor_size {
-                index_preference = Option::from(index);
-            }
-        }
-
-        if let Some(preference) = index_preference {
-            let current_len = monitors.elements().len();
-            if *preference > current_len {
-                monitors.elements_mut().reserve(1);
-            }
-
-            monitors.elements_mut().insert(*preference, m);
-        } else {
-            monitors.elements_mut().push_back(m);
-        }
+        monitors.elements_mut().push_back(m);
    }

    true.into()
@@ -161,19 +133,15 @@ pub extern "system" fn border_window(
            WM_PAINT => {
                let border_rect = *BORDER_RECT.lock();
                let mut ps = PAINTSTRUCT::default();
-                let hdc = BeginPaint(window, &mut ps);
-                let hpen = CreatePen(
-                    PS_SOLID,
-                    20,
-                    COLORREF(BORDER_COLOUR_CURRENT.load(Ordering::SeqCst)),
-                );
+                let hdc = BeginPaint(window, std::ptr::addr_of_mut!(ps).cast());
+                let hpen = CreatePen(PS_SOLID, 20, BORDER_COLOUR_CURRENT.load(Ordering::SeqCst));
                let hbrush = WindowsApi::create_solid_brush(TRANSPARENCY_COLOUR);

                SelectObject(hdc, hpen);
                SelectObject(hdc, hbrush);
                Rectangle(hdc, 0, 0, border_rect.right, border_rect.bottom);
                EndPaint(window, &ps);
-                ValidateRect(window, None);
+                ValidateRect(window, std::ptr::null());

                LRESULT(0)
            }
@@ -185,54 +153,3 @@ pub extern "system" fn border_window(
        }
    }
 }
-
-pub extern "system" fn hidden_window(
-    window: HWND,
-    message: u32,
-    wparam: WPARAM,
-    lparam: LPARAM,
-) -> LRESULT {
-    unsafe {
-        match message as u32 {
-            WM_DISPLAYCHANGE => {
-                let event_type = WindowManagerEvent::DisplayChange(Window { hwnd: window.0 });
-                WINEVENT_CALLBACK_CHANNEL
-                    .lock()
-                    .0
-                    .send(event_type)
-                    .expect("could not send message on WINEVENT_CALLBACK_CHANNEL");
-
-                LRESULT(0)
-            }
-            // Added based on this https://stackoverflow.com/a/33762334
-            WM_SETTINGCHANGE => {
-                #[allow(clippy::cast_possible_truncation)]
-                if wparam.0 as u32 == SPI_SETWORKAREA.0
-                    || wparam.0 as u32 == SPI_ICONVERTICALSPACING.0
-                {
-                    let event_type = WindowManagerEvent::DisplayChange(Window { hwnd: window.0 });
-                    WINEVENT_CALLBACK_CHANNEL
-                        .lock()
-                        .0
-                        .send(event_type)
-                        .expect("could not send message on WINEVENT_CALLBACK_CHANNEL");
-                }
-                LRESULT(0)
-            }
-            // Added based on this https://stackoverflow.com/a/33762334
-            WM_DEVICECHANGE => {
-                #[allow(clippy::cast_possible_truncation)]
-                if wparam.0 as u32 == DBT_DEVNODES_CHANGED {
-                    let event_type = WindowManagerEvent::DisplayChange(Window { hwnd: window.0 });
-                    WINEVENT_CALLBACK_CHANNEL
-                        .lock()
-                        .0
-                        .send(event_type)
-                        .expect("could not send message on WINEVENT_CALLBACK_CHANNEL");
-                }
-                LRESULT(0)
-            }
-            _ => DefWindowProcW(window, message, wparam, lparam),
-        }
-    }
-}
--- a/komorebic.lib.ahk
+++ b/komorebic.lib.ahk
@@ -1,361 +1,349 @@
 ; Generated by komorebic.exe

 Start(ffm, await_configuration, tcp_port) {
-    RunWait, komorebic.exe start %ffm% --await-configuration %await_configuration% --tcp-port %tcp_port%, , Hide
+    Run, komorebic.exe start %ffm% --await-configuration %await_configuration% --tcp-port %tcp_port%, , Hide
 }

 Stop() {
-    RunWait, komorebic.exe stop, , Hide
+    Run, komorebic.exe stop, , Hide
 }

 State() {
-    RunWait, komorebic.exe state, , Hide
+    Run, komorebic.exe state, , Hide
 }

 Query(state_query) {
-    RunWait, komorebic.exe query %state_query%, , Hide
+    Run, komorebic.exe query %state_query%, , Hide
 }

 Subscribe(named_pipe) {
-    RunWait, komorebic.exe subscribe %named_pipe%, , Hide
+    Run, komorebic.exe subscribe %named_pipe%, , Hide
 }

 Unsubscribe(named_pipe) {
-    RunWait, komorebic.exe unsubscribe %named_pipe%, , Hide
+    Run, komorebic.exe unsubscribe %named_pipe%, , Hide
 }

 Log() {
-    RunWait, komorebic.exe log, , Hide
+    Run, komorebic.exe log, , Hide
 }

 QuickSaveResize() {
-    RunWait, komorebic.exe quick-save-resize, , Hide
+    Run, komorebic.exe quick-save-resize, , Hide
 }

 QuickLoadResize() {
-    RunWait, komorebic.exe quick-load-resize, , Hide
+    Run, komorebic.exe quick-load-resize, , Hide
 }

 SaveResize(path) {
-    RunWait, komorebic.exe save-resize %path%, , Hide
+    Run, komorebic.exe save-resize %path%, , Hide
 }

 LoadResize(path) {
-    RunWait, komorebic.exe load-resize %path%, , Hide
+    Run, komorebic.exe load-resize %path%, , Hide
 }

 Focus(operation_direction) {
-    RunWait, komorebic.exe focus %operation_direction%, , Hide
+    Run, komorebic.exe focus %operation_direction%, , Hide
 }

 Move(operation_direction) {
-    RunWait, komorebic.exe move %operation_direction%, , Hide
-}
-
-Minimize() {
-    RunWait, komorebic.exe minimize, , Hide
-}
-
-Close() {
-    RunWait, komorebic.exe close, , Hide
+    Run, komorebic.exe move %operation_direction%, , Hide
 }

 CycleFocus(cycle_direction) {
-    RunWait, komorebic.exe cycle-focus %cycle_direction%, , Hide
+    Run, komorebic.exe cycle-focus %cycle_direction%, , Hide
 }

 CycleMove(cycle_direction) {
-    RunWait, komorebic.exe cycle-move %cycle_direction%, , Hide
+    Run, komorebic.exe cycle-move %cycle_direction%, , Hide
 }

 Stack(operation_direction) {
-    RunWait, komorebic.exe stack %operation_direction%, , Hide
+    Run, komorebic.exe stack %operation_direction%, , Hide
 }

 Resize(edge, sizing) {
-    RunWait, komorebic.exe resize %edge% %sizing%, , Hide
+    Run, komorebic.exe resize %edge% %sizing%, , Hide
 }

 ResizeAxis(axis, sizing) {
-    RunWait, komorebic.exe resize-axis %axis% %sizing%, , Hide
+    Run, komorebic.exe resize-axis %axis% %sizing%, , Hide
 }

 Unstack() {
-    RunWait, komorebic.exe unstack, , Hide
+    Run, komorebic.exe unstack, , Hide
 }

 CycleStack(cycle_direction) {
-    RunWait, komorebic.exe cycle-stack %cycle_direction%, , Hide
+    Run, komorebic.exe cycle-stack %cycle_direction%, , Hide
 }

 MoveToMonitor(target) {
-    RunWait, komorebic.exe move-to-monitor %target%, , Hide
+    Run, komorebic.exe move-to-monitor %target%, , Hide
 }

 MoveToWorkspace(target) {
-    RunWait, komorebic.exe move-to-workspace %target%, , Hide
+    Run, komorebic.exe move-to-workspace %target%, , Hide
 }

 SendToMonitor(target) {
-    RunWait, komorebic.exe send-to-monitor %target%, , Hide
+    Run, komorebic.exe send-to-monitor %target%, , Hide
 }

 SendToWorkspace(target) {
-    RunWait, komorebic.exe send-to-workspace %target%, , Hide
+    Run, komorebic.exe send-to-workspace %target%, , Hide
 }

 SendToMonitorWorkspace(target_monitor, target_workspace) {
-    RunWait, komorebic.exe send-to-monitor-workspace %target_monitor% %target_workspace%, , Hide
+    Run, komorebic.exe send-to-monitor-workspace %target_monitor% %target_workspace%, , Hide
 }

 FocusMonitor(target) {
-    RunWait, komorebic.exe focus-monitor %target%, , Hide
+    Run, komorebic.exe focus-monitor %target%, , Hide
 }

 FocusWorkspace(target) {
-    RunWait, komorebic.exe focus-workspace %target%, , Hide
+    Run, komorebic.exe focus-workspace %target%, , Hide
 }

 FocusMonitorWorkspace(target_monitor, target_workspace) {
-    RunWait, komorebic.exe focus-monitor-workspace %target_monitor% %target_workspace%, , Hide
+    Run, komorebic.exe focus-monitor-workspace %target_monitor% %target_workspace%, , Hide
 }

 CycleMonitor(cycle_direction) {
-    RunWait, komorebic.exe cycle-monitor %cycle_direction%, , Hide
+    Run, komorebic.exe cycle-monitor %cycle_direction%, , Hide
 }

 CycleWorkspace(cycle_direction) {
-    RunWait, komorebic.exe cycle-workspace %cycle_direction%, , Hide
+    Run, komorebic.exe cycle-workspace %cycle_direction%, , Hide
 }

 MoveWorkspaceToMonitor(target) {
-    RunWait, komorebic.exe move-workspace-to-monitor %target%, , Hide
+    Run, komorebic.exe move-workspace-to-monitor %target%, , Hide
 }

 NewWorkspace() {
-    RunWait, komorebic.exe new-workspace, , Hide
+    Run, komorebic.exe new-workspace, , Hide
 }

 ResizeDelta(pixels) {
-    RunWait, komorebic.exe resize-delta %pixels%, , Hide
+    Run, komorebic.exe resize-delta %pixels%, , Hide
 }

 InvisibleBorders(left, top, right, bottom) {
-    RunWait, komorebic.exe invisible-borders %left% %top% %right% %bottom%, , Hide
+    Run, komorebic.exe invisible-borders %left% %top% %right% %bottom%, , Hide
 }

 WorkAreaOffset(left, top, right, bottom) {
-    RunWait, komorebic.exe work-area-offset %left% %top% %right% %bottom%, , Hide
+    Run, komorebic.exe work-area-offset %left% %top% %right% %bottom%, , Hide
 }

 AdjustContainerPadding(sizing, adjustment) {
-    RunWait, komorebic.exe adjust-container-padding %sizing% %adjustment%, , Hide
+    Run, komorebic.exe adjust-container-padding %sizing% %adjustment%, , Hide
 }

 AdjustWorkspacePadding(sizing, adjustment) {
-    RunWait, komorebic.exe adjust-workspace-padding %sizing% %adjustment%, , Hide
+    Run, komorebic.exe adjust-workspace-padding %sizing% %adjustment%, , Hide
 }

 ChangeLayout(default_layout) {
-    RunWait, komorebic.exe change-layout %default_layout%, , Hide
+    Run, komorebic.exe change-layout %default_layout%, , Hide
 }

 LoadCustomLayout(path) {
-    RunWait, komorebic.exe load-custom-layout %path%, , Hide
+    Run, komorebic.exe load-custom-layout %path%, , Hide
 }

 FlipLayout(axis) {
-    RunWait, komorebic.exe flip-layout %axis%, , Hide
+    Run, komorebic.exe flip-layout %axis%, , Hide
 }

 Promote() {
-    RunWait, komorebic.exe promote, , Hide
+    Run, komorebic.exe promote, , Hide
 }

 PromoteFocus() {
-    RunWait, komorebic.exe promote-focus, , Hide
+    Run, komorebic.exe promote-focus, , Hide
 }

 Retile() {
-    RunWait, komorebic.exe retile, , Hide
-}
-
-MonitorIndexPreference(index_preference, left, top, right, bottom) {
-    RunWait, komorebic.exe monitor-index-preference %index_preference% %left% %top% %right% %bottom%, , Hide
+    Run, komorebic.exe retile, , Hide
 }

 EnsureWorkspaces(monitor, workspace_count) {
-    RunWait, komorebic.exe ensure-workspaces %monitor% %workspace_count%, , Hide
+    Run, komorebic.exe ensure-workspaces %monitor% %workspace_count%, , Hide
 }

 ContainerPadding(monitor, workspace, size) {
-    RunWait, komorebic.exe container-padding %monitor% %workspace% %size%, , Hide
+    Run, komorebic.exe container-padding %monitor% %workspace% %size%, , Hide
 }

 WorkspacePadding(monitor, workspace, size) {
-    RunWait, komorebic.exe workspace-padding %monitor% %workspace% %size%, , Hide
+    Run, komorebic.exe workspace-padding %monitor% %workspace% %size%, , Hide
 }

 WorkspaceLayout(monitor, workspace, value) {
-    RunWait, komorebic.exe workspace-layout %monitor% %workspace% %value%, , Hide
+    Run, komorebic.exe workspace-layout %monitor% %workspace% %value%, , Hide
 }

 WorkspaceCustomLayout(monitor, workspace, path) {
-    RunWait, komorebic.exe workspace-custom-layout %monitor% %workspace% %path%, , Hide
+    Run, komorebic.exe workspace-custom-layout %monitor% %workspace% %path%, , Hide
 }

 WorkspaceLayoutRule(monitor, workspace, at_container_count, layout) {
-    RunWait, komorebic.exe workspace-layout-rule %monitor% %workspace% %at_container_count% %layout%, , Hide
+    Run, komorebic.exe workspace-layout-rule %monitor% %workspace% %at_container_count% %layout%, , Hide
 }

 WorkspaceCustomLayoutRule(monitor, workspace, at_container_count, path) {
-    RunWait, komorebic.exe workspace-custom-layout-rule %monitor% %workspace% %at_container_count% %path%, , Hide
+    Run, komorebic.exe workspace-custom-layout-rule %monitor% %workspace% %at_container_count% %path%, , Hide
 }

 ClearWorkspaceLayoutRules(monitor, workspace) {
-    RunWait, komorebic.exe clear-workspace-layout-rules %monitor% %workspace%, , Hide
+    Run, komorebic.exe clear-workspace-layout-rules %monitor% %workspace%, , Hide
 }

 WorkspaceTiling(monitor, workspace, value) {
-    RunWait, komorebic.exe workspace-tiling %monitor% %workspace% %value%, , Hide
+    Run, komorebic.exe workspace-tiling %monitor% %workspace% %value%, , Hide
 }

 WorkspaceName(monitor, workspace, value) {
-    RunWait, komorebic.exe workspace-name %monitor% %workspace% %value%, , Hide
+    Run, komorebic.exe workspace-name %monitor% %workspace% %value%, , Hide
 }

 ToggleWindowContainerBehaviour() {
-    RunWait, komorebic.exe toggle-window-container-behaviour, , Hide
+    Run, komorebic.exe toggle-window-container-behaviour, , Hide
 }

 TogglePause() {
-    RunWait, komorebic.exe toggle-pause, , Hide
+    Run, komorebic.exe toggle-pause, , Hide
 }

 ToggleTiling() {
-    RunWait, komorebic.exe toggle-tiling, , Hide
+    Run, komorebic.exe toggle-tiling, , Hide
 }

 ToggleFloat() {
-    RunWait, komorebic.exe toggle-float, , Hide
+    Run, komorebic.exe toggle-float, , Hide
 }

 ToggleMonocle() {
-    RunWait, komorebic.exe toggle-monocle, , Hide
+    Run, komorebic.exe toggle-monocle, , Hide
 }

 ToggleMaximize() {
-    RunWait, komorebic.exe toggle-maximize, , Hide
+    Run, komorebic.exe toggle-maximize, , Hide
 }

 RestoreWindows() {
-    RunWait, komorebic.exe restore-windows, , Hide
+    Run, komorebic.exe restore-windows, , Hide
 }

 Manage() {
-    RunWait, komorebic.exe manage, , Hide
+    Run, komorebic.exe manage, , Hide
 }

 Unmanage() {
-    RunWait, komorebic.exe unmanage, , Hide
+    Run, komorebic.exe unmanage, , Hide
 }

 ReloadConfiguration() {
-    RunWait, komorebic.exe reload-configuration, , Hide
+    Run, komorebic.exe reload-configuration, , Hide
 }

 WatchConfiguration(boolean_state) {
-    RunWait, komorebic.exe watch-configuration %boolean_state%, , Hide
+    Run, komorebic.exe watch-configuration %boolean_state%, , Hide
 }

 CompleteConfiguration() {
-    RunWait, komorebic.exe complete-configuration, , Hide
+    Run, komorebic.exe complete-configuration, , Hide
 }

 WindowHidingBehaviour(hiding_behaviour) {
-    RunWait, komorebic.exe window-hiding-behaviour %hiding_behaviour%, , Hide
+    Run, komorebic.exe window-hiding-behaviour %hiding_behaviour%, , Hide
 }

 CrossMonitorMoveBehaviour(move_behaviour) {
-    RunWait, komorebic.exe cross-monitor-move-behaviour %move_behaviour%, , Hide
+    Run, komorebic.exe cross-monitor-move-behaviour %move_behaviour%, , Hide
 }

 ToggleCrossMonitorMoveBehaviour() {
-    RunWait, komorebic.exe toggle-cross-monitor-move-behaviour, , Hide
+    Run, komorebic.exe toggle-cross-monitor-move-behaviour, , Hide
 }

 UnmanagedWindowOperationBehaviour(operation_behaviour) {
-    RunWait, komorebic.exe unmanaged-window-operation-behaviour %operation_behaviour%, , Hide
+    Run, komorebic.exe unmanaged-window-operation-behaviour %operation_behaviour%, , Hide
 }

 FloatRule(identifier, id) {
-    RunWait, komorebic.exe float-rule %identifier% "%id%", , Hide
+    Run, komorebic.exe float-rule %identifier% "%id%", , Hide
 }

 ManageRule(identifier, id) {
-    RunWait, komorebic.exe manage-rule %identifier% "%id%", , Hide
+    Run, komorebic.exe manage-rule %identifier% "%id%", , Hide
 }

 WorkspaceRule(identifier, id, monitor, workspace) {
-    RunWait, komorebic.exe workspace-rule %identifier% "%id%" %monitor% %workspace%, , Hide
+    Run, komorebic.exe workspace-rule %identifier% "%id%" %monitor% %workspace%, , Hide
 }

 IdentifyObjectNameChangeApplication(identifier, id) {
-    RunWait, komorebic.exe identify-object-name-change-application %identifier% "%id%", , Hide
+    Run, komorebic.exe identify-object-name-change-application %identifier% "%id%", , Hide
 }

 IdentifyTrayApplication(identifier, id) {
-    RunWait, komorebic.exe identify-tray-application %identifier% "%id%", , Hide
+    Run, komorebic.exe identify-tray-application %identifier% "%id%", , Hide
 }

 IdentifyLayeredApplication(identifier, id) {
-    RunWait, komorebic.exe identify-layered-application %identifier% "%id%", , Hide
+    Run, komorebic.exe identify-layered-application %identifier% "%id%", , Hide
 }

 IdentifyBorderOverflowApplication(identifier, id) {
-    RunWait, komorebic.exe identify-border-overflow-application %identifier% "%id%", , Hide
+    Run, komorebic.exe identify-border-overflow-application %identifier% "%id%", , Hide
 }

 ActiveWindowBorder(boolean_state) {
-    RunWait, komorebic.exe active-window-border %boolean_state%, , Hide
+    Run, komorebic.exe active-window-border %boolean_state%, , Hide
 }

 ActiveWindowBorderColour(r, g, b, window_kind) {
-    RunWait, komorebic.exe active-window-border-colour %r% %g% %b% --window-kind %window_kind%, , Hide
+    Run, komorebic.exe active-window-border-colour %r% %g% %b% --window-kind %window_kind%, , Hide
 }

 FocusFollowsMouse(boolean_state, implementation) {
-    RunWait, komorebic.exe focus-follows-mouse %boolean_state% --implementation %implementation%, , Hide
+    Run, komorebic.exe focus-follows-mouse %boolean_state% --implementation %implementation%, , Hide
 }

 ToggleFocusFollowsMouse(implementation) {
-    RunWait, komorebic.exe toggle-focus-follows-mouse  --implementation %implementation%, , Hide
+    Run, komorebic.exe toggle-focus-follows-mouse  --implementation %implementation%, , Hide
 }

 MouseFollowsFocus(boolean_state) {
-    RunWait, komorebic.exe mouse-follows-focus %boolean_state%, , Hide
+    Run, komorebic.exe mouse-follows-focus %boolean_state%, , Hide
 }

 ToggleMouseFollowsFocus() {
-    RunWait, komorebic.exe toggle-mouse-follows-focus, , Hide
+    Run, komorebic.exe toggle-mouse-follows-focus, , Hide
 }

 AhkLibrary() {
-    RunWait, komorebic.exe ahk-library, , Hide
+    Run, komorebic.exe ahk-library, , Hide
 }

 AhkAppSpecificConfiguration(path, override_path) {
-    RunWait, komorebic.exe ahk-app-specific-configuration %path% %override_path%, , Hide
+    Run, komorebic.exe ahk-app-specific-configuration %path% %override_path%, , Hide
 }

 FormatAppSpecificConfiguration(path) {
-    RunWait, komorebic.exe format-app-specific-configuration %path%, , Hide
+    Run, komorebic.exe format-app-specific-configuration %path%, , Hide
 }

 NotificationSchema() {
-    RunWait, komorebic.exe notification-schema, , Hide
+    Run, komorebic.exe notification-schema, , Hide
 }

 SocketSchema() {
-    RunWait, komorebic.exe socket-schema, , Hide
+    Run, komorebic.exe socket-schema, , Hide
 }
--- a/komorebic/Cargo.toml
+++ b/komorebic/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komorebic"
-version = "0.1.14"
+version = "0.1.13"
 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"]
@@ -14,7 +14,7 @@ edition = "2021"
 derive-ahk = { path = "../derive-ahk" }
 komorebi-core = { path = "../komorebi-core" }

-clap = { version = "4", features = ["derive", "wrap_help"] }
+clap = { version = "3", features = ["derive", "wrap_help"] }
 color-eyre = "0.6"
 dirs = "4"
 fs-tail = "0.1"
@@ -29,7 +29,7 @@ sysinfo = "0.26"
 uds_windows = "1"

 [dependencies.windows]
-version = "0.43"
+version = "0.39"
 features = [
    "Win32_Foundation",
    "Win32_UI_WindowsAndMessaging"
--- a/komorebic/src/main.rs
+++ b/komorebic/src/main.rs
@@ -12,8 +12,9 @@ use std::path::PathBuf;
 use std::process::Command;
 use std::time::Duration;

+use clap::AppSettings;
+use clap::ArgEnum;
 use clap::Parser;
-use clap::ValueEnum;
 use color_eyre::eyre::anyhow;
 use color_eyre::Result;
 use fs_tail::TailedFile;
@@ -76,7 +77,7 @@ trait AhkFunction {
    fn generate_ahk_function() -> String;
 }

-#[derive(Copy, Clone, ValueEnum)]
+#[derive(Copy, Clone, ArgEnum)]
 enum BooleanState {
    Enable,
    Disable,
@@ -98,7 +99,7 @@ macro_rules! gen_enum_subcommand_args {
            paste! {
                #[derive(clap::Parser, derive_ahk::AhkFunction)]
                pub struct $name {
-                    #[clap(value_enum)]
+                    #[clap(arg_enum)]
                    [<$element:snake>]: $element
                }
            }
@@ -153,7 +154,7 @@ gen_target_subcommand_args! {
 macro_rules! gen_workspace_subcommand_args {
    // Workspace Property: #[enum] Value Enum (if the value is an Enum)
    // Workspace Property: Value Type (if the value is anything else)
-    ( $( $name:ident: $(#[enum] $(@$value_enum:tt)?)? $value:ty ),+ $(,)? ) => (
+    ( $( $name:ident: $(#[enum] $(@$arg_enum:tt)?)? $value:ty ),+ $(,)? ) => (
        paste! {
            $(
                #[derive(clap::Parser, derive_ahk::AhkFunction)]
@@ -164,9 +165,9 @@ macro_rules! gen_workspace_subcommand_args {
                    /// Workspace index on the specified monitor (zero-indexed)
                    workspace: usize,

-                    $(#[clap(value_enum)] $($value_enum)?)?
+                    $(#[clap(arg_enum)] $($arg_enum)?)?
                    #[cfg_attr(
-                        all($(FALSE $($value_enum)?)?),
+                        all($(FALSE $($arg_enum)?)?),
                        doc = ""$name " of the workspace as a "$value ""
                    )]
                    value: $value,
@@ -214,7 +215,7 @@ pub struct WorkspaceLayoutRule {
    /// The number of window containers on-screen required to trigger this layout rule
    at_container_count: usize,

-    #[clap(value_enum)]
+    #[clap(arg_enum)]
    layout: DefaultLayout,
 }

@@ -235,17 +236,17 @@ pub struct WorkspaceCustomLayoutRule {

 #[derive(Parser, AhkFunction)]
 struct Resize {
-    #[clap(value_enum)]
+    #[clap(arg_enum)]
    edge: OperationDirection,
-    #[clap(value_enum)]
+    #[clap(arg_enum)]
    sizing: Sizing,
 }

 #[derive(Parser, AhkFunction)]
 struct ResizeAxis {
-    #[clap(value_enum)]
+    #[clap(arg_enum)]
    axis: Axis,
-    #[clap(value_enum)]
+    #[clap(arg_enum)]
    sizing: Sizing,
 }

@@ -279,20 +280,6 @@ struct WorkAreaOffset {
    bottom: i32,
 }

-#[derive(Parser, AhkFunction)]
-struct MonitorIndexPreference {
-    /// Preferred monitor index (zero-indexed)
-    index_preference: usize,
-    /// Left value of the monitor's size Rect
-    left: i32,
-    /// Top value of the monitor's size Rect
-    top: i32,
-    /// Right value of the monitor's size Rect
-    right: i32,
-    /// Bottom value of the monitor's size Rect
-    bottom: i32,
-}
-
 #[derive(Parser, AhkFunction)]
 struct EnsureWorkspaces {
    /// Monitor index (zero-indexed)
@@ -345,7 +332,7 @@ macro_rules! gen_padding_adjustment_subcommand_args {
        $(
            #[derive(clap::Parser, derive_ahk::AhkFunction)]
            pub struct $name {
-                #[clap(value_enum)]
+                #[clap(arg_enum)]
                sizing: Sizing,
                /// Pixels to adjust by as an integer
                adjustment: i32,
@@ -365,7 +352,7 @@ macro_rules! gen_application_target_subcommand_args {
        $(
            #[derive(clap::Parser, derive_ahk::AhkFunction)]
            pub struct $name {
-                #[clap(value_enum)]
+                #[clap(arg_enum)]
                identifier: ApplicationIdentifier,
                /// Identifier as a string
                id: String,
@@ -385,7 +372,7 @@ gen_application_target_subcommand_args! {

 #[derive(Parser, AhkFunction)]
 struct WorkspaceRule {
-    #[clap(value_enum)]
+    #[clap(arg_enum)]
    identifier: ApplicationIdentifier,
    /// Identifier as a string
    id: String,
@@ -397,27 +384,27 @@ struct WorkspaceRule {

 #[derive(Parser, AhkFunction)]
 struct ToggleFocusFollowsMouse {
-    #[clap(value_enum, short, long, default_value = "windows")]
+    #[clap(arg_enum, short, long, default_value = "windows")]
    implementation: FocusFollowsMouseImplementation,
 }

 #[derive(Parser, AhkFunction)]
 struct FocusFollowsMouse {
-    #[clap(value_enum, short, long, default_value = "windows")]
+    #[clap(arg_enum, short, long, default_value = "windows")]
    implementation: FocusFollowsMouseImplementation,
-    #[clap(value_enum)]
+    #[clap(arg_enum)]
    boolean_state: BooleanState,
 }

 #[derive(Parser, AhkFunction)]
 struct ActiveWindowBorder {
-    #[clap(value_enum)]
+    #[clap(arg_enum)]
    boolean_state: BooleanState,
 }

 #[derive(Parser, AhkFunction)]
 struct ActiveWindowBorderColour {
-    #[clap(value_enum, short, long, default_value = "single")]
+    #[clap(arg_enum, short, long, default_value = "single")]
    window_kind: WindowKind,
    /// Red
    r: u32,
@@ -485,7 +472,7 @@ struct FormatAppSpecificConfiguration {
 }

 #[derive(Parser)]
-#[clap(author, about, version)]
+#[clap(author, about, version, setting = AppSettings::DeriveDisplayOrder)]
 struct Opts {
    #[clap(subcommand)]
    subcmd: SubCommand,
@@ -530,10 +517,6 @@ enum SubCommand {
    /// Move the focused window in the specified direction
    #[clap(arg_required_else_help = true)]
    Move(Move),
-    /// Minimize the focused window
-    Minimize,
-    /// Close the focused window
-    Close,
    /// Change focus to the window in the specified cycle direction
    #[clap(arg_required_else_help = true)]
    CycleFocus(CycleFocus),
@@ -620,9 +603,6 @@ enum SubCommand {
    PromoteFocus,
    /// Force the retiling of all managed windows
    Retile,
-    /// Set the monitor index preference for a monitor identified using its size
-    #[clap(arg_required_else_help = true)]
-    MonitorIndexPreference(MonitorIndexPreference),
    /// Create at least this many workspaces for the specified monitor
    #[clap(arg_required_else_help = true)]
    EnsureWorkspaces(EnsureWorkspaces),
@@ -795,12 +775,6 @@ fn main() -> Result<()> {
        SubCommand::Focus(arg) => {
            send_message(&SocketMessage::FocusWindow(arg.operation_direction).as_bytes()?)?;
        }
-        SubCommand::Close => {
-            send_message(&SocketMessage::Close.as_bytes()?)?;
-        }
-        SubCommand::Minimize => {
-            send_message(&SocketMessage::Minimize.as_bytes()?)?;
-        }
        SubCommand::Promote => {
            send_message(&SocketMessage::Promote.as_bytes()?)?;
        }
@@ -1125,18 +1099,6 @@ fn main() -> Result<()> {
                    .as_bytes()?,
            )?;
        }
-        SubCommand::MonitorIndexPreference(arg) => {
-            send_message(
-                &SocketMessage::MonitorIndexPreference(
-                    arg.index_preference,
-                    arg.left,
-                    arg.top,
-                    arg.right,
-                    arg.bottom,
-                )
-                .as_bytes()?,
-            )?;
-        }
        SubCommand::EnsureWorkspaces(workspaces) => {
            send_message(
                &SocketMessage::EnsureWorkspaces(workspaces.monitor, workspaces.workspace_count)
@@ -1144,7 +1106,7 @@ fn main() -> Result<()> {
            )?;
        }
        SubCommand::State => {
-            let home = DATA_DIR.clone();
+            let home = HOME_DIR.clone();
            let mut socket = home;
            socket.push("komorebic.sock");
            let socket = socket.as_path();
@@ -1160,10 +1122,9 @@ fn main() -> Result<()> {
                },
            };

-            let listener = UnixListener::bind(&socket)?;
-
            send_message(&SocketMessage::State.as_bytes()?)?;

+            let listener = UnixListener::bind(&socket)?;
            match listener.accept() {
                Ok(incoming) => {
                    let stream = BufReader::new(incoming.0);
@@ -1179,7 +1140,7 @@ fn main() -> Result<()> {
            }
        }
        SubCommand::Query(arg) => {
-            let home = DATA_DIR.clone();
+            let home = HOME_DIR.clone();
            let mut socket = home;
            socket.push("komorebic.sock");
            let socket = socket.as_path();
@@ -1195,10 +1156,9 @@ fn main() -> Result<()> {
                },
            };

-            let listener = UnixListener::bind(&socket)?;
-
            send_message(&SocketMessage::Query(arg.state_query).as_bytes()?)?;

+            let listener = UnixListener::bind(&socket)?;
            match listener.accept() {
                Ok(incoming) => {
                    let stream = BufReader::new(incoming.0);
@@ -1382,7 +1342,7 @@ fn main() -> Result<()> {
            println!("File successfully formatted for PRs to https://github.com/LGUG2Z/komorebi-application-specific-configuration");
        }
        SubCommand::NotificationSchema => {
-            let home = DATA_DIR.clone();
+            let home = HOME_DIR.clone();
            let mut socket = home;
            socket.push("komorebic.sock");
            let socket = socket.as_path();
@@ -1416,7 +1376,7 @@ fn main() -> Result<()> {
            }
        }
        SubCommand::SocketSchema => {
-            let home = DATA_DIR.clone();
+            let home = HOME_DIR.clone();
            let mut socket = home;
            socket.push("komorebic.sock");
            let socket = socket.as_path();