feat(wm): drop empty containers on ws update

We shouldn't ever have empty containers, but never say never because someone on the Discord has an empty container with no Windows that continues to take up a tile. This commit adds a call to drop all containers without any windows whenever Workspace::update is called.
fix(wm): remove border width/offset when disabled
2026-02-12 08:17:40 +01:00 · 2025-04-07 14:38:31 -07:00 · 2025-04-07 10:12:18 -07:00 · 2025-04-07 10:12:18 -07:00 · 2025-04-06 21:19:41 -07:00 · 2025-04-06 21:17:35 -07:00
117 changed files with 17471 additions and 3797 deletions
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -18,6 +18,14 @@ on:
  workflow_dispatch:

 jobs:
+  cargo-deny:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: EmbarkStudios/cargo-deny-action@v2
+
  build:
    strategy:
      fail-fast: true
@@ -47,7 +55,7 @@ jobs:
          key: ${{ matrix.platform.target }}
      - run: cargo +nightly fmt --check
      - run: cargo clippy
-      - run: cargo test --package komorebi --test compat
+      - run: cargo test
      - uses: houseabsolute/actions-rust-cross@v1
        with:
          command: "build"
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,40 @@
+# The Komorebi Code of Conduct
+
+This document is based on the [Rust Code of
+Conduct](https://www.rust-lang.org/policies/code-of-conduct)
+
+## Conduct
+
+- We are committed to providing a friendly, safe and welcoming environment for
+all, regardless of level of experience, gender identity and expression, sexual
+orientation, disability, personal appearance, body size, race, ethnicity, age,
+religion, nationality, or other similar characteristic.
+
+- Please avoid using overtly sexual aliases or other nicknames that might
+detract from a friendly, safe and welcoming environment for all.
+
+- Please be kind and courteous. There’s no need to be mean or rude.
+
+- Respect that people have differences of opinion and that every design or
+implementation choice carries a trade-off and numerous costs. There is seldom a
+right answer.
+
+- Please keep unstructured critique to a minimum. If you have solid ideas you
+want to experiment with, make a fork and see how it works.
+
+- We will exclude you from interaction if you insult, demean or harass anyone.
+That is not welcome behavior. We interpret the term “harassment” as including
+the definition in the [Citizen Code of
+Conduct](https://github.com/stumpsyn/policies/blob/master/citizen_code_of_conduct.md);
+if you have any lack of clarity about what might be included in that concept,
+please read their definition. In particular, we don’t tolerate behavior that
+excludes people in socially marginalized groups.
+
+- Private harassment is also unacceptable. No matter who you are, if you feel
+you have been or are being harassed or made uncomfortable by a community member,
+please contact me immediately. Whether you’re a regular contributor or a
+newcomer, we care about making this community a safe place for you and we’ve got
+your back.
+
+- Likewise any spamming, trolling, flaming, baiting or other attention-stealing
+behavior is not welcome.
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,13 +13,14 @@ members = [

 [workspace.dependencies]
 clap = { version = "4", features = ["derive", "wrap_help"] }
+chrono-tz = "0.10"
 chrono = "0.4"
 crossbeam-channel = "0.5"
 crossbeam-utils = "0.8"
 color-eyre = "0.6"
-eframe = "0.30"
-egui_extras = "0.30"
-dirs = "5"
+eframe = "0.31"
+egui_extras = "0.31"
+dirs = "6"
 dunce = "1"
 hotwatch = "0.5"
 schemars = "0.8"
@@ -27,33 +28,38 @@ lazy_static = "1"
 serde = { version = "1", features = ["derive"] }
 serde_json = { package = "serde_json_lenient", version = "0.2" }
 serde_yaml = "0.9"
+strum = { version = "0.27", features = ["derive"] }
 tracing = "0.1"
 tracing-appender = "0.2"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 paste = "1"
 sysinfo = "0.33"
 uds_windows = "1"
-win32-display-data = { git = "https://github.com/LGUG2Z/win32-display-data", rev = "75286e77c068a89d12adcd6404c9c4874a60acf5" }
-windows-implement = { version = "0.58" }
-windows-interface = { version = "0.58" }
-windows-core = { version = "0.58" }
-shadow-rs = "0.37"
+win32-display-data = { git = "https://github.com/LGUG2Z/win32-display-data", rev = "a28c6559a9de2f92c142a714947a9b081776caca" }
+windows-numerics = { version = "0.2" }
+windows-implement = { version = "0.60" }
+windows-interface = { version = "0.59" }
+windows-core = { version = "0.61" }
+shadow-rs = "1"
 which = "7"

 [workspace.dependencies.windows]
-version = "0.58"
+version = "0.61"
 features = [
-    "implement",
    "Foundation_Numerics",
+    "Win32_Devices",
+    "Win32_Devices_Display",
    "Win32_System_Com",
    "Win32_UI_Shell_Common", # for IObjectArray
    "Win32_Foundation",
+    "Win32_Globalization",
    "Win32_Graphics_Dwm",
    "Win32_Graphics_Gdi",
    "Win32_Graphics_Direct2D",
    "Win32_Graphics_Direct2D_Common",
    "Win32_Graphics_Dxgi_Common",
    "Win32_System_LibraryLoader",
+    "Win32_System_Power",
    "Win32_System_RemoteDesktop",
    "Win32_System_Threading",
    "Win32_UI_Accessibility",
@@ -66,4 +72,4 @@ features = [
    "Win32_System_WindowsProgramming",
    "Media",
    "Media_Control"
-]
+]
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
 # Komorebi License

-Version 1.0.0
+Version 2.0.0

 ## Acceptance

@@ -13,9 +13,20 @@ your licenses.
 The licensor grants you a copyright license for the software
 to do everything you might do with the software that would
 otherwise infringe the licensor's copyright in it for any
-permitted purpose. However, you may only make changes according
+permitted purpose. However, you may only distribute the source
+code of the software according to the [Distribution License](
+#distribution-license), you may only make changes according
 to the [Changes License](#changes-license), and you may not
-distribute the software or new works based on the software.
+otherwise distribute the software or new works based on the
+software.
+
+## Distribution License
+
+The licensor grants you an additional copyright license to
+distribute copies of the source code of the software. Your
+license to distribute covers distributing the source code of
+the software with changes permitted by the [Changes License](
+#changes-license).

 ## Changes License

@@ -45,7 +56,7 @@ law. These terms do not limit them.

 These terms do not allow you to sublicense or transfer any of
 your licenses to anyone else, or prevent the licensor from
-granting licenses to anyone else.  These terms do not imply
+granting licenses to anyone else. These terms do not imply
 any other licenses.

 ## Patent Defense
@@ -63,7 +74,7 @@ violated any of these terms, or done anything with the software
 not covered by your licenses, your licenses can nonetheless
 continue if you come into full compliance with these terms,
 and take practical steps to correct past violations, within
-32 days of receiving notice.  Otherwise, all your licenses
+32 days of receiving notice. Otherwise, all your licenses
 end immediately.

 ## No Liability
@@ -88,11 +99,10 @@ organizations that have control over, are under the control of,
 or are under common control with that organization.  **Control**
 means ownership of substantially all the assets of an entity,
 or the power to direct its management and policies by vote,
-contract, or otherwise.  Control can be direct or indirect.
+contract, or otherwise. Control can be direct or indirect.

 **Your licenses** are all the licenses granted to you for the
 software under these terms.

 **Use** means anything you do with the software requiring one
 of your licenses.
-
--- a/README.md
+++ b/README.md
@@ -7,9 +7,9 @@ Tiling Window Management for Windows.
    <img alt="Tech for Palestine" src="https://badge.techforpalestine.org/default">
  </a>
  <img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/LGUG2Z/komorebi/.github/workflows/windows.yaml">
-  <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">
+  <img alt="Active Individual Commercial Use Licenses" src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Flgug2z-ecstaticmagentacheetah.web.val.run&query=%24.&label=active%20individual%20commercial%20use%20licenses&cacheSeconds=3600&link=https%3A%2F%2Flgug2z.com%2Fsoftware%2Fkomorebi">
  <a href="https://discord.gg/mGkn66PHkx">
    <img alt="Discord" src="https://img.shields.io/discord/898554690126630914">
  </a>
@@ -71,7 +71,10 @@ showcases the many awesome projects that exist in the _komorebi_ ecosystem.

 ## Licensing for Personal Use

-`komorebi` is licensed under the [Komorebi 1.0.0
+`komorebi` is [educational source
+software](https://lgug2z.com/articles/educational-source-software/).
+
+`komorebi` is licensed under the [Komorebi 2.0.0
 license](https://github.com/LGUG2Z/komorebi-license), which is a fork of the
 [PolyForm Strict 1.0.0
 license](https://polyformproject.org/licenses/strict/1.0.0). On a high level
@@ -82,7 +85,7 @@ hard-forks) based on the software.
 Anyone is free to make their own fork of `komorebi` with changes intended either
 for personal use or for integration back upstream via pull requests.

-The [Komorebi 1.0.0 License](https://github.com/LGUG2Z/komorebi-license) does
+The [Komorebi 2.0.0 License](https://github.com/LGUG2Z/komorebi-license) does
 not permit any kind of commercial use (i.e. using `komorebi` at work).

 ## Sponsorship for Personal Use
@@ -99,7 +102,8 @@ me on GitHub.
 [GitHub Sponsors is enabled for this
 project](https://github.com/sponsors/LGUG2Z). Sponsors can claim custom roles on
 the Discord server, get shout outs at the end of _komorebi_-related videos on
-YouTube, and gain the ability to submit feature requests on the issue tracker.
+YouTube, gain the ability to submit feature requests on the issue tracker, and
+receive releases of komorebi with "easter eggs" on physical media.

 If you would like to tip or sponsor the project but are unable to use GitHub
 Sponsors, you may also sponsor through [Ko-fi](https://ko-fi.com/lgug2z), or
@@ -142,7 +146,8 @@ video will answer the majority of your questions.

 [@amnweb](https://github.com/amnweb) showing _komorebi_ `v0.1.28` running on Windows 11 with window borders,
 unfocused window transparency and animations enabled, using a custom status bar integrated using
-_komorebi_'s [Window Manager Event Subscriptions](https://github.com/LGUG2Z/komorebi?tab=readme-ov-file#window-manager-event-subscriptions).
+_komorebi_'
+s [Window Manager Event Subscriptions](https://github.com/LGUG2Z/komorebi?tab=readme-ov-file#window-manager-event-subscriptions).

 https://github.com/LGUG2Z/komorebi/assets/13164844/21be8dc4-fa76-4f70-9b37-1d316f4b40c2

@@ -389,7 +394,7 @@ every `WindowManagerEvent` and `SocketMessage` handled by `komorebi` in a Rust c
 Below is a simple example of how to use `komorebi-client` in a basic Rust application.

 ```rust
-// komorebi-client = { git = "https://github.com/LGUG2Z/komorebi", tag = "v0.1.33"}
+// komorebi-client = { git = "https://github.com/LGUG2Z/komorebi", tag = "v0.1.35"}

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

  -a, --animation-type <ANIMATION_TYPE>
          Animation type to apply the style to. If not specified, sets global style
--- a/docs/cli/border-colour.md
+++ b/docs/cli/border-colour.md
@@ -18,7 +18,7 @@ Arguments:
 Options:
  -w, --window-kind <WINDOW_KIND>
          [default: single]
-          [possible values: single, stack, monocle, unfocused, floating]
+          [possible values: single, stack, monocle, unfocused, unfocused-locked, floating]

  -h, --help
          Print help
--- a/docs/cli/clear-session-float-rules.md
+++ b/docs/cli/clear-session-float-rules.md
@@ -0,0 +1,12 @@
+# clear-session-float-rules
+
+```
+Clear all session float rules
+
+Usage: komorebic.exe clear-session-float-rules
+
+Options:
+  -h, --help
+          Print help
+
+```
--- a/docs/cli/cycle-empty-workspace.md
+++ b/docs/cli/cycle-empty-workspace.md
@@ -0,0 +1,16 @@
+# cycle-empty-workspace
+
+```
+Focus the next empty workspace in the given cycle direction (if one exists)
+
+Usage: komorebic.exe cycle-empty-workspace <CYCLE_DIRECTION>
+
+Arguments:
+  <CYCLE_DIRECTION>
+          [possible values: previous, next]
+
+Options:
+  -h, --help
+          Print help
+
+```
--- a/docs/cli/data-directory.md
+++ b/docs/cli/data-directory.md
@@ -0,0 +1,12 @@
+# data-directory
+
+```
+Show the path to komorebi's data directory in %LOCALAPPDATA%
+
+Usage: komorebic.exe data-directory
+
+Options:
+  -h, --help
+          Print help
+
+```
--- a/docs/cli/flip-layout.md
+++ b/docs/cli/flip-layout.md
@@ -1,7 +1,7 @@
 # flip-layout

 ```
-Flip the layout on the focused workspace (BSP only)
+Flip the layout on the focused workspace

 Usage: komorebic.exe flip-layout <AXIS>

--- a/docs/cli/focus-monitor-at-cursor.md
+++ b/docs/cli/focus-monitor-at-cursor.md
@@ -0,0 +1,12 @@
+# focus-monitor-at-cursor
+
+```
+Focus the monitor at the current cursor location
+
+Usage: komorebic.exe focus-monitor-at-cursor
+
+Options:
+  -h, --help
+          Print help
+
+```
--- a/docs/cli/move-to-last-workspace.md
+++ b/docs/cli/move-to-last-workspace.md
@@ -0,0 +1,12 @@
+# move-to-last-workspace
+
+```
+Move the focused window to the last focused monitor workspace
+
+Usage: komorebic.exe move-to-last-workspace
+
+Options:
+  -h, --help
+          Print help
+
+```
--- a/docs/cli/query.md
+++ b/docs/cli/query.md
@@ -7,7 +7,7 @@ Usage: komorebic.exe query <STATE_QUERY>

 Arguments:
  <STATE_QUERY>
-          [possible values: focused-monitor-index, focused-workspace-index, focused-container-index, focused-window-index]
+          [possible values: focused-monitor-index, focused-workspace-index, focused-container-index, focused-window-index, focused-workspace-name, focused-workspace-layout, version]

 Options:
  -h, --help
--- a/docs/cli/send-to-last-workspace.md
+++ b/docs/cli/send-to-last-workspace.md
@@ -0,0 +1,12 @@
+# send-to-last-workspace
+
+```
+Send the focused window to the last focused monitor workspace
+
+Usage: komorebic.exe send-to-last-workspace
+
+Options:
+  -h, --help
+          Print help
+
+```
--- a/docs/cli/session-float-rule.md
+++ b/docs/cli/session-float-rule.md
@@ -0,0 +1,12 @@
+# session-float-rule
+
+```
+Add a rule to float the foreground window for the rest of this session
+
+Usage: komorebic.exe session-float-rule
+
+Options:
+  -h, --help
+          Print help
+
+```
--- a/docs/cli/session-float-rules.md
+++ b/docs/cli/session-float-rules.md
@@ -0,0 +1,12 @@
+# session-float-rules
+
+```
+Show all session float rules
+
+Usage: komorebic.exe session-float-rules
+
+Options:
+  -h, --help
+          Print help
+
+```
--- a/docs/cli/toggle-lock.md
+++ b/docs/cli/toggle-lock.md
@@ -0,0 +1,12 @@
+# toggle-lock
+
+```
+Toggle a lock for the focused container, ensuring it will not be displaced by any new windows
+
+Usage: komorebic.exe toggle-lock
+
+Options:
+  -h, --help
+          Print help
+
+```
--- a/docs/cli/toggle-window-based-work-area-offset.md
+++ b/docs/cli/toggle-window-based-work-area-offset.md
@@ -0,0 +1,12 @@
+# toggle-window-based-work-area-offset
+
+```
+Toggle application of the window-based work area offset for the focused workspace
+
+Usage: komorebic.exe toggle-window-based-work-area-offset
+
+Options:
+  -h, --help
+          Print help
+
+```
--- a/docs/cli/toggle-workspace-float-override.md
+++ b/docs/cli/toggle-workspace-float-override.md
@@ -1,8 +1,7 @@
 # toggle-workspace-float-override

 ```
-Enable or disable float override, which makes it so every new window opens in floating mode, for the currently focused workspace. If there was no override value set for the workspace
-previously it takes the opposite of the global value
+Enable or disable float override, which makes it so every new window opens in floating mode, for the currently focused workspace. If there was no override value set for the workspace previously it takes the opposite of the global value

 Usage: komorebic.exe toggle-workspace-float-override

--- a/docs/cli/toggle-workspace-layer.md
+++ b/docs/cli/toggle-workspace-layer.md
@@ -0,0 +1,12 @@
+# toggle-workspace-layer
+
+```
+Toggle between the Tiling and Floating layers on the focused workspace
+
+Usage: komorebic.exe toggle-workspace-layer
+
+Options:
+  -h, --help
+          Print help
+
+```
--- a/docs/cli/toggle-workspace-window-container-behaviour.md
+++ b/docs/cli/toggle-workspace-window-container-behaviour.md
@@ -1,8 +1,7 @@
 # toggle-workspace-window-container-behaviour

 ```
-Toggle the behaviour for new windows (stacking or dynamic tiling) for currently focused workspace. If there was no behaviour set for the workspace previously it takes the opposite of the
-global value
+Toggle the behaviour for new windows (stacking or dynamic tiling) for currently focused workspace. If there was no behaviour set for the workspace previously it takes the opposite of the global value

 Usage: komorebic.exe toggle-workspace-window-container-behaviour

--- a/docs/common-workflows/multi-monitor-setup.md
+++ b/docs/common-workflows/multi-monitor-setup.md
@@ -0,0 +1,412 @@
+# Multi-Monitor Setup
+
+You can set up komorebi to work with multiple monitors. To do so, first you start by setting up multiple monitor
+configurations on your `komorebi.json` config file.
+
+If you've used the [`komorebic quickstart`](../cli/quickstart.md) command you'll already have a `komorebi.json` config
+file with one monitor config setup. Open this file and look for the `"monitors":` line, you should find something like
+this:
+
+```json
+{
+  "monitors": [
+    {
+      "workspaces": [
+        {
+          "name": "I",
+          "layout": "BSP"
+        },
+        {
+          "name": "II",
+          "layout": "VerticalStack"
+        },
+        {
+          "name": "III",
+          "layout": "HorizontalStack"
+        },
+        {
+          "name": "IV",
+          "layout": "UltrawideVerticalStack"
+        },
+        {
+          "name": "V",
+          "layout": "Rows"
+        },
+        {
+          "name": "VI",
+          "layout": "Grid"
+        },
+        {
+          "name": "VII",
+          "layout": "RightMainVerticalStack"
+        }
+      ]
+    }
+  ]
+}
+```
+
+For this example we will remove some workspaces to simplify the config so it is easier to look at, but feel free to
+set up as many workspaces per monitor as you'd like. Here is the same configuration with only 3 workspaces.
+
+```json
+{
+  "monitors": [
+    {
+      "workspaces": [
+        {
+          "name": "I",
+          "layout": "BSP"
+        },
+        {
+          "name": "II",
+          "layout": "VerticalStack"
+        },
+        {
+          "name": "III",
+          "layout": "HorizontalStack"
+        }
+      ]
+    }
+  ]
+}
+```
+
+Let's add another monitor:
+
+```json
+{
+  "monitors": [
+    // monitor 1, index 0
+    {
+      "workspaces": [
+        {
+          "name": "I",
+          "layout": "BSP"
+        },
+        {
+          "name": "II",
+          "layout": "VerticalStack"
+        },
+        {
+          "name": "III",
+          "layout": "HorizontalStack"
+        }
+      ]
+    },
+    // monitor 2, index 1
+    {
+      "workspaces": [
+        {
+          "name": "1",
+          "layout": "BSP"
+        },
+        {
+          "name": "2",
+          "layout": "VerticalStack"
+        },
+        {
+          "name": "3",
+          "layout": "HorizontalStack"
+        }
+      ]
+    }
+  ]
+}
+```
+
+Now have two monitor configurations. We have the first monitor configuration, which is index 0 (*usually
+on programming languages the first item of a list starts with index 0*), this configuration has 3 workspaces with names
+"I", "II" and "III". Then the 2nd monitor configuration, which is index 1, also has 3 workspaces with names "1", "2",
+and "3" (you should always give unique names to your workspaces).
+
+Now if you start komorebi with two monitors connected, the main monitor will use the configuration with index 0 and the
+secondary monitor will use the configuration with index 1.
+
+---
+
+Let's say you have more monitors, or you want to make sure that a certain configuration is always applied to a certain
+monitor. For this you will want to use the `display_index_preferences`.
+
+Open up a terminal and type the following command: [ `komorebic monitor-info`](../cli/monitor-information.md). This
+command will give you the information about your connected monitors, you want to look up the `serial_number_id`. You
+should get something like this:
+
+```
+❯ komorebic monitor-info
+[
+  {
+    "id": 6620935,
+    "name": "DISPLAY1",
+    "device": "BOE0A1C",
+    "device_id": "BOE0A1C-5&a2bea0b&0&UID512",
+    "serial_number_id": "0",
+    "size": {
+      "left": 0,
+      "top": 0,
+      "right": 1920,
+      "bottom": 1080
+    }
+  },
+  {
+    "id": 181932057,
+    "name": "DISPLAY2",
+    "device": "VSC8C31",
+    "device_id": "VSC8C31-5&18560b1f&0&UID4356",
+    "serial_number_id": "UEP174021562",
+    "size": {
+      "left": 0,
+      "top": -1080,
+      "right": 1920,
+      "bottom": 1080
+    }
+  }
+]
+```
+
+In this case the setup is a laptop with a secondary monitor connected. You'll need to figure out which monitor is which,
+usually the display name's number should be similar to the numbers you can find on
+`Windows Settings -> System -> Display`.
+
+If you have trouble with this step you can always jump on Discord and ask for help (create a `Support` thread).
+
+Once you know which monitor is which, you want to look up their `serial_number_id` to use that on
+`display_index_preferences`, you can also use the `device_id`, it accepts both however there have been reported cases
+where the `device_id` changes after a restart while the `serial_number_id` doesn't.
+
+So with the example above, we want the laptop to always use the configuration index 0 and the other monitor to use
+configuration index 1, so we map the configuration index number to the monitor `serial_number_id`/`device_id` like this:
+
+```json
+{
+  "display_index_preferences": {
+    "0": "0",
+    "1": "UEP174021562"
+  }
+}
+```
+
+Again you could also have used the `device_id` like this:
+
+```json
+{
+  "display_index_preferences": {
+    "0": "BOE0A1C-5&a2bea0b&0&UID512",
+    "1": "VSC8C31-5&18560b1f&0&UID4356"
+  }
+}
+```
+
+You should add this `display_index_preferences` option to your `komorebi.json` file. If you find that something is
+not working as expected you can try to use the command `komorebic check`.
+
+> [!IMPORTANT]
+>
+> **When using multiple monitors it is recommended to always set the `display_index_preferences`. If you don't you might
+get some undefined behaviour.**
+
+---
+
+If you would like to run multiple instances of `komorebi-bar` to target different monitors, it is possible to do so
+using the `bar_configurations` array in your `komorebi.json` configuration file. You can refer to the
+[multiple-bar-instances](multiple-bar-instances.md) documentation.
+
+In this case it is important to use `display_index_preferences`, because if you don't, and you have 3 or more monitors,
+disconnecting and reconnecting monitors may result in the bars for the monitors getting shifted around.
+
+Consider this setup with 3 monitors (A, B and C):
+
+```json
+// HOME_MONITOR_1_BAR.json
+{
+  "monitor_index": 0
+  //...
+}
+```
+
+```json
+// HOME_MONITOR_2_BAR.json
+{
+  "monitor_index": 1
+  //...
+}
+```
+
+```json
+// WORK_MONITOR_1_BAR.json
+{
+  "monitor_index": 2
+  //...
+}
+```
+
+```json
+{
+  "display_index_preferences": {
+    "0": "MONITOR_1_ID",
+    "1": "MONITOR_2_ID",
+    "2": "MONITOR_3_ID"
+  },
+  "bar_configurations": [
+    // this bar uses "monitor_index": 0,
+    "path/to/bar_config_1.json",
+    // this bar uses "monitor_index": 1,
+    "path/to/bar_config_2.json",
+    // this bar uses "monitor_index": 2,
+    "path/to/bar_config_3.json"
+  ]
+}
+```
+
+Komorebi uses an internal map to keep track of monitor to config indices, this map is called `monitor_usr_idx_map` it is
+an internal variable to komorebi that you don't need to do anything with, but you can see it with the [
+`komorebic state`](../cli/state.md) command (in case you need to debug something).
+
+At first, komorebi will load all monitors and set the internal index map (`monitor_usr_idx_map`) as:
+
+```json
+{
+  // This is monitor A
+  "0": 0,
+  // This is monitor B
+  "1": 1,
+  // This is monitor C
+  "2": 2
+}
+```
+
+Which kind of seems unnecessary, but imagine that then you disconnect monitor B (or it goes to sleep). Then komorebi
+will only have 2 monitors with index 0 and 1, so the above map will be updated to this:
+
+```jsonc
+[
+  "0": 0, // This is monitor A
+  "2": 1, // This is now monitor C, because monitor B disconnected
+]
+```
+
+So now the bar intended to be for monitor B, which was looking for index "1" on that map, doesn't see it and knows it
+should be disabled. And the bar for monitor C looks at that map and knows that it's index "2" now maps to index 1 so it
+uses that index internally to get all the correct values about the monitor.
+
+If you didn't have the `display_index_preferences` set, then when you disconnected monitor B, komorebi wouldn't know
+how to map the indices and would use default behaviour which would result in a map like this:
+
+```json
+{
+  // This is monitor A 
+  "0": 0,
+  // This is monitor C, because monitor B disconnected. However the bars will think it is monitor B because it has index "1" 
+  "1": 1
+}
+```
+
+# Multiple Monitors on different machines
+
+You can use the same `komorebi.json` to configure two different setups and then synchronize your config across machines.
+However, if you do this it is important to be aware of a few things.
+
+Firstly, using `display_index_preferences` is required in this case.
+
+You will need to get the `serial_number_id` or `device_id` of all the monitors of all your setups. With that information
+you would then set your config like this:
+
+```json
+{
+  "display_index_preferences": {
+    "0": "HOME_MONITOR_1_ID",
+    "1": "HOME_MONITOR_2_ID",
+    "2": "WORK_MONITOR_1_ID",
+    "3": "WORK_MONITOR_2_ID"
+  },
+  "monitors": [
+    // HOME_MONITOR_1
+    {
+      "workspaces": [
+        // ...
+      ]
+    },
+    // HOME_MONITOR_2
+    {
+      "workspaces": [
+        // ...
+      ]
+    },
+    // WORK_MONITOR_1
+    {
+      "workspaces": [
+        // ...
+      ]
+    },
+    // WORK_MONITOR_2
+    {
+      "workspaces": [
+        // ...
+      ]
+    }
+  ]
+}
+```
+
+> [!NOTE]
+>
+> *You can't use the same config on two different monitors, you have to make a duplicated config for each monitor!*
+
+Then on the bar configs you need to set the bar's monitor index like this:
+
+```json
+// HOME_MONITOR_1_BAR.json
+{
+  "monitor_index": 0
+  //...
+}
+```
+
+```json
+// HOME_MONITOR_2_BAR.json
+{
+  "monitor_index": 1
+  //...
+}
+```
+
+```json
+// WORK_MONITOR_1_BAR.json
+{
+  "monitor_index": 2
+  //...
+}
+```
+
+```json
+// WORK_MONITOR_2_BAR.json
+{
+  "monitor_index": 3
+  //...
+}
+```
+
+Although you will only ever have 2 monitors connected at any one time, and they'll always have index 0 and 1, the
+above config will still work on both physical configurations.
+
+This is because komorebi will apply the appropriate config to the loaded monitors and will create a map of the user
+index (the index defined in the user config) to the actual monitor index, and the bar will use that map to know if it
+should be enabled, and where it should be drawn.
+
+### Things to keep in mind
+
+* If you are using a laptop connected to one monitor at work and a different one at home, the work monitor and the home
+  monitor are considered different monitors by komorebi
+* When you disconnect from work, komorebi will keep the work monitor cached
+* You can still use a laptop alone without any monitor and if you need a window that was on the other monitor you can
+  press the taskbar icon or use `alt + tab` to bring it to focus and that window will now be part of the laptop monitor
+* If you then reconnect the work monitor, the cached version will be applied with all its windows (except any window(s)
+  you might have moved to another monitor)
+* If however, instead of reconnecting the work monitor, you connect the home monitor, then the work monitor will still
+  remain cached, and komorebi will load the home monitor from the cache (if it exists)
+* Sometimes when you disconnect/reconnect a monitor the event might be missed by komorebi, meaning that Windows will
+  show you both monitors but komorebi won't know about the existence of one of them
+* If you notice this type of weird behaviour, always run the [
+  `komorebic monitor-info`](../cli/monitor-information.md)
+  command and validate if one of the monitors is missing
+* To fix this you can try disconnecting and reconnecting the monitor again, or restarting komorebi
--- a/docs/common-workflows/remove-gaps.md
+++ b/docs/common-workflows/remove-gaps.md
@@ -8,12 +8,8 @@ configuration file.
 ```json
 {
  "default_workspace_padding": 0,
-  "default_container_padding": 0,
-  "border_width": 0,
-  "border_offset": -1
+  "default_container_padding": -1,
 }
 ```

-A restart of `komorebi` is required after changing these settings.
-
 [![Watch the tutorial video](https://img.youtube.com/vi/6QYLao953XE/hqdefault.jpg)](https://www.youtube.com/watch?v=6QYLao953XE)
--- a/docs/example-configurations.md
+++ b/docs/example-configurations.md
@@ -75,7 +75,7 @@ solo developer.

 If you choose to use the active window border, you can set different colours to
 give you visual queues when you are focused on a single window, a stack of
-windows, or a window that is in monocole mode.
+windows, or a window that is in monocle mode.

 The example colours given are blue single, green for stack and pink for
 monocle.
@@ -254,5 +254,5 @@ stackbars as well as the status bar.
 If set in `komorebi.bar.json`, the theme will only be applied to the status bar.

 All [Catppuccin palette variants](https://catppuccin.com/)
-and [most Base16 palette variants](https://tinted-theming.github.io/base16-gallery/)
+and [most Base16 palette variants](https://tinted-theming.github.io/tinted-gallery/)
 are available as themes.
--- a/docs/index.md
+++ b/docs/index.md
@@ -34,7 +34,7 @@ showcases the many awesome projects that exist in the `komorebi` ecosystem.

 ## Licensing for Personal Use

-`komorebi` is licensed under the [Komorebi 1.0.0 license](https://github.com/LGUG2Z/komorebi-license), which is a fork
+`komorebi` is licensed under the [Komorebi 2.0.0 license](https://github.com/LGUG2Z/komorebi-license), which is a fork
 of the [PolyForm Strict 1.0.0 license](https://polyformproject.org/licenses/strict/1.0.0). On a high level this means
 that you are free to do whatever you want with `komorebi` for personal use other than redistribution, or distribution of
 new works (i.e. hard-forks) based on the software.
@@ -42,7 +42,7 @@ new works (i.e. hard-forks) based on the software.
 Anyone is free to make their own fork of `komorebi` with changes intended either for personal use or for integration
 back upstream via pull requests.

-The [Komorebi 1.0.0 License](https://github.com/LGUG2Z/komorebi-license) does not permit any kind of commercial use (
+The [Komorebi 2.0.0 License](https://github.com/LGUG2Z/komorebi-license) does not permit any kind of commercial use (
 i.e. using `komorebi` at work).

 ## Sponsorship for Personal Use
--- a/docs/komorebi.bar.example.json
+++ b/docs/komorebi.bar.example.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/LGUG2Z/komorebi/v0.1.33/schema.bar.json",
+  "$schema": "https://raw.githubusercontent.com/LGUG2Z/komorebi/v0.1.35/schema.bar.json",
  "monitor": 0,
  "font_family": "JetBrains Mono",
  "theme": {
--- a/docs/komorebi.example.json
+++ b/docs/komorebi.example.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/LGUG2Z/komorebi/v0.1.33/schema.json",
+  "$schema": "https://raw.githubusercontent.com/LGUG2Z/komorebi/v0.1.35/schema.json",
  "app_specific_configuration_path": "$Env:USERPROFILE/applications.json",
  "window_hiding_behaviour": "Cloak",
  "cross_monitor_move_behaviour": "Insert",
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -132,3 +132,19 @@ running `komorebic stop` and `komorebic start`.
   We can see the _komorebi_ state is no longer associated with the previous
   device: `null`, suggesting an issue when the display resumes from a suspended
   state.
+
+## Komorebi Bar does not render transparency on Nvidia GPUs
+
+Users with Nvidia GPUs may have issues with transparency on the Komorebi Bar.
+
+To solve this the user can do the following:
+1. Open the Nvidia Control Panel
+2. On the left menu tree, under "3D Settings", select "Manage 3D Settings"
+3. Select the "Program Settings" tab
+4. Press the "Add" button and select "komorebi-bar"
+5. Under "3. Specify the settings for this program:", find the feature labelled, "OpenGL GDI compatibility"
+6. Change the setting to "Prefer compatibility"
+7. At the bottom of the window select "Apply"
+8. Restart the Komorebi Bar with "komorebic stop --bar; komorebic start --bar"
+
+This should resolve the issue and your Komorebi Bar should render with the proper transparency.
--- a/docs/usage/focusing-windows.md
+++ b/docs/usage/focusing-windows.md
@@ -0,0 +1,46 @@
+# Focusing Windows
+
+Windows can be focused in a direction (left, down, up, right) using the [`komorebic focus`](../cli/focus.md) command.
+
+```
+# example showing how you might bind this command
+
+alt + h                 : komorebic focus left
+alt + j                 : komorebic focus down
+alt + k                 : komorebic focus up
+alt + l                 : komorebic focus right
+```
+
+Windows can be focused in a cycle direction (previous, next) using the [`komorebic cycle-focus`](../cli/cycle-focus.md)
+command.
+
+```
+# example showing you might bind this command
+
+alt + shift + oem_4     : komorebic cycle-focus previous # oem_4 is [
+alt + shift + oem_6     : komorebic cycle-focus next # oem_6 is ]
+```
+
+It is possible to attempt to focus the first window, on any workspace, matching an exe using the [
+`komorebic eager-focus`](../cli/eager-focus.md) command.
+
+```
+# example showing how you might bind this command
+
+win + 1                 : komorebic eager-focus firefox.exe
+```
+
+The window at the largest tile can be focused using the [`komorebic promote-focus`](../cli/promote-focus.md) command.
+
+```
+# example showing how you might bind this command
+
+alt + return            : komorebic promote-focus
+```
+
+The behaviour when attempting to call `komorebic focus` when at the left or right edge of a monitor is determined by
+the [`cross_boundary_behaviour`](https://komorebi.lgug2z.com/schema#cross_boundary_behaviour) configuration option.
+
+When set to `Workspace`, the next workspace on the same monitor will be focused.
+
+When set to `Monitor`, the focused workspace on the next monitor in the given direction will be focused.
--- a/docs/usage/focusing-workspaces.md
+++ b/docs/usage/focusing-workspaces.md
@@ -0,0 +1,59 @@
+# Focusing Workspaces
+
+Workspaces on the focused monitor can be focused by their index using the [
+`komorebic focus-workspace`](../cli/focus-workspace.md)  command.
+
+If this command is called with an index for a workspace which does not exist, that workspace, and all workspace indexes
+required to get to that workspace, will be created.
+
+```
+# example showing how you might bind this command
+
+alt + 1                 : komorebic focus-workspace 0
+alt + 2                 : komorebic focus-workspace 1
+alt + 3                 : komorebic focus-workspace 2
+```
+
+Workspaces on the focused monitor can be focused in a cycle direction (previous, next) using the [
+`komorebic cycle-workspace`](../cli/cycle-workspace.md) command.
+
+```
+# example showing how you might bind this command
+
+alt + shift + oem_4     : komorebic cycle-workspace previous # oem_4 is [
+alt + shift + oem_6     : komorebic cycle-workspace next # oem_6 is ]
+```
+
+Workspaces on other monitors can be focused by both the monitor index and the workspace index using the [
+`komorebic focus-monitor-workspace`](../cli/focus-monitor-workspace.md) command.
+
+```
+# example showing how you might bind this command
+
+alt + 1                 : komorebic focus-monitor-workspace 0 0
+alt + 2                 : komorebic focus-monitor-workspace 0 1 
+alt + 3                 : komorebic focus-monitor-workspace 1 0
+```
+
+Workspaces on any monitor can be focused by their name (given that all workspace names across all monitors are unique)
+using the [`komorebic focus-named-workspace`](../cli/focus-named-workspace.md)  command.
+
+```
+# example showing how you might bind this command
+
+alt + c                 : komorebic focus-named-workspace coding
+```
+
+Workspaces on all monitors can be set to the same index (emulating single workspaces which span across all monitors)
+using the [`komorebic focus-workspaces`](../cli/focus-workspaces.md) command.
+
+```
+# example showing how you might bind this command
+
+alt + 1                 : komorebic focus-workspaces 0
+alt + 2                 : komorebic focus-workspaces 1
+alt + 3                 : komorebic focus-workspaces 2
+```
+
+The last focused workspace on the focused monitor can be re-focused using the [
+`komorebic focus-last-workspace`](../cli/focus-last-workspace.md) command.
--- a/docs/usage/moving-windows-across-workspaces.md
+++ b/docs/usage/moving-windows-across-workspaces.md
@@ -0,0 +1,59 @@
+# Moving Windows Across Workspaces
+
+Windows can be moved to another workspace on the focused monitor using the [
+`komorebic move-to-workspace`](../cli/move-to-workspace.md) command. This command will also move your focus to the
+target workspace.
+
+```
+# example showing how you might bind this command
+
+alt + shift + 1         : komorebic move-to-workspace 0
+alt + shift + 2         : komorebic move-to-workspace 1
+alt + shift + 3         : komorebic move-to-workspace 2
+```
+
+Windows can be sent to another workspace on the focused monitor using the [
+`komorebic send-to-workspace`](../cli/send-to-workspace.md) command. This command will keep your focus on the origin
+workspace.
+
+```
+# example showing how you might bind this command
+
+alt + shift + 1         : komorebic send-to-workspace 0
+alt + shift + 2         : komorebic send-to-workspace 1
+alt + shift + 3         : komorebic send-to-workspace 2
+```
+
+Windows can be moved to another workspace on the focused monitor in a cycle direction (previous, next) using the [
+`komorebic cycle-move-to-workspace`](../cli/cycle-move-to-workspace.md) command. This command will also move your focus
+to the target workspace.
+
+```
+# example showing how you might bind this command
+
+alt + shift + oem_4     : komorebic cycle-move-to-workspace previous # oem_4 is [
+alt + shift + oem_6     : komorebic cycle-move-to-workspace next # oem_6 is ]
+```
+
+Windows can be sent to another workspace on the focused monitor in a cycle direction (previous, next) using the [
+`komorebic cycle-move-to-workspace`](../cli/cycle-move-to-workspace.md) command. This command will keep your focus on
+the origin workspace.
+
+```
+# example showing how you might bind this command
+
+alt + shift + oem_4     : komorebic cycle-send-to-workspace previous # oem_4 is [
+alt + shift + oem_6     : komorebic cycle-send-to-workspace next # oem_6 is ]
+```
+
+Windows can be moved or sent to the focused workspace on a another monitor using the [
+`komorebic move-to-monitor`](../cli/move-to-monitor.md) and [`komorebic send-to-monitor`](../cli/send-to-monitor.md)
+commands.
+
+Windows can be moved or sent to the focused workspace on a monitor in a cycle direction (previous, next) using the [
+`komorebic cycle-move-to-monitor`](../cli/cycle-move-to-monitor.md) and [
+`komorebic cycle-send-to-monitor`](../cli/cycle-send-to-monitor.md) commands.
+
+Windows can be moved or sent to a named workspace on any monitor (given that all workspace names across all monitors are
+unique) using the [`komorebic move-to-named-workspace`](../cli/move-to-named-workspace.md) and [
+`komorebic send-to-named-workspace`](../cli/send-to-named-workspace.md) commands
--- a/docs/usage/moving-windows.md
+++ b/docs/usage/moving-windows.md
@@ -0,0 +1,50 @@
+# Moving Windows
+
+Windows can be moved in a direction (left, down, up, right) using the [`komorebic move`](../cli/move.md) command.
+
+```
+# example showing how you might bind this command
+
+alt + shift + h         : komorebic move left
+alt + shift + j         : komorebic move down
+alt + shift + k         : komorebic move up
+alt + shift + l         : komorebic move right
+```
+
+Windows can be moved in a cycle direction (previous, next) using the [`komorebic cycle-move`](../cli/cycle-move.md)
+command.
+
+```
+# example showing how you might bind this command
+
+alt + shift + oem_4     : komorebic cycle-move previous # oem_4 is [
+alt + shift + oem_6     : komorebic cycle-move next # oem_6 is ]
+```
+
+The focused window can be moved to the largest tile using the [`komorebic promote`](../cli/promote.md) command.
+
+```
+# example showing how you might bind this command
+
+alt + shift + return    : komorebic promote
+```
+
+The behaviour when attempting to call `komorebic move` when at the left or right edge of a monitor is determined by
+the [`cross_boundary_behaviour`](https://komorebi.lgug2z.com/schema#cross_boundary_behaviour) configuration option.
+
+When set to `Workspace`, the focused window will be moved to the next workspace on the focused monitor in the given
+direction
+
+When set to `Monitor`, the focused window will be moved to the focused workspace on the next monitor in the given
+direction.
+
+The behaviour when calling `komorebic move` with `cross_boundary_behaviour` set to `Monitor` can be further refined with
+the [`cross_monitor_move_behaviour`](https://komorebi.lgug2z.com/schema#cross_monitor_move_behaviour) configuration
+option.
+
+When set to `Swap`, the focused window will be swapped with the window at the corresponding edge of the adjacent monitor
+
+When set to `Insert`, the focused window will be inserted into the focused workspace on the adjacent monitor.
+
+When set to `NoOp`, the focused window will not be moved across a monitor boundary, though focusing across monitor
+boundaries will continue to function.
--- a/docs/usage/stacking-windows.md
+++ b/docs/usage/stacking-windows.md
@@ -0,0 +1,52 @@
+# Stacking Windows
+
+Windows can be stacked in a direction (left, down, up, right) using the [`komorebic stack`](../cli/stack.md) command.
+
+```
+# example showing how you might bind this command
+
+alt + left              : komorebic stack left
+alt + down              : komorebic stack down
+alt + up                : komorebic stack up
+alt + right             : komorebic stack right
+```
+
+Windows can be popped from a stack using the [`komorebic unstack`](../cli/unstack.md) command.
+
+```
+# example showing how you might bind this command
+
+alt + oem_1             : komorebic unstack # oem_1 is ;
+```
+
+Windows in a stack can be focused in a cycle direction (previous, next) using the [
+`komorebic cycle-stack`](../cli/cycle-stack.md) command.
+
+```
+# example showing how you might bind this command
+
+alt + oem_4             : komorebic cycle-stack previous # oem_4 is [
+alt + oem_6             : komorebic cycle-stack next # oem_6 is ]
+```
+
+Windows in a stack can have their positions in the stack moved in a cycle direction (previous, next) using the [
+`komorebic cycle-stack-index`](../cli/cycle-stack-index.md) command.
+
+```
+# example showing how you might bind this command
+
+alt + shift + oem_4     : komorebic cycle-stack-index previous # oem_4 is [
+alt + shift + oem_6     : komorebic cycle-stack-index next # oem_6 is ]
+```
+
+Windows in a stack can be focused by their index in the stack using the [
+`komorebic focus-stack-window`](../cli/focus-stack-window.md) command.
+
+All windows on the focused workspace can be combined into a single stack using the [
+`komorebic stack-all`](../cli/stack-all.md) command.
+
+All windows in a focused stack can be popped using the [`komorebic unstack-all`](../cli/unstack-all.md) command.
+
+It is possible to tell the window manager to stack the next opened window on top of the currently focused window by
+using the [
+`komorebic toggle-workspace-window-container-behaviour`](../cli/toggle-workspace-window-container-behaviour.md) command.
--- a/34
+++ b/34
@@ -19,13 +19,43 @@ install-targets *targets:
    "{{ targets }}" -split ' ' | ForEach-Object { just install-target $_ }

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

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

+install-with-jsonschema:
+    just install-targets-with-jsonschema komorebic komorebic-no-console komorebi komorebi-bar komorebi-gui
+
+build-targets *targets:
+    "{{ targets }}" -split ' ' | ForEach-Object { just build-target $_ }
+
+build-target target:
+    cargo +stable build --package {{ target }} --locked --release --no-default-features
+
+build:
+    just build-targets komorebic komorebic-no-console komorebi komorebi-bar komorebi-gui
+
+copy-target target:
+    cp .\target\release\{{ target }}.exe $Env:USERPROFILE\.cargo\bin
+
+copy-targets *targets:
+    "{{ targets }}" -split ' ' | ForEach-Object { just copy-target $_ }
+
+wpm target:
+    just build-target {{ target }} && wpmctl stop {{ target }}; just copy-target {{ target }} && wpmctl start {{ target }}
+
+copy:
+    just copy-targets komorebic komorebic-no-console komorebi komorebi-bar komorebi-gui
+
 run target:
-    cargo +stable run --bin {{ target }} --locked
+    cargo +stable run --bin {{ target }} --locked --no-default-features

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

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

 docgen:
    cargo run --package komorebic -- docgen
--- a/komorebi-bar/Cargo.toml
+++ b/komorebi-bar/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komorebi-bar"
-version = "0.1.34"
+version = "0.1.36"
 edition = "2021"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -9,6 +9,7 @@ edition = "2021"
 komorebi-client = { path = "../komorebi-client" }
 komorebi-themes = { path = "../komorebi-themes" }

+chrono-tz = { workspace = true }
 chrono = { workspace = true }
 clap = { workspace = true }
 color-eyre = { workspace = true }
@@ -16,17 +17,18 @@ crossbeam-channel = { workspace = true }
 dirs = { workspace = true }
 dunce = { workspace = true }
 eframe = { workspace = true }
-egui-phosphor = "0.8"
+egui-phosphor = "0.9"
 font-loader = "0.11"
 hotwatch = { workspace = true }
 image = "0.25"
-netdev = "0.32"
+lazy_static = { workspace = true }
+netdev = "0.33"
 num = "0.4"
 num-derive = "0.4"
 num-traits = "0.2"
-random_word = { version = "0.4", features = ["en"] }
+random_word = { version = "0.5", features = ["en"] }
 reqwest = { version = "0.12", features = ["blocking"] }
-schemars = { workspace = true }
+schemars = { workspace = true, optional = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 starship-battery = "0.10"
@@ -34,4 +36,10 @@ sysinfo = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 windows = { workspace = true }
-windows-icons = { git = "https://github.com/LGUG2Z/windows-icons", rev = "d67cc9920aa9b4883393e411fb4fa2ddd4c498b5" }
+windows-core = { workspace = true }
+windows-icons = { git = "https://github.com/LGUG2Z/windows-icons", rev = "0c9d7ee1b807347c507d3a9862dd007b4d3f4354" }
+windows-icons-fallback = { package = "windows-icons", git = "https://github.com/LGUG2Z/windows-icons", rev = "d67cc9920aa9b4883393e411fb4fa2ddd4c498b5" }
+
+[features]
+default = ["schemars"]
+schemars = ["dep:schemars"]
--- a/komorebi-bar/src/bar.rs
+++ b/komorebi-bar/src/bar.rs
--- a/komorebi-bar/src/config.rs
+++ b/komorebi-bar/src/config.rs
@@ -1,19 +1,19 @@
 use crate::render::Grouping;
-use crate::widget::WidgetConfig;
+use crate::widgets::widget::WidgetConfig;
 use crate::DEFAULT_PADDING;
 use eframe::egui::Pos2;
 use eframe::egui::TextBuffer;
 use eframe::egui::Vec2;
 use komorebi_client::KomorebiTheme;
 use komorebi_client::Rect;
-use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use std::collections::HashMap;
 use std::path::PathBuf;

-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
-/// The `komorebi.bar.json` configuration file reference for `v0.1.34`
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+/// The `komorebi.bar.json` configuration file reference for `v0.1.36`
 pub struct KomobarConfig {
    /// Bar height (default: 50)
    pub height: Option<f32>,
@@ -125,9 +125,19 @@ impl KomobarConfig {
            }
        }
    }
+
+    pub fn show_all_icons_on_komorebi_workspace(widgets: &[WidgetConfig]) -> bool {
+        widgets
+            .iter()
+            .any(|w| matches!(w, WidgetConfig::Komorebi(config) if config.workspaces.is_some_and(|w| w.enable && w.display.is_some_and(|s| matches!(s,
+            WorkspacesDisplayFormat::AllIcons
+            | WorkspacesDisplayFormat::AllIconsAndText
+            | WorkspacesDisplayFormat::AllIconsAndTextOnSelected)))))
+    }
 }

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

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

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

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

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

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

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

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

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

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 #[serde(tag = "palette")]
 pub enum KomobarTheme {
    /// A theme from catppuccin-egui
@@ -363,12 +382,24 @@ pub enum KomobarTheme {
        /// Name of the Catppuccin theme (theme previews: https://github.com/catppuccin/catppuccin)
        name: komorebi_themes::Catppuccin,
        accent: Option<komorebi_themes::CatppuccinValue>,
+        auto_select_fill: Option<komorebi_themes::CatppuccinValue>,
+        auto_select_text: Option<komorebi_themes::CatppuccinValue>,
    },
    /// A theme from base16-egui-themes
    Base16 {
-        /// Name of the Base16 theme (theme previews: https://tinted-theming.github.io/base16-gallery)
+        /// Name of the Base16 theme (theme previews: https://tinted-theming.github.io/tinted-gallery/)
        name: komorebi_themes::Base16,
        accent: Option<komorebi_themes::Base16Value>,
+        auto_select_fill: Option<komorebi_themes::Base16Value>,
+        auto_select_text: Option<komorebi_themes::Base16Value>,
+    },
+    /// A custom Base16 theme
+    Custom {
+        /// Colours of the custom Base16 theme palette
+        colours: Box<komorebi_themes::Base16ColourPalette>,
+        accent: Option<komorebi_themes::Base16Value>,
+        auto_select_fill: Option<komorebi_themes::Base16Value>,
+        auto_select_text: Option<komorebi_themes::Base16Value>,
    },
 }

@@ -380,18 +411,33 @@ impl From<KomorebiTheme> for KomobarTheme {
            } => Self::Catppuccin {
                name,
                accent: bar_accent,
+                auto_select_fill: None,
+                auto_select_text: None,
            },
            KomorebiTheme::Base16 {
                name, bar_accent, ..
            } => Self::Base16 {
                name,
                accent: bar_accent,
+                auto_select_fill: None,
+                auto_select_text: None,
+            },
+            KomorebiTheme::Custom {
+                colours,
+                bar_accent,
+                ..
+            } => Self::Custom {
+                colours,
+                accent: bar_accent,
+                auto_select_fill: None,
+                auto_select_text: None,
            },
        }
    }
 }

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

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum DisplayFormat {
    /// Show only icon
    Icon,
@@ -416,3 +463,91 @@ pub enum DisplayFormat {
    /// Show an icon and text for the selected element, and icons on the rest
    IconAndTextOnSelected,
 }
+
+macro_rules! extend_enum {
+    ($existing_enum:ident, $new_enum:ident, { $($(#[$meta:meta])* $variant:ident),* $(,)? }) => {
+        #[derive(Copy, Clone, Debug, serde::Serialize, serde::Deserialize, PartialEq)]
+        #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+        pub enum $new_enum {
+            // Add new variants
+            $(
+                $(#[$meta])*
+                $variant,
+            )*
+            // Include a variant that wraps the existing enum and flatten it when deserializing
+            #[serde(untagged)]
+            Existing($existing_enum),
+        }
+
+        // Implement From for the existing enum
+        impl From<$existing_enum> for $new_enum {
+            fn from(value: $existing_enum) -> Self {
+                $new_enum::Existing(value)
+            }
+        }
+    };
+}
+
+extend_enum!(DisplayFormat, WorkspacesDisplayFormat, {
+    /// Show all icons only
+    AllIcons,
+    /// Show both all icons and text
+    AllIconsAndText,
+    /// Show all icons and text for the selected element, and all icons on the rest
+    AllIconsAndTextOnSelected,
+});
+
+#[cfg(test)]
+mod tests {
+    use serde::Deserialize;
+    use serde::Serialize;
+    use serde_json::json;
+
+    #[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq)]
+    #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+    pub enum OriginalDisplayFormat {
+        /// Show None Of The Things
+        NoneOfTheThings,
+    }
+
+    extend_enum!(OriginalDisplayFormat, ExtendedDisplayFormat, {
+        /// Show Some Of The Things
+        SomeOfTheThings,
+    });
+
+    #[derive(serde::Deserialize)]
+    struct ExampleConfig {
+        #[allow(unused)]
+        format: ExtendedDisplayFormat,
+    }
+
+    #[test]
+    pub fn extend_new_variant() {
+        let raw = json!({
+            "format": "SomeOfTheThings",
+        })
+        .to_string();
+
+        assert!(serde_json::from_str::<ExampleConfig>(&raw).is_ok())
+    }
+
+    #[test]
+    pub fn extend_existing_variant() {
+        let raw = json!({
+            "format": "NoneOfTheThings",
+        })
+        .to_string();
+
+        assert!(serde_json::from_str::<ExampleConfig>(&raw).is_ok())
+    }
+
+    #[test]
+    pub fn extend_invalid_variant() {
+        let raw = json!({
+            "format": "ALLOFTHETHINGS",
+        })
+        .to_string();
+
+        assert!(serde_json::from_str::<ExampleConfig>(&raw).is_err())
+    }
+}
--- a/komorebi-bar/src/main.rs
+++ b/komorebi-bar/src/main.rs
@@ -1,20 +1,9 @@
 mod bar;
-mod battery;
 mod config;
-mod cpu;
-mod date;
-mod komorebi;
-mod komorebi_layout;
-mod media;
-mod memory;
-mod network;
 mod render;
 mod selected_frame;
-mod storage;
-mod time;
 mod ui;
-mod update;
-mod widget;
+mod widgets;

 use crate::bar::Komobar;
 use crate::config::KomobarConfig;
@@ -27,22 +16,22 @@ use font_loader::system_fonts;
 use hotwatch::EventKind;
 use hotwatch::Hotwatch;
 use image::RgbaImage;
+use komorebi_client::replace_env_in_path;
+use komorebi_client::PathExt;
 use komorebi_client::SocketMessage;
 use komorebi_client::SubscribeOptions;
-use schemars::gen::SchemaSettings;
 use std::collections::HashMap;
 use std::io::BufReader;
 use std::io::Read;
 use std::path::PathBuf;
 use std::sync::atomic::AtomicI32;
+use std::sync::atomic::AtomicU32;
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering;
-use std::sync::Arc;
 use std::sync::LazyLock;
 use std::sync::Mutex;
 use std::time::Duration;
 use tracing_subscriber::EnvFilter;
-use windows::Win32::Foundation::BOOL;
 use windows::Win32::Foundation::HWND;
 use windows::Win32::Foundation::LPARAM;
 use windows::Win32::System::Threading::GetCurrentProcessId;
@@ -51,6 +40,7 @@ use windows::Win32::UI::HiDpi::SetProcessDpiAwarenessContext;
 use windows::Win32::UI::HiDpi::DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2;
 use windows::Win32::UI::WindowsAndMessaging::EnumThreadWindows;
 use windows::Win32::UI::WindowsAndMessaging::GetWindowThreadProcessId;
+use windows_core::BOOL;

 pub static MAX_LABEL_WIDTH: AtomicI32 = AtomicI32::new(400);
 pub static MONITOR_LEFT: AtomicI32 = AtomicI32::new(0);
@@ -60,7 +50,10 @@ pub static MONITOR_INDEX: AtomicUsize = AtomicUsize::new(0);
 pub static BAR_HEIGHT: f32 = 50.0;
 pub static DEFAULT_PADDING: f32 = 10.0;

-pub static ICON_CACHE: LazyLock<Mutex<HashMap<String, RgbaImage>>> =
+pub static AUTO_SELECT_FILL_COLOUR: AtomicU32 = AtomicU32::new(0);
+pub static AUTO_SELECT_TEXT_COLOUR: AtomicU32 = AtomicU32::new(0);
+
+pub static ICON_CACHE: LazyLock<Mutex<HashMap<isize, RgbaImage>>> =
    LazyLock::new(|| Mutex::new(HashMap::new()));

 #[derive(Parser)]
@@ -74,6 +67,7 @@ struct Opts {
    fonts: bool,
    /// Path to a JSON or YAML configuration file
    #[clap(short, long)]
+    #[clap(value_parser = replace_env_in_path)]
    config: Option<PathBuf>,
    /// Write an example komorebi.bar.json to disk
    #[clap(long)]
@@ -125,8 +119,9 @@ fn main() -> color_eyre::Result<()> {

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

+    #[cfg(feature = "schemars")]
    if opts.schema {
-        let settings = SchemaSettings::default().with(|s| {
+        let settings = schemars::gen::SchemaSettings::default().with(|s| {
            s.option_nullable = false;
            s.option_add_null_type = false;
            s.inline_subschemas = true;
@@ -167,13 +162,15 @@ fn main() -> color_eyre::Result<()> {
    let home_dir: PathBuf = std::env::var("KOMOREBI_CONFIG_HOME").map_or_else(
        |_| dirs::home_dir().expect("there is no home directory"),
        |home_path| {
-            let home = PathBuf::from(&home_path);
+            let home = home_path.replace_env();

-            if home.as_path().is_dir() {
-                home
-            } else {
-                panic!("$Env:KOMOREBI_CONFIG_HOME is set to '{home_path}', which is not a valid directory");
-            }
+            assert!(
+                home.is_dir(),
+                "$Env:KOMOREBI_CONFIG_HOME is set to '{}', which is not a valid directory",
+                home_path
+            );
+
+            home
        },
    );

@@ -182,7 +179,7 @@ fn main() -> color_eyre::Result<()> {
        std::fs::write(home_dir.join("komorebi.bar.json"), komorebi_bar_json)?;
        println!(
            "Example komorebi.bar.json file written to {}",
-            home_dir.as_path().display()
+            home_dir.display()
        );

        std::process::exit(0);
@@ -190,16 +187,11 @@ fn main() -> color_eyre::Result<()> {

    let default_config_path = home_dir.join("komorebi.bar.json");

-    let config_path = opts.config.map_or_else(
-        || {
-            if !default_config_path.is_file() {
-                None
-            } else {
-                Some(default_config_path.clone())
-            }
-        },
-        Option::from,
-    );
+    let config_path = opts.config.or_else(|| {
+        default_config_path
+            .is_file()
+            .then_some(default_config_path.clone())
+    });

    let mut config = match config_path {
        None => {
@@ -209,17 +201,14 @@ fn main() -> color_eyre::Result<()> {
            std::fs::write(&default_config_path, komorebi_bar_json)?;
            tracing::info!(
                "created example configuration file: {}",
-                default_config_path.as_path().display()
+                default_config_path.display()
            );

            KomobarConfig::read(&default_config_path)?
        }
        Some(ref config) => {
            if !opts.aliases {
-                tracing::info!(
-                    "found configuration file: {}",
-                    config.as_path().to_string_lossy()
-                );
+                tracing::info!("found configuration file: {}", config.display());
            }

            KomobarConfig::read(config)?
@@ -237,12 +226,16 @@ fn main() -> color_eyre::Result<()> {
        &SocketMessage::State,
    )?)?;

-    let (monitor_index, work_area_offset) = match &config.monitor {
+    let (usr_monitor_index, work_area_offset) = match &config.monitor {
        MonitorConfigOrIndex::MonitorConfig(monitor_config) => {
            (monitor_config.index, monitor_config.work_area_offset)
        }
        MonitorConfigOrIndex::Index(idx) => (*idx, None),
    };
+    let monitor_index = state
+        .monitor_usr_idx_map
+        .get(&usr_monitor_index)
+        .map_or(usr_monitor_index, |i| *i);

    MONITOR_RIGHT.store(
        state.monitors.elements()[monitor_index].size().right,
@@ -315,10 +308,7 @@ fn main() -> color_eyre::Result<()> {
    hotwatch.watch(config_path, move |event| match event.kind {
        EventKind::Modify(_) | EventKind::Remove(_) => match KomobarConfig::read(&config_path_cl) {
            Ok(updated) => {
-                tracing::info!(
-                    "configuration file updated: {}",
-                    config_path_cl.as_path().to_string_lossy()
-                );
+                tracing::info!("configuration file updated: {}", config_path_cl.display());

                if let Err(error) = tx_config.send(updated) {
                    tracing::error!("could not send configuration update to gui: {error}")
@@ -333,7 +323,6 @@ fn main() -> color_eyre::Result<()> {

    tracing::info!("watching configuration file for changes");

-    let config_arc = Arc::new(config);
    eframe::run_native(
        "komorebi-bar",
        native_options,
@@ -346,7 +335,7 @@ fn main() -> color_eyre::Result<()> {

            let ctx_komorebi = cc.egui_ctx.clone();
            std::thread::spawn(move || {
-                let subscriber_name = format!("komorebi-bar-{}", random_word::gen(random_word::Lang::En));
+                let subscriber_name = format!("komorebi-bar-{}", random_word::get(random_word::Lang::En));

                let listener = komorebi_client::subscribe_with_options(&subscriber_name, SubscribeOptions {
                    filter_state_changes: true,
@@ -421,7 +410,7 @@ fn main() -> color_eyre::Result<()> {
                }
            });

-            Ok(Box::new(Komobar::new(cc, rx_gui, rx_config, config_arc)))
+            Ok(Box::new(Komobar::new(cc, rx_gui, rx_config, config)))
        }),
    )
    .map_err(|error| color_eyre::eyre::Error::msg(error.to_string()))
--- a/komorebi-bar/src/network.rs
+++ b/komorebi-bar/src/network.rs
@@ -1,376 +0,0 @@
-use crate::config::LabelPrefix;
-use crate::render::RenderConfig;
-use crate::selected_frame::SelectableFrame;
-use crate::widget::BarWidget;
-use eframe::egui::text::LayoutJob;
-use eframe::egui::Align;
-use eframe::egui::Context;
-use eframe::egui::Label;
-use eframe::egui::TextFormat;
-use eframe::egui::Ui;
-use num_derive::FromPrimitive;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use serde::Serialize;
-use std::fmt;
-use std::process::Command;
-use std::time::Duration;
-use std::time::Instant;
-use sysinfo::Networks;
-
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
-pub struct NetworkConfig {
-    /// Enable the Network widget
-    pub enable: bool,
-    /// Show total data transmitted
-    pub show_total_data_transmitted: bool,
-    /// Show network activity
-    pub show_network_activity: bool,
-    /// Show default interface
-    pub show_default_interface: Option<bool>,
-    /// Characters to reserve for network activity data
-    pub network_activity_fill_characters: Option<usize>,
-    /// Data refresh interval (default: 10 seconds)
-    pub data_refresh_interval: Option<u64>,
-    /// Display label prefix
-    pub label_prefix: Option<LabelPrefix>,
-}
-
-impl From<NetworkConfig> for Network {
-    fn from(value: NetworkConfig) -> Self {
-        let data_refresh_interval = value.data_refresh_interval.unwrap_or(10);
-
-        Self {
-            enable: value.enable,
-            show_total_activity: value.show_total_data_transmitted,
-            show_activity: value.show_network_activity,
-            show_default_interface: value.show_default_interface.unwrap_or(true),
-            networks_network_activity: Networks::new_with_refreshed_list(),
-            default_interface: String::new(),
-            data_refresh_interval,
-            label_prefix: value.label_prefix.unwrap_or(LabelPrefix::Icon),
-            network_activity_fill_characters: value
-                .network_activity_fill_characters
-                .unwrap_or_default(),
-            last_state_total_activity: vec![],
-            last_state_activity: vec![],
-            last_updated_network_activity: Instant::now()
-                .checked_sub(Duration::from_secs(data_refresh_interval))
-                .unwrap(),
-        }
-    }
-}
-
-pub struct Network {
-    pub enable: bool,
-    pub show_total_activity: bool,
-    pub show_activity: bool,
-    pub show_default_interface: bool,
-    networks_network_activity: Networks,
-    data_refresh_interval: u64,
-    label_prefix: LabelPrefix,
-    default_interface: String,
-    last_state_total_activity: Vec<NetworkReading>,
-    last_state_activity: Vec<NetworkReading>,
-    last_updated_network_activity: Instant,
-    network_activity_fill_characters: usize,
-}
-
-impl Network {
-    fn default_interface(&mut self) {
-        if let Ok(interface) = netdev::get_default_interface() {
-            if let Some(friendly_name) = &interface.friendly_name {
-                self.default_interface.clone_from(friendly_name);
-            }
-        }
-    }
-
-    fn network_activity(&mut self) -> (Vec<NetworkReading>, Vec<NetworkReading>) {
-        let mut activity = self.last_state_activity.clone();
-        let mut total_activity = self.last_state_total_activity.clone();
-        let now = Instant::now();
-
-        if now.duration_since(self.last_updated_network_activity)
-            > Duration::from_secs(self.data_refresh_interval)
-        {
-            activity.clear();
-            total_activity.clear();
-
-            if let Ok(interface) = netdev::get_default_interface() {
-                if let Some(friendly_name) = &interface.friendly_name {
-                    self.default_interface.clone_from(friendly_name);
-
-                    self.networks_network_activity.refresh(true);
-
-                    for (interface_name, data) in &self.networks_network_activity {
-                        if friendly_name.eq(interface_name) {
-                            if self.show_activity {
-                                activity.push(NetworkReading::new(
-                                    NetworkReadingFormat::Speed,
-                                    Self::to_pretty_bytes(
-                                        data.received(),
-                                        self.data_refresh_interval,
-                                    ),
-                                    Self::to_pretty_bytes(
-                                        data.transmitted(),
-                                        self.data_refresh_interval,
-                                    ),
-                                ));
-                            }
-
-                            if self.show_total_activity {
-                                total_activity.push(NetworkReading::new(
-                                    NetworkReadingFormat::Total,
-                                    Self::to_pretty_bytes(data.total_received(), 1),
-                                    Self::to_pretty_bytes(data.total_transmitted(), 1),
-                                ))
-                            }
-                        }
-                    }
-                }
-            }
-
-            self.last_state_activity.clone_from(&activity);
-            self.last_state_total_activity.clone_from(&total_activity);
-            self.last_updated_network_activity = now;
-        }
-
-        (activity, total_activity)
-    }
-
-    fn reading_to_label(
-        &self,
-        ctx: &Context,
-        reading: NetworkReading,
-        config: RenderConfig,
-    ) -> Label {
-        let (text_down, text_up) = match self.label_prefix {
-            LabelPrefix::None | LabelPrefix::Icon => match reading.format {
-                NetworkReadingFormat::Speed => (
-                    format!(
-                        "{: >width$}/s | ",
-                        reading.received_text,
-                        width = self.network_activity_fill_characters
-                    ),
-                    format!(
-                        "{: >width$}/s",
-                        reading.transmitted_text,
-                        width = self.network_activity_fill_characters
-                    ),
-                ),
-                NetworkReadingFormat::Total => (
-                    format!("{} | ", reading.received_text),
-                    reading.transmitted_text,
-                ),
-            },
-            LabelPrefix::Text | LabelPrefix::IconAndText => match reading.format {
-                NetworkReadingFormat::Speed => (
-                    format!(
-                        "DOWN: {: >width$}/s | ",
-                        reading.received_text,
-                        width = self.network_activity_fill_characters
-                    ),
-                    format!(
-                        "UP: {: >width$}/s",
-                        reading.transmitted_text,
-                        width = self.network_activity_fill_characters
-                    ),
-                ),
-                NetworkReadingFormat::Total => (
-                    format!("\u{2211}DOWN: {}/s | ", reading.received_text),
-                    format!("\u{2211}UP: {}/s", reading.transmitted_text),
-                ),
-            },
-        };
-
-        let icon_format = TextFormat::simple(
-            config.icon_font_id.clone(),
-            ctx.style().visuals.selection.stroke.color,
-        );
-        let text_format = TextFormat {
-            font_id: config.text_font_id.clone(),
-            color: ctx.style().visuals.text_color(),
-            valign: Align::Center,
-            ..Default::default()
-        };
-
-        // icon
-        let mut layout_job = LayoutJob::simple(
-            match self.label_prefix {
-                LabelPrefix::Icon | LabelPrefix::IconAndText => {
-                    egui_phosphor::regular::ARROW_FAT_DOWN.to_string()
-                }
-                LabelPrefix::None | LabelPrefix::Text => String::new(),
-            },
-            icon_format.font_id.clone(),
-            icon_format.color,
-            100.0,
-        );
-
-        // text
-        layout_job.append(
-            &text_down,
-            ctx.style().spacing.item_spacing.x,
-            text_format.clone(),
-        );
-
-        // icon
-        layout_job.append(
-            &match self.label_prefix {
-                LabelPrefix::Icon | LabelPrefix::IconAndText => {
-                    egui_phosphor::regular::ARROW_FAT_UP.to_string()
-                }
-                LabelPrefix::None | LabelPrefix::Text => String::new(),
-            },
-            0.0,
-            icon_format.clone(),
-        );
-
-        // text
-        layout_job.append(
-            &text_up,
-            ctx.style().spacing.item_spacing.x,
-            text_format.clone(),
-        );
-
-        Label::new(layout_job).selectable(false)
-    }
-
-    fn to_pretty_bytes(input_in_bytes: u64, timespan_in_s: u64) -> String {
-        let input = input_in_bytes as f32 / timespan_in_s as f32;
-        let mut magnitude = input.log(1024f32) as u32;
-
-        // let the base unit be KiB
-        if magnitude < 1 {
-            magnitude = 1;
-        }
-
-        let base: Option<DataUnit> = num::FromPrimitive::from_u32(magnitude);
-        let result = input / ((1u64) << (magnitude * 10)) as f32;
-
-        match base {
-            Some(DataUnit::B) => format!("{result:.1} B"),
-            Some(unit) => format!("{result:.1} {unit}iB"),
-            None => String::from("Unknown data unit"),
-        }
-    }
-}
-
-impl BarWidget for Network {
-    fn render(&mut self, ctx: &Context, ui: &mut Ui, config: &mut RenderConfig) {
-        if self.enable {
-            // widget spacing: make sure to use the same config to call the apply_on_widget function
-            let mut render_config = config.clone();
-
-            if self.show_total_activity || self.show_activity {
-                let (activity, total_activity) = self.network_activity();
-
-                if self.show_total_activity {
-                    for reading in total_activity {
-                        render_config.apply_on_widget(true, ui, |ui| {
-                            ui.add(self.reading_to_label(ctx, reading, config.clone()));
-                        });
-                    }
-                }
-
-                if self.show_activity {
-                    for reading in activity {
-                        render_config.apply_on_widget(true, ui, |ui| {
-                            ui.add(self.reading_to_label(ctx, reading, config.clone()));
-                        });
-                    }
-                }
-            }
-
-            if self.show_default_interface {
-                self.default_interface();
-
-                if !self.default_interface.is_empty() {
-                    let mut layout_job = LayoutJob::simple(
-                        match self.label_prefix {
-                            LabelPrefix::Icon | LabelPrefix::IconAndText => {
-                                egui_phosphor::regular::WIFI_HIGH.to_string()
-                            }
-                            LabelPrefix::None | LabelPrefix::Text => String::new(),
-                        },
-                        config.icon_font_id.clone(),
-                        ctx.style().visuals.selection.stroke.color,
-                        100.0,
-                    );
-
-                    if let LabelPrefix::Text | LabelPrefix::IconAndText = self.label_prefix {
-                        self.default_interface.insert_str(0, "NET: ");
-                    }
-
-                    layout_job.append(
-                        &self.default_interface,
-                        10.0,
-                        TextFormat {
-                            font_id: config.text_font_id.clone(),
-                            color: ctx.style().visuals.text_color(),
-                            valign: Align::Center,
-                            ..Default::default()
-                        },
-                    );
-
-                    render_config.apply_on_widget(false, ui, |ui| {
-                        if SelectableFrame::new(false)
-                            .show(ui, |ui| ui.add(Label::new(layout_job).selectable(false)))
-                            .clicked()
-                        {
-                            if let Err(error) = Command::new("cmd.exe").args(["/C", "ncpa"]).spawn()
-                            {
-                                eprintln!("{}", error)
-                            }
-                        }
-                    });
-                }
-            }
-
-            // widget spacing: pass on the config that was use for calling the apply_on_widget function
-            *config = render_config.clone();
-        }
-    }
-}
-
-#[derive(Clone)]
-enum NetworkReadingFormat {
-    Speed = 0,
-    Total = 1,
-}
-
-#[derive(Clone)]
-struct NetworkReading {
-    pub format: NetworkReadingFormat,
-    pub received_text: String,
-    pub transmitted_text: String,
-}
-
-impl NetworkReading {
-    pub fn new(format: NetworkReadingFormat, received: String, transmitted: String) -> Self {
-        NetworkReading {
-            format,
-            received_text: received,
-            transmitted_text: transmitted,
-        }
-    }
-}
-
-#[derive(Debug, FromPrimitive)]
-enum DataUnit {
-    B = 0,
-    K = 1,
-    M = 2,
-    G = 3,
-    T = 4,
-    P = 5,
-    E = 6,
-    Z = 7,
-    Y = 8,
-}
-
-impl fmt::Display for DataUnit {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{:?}", self)
-    }
-}
--- a/komorebi-bar/src/render.rs
+++ b/komorebi-bar/src/render.rs
@@ -1,27 +1,31 @@
 use crate::bar::Alignment;
 use crate::config::KomobarConfig;
 use crate::config::MonitorConfigOrIndex;
+use crate::AUTO_SELECT_FILL_COLOUR;
+use crate::AUTO_SELECT_TEXT_COLOUR;
 use eframe::egui::Color32;
 use eframe::egui::Context;
+use eframe::egui::CornerRadius;
 use eframe::egui::FontId;
 use eframe::egui::Frame;
 use eframe::egui::InnerResponse;
 use eframe::egui::Margin;
-use eframe::egui::Rounding;
 use eframe::egui::Shadow;
 use eframe::egui::TextStyle;
 use eframe::egui::Ui;
-use eframe::egui::Vec2;
-use schemars::JsonSchema;
+use komorebi_client::Colour;
+use komorebi_client::Rgb;
 use serde::Deserialize;
 use serde::Serialize;
+use std::num::NonZeroU32;
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;

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

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 #[serde(tag = "kind")]
 pub enum Grouping {
    /// No grouping is applied
@@ -54,6 +58,12 @@ pub struct RenderConfig {
    pub text_font_id: FontId,
    /// FontId for icon (based on scaling the text font id)
    pub icon_font_id: FontId,
+    /// Show all icons on the workspace section of the Komorebi widget
+    pub show_all_icons: bool,
+    /// Background color of the selected frame
+    pub auto_select_fill: Option<Color32>,
+    /// Text color of the selected frame
+    pub auto_select_text: Option<Color32>,
 }

 pub trait RenderExt {
@@ -87,6 +97,15 @@ impl RenderExt for &KomobarConfig {
            MonitorConfigOrIndex::Index(idx) => *idx,
        };

+        // check if any of the alignments have a komorebi widget with the workspace set to show all icons
+        let show_all_icons =
+            KomobarConfig::show_all_icons_on_komorebi_workspace(&self.left_widgets)
+                || self
+                    .center_widgets
+                    .as_ref()
+                    .is_some_and(|list| KomobarConfig::show_all_icons_on_komorebi_workspace(list))
+                || KomobarConfig::show_all_icons_on_komorebi_workspace(&self.right_widgets);
+
        RenderConfig {
            monitor_idx,
            spacing: self.widget_spacing.unwrap_or(10.0),
@@ -97,6 +116,11 @@ impl RenderExt for &KomobarConfig {
            applied_on_widget: false,
            text_font_id,
            icon_font_id,
+            show_all_icons,
+            auto_select_fill: NonZeroU32::new(AUTO_SELECT_FILL_COLOUR.load(Ordering::SeqCst))
+                .map(|c| Colour::Rgb(Rgb::from(c.get())).into()),
+            auto_select_text: NonZeroU32::new(AUTO_SELECT_TEXT_COLOUR.load(Ordering::SeqCst))
+                .map(|c| Colour::Rgb(Rgb::from(c.get())).into()),
        }
    }
 }
@@ -121,6 +145,9 @@ impl RenderConfig {
            applied_on_widget: false,
            text_font_id: FontId::default(),
            icon_font_id: FontId::default(),
+            show_all_icons: false,
+            auto_select_fill: None,
+            auto_select_text: None,
        }
    }

@@ -135,10 +162,10 @@ impl RenderConfig {
            return self.define_group_frame(
                //TODO: this outer margin can be a config
                Some(Margin {
-                    left: 10.0,
-                    right: 10.0,
-                    top: 6.0,
-                    bottom: 6.0,
+                    left: 10,
+                    right: 10,
+                    top: 6,
+                    bottom: 6,
                }),
                config,
                ui_style,
@@ -191,11 +218,11 @@ impl RenderConfig {
        ui: &mut Ui,
        add_contents: impl FnOnce(&mut Ui) -> R,
    ) -> InnerResponse<R> {
-        Frame::none()
+        Frame::NONE
            .outer_margin(outer_margin.unwrap_or(Margin::ZERO))
            .inner_margin(match self.more_inner_margin {
-                true => Margin::symmetric(5.0, 0.0),
-                false => Margin::same(0.0),
+                true => Margin::symmetric(5, 0),
+                false => Margin::same(0),
            })
            .show(ui, add_contents)
    }
@@ -220,13 +247,13 @@ impl RenderConfig {
        Frame::group(ui_style)
            .outer_margin(outer_margin.unwrap_or(Margin::ZERO))
            .inner_margin(match self.more_inner_margin {
-                true => Margin::symmetric(6.0, 1.0),
-                false => Margin::symmetric(1.0, 1.0),
+                true => Margin::symmetric(6, 1),
+                false => Margin::symmetric(1, 1),
            })
            .stroke(ui_style.visuals.widgets.noninteractive.bg_stroke)
-            .rounding(match config.rounding {
+            .corner_radius(match config.rounding {
                Some(rounding) => rounding.into(),
-                None => ui_style.visuals.widgets.noninteractive.rounding,
+                None => ui_style.visuals.widgets.noninteractive.corner_radius,
            })
            .fill(
                self.background_color
@@ -237,27 +264,27 @@ impl RenderConfig {
                    // new styles can be added if needed here
                    GroupingStyle::Default => Shadow::NONE,
                    GroupingStyle::DefaultWithShadowB4O1S3 => Shadow {
-                        blur: 4.0,
-                        offset: Vec2::new(1.0, 1.0),
-                        spread: 3.0,
+                        blur: 4,
+                        offset: [1, 1],
+                        spread: 3,
                        color: Color32::BLACK.try_apply_alpha(config.transparency_alpha),
                    },
                    GroupingStyle::DefaultWithShadowB4O0S3 => Shadow {
-                        blur: 4.0,
-                        offset: Vec2::new(0.0, 0.0),
-                        spread: 3.0,
+                        blur: 4,
+                        offset: [0, 0],
+                        spread: 3,
                        color: Color32::BLACK.try_apply_alpha(config.transparency_alpha),
                    },
                    GroupingStyle::DefaultWithShadowB0O1S3 => Shadow {
-                        blur: 0.0,
-                        offset: Vec2::new(1.0, 1.0),
-                        spread: 3.0,
+                        blur: 0,
+                        offset: [1, 1],
+                        spread: 3,
                        color: Color32::BLACK.try_apply_alpha(config.transparency_alpha),
                    },
                    GroupingStyle::DefaultWithGlowB3O1S2 => Shadow {
-                        blur: 3.0,
-                        offset: Vec2::new(1.0, 1.0),
-                        spread: 2.0,
+                        blur: 3,
+                        offset: [1, 1],
+                        spread: 2,
                        color: ui_style
                            .visuals
                            .selection
@@ -266,9 +293,9 @@ impl RenderConfig {
                            .try_apply_alpha(config.transparency_alpha),
                    },
                    GroupingStyle::DefaultWithGlowB3O0S2 => Shadow {
-                        blur: 3.0,
-                        offset: Vec2::new(0.0, 0.0),
-                        spread: 2.0,
+                        blur: 3,
+                        offset: [0, 0],
+                        spread: 2,
                        color: ui_style
                            .visuals
                            .selection
@@ -277,9 +304,9 @@ impl RenderConfig {
                            .try_apply_alpha(config.transparency_alpha),
                    },
                    GroupingStyle::DefaultWithGlowB0O1S2 => Shadow {
-                        blur: 0.0,
-                        offset: Vec2::new(1.0, 1.0),
-                        spread: 2.0,
+                        blur: 0,
+                        offset: [1, 1],
+                        spread: 2,
                        color: ui_style
                            .visuals
                            .selection
@@ -295,9 +322,9 @@ impl RenderConfig {
    fn widget_outer_margin(&mut self, ui: &mut Ui) -> Margin {
        let spacing = if self.applied_on_widget {
            // Remove the default item spacing from the margin
-            self.spacing - ui.spacing().item_spacing.x
+            (self.spacing - ui.spacing().item_spacing.x) as i8
        } else {
-            0.0
+            0
        };

        if !self.applied_on_widget {
@@ -309,25 +336,26 @@ impl RenderConfig {
                Some(align) => match align {
                    Alignment::Left => spacing,
                    Alignment::Center => spacing,
-                    Alignment::Right => 0.0,
+                    Alignment::Right => 0,
                },
-                None => 0.0,
+                None => 0,
            },
            right: match self.alignment {
                Some(align) => match align {
-                    Alignment::Left => 0.0,
-                    Alignment::Center => 0.0,
+                    Alignment::Left => 0,
+                    Alignment::Center => 0,
                    Alignment::Right => spacing,
                },
-                None => 0.0,
+                None => 0,
            },
-            top: 0.0,
-            bottom: 0.0,
+            top: 0,
+            bottom: 0,
        }
    }
 }

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

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

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 #[serde(untagged)]
 pub enum RoundingConfig {
    /// All 4 corners are the same    
@@ -366,16 +396,19 @@ pub enum RoundingConfig {
    Individual([f32; 4]),
 }

-impl From<RoundingConfig> for Rounding {
+impl From<RoundingConfig> for CornerRadius {
    fn from(value: RoundingConfig) -> Self {
        match value {
-            RoundingConfig::Same(value) => Rounding::same(value),
-            RoundingConfig::Individual(values) => Self {
-                nw: values[0],
-                ne: values[1],
-                sw: values[2],
-                se: values[3],
-            },
+            RoundingConfig::Same(value) => Self::same(value as u8),
+            RoundingConfig::Individual(values) => {
+                let values = values.map(|f| f as u8);
+                Self {
+                    nw: values[0],
+                    ne: values[1],
+                    sw: values[2],
+                    se: values[3],
+                }
+            }
        }
    }
 }
--- a/komorebi-bar/src/selected_frame.rs
+++ b/komorebi-bar/src/selected_frame.rs
@@ -1,48 +1,81 @@
+use eframe::egui::Color32;
 use eframe::egui::CursorIcon;
 use eframe::egui::Frame;
 use eframe::egui::Margin;
 use eframe::egui::Response;
 use eframe::egui::Sense;
+use eframe::egui::Stroke;
 use eframe::egui::Ui;

 /// Same as SelectableLabel, but supports all content
 pub struct SelectableFrame {
    selected: bool,
+    selected_fill: Option<Color32>,
 }

 impl SelectableFrame {
    pub fn new(selected: bool) -> Self {
-        Self { selected }
+        Self {
+            selected,
+            selected_fill: None,
+        }
+    }
+
+    pub fn new_auto(selected: bool, selected_fill: Option<Color32>) -> Self {
+        Self {
+            selected,
+            selected_fill,
+        }
    }

    pub fn show<R>(self, ui: &mut Ui, add_contents: impl FnOnce(&mut Ui) -> R) -> Response {
-        let Self { selected } = self;
+        let Self {
+            selected,
+            selected_fill,
+        } = self;

-        Frame::none()
+        Frame::NONE
            .show(ui, |ui| {
                let response = ui.interact(ui.max_rect(), ui.unique_id(), Sense::click());

                if ui.is_rect_visible(response.rect) {
+                    // take into account the stroke width
                    let inner_margin = Margin::symmetric(
-                        ui.style().spacing.button_padding.x,
-                        ui.style().spacing.button_padding.y,
+                        ui.style().spacing.button_padding.x as i8 - 1,
+                        ui.style().spacing.button_padding.y as i8 - 1,
                    );

-                    if selected
-                        || response.hovered()
-                        || response.highlighted()
-                        || response.has_focus()
-                    {
+                    // since the stroke is drawn inside the frame, we always reserve space for it
+                    if selected && response.hovered() {
                        let visuals = ui.style().interact_selectable(&response, selected);

-                        Frame::none()
-                            .stroke(visuals.bg_stroke)
-                            .rounding(visuals.rounding)
+                        Frame::NONE
+                            .stroke(Stroke::new(1.0, visuals.bg_stroke.color))
+                            .corner_radius(visuals.corner_radius)
+                            .fill(selected_fill.unwrap_or(visuals.bg_fill))
+                            .inner_margin(inner_margin)
+                            .show(ui, add_contents);
+                    } else if response.hovered() || response.highlighted() || response.has_focus() {
+                        let visuals = ui.style().interact_selectable(&response, selected);
+
+                        Frame::NONE
+                            .stroke(Stroke::new(1.0, visuals.bg_stroke.color))
+                            .corner_radius(visuals.corner_radius)
                            .fill(visuals.bg_fill)
                            .inner_margin(inner_margin)
                            .show(ui, add_contents);
+                    } else if selected {
+                        let visuals = ui.style().interact_selectable(&response, selected);
+
+                        Frame::NONE
+                            .stroke(Stroke::new(1.0, visuals.bg_fill))
+                            .corner_radius(visuals.corner_radius)
+                            .fill(selected_fill.unwrap_or(visuals.bg_fill))
+                            .inner_margin(inner_margin)
+                            .show(ui, add_contents);
                    } else {
-                        Frame::none()
+                        Frame::NONE
+                            .stroke(Stroke::new(1.0, Color32::TRANSPARENT))
                            .inner_margin(inner_margin)
                            .show(ui, add_contents);
                    }
--- a/komorebi-bar/src/widgets/battery.rs
+++ b/komorebi-bar/src/widgets/battery.rs
@@ -1,14 +1,13 @@
 use crate::config::LabelPrefix;
 use crate::render::RenderConfig;
 use crate::selected_frame::SelectableFrame;
-use crate::widget::BarWidget;
+use crate::widgets::widget::BarWidget;
 use eframe::egui::text::LayoutJob;
 use eframe::egui::Align;
 use eframe::egui::Context;
 use eframe::egui::Label;
 use eframe::egui::TextFormat;
 use eframe::egui::Ui;
-use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use starship_battery::units::ratio::percent;
@@ -18,7 +17,8 @@ use std::process::Command;
 use std::time::Duration;
 use std::time::Instant;

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct BatteryConfig {
    /// Enable the Battery widget
    pub enable: bool,
@@ -28,6 +28,8 @@ pub struct BatteryConfig {
    pub data_refresh_interval: Option<u64>,
    /// Display label prefix
    pub label_prefix: Option<LabelPrefix>,
+    /// Select when the current percentage is under this value [[1-100]]
+    pub auto_select_under: Option<u8>,
 }

 impl From<BatteryConfig> for Battery {
@@ -38,9 +40,10 @@ impl From<BatteryConfig> for Battery {
            enable: value.enable,
            hide_on_full_charge: value.hide_on_full_charge.unwrap_or(false),
            manager: Manager::new().unwrap(),
-            last_state: String::new(),
+            last_state: None,
            data_refresh_interval,
            label_prefix: value.label_prefix.unwrap_or(LabelPrefix::Icon),
+            auto_select_under: value.auto_select_under.map(|u| u.clamp(1, 100)),
            state: BatteryState::Discharging,
            last_updated: Instant::now()
                .checked_sub(Duration::from_secs(data_refresh_interval))
@@ -52,6 +55,16 @@ impl From<BatteryConfig> for Battery {
 pub enum BatteryState {
    Charging,
    Discharging,
+    High,
+    Medium,
+    Low,
+    Warning,
+}
+
+#[derive(Clone, Debug)]
+struct BatteryOutput {
+    label: String,
+    selected: bool,
 }

 pub struct Battery {
@@ -61,37 +74,53 @@ pub struct Battery {
    pub state: BatteryState,
    data_refresh_interval: u64,
    label_prefix: LabelPrefix,
-    last_state: String,
+    auto_select_under: Option<u8>,
+    last_state: Option<BatteryOutput>,
    last_updated: Instant,
 }

 impl Battery {
-    fn output(&mut self) -> String {
+    fn output(&mut self) -> Option<BatteryOutput> {
        let mut output = self.last_state.clone();

        let now = Instant::now();
        if now.duration_since(self.last_updated) > Duration::from_secs(self.data_refresh_interval) {
-            output.clear();
+            output = None;

            if let Ok(mut batteries) = self.manager.batteries() {
                if let Some(Ok(first)) = batteries.nth(0) {
-                    let percentage = first.state_of_charge().get::<percent>();
+                    let percentage = first.state_of_charge().get::<percent>().round() as u8;

-                    if percentage == 100.0 && self.hide_on_full_charge {
-                        output = String::new()
+                    if percentage == 100 && self.hide_on_full_charge {
+                        output = None
                    } else {
                        match first.state() {
                            State::Charging => self.state = BatteryState::Charging,
-                            State::Discharging => self.state = BatteryState::Discharging,
+                            State::Discharging => {
+                                self.state = match percentage {
+                                    p if p > 75 => BatteryState::Discharging,
+                                    p if p > 50 => BatteryState::High,
+                                    p if p > 25 => BatteryState::Medium,
+                                    p if p > 10 => BatteryState::Low,
+                                    _ => BatteryState::Warning,
+                                }
+                            }
                            _ => {}
                        }

-                        output = match self.label_prefix {
-                            LabelPrefix::Text | LabelPrefix::IconAndText => {
-                                format!("BAT: {percentage:.0}%")
-                            }
-                            LabelPrefix::None | LabelPrefix::Icon => format!("{percentage:.0}%"),
-                        }
+                        let selected = self.auto_select_under.is_some_and(|u| percentage <= u);
+
+                        output = Some(BatteryOutput {
+                            label: match self.label_prefix {
+                                LabelPrefix::Text | LabelPrefix::IconAndText => {
+                                    format!("BAT: {percentage}%")
+                                }
+                                LabelPrefix::None | LabelPrefix::Icon => {
+                                    format!("{percentage}%")
+                                }
+                            },
+                            selected,
+                        })
                    }
                }
            }
@@ -108,35 +137,43 @@ impl BarWidget for Battery {
    fn render(&mut self, ctx: &Context, ui: &mut Ui, config: &mut RenderConfig) {
        if self.enable {
            let output = self.output();
-            if !output.is_empty() {
+            if let Some(output) = output {
                let emoji = match self.state {
                    BatteryState::Charging => egui_phosphor::regular::BATTERY_CHARGING,
                    BatteryState::Discharging => egui_phosphor::regular::BATTERY_FULL,
+                    BatteryState::High => egui_phosphor::regular::BATTERY_HIGH,
+                    BatteryState::Medium => egui_phosphor::regular::BATTERY_MEDIUM,
+                    BatteryState::Low => egui_phosphor::regular::BATTERY_LOW,
+                    BatteryState::Warning => egui_phosphor::regular::BATTERY_WARNING,
                };

+                let auto_text_color = config.auto_select_text.filter(|_| output.selected);
+
                let mut layout_job = LayoutJob::simple(
                    match self.label_prefix {
                        LabelPrefix::Icon | LabelPrefix::IconAndText => emoji.to_string(),
                        LabelPrefix::None | LabelPrefix::Text => String::new(),
                    },
                    config.icon_font_id.clone(),
-                    ctx.style().visuals.selection.stroke.color,
+                    auto_text_color.unwrap_or(ctx.style().visuals.selection.stroke.color),
                    100.0,
                );

                layout_job.append(
-                    &output,
+                    &output.label,
                    10.0,
                    TextFormat {
                        font_id: config.text_font_id.clone(),
-                        color: ctx.style().visuals.text_color(),
+                        color: auto_text_color.unwrap_or(ctx.style().visuals.text_color()),
                        valign: Align::Center,
                        ..Default::default()
                    },
                );

+                let auto_focus_fill = config.auto_select_fill;
+
                config.apply_on_widget(false, ui, |ui| {
-                    if SelectableFrame::new(false)
+                    if SelectableFrame::new_auto(output.selected, auto_focus_fill)
                        .show(ui, |ui| ui.add(Label::new(layout_job).selectable(false)))
                        .clicked()
                    {
--- a/komorebi-bar/src/widgets/cpu.rs
+++ b/komorebi-bar/src/widgets/cpu.rs
@@ -1,14 +1,13 @@
 use crate::config::LabelPrefix;
 use crate::render::RenderConfig;
 use crate::selected_frame::SelectableFrame;
-use crate::widget::BarWidget;
+use crate::widgets::widget::BarWidget;
 use eframe::egui::text::LayoutJob;
 use eframe::egui::Align;
 use eframe::egui::Context;
 use eframe::egui::Label;
 use eframe::egui::TextFormat;
 use eframe::egui::Ui;
-use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use std::process::Command;
@@ -17,7 +16,8 @@ use std::time::Instant;
 use sysinfo::RefreshKind;
 use sysinfo::System;

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct CpuConfig {
    /// Enable the Cpu widget
    pub enable: bool,
@@ -25,6 +25,8 @@ pub struct CpuConfig {
    pub data_refresh_interval: Option<u64>,
    /// Display label prefix
    pub label_prefix: Option<LabelPrefix>,
+    /// Select when the current percentage is over this value [[1-100]]
+    pub auto_select_over: Option<u8>,
 }

 impl From<CpuConfig> for Cpu {
@@ -38,6 +40,7 @@ impl From<CpuConfig> for Cpu {
            ),
            data_refresh_interval,
            label_prefix: value.label_prefix.unwrap_or(LabelPrefix::IconAndText),
+            auto_select_over: value.auto_select_over.map(|o| o.clamp(1, 100)),
            last_updated: Instant::now()
                .checked_sub(Duration::from_secs(data_refresh_interval))
                .unwrap(),
@@ -45,26 +48,38 @@ impl From<CpuConfig> for Cpu {
    }
 }

+#[derive(Clone, Debug)]
+struct CpuOutput {
+    label: String,
+    selected: bool,
+}
+
 pub struct Cpu {
    pub enable: bool,
    system: System,
    data_refresh_interval: u64,
    label_prefix: LabelPrefix,
+    auto_select_over: Option<u8>,
    last_updated: Instant,
 }

 impl Cpu {
-    fn output(&mut self) -> String {
+    fn output(&mut self) -> CpuOutput {
        let now = Instant::now();
        if now.duration_since(self.last_updated) > Duration::from_secs(self.data_refresh_interval) {
            self.system.refresh_cpu_usage();
            self.last_updated = now;
        }

-        let used = self.system.global_cpu_usage();
-        match self.label_prefix {
-            LabelPrefix::Text | LabelPrefix::IconAndText => format!("CPU: {:.0}%", used),
-            LabelPrefix::None | LabelPrefix::Icon => format!("{:.0}%", used),
+        let used = self.system.global_cpu_usage() as u8;
+        let selected = self.auto_select_over.is_some_and(|o| used >= o);
+
+        CpuOutput {
+            label: match self.label_prefix {
+                LabelPrefix::Text | LabelPrefix::IconAndText => format!("CPU: {}%", used),
+                LabelPrefix::None | LabelPrefix::Icon => format!("{}%", used),
+            },
+            selected,
        }
    }
 }
@@ -73,7 +88,9 @@ impl BarWidget for Cpu {
    fn render(&mut self, ctx: &Context, ui: &mut Ui, config: &mut RenderConfig) {
        if self.enable {
            let output = self.output();
-            if !output.is_empty() {
+            if !output.label.is_empty() {
+                let auto_text_color = config.auto_select_text.filter(|_| output.selected);
+
                let mut layout_job = LayoutJob::simple(
                    match self.label_prefix {
                        LabelPrefix::Icon | LabelPrefix::IconAndText => {
@@ -82,23 +99,25 @@ impl BarWidget for Cpu {
                        LabelPrefix::None | LabelPrefix::Text => String::new(),
                    },
                    config.icon_font_id.clone(),
-                    ctx.style().visuals.selection.stroke.color,
+                    auto_text_color.unwrap_or(ctx.style().visuals.selection.stroke.color),
                    100.0,
                );

                layout_job.append(
-                    &output,
+                    &output.label,
                    10.0,
                    TextFormat {
                        font_id: config.text_font_id.clone(),
-                        color: ctx.style().visuals.text_color(),
+                        color: auto_text_color.unwrap_or(ctx.style().visuals.text_color()),
                        valign: Align::Center,
                        ..Default::default()
                    },
                );

+                let auto_focus_fill = config.auto_select_fill;
+
                config.apply_on_widget(false, ui, |ui| {
-                    if SelectableFrame::new(false)
+                    if SelectableFrame::new_auto(output.selected, auto_focus_fill)
                        .show(ui, |ui| ui.add(Label::new(layout_job).selectable(false)))
                        .clicked()
                    {
--- a/komorebi-bar/src/widgets/date.rs
+++ b/komorebi-bar/src/widgets/date.rs
@@ -1,7 +1,9 @@
 use crate::config::LabelPrefix;
 use crate::render::RenderConfig;
 use crate::selected_frame::SelectableFrame;
-use crate::widget::BarWidget;
+use crate::widgets::widget::BarWidget;
+use chrono::Local;
+use chrono_tz::Tz;
 use eframe::egui::text::LayoutJob;
 use eframe::egui::Align;
 use eframe::egui::Context;
@@ -9,12 +11,14 @@ use eframe::egui::Label;
 use eframe::egui::TextFormat;
 use eframe::egui::Ui;
 use eframe::egui::WidgetText;
-use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
+use std::time::Duration;
+use std::time::Instant;

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

            // get the strftime value of modifier
-            let formatted_modifier = chrono::Local::now().format(modifier).to_string();
+            let formatted_modifier = Local::now().format(modifier).to_string();

            // find the gotten value in the original output
            if let Some(pos) = modified_output.find(&formatted_modifier) {
@@ -55,7 +59,8 @@ impl CustomModifiers {
    }
 }

-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct DateConfig {
    /// Enable the Date widget
    pub enable: bool,
@@ -63,19 +68,41 @@ pub struct DateConfig {
    pub format: DateFormat,
    /// Display label prefix
    pub label_prefix: Option<LabelPrefix>,
+    /// TimeZone (https://docs.rs/chrono-tz/latest/chrono_tz/enum.Tz.html)
+    ///
+    /// Use a custom format to display additional information, i.e.:
+    /// ```json
+    /// {
+    ///     "Date": {
+    ///         "enable": true,
+    ///         "format": { "Custom": "%D %Z (Tokyo)" },
+    ///         "timezone": "Asia/Tokyo"
+    ///      }
+    ///}
+    /// ```
+    pub timezone: Option<String>,
 }

 impl From<DateConfig> for Date {
    fn from(value: DateConfig) -> Self {
+        let data_refresh_interval = 1;
+
        Self {
            enable: value.enable,
            format: value.format,
            label_prefix: value.label_prefix.unwrap_or(LabelPrefix::Icon),
+            timezone: value.timezone,
+            data_refresh_interval,
+            last_state: String::new(),
+            last_updated: Instant::now()
+                .checked_sub(Duration::from_secs(data_refresh_interval))
+                .unwrap(),
        }
    }
 }

-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum DateFormat {
    /// Month/Date/Year format (09/08/24)
    MonthDateYear,
@@ -119,19 +146,46 @@ pub struct Date {
    pub enable: bool,
    pub format: DateFormat,
    label_prefix: LabelPrefix,
+    timezone: Option<String>,
+    data_refresh_interval: u64,
+    last_state: String,
+    last_updated: Instant,
 }

 impl Date {
    fn output(&mut self) -> String {
-        let formatted = chrono::Local::now()
-            .format(&self.format.fmt_string())
-            .to_string();
+        let mut output = self.last_state.clone();
+        let now = Instant::now();

-        // if custom modifiers are used, apply them
-        match &self.format {
-            DateFormat::CustomModifiers(custom) => custom.apply(&formatted),
-            _ => formatted,
+        if now.duration_since(self.last_updated) > Duration::from_secs(self.data_refresh_interval) {
+            let formatted = match &self.timezone {
+                Some(timezone) => match timezone.parse::<Tz>() {
+                    Ok(tz) => Local::now()
+                        .with_timezone(&tz)
+                        .format(&self.format.fmt_string())
+                        .to_string()
+                        .trim()
+                        .to_string(),
+                    Err(_) => format!("Invalid timezone: {}", timezone),
+                },
+                None => Local::now()
+                    .format(&self.format.fmt_string())
+                    .to_string()
+                    .trim()
+                    .to_string(),
+            };
+
+            // if custom modifiers are used, apply them
+            output = match &self.format {
+                DateFormat::CustomModifiers(custom) => custom.apply(&formatted),
+                _ => formatted,
+            };
+
+            self.last_state.clone_from(&output);
+            self.last_updated = now;
        }
+
+        output
    }
 }

--- a/komorebi-bar/src/widgets/keyboard.rs
+++ b/komorebi-bar/src/widgets/keyboard.rs
@@ -0,0 +1,177 @@
+use crate::config::LabelPrefix;
+use crate::render::RenderConfig;
+use crate::widgets::widget::BarWidget;
+use eframe::egui::text::LayoutJob;
+use eframe::egui::Align;
+use eframe::egui::Context;
+use eframe::egui::Label;
+use eframe::egui::TextFormat;
+use eframe::egui::Ui;
+use eframe::egui::WidgetText;
+use serde::Deserialize;
+use serde::Serialize;
+use std::time::Duration;
+use std::time::Instant;
+use windows::Win32::Globalization::LCIDToLocaleName;
+use windows::Win32::Globalization::LOCALE_ALLOW_NEUTRAL_NAMES;
+use windows::Win32::System::SystemServices::LOCALE_NAME_MAX_LENGTH;
+use windows::Win32::UI::Input::KeyboardAndMouse::GetKeyboardLayout;
+use windows::Win32::UI::WindowsAndMessaging::GetForegroundWindow;
+use windows::Win32::UI::WindowsAndMessaging::GetWindowThreadProcessId;
+
+const DEFAULT_DATA_REFRESH_INTERVAL: u64 = 1;
+const ERROR_TEXT: &str = "Error";
+
+#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+pub struct KeyboardConfig {
+    /// Enable the Input widget
+    pub enable: bool,
+    /// Data refresh interval (default: 1 second)
+    pub data_refresh_interval: Option<u64>,
+    /// Display label prefix
+    pub label_prefix: Option<LabelPrefix>,
+}
+
+impl From<KeyboardConfig> for Keyboard {
+    fn from(value: KeyboardConfig) -> Self {
+        let data_refresh_interval = value
+            .data_refresh_interval
+            .unwrap_or(DEFAULT_DATA_REFRESH_INTERVAL);
+
+        Self {
+            enable: value.enable,
+            data_refresh_interval,
+            label_prefix: value.label_prefix.unwrap_or(LabelPrefix::IconAndText),
+            last_updated: Instant::now(),
+            lang_name: get_lang(),
+        }
+    }
+}
+
+pub struct Keyboard {
+    pub enable: bool,
+    data_refresh_interval: u64,
+    label_prefix: LabelPrefix,
+    last_updated: Instant,
+    lang_name: String,
+}
+
+/// Retrieves the name of the active keyboard layout for the current foreground window.
+///
+/// This function determines the active keyboard layout by querying the system for the
+/// foreground window's thread ID and its associated keyboard layout. It then attempts
+/// to retrieve the locale name corresponding to the keyboard layout.
+///
+/// # Failure Cases
+///
+/// This function can fail in two distinct scenarios:
+///
+/// 1. **Failure to Retrieve the Locale Name**:
+///    If the system fails to retrieve the locale name (e.g., due to an invalid or unsupported
+///    language identifier), the function will return `Err(())`.
+///
+/// 2. **Invalid UTF-16 Characters in the Locale Name**:
+///    If the retrieved locale name contains invalid UTF-16 sequences, the conversion to a Rust
+///    `String` will fail, and the function will return `Err(())`.
+///
+/// # Returns
+///
+/// - `Ok(String)`: The name of the active keyboard layout as a valid UTF-8 string.
+/// - `Err(())`: Indicates that the function failed to retrieve the locale name or encountered
+///   invalid UTF-16 characters during conversion.
+fn get_active_keyboard_layout() -> Result<String, ()> {
+    let foreground_window_tid = unsafe { GetWindowThreadProcessId(GetForegroundWindow(), None) };
+    let lcid = unsafe { GetKeyboardLayout(foreground_window_tid) };
+
+    // Extract the low word (language identifier) from the keyboard layout handle.
+    let lang_id = (lcid.0 as u32) & 0xFFFF;
+    let mut locale_name_buffer = [0; LOCALE_NAME_MAX_LENGTH as usize];
+    let char_count = unsafe {
+        LCIDToLocaleName(
+            lang_id,
+            Some(&mut locale_name_buffer),
+            LOCALE_ALLOW_NEUTRAL_NAMES,
+        )
+    };
+
+    match char_count {
+        0 => Err(()),
+        _ => String::from_utf16(&locale_name_buffer[..char_count as usize]).map_err(|_| ()),
+    }
+}
+
+/// Retrieves the name of the active keyboard layout or a fallback error message.
+///
+/// # Behavior
+///
+/// - **Success Case**:
+///   If [`get_active_keyboard_layout`] succeeds, this function returns the retrieved keyboard
+///   layout name as a `String`.
+///
+/// - **Failure Case**:
+///   If [`get_active_keyboard_layout`] fails, this function returns the value of `ERROR_TEXT`
+///   as a fallback message. This ensures that the function always returns a valid `String`,
+///   even in error scenarios.
+///
+/// # Returns
+///
+/// A `String` representing either:
+/// - The name of the active keyboard layout, or
+/// - The fallback error message (`ERROR_TEXT`) if the layout name cannot be retrieved.
+fn get_lang() -> String {
+    get_active_keyboard_layout()
+        .map(|l| l.trim_end_matches('\0').to_string())
+        .unwrap_or_else(|_| ERROR_TEXT.to_string())
+}
+
+impl Keyboard {
+    fn output(&mut self) -> String {
+        let now = Instant::now();
+        if now.duration_since(self.last_updated) > Duration::from_secs(self.data_refresh_interval) {
+            self.last_updated = now;
+            self.lang_name = get_lang();
+        }
+
+        match self.label_prefix {
+            LabelPrefix::Text | LabelPrefix::IconAndText => format!("KB: {}", self.lang_name),
+            LabelPrefix::None | LabelPrefix::Icon => self.lang_name.clone(),
+        }
+    }
+}
+
+impl BarWidget for Keyboard {
+    fn render(&mut self, ctx: &Context, ui: &mut Ui, config: &mut RenderConfig) {
+        if self.enable {
+            let output = self.output();
+            if !output.is_empty() {
+                let mut layout_job = LayoutJob::simple(
+                    match self.label_prefix {
+                        LabelPrefix::Icon | LabelPrefix::IconAndText => {
+                            egui_phosphor::regular::KEYBOARD.to_string()
+                        }
+                        LabelPrefix::None | LabelPrefix::Text => String::new(),
+                    },
+                    config.icon_font_id.clone(),
+                    ctx.style().visuals.selection.stroke.color,
+                    100.0,
+                );
+
+                layout_job.append(
+                    &output,
+                    10.0,
+                    TextFormat {
+                        font_id: config.text_font_id.clone(),
+                        color: ctx.style().visuals.text_color(),
+                        valign: Align::Center,
+                        ..Default::default()
+                    },
+                );
+
+                config.apply_on_widget(true, ui, |ui| {
+                    ui.add(Label::new(WidgetText::LayoutJob(layout_job.clone())).selectable(false))
+                });
+            }
+        }
+    }
+}
--- a/komorebi-bar/src/widgets/komorebi.rs
+++ b/komorebi-bar/src/widgets/komorebi.rs
@@ -1,26 +1,32 @@
 use crate::bar::apply_theme;
 use crate::config::DisplayFormat;
 use crate::config::KomobarTheme;
-use crate::komorebi_layout::KomorebiLayout;
+use crate::config::WorkspacesDisplayFormat;
 use crate::render::Grouping;
 use crate::render::RenderConfig;
 use crate::selected_frame::SelectableFrame;
 use crate::ui::CustomUi;
-use crate::widget::BarWidget;
+use crate::widgets::komorebi_layout::KomorebiLayout;
+use crate::widgets::widget::BarWidget;
 use crate::ICON_CACHE;
 use crate::MAX_LABEL_WIDTH;
 use crate::MONITOR_INDEX;
+use eframe::egui::text::LayoutJob;
 use eframe::egui::vec2;
+use eframe::egui::Align;
 use eframe::egui::Color32;
 use eframe::egui::ColorImage;
 use eframe::egui::Context;
+use eframe::egui::CornerRadius;
 use eframe::egui::Frame;
 use eframe::egui::Image;
 use eframe::egui::Label;
 use eframe::egui::Margin;
-use eframe::egui::Rounding;
+use eframe::egui::RichText;
 use eframe::egui::Sense;
 use eframe::egui::Stroke;
+use eframe::egui::StrokeKind;
+use eframe::egui::TextFormat;
 use eframe::egui::TextureHandle;
 use eframe::egui::TextureOptions;
 use eframe::egui::Ui;
@@ -33,38 +39,47 @@ use komorebi_client::Rect;
 use komorebi_client::SocketMessage;
 use komorebi_client::Window;
 use komorebi_client::Workspace;
-use schemars::JsonSchema;
+use komorebi_client::WorkspaceLayer;
 use serde::Deserialize;
 use serde::Serialize;
 use std::cell::RefCell;
 use std::collections::BTreeMap;
+use std::collections::HashMap;
 use std::path::PathBuf;
 use std::rc::Rc;
 use std::sync::atomic::Ordering;

-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct KomorebiConfig {
    /// Configure the Workspaces widget
    pub workspaces: Option<KomorebiWorkspacesConfig>,
    /// Configure the Layout widget
    pub layout: Option<KomorebiLayoutConfig>,
-    /// Configure the Focused Window widget
-    pub focused_window: Option<KomorebiFocusedWindowConfig>,
+    /// Configure the Workspace Layer widget
+    pub workspace_layer: Option<KomorebiWorkspaceLayerConfig>,
+    /// Configure the Focused Container widget
+    #[serde(alias = "focused_window")]
+    pub focused_container: Option<KomorebiFocusedContainerConfig>,
+    /// Configure the Locked Container widget
+    pub locked_container: Option<KomorebiLockedContainerConfig>,
    /// Configure the Configuration Switcher widget
    pub configuration_switcher: Option<KomorebiConfigurationSwitcherConfig>,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct KomorebiWorkspacesConfig {
    /// Enable the Komorebi Workspaces widget
    pub enable: bool,
    /// Hide workspaces without any windows
    pub hide_empty_workspaces: bool,
    /// Display format of the workspace
-    pub display: Option<DisplayFormat>,
+    pub display: Option<WorkspacesDisplayFormat>,
 }

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

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
-pub struct KomorebiFocusedWindowConfig {
-    /// Enable the Komorebi Focused Window widget
+#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+pub struct KomorebiWorkspaceLayerConfig {
+    /// Enable the Komorebi Workspace Layer widget
    pub enable: bool,
-    /// DEPRECATED: use 'display' instead (Show the icon of the currently focused window)
+    /// Display format of the current layer
+    pub display: Option<DisplayFormat>,
+    /// Show the widget event if the layer is Tiling
+    pub show_when_tiling: Option<bool>,
+}
+
+#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+pub struct KomorebiFocusedContainerConfig {
+    /// Enable the Komorebi Focused Container widget
+    pub enable: bool,
+    /// DEPRECATED: use 'display' instead (Show the icon of the currently focused container)
    pub show_icon: Option<bool>,
-    /// Display format of the currently focused window
+    /// Display format of the currently focused container
    pub display: Option<DisplayFormat>,
 }

-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+pub struct KomorebiLockedContainerConfig {
+    /// Enable the Komorebi Locked Container widget
+    pub enable: bool,
+    /// Display format of the current locked state
+    pub display: Option<DisplayFormat>,
+    /// Show the widget event if the layer is unlocked
+    pub show_when_unlocked: Option<bool>,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct KomorebiConfigurationSwitcherConfig {
    /// Enable the Komorebi Configurations widget
    pub enable: bool,
@@ -118,13 +157,19 @@ impl From<&KomorebiConfig> for Komorebi {
                    .unwrap_or_default(),
                mouse_follows_focus: true,
                work_area_offset: None,
-                focused_container_information: KomorebiNotificationStateContainerInformation::EMPTY,
+                focused_container_information: (
+                    false,
+                    KomorebiNotificationStateContainerInformation::EMPTY,
+                ),
                stack_accent: None,
                monitor_index: MONITOR_INDEX.load(Ordering::SeqCst),
+                monitor_usr_idx_map: HashMap::new(),
            })),
            workspaces: value.workspaces,
            layout: value.layout.clone(),
-            focused_window: value.focused_window,
+            focused_container: value.focused_container,
+            workspace_layer: value.workspace_layer,
+            locked_container: value.locked_container,
            configuration_switcher,
        }
    }
@@ -135,7 +180,9 @@ pub struct Komorebi {
    pub komorebi_notification_state: Rc<RefCell<KomorebiNotificationState>>,
    pub workspaces: Option<KomorebiWorkspacesConfig>,
    pub layout: Option<KomorebiLayoutConfig>,
-    pub focused_window: Option<KomorebiFocusedWindowConfig>,
+    pub focused_container: Option<KomorebiFocusedContainerConfig>,
+    pub workspace_layer: Option<KomorebiWorkspaceLayerConfig>,
+    pub locked_container: Option<KomorebiLockedContainerConfig>,
    pub configuration_switcher: Option<KomorebiConfigurationSwitcherConfig>,
 }

@@ -143,84 +190,93 @@ impl BarWidget for Komorebi {
    fn render(&mut self, ctx: &Context, ui: &mut Ui, config: &mut RenderConfig) {
        let mut komorebi_notification_state = self.komorebi_notification_state.borrow_mut();
        let icon_size = Vec2::splat(config.icon_font_id.size);
+        let text_size = Vec2::splat(config.text_font_id.size);

        if let Some(workspaces) = self.workspaces {
            if workspaces.enable {
                let mut update = None;

                if !komorebi_notification_state.workspaces.is_empty() {
-                    let format = workspaces.display.unwrap_or(DisplayFormat::Text);
+                    let format = workspaces.display.unwrap_or(DisplayFormat::Text.into());

                    config.apply_on_widget(false, ui, |ui| {
-                        for (i, (ws, container_information)) in
+                        for (i, (ws, containers, _, should_show)) in
                            komorebi_notification_state.workspaces.iter().enumerate()
                        {
+                            if *should_show {
+                            let is_selected = komorebi_notification_state.selected_workspace.eq(ws);
+
                            if SelectableFrame::new(
-                                komorebi_notification_state.selected_workspace.eq(ws),
+                                is_selected,
                            )
                            .show(ui, |ui| {
                                let mut has_icon = false;

-                                if format == DisplayFormat::Icon
-                                    || format == DisplayFormat::IconAndText
-                                    || format == DisplayFormat::IconAndTextOnSelected
-                                    || (format == DisplayFormat::TextAndIconOnSelected
-                                        && komorebi_notification_state.selected_workspace.eq(ws))
+                                if format == WorkspacesDisplayFormat::AllIcons
+                                    || format == WorkspacesDisplayFormat::AllIconsAndText
+                                    || format == WorkspacesDisplayFormat::AllIconsAndTextOnSelected
+                                    || format == DisplayFormat::Icon.into()
+                                    || format == DisplayFormat::IconAndText.into()
+                                    || format == DisplayFormat::IconAndTextOnSelected.into()
+                                    || (format == DisplayFormat::TextAndIconOnSelected.into() && is_selected)
                                {
-                                    let icons: Vec<_> =
-                                        container_information.icons.iter().flatten().collect();
+                                    has_icon = containers.iter().any(|(_, container_info)| {
+                                        container_info.icons.iter().any(|icon| icon.is_some())
+                                    });

-                                    if !icons.is_empty() {
-                                        Frame::none()
+                                    if has_icon {
+                                        Frame::NONE
                                            .inner_margin(Margin::same(
-                                                ui.style().spacing.button_padding.y,
+                                                ui.style().spacing.button_padding.y as i8,
                                            ))
                                            .show(ui, |ui| {
-                                                for icon in icons {
-                                                    ui.add(
-                                                        Image::from(&img_to_texture(ctx, icon))
-                                                            .maintain_aspect_ratio(true)
-                                                            .fit_to_exact_size(icon_size),
-                                                    );
-
-                                                    if !has_icon {
-                                                        has_icon = true;
+                                                for (is_focused, container) in containers {
+                                                    for icon in container.icons.iter().flatten().collect::<Vec<_>>() {
+                                                        ui.add(
+                                                            Image::from(&img_to_texture(ctx, icon))
+                                                                .maintain_aspect_ratio(true)
+                                                                .fit_to_exact_size(if *is_focused { icon_size } else { text_size }),
+                                                        );
                                                    }
                                                }
                                            });
                                    }
                                }

-                                // draw a custom icon when there is no app icon
-                                if match format {
-                                    DisplayFormat::Icon => !has_icon,
-                                    _ => false,
-                                } {
+                                // draw a custom icon when there is no app icon or text
+                                if !has_icon && (matches!(format, WorkspacesDisplayFormat::AllIcons | WorkspacesDisplayFormat::Existing(DisplayFormat::Icon))
+                                || (!is_selected && matches!(format, WorkspacesDisplayFormat::AllIconsAndTextOnSelected | WorkspacesDisplayFormat::Existing(DisplayFormat::IconAndTextOnSelected)))) {
                                    let (response, painter) =
                                        ui.allocate_painter(icon_size, Sense::hover());
                                    let stroke = Stroke::new(
                                        1.0,
-                                        ctx.style().visuals.selection.stroke.color,
+                                        if is_selected { ctx.style().visuals.selection.stroke.color} else { ui.style().visuals.text_color() },
                                    );
                                    let mut rect = response.rect;
-                                    let rounding = Rounding::same(rect.width() * 0.1);
+                                    let rounding = CornerRadius::same((rect.width() * 0.1) as u8);
                                    rect = rect.shrink(stroke.width);
                                    let c = rect.center();
                                    let r = rect.width() / 2.0;
-                                    painter.rect_stroke(rect, rounding, stroke);
+                                    painter.rect_stroke(rect, rounding, stroke, StrokeKind::Outside);
                                    painter.line_segment([c - vec2(r, r), c + vec2(r, r)], stroke);

                                    response.on_hover_text(ws.to_string())
+                                // add hover text when there are only icons
                                } else if match format {
-                                    DisplayFormat::Icon => has_icon,
+                                    WorkspacesDisplayFormat::AllIcons | WorkspacesDisplayFormat::Existing(DisplayFormat::Icon) => has_icon,
                                    _ => false,
                                } {
                                    ui.response().on_hover_text(ws.to_string())
-                                } else if format != DisplayFormat::IconAndTextOnSelected
-                                    || (format == DisplayFormat::IconAndTextOnSelected
-                                        && komorebi_notification_state.selected_workspace.eq(ws))
+                                // add label only
+                                } else if (format != WorkspacesDisplayFormat::AllIconsAndTextOnSelected && format != DisplayFormat::IconAndTextOnSelected.into())
+                                    || (is_selected && matches!(format, WorkspacesDisplayFormat::AllIconsAndTextOnSelected | WorkspacesDisplayFormat::Existing(DisplayFormat::IconAndTextOnSelected)))
                                {
-                                    ui.add(Label::new(ws.to_string()).selectable(false))
+                                     if is_selected {
+                                        ui.add(Label::new(RichText::new(ws.to_string()).color(ctx.style().visuals.selection.stroke.color)).selectable(false))
+                                    }
+                                    else {
+                                        ui.add(Label::new(ws.to_string()).selectable(false))
+                                    }
                                } else {
                                    ui.response()
                                }
@@ -269,6 +325,7 @@ impl BarWidget for Komorebi {
                                    );
                                }
                            }
+                            }
                        }
                    });
                }
@@ -279,6 +336,120 @@ impl BarWidget for Komorebi {
            }
        }

+        if let Some(layer_config) = &self.workspace_layer {
+            if layer_config.enable {
+                let layer = komorebi_notification_state
+                    .workspaces
+                    .iter()
+                    .find(|o| komorebi_notification_state.selected_workspace.eq(&o.0))
+                    .map(|(_, _, layer, _)| layer);
+
+                if let Some(layer) = layer {
+                    if (layer_config.show_when_tiling.unwrap_or_default()
+                        && matches!(layer, WorkspaceLayer::Tiling))
+                        || matches!(layer, WorkspaceLayer::Floating)
+                    {
+                        let display_format = layer_config.display.unwrap_or(DisplayFormat::Text);
+                        let size = Vec2::splat(config.icon_font_id.size);
+
+                        config.apply_on_widget(false, ui, |ui| {
+                            let layer_frame = SelectableFrame::new(false)
+                                .show(ui, |ui| {
+                                    if display_format != DisplayFormat::Text {
+                                        if matches!(layer, WorkspaceLayer::Tiling) {
+                                            let (response, painter) =
+                                                ui.allocate_painter(size, Sense::hover());
+                                            let color = ctx.style().visuals.selection.stroke.color;
+                                            let stroke = Stroke::new(1.0, color);
+                                            let mut rect = response.rect;
+                                            let corner =
+                                                CornerRadius::same((rect.width() * 0.1) as u8);
+                                            rect = rect.shrink(stroke.width);
+
+                                            // tiling
+                                            let mut rect_left = response.rect;
+                                            rect_left.set_width(rect.width() * 0.48);
+                                            rect_left.set_height(rect.height() * 0.98);
+                                            let mut rect_right = rect_left;
+                                            rect_left = rect_left.translate(Vec2::new(
+                                                rect.width() * 0.01 + stroke.width,
+                                                rect.width() * 0.01 + stroke.width,
+                                            ));
+                                            rect_right = rect_right.translate(Vec2::new(
+                                                rect.width() * 0.51 + stroke.width,
+                                                rect.width() * 0.01 + stroke.width,
+                                            ));
+                                            painter.rect_filled(rect_left, corner, color);
+                                            painter.rect_stroke(
+                                                rect_right,
+                                                corner,
+                                                stroke,
+                                                StrokeKind::Outside,
+                                            );
+                                        } else {
+                                            let (response, painter) =
+                                                ui.allocate_painter(size, Sense::hover());
+                                            let color = ctx.style().visuals.selection.stroke.color;
+                                            let stroke = Stroke::new(1.0, color);
+                                            let mut rect = response.rect;
+                                            let corner =
+                                                CornerRadius::same((rect.width() * 0.1) as u8);
+                                            rect = rect.shrink(stroke.width);
+
+                                            // floating
+                                            let mut rect_left = response.rect;
+                                            rect_left.set_width(rect.width() * 0.65);
+                                            rect_left.set_height(rect.height() * 0.65);
+                                            let mut rect_right = rect_left;
+                                            rect_left = rect_left.translate(Vec2::new(
+                                                rect.width() * 0.01 + stroke.width,
+                                                rect.width() * 0.01 + stroke.width,
+                                            ));
+                                            rect_right = rect_right.translate(Vec2::new(
+                                                rect.width() * 0.34 + stroke.width,
+                                                rect.width() * 0.34 + stroke.width,
+                                            ));
+                                            painter.rect_filled(rect_left, corner, color);
+                                            painter.rect_stroke(
+                                                rect_right,
+                                                corner,
+                                                stroke,
+                                                StrokeKind::Outside,
+                                            );
+                                        }
+                                    }
+
+                                    if display_format != DisplayFormat::Icon {
+                                        ui.add(Label::new(layer.to_string()).selectable(false));
+                                    }
+                                })
+                                .on_hover_text(layer.to_string());
+
+                            if layer_frame.clicked()
+                                && komorebi_client::send_batch([
+                                    SocketMessage::FocusMonitorAtCursor,
+                                    SocketMessage::MouseFollowsFocus(false),
+                                    SocketMessage::ToggleWorkspaceLayer,
+                                    SocketMessage::MouseFollowsFocus(
+                                        komorebi_notification_state.mouse_follows_focus,
+                                    ),
+                                ])
+                                .is_err()
+                            {
+                                tracing::error!(
+                                    "could not send the following batch of messages to komorebi:\n\
+                                                MouseFollowsFocus(false),
+                                                ToggleWorkspaceLayer,
+                                                MouseFollowsFocus({})",
+                                    komorebi_notification_state.mouse_follows_focus,
+                                );
+                            }
+                        });
+                    }
+                }
+            }
+        }
+
        if let Some(layout_config) = &self.layout {
            if layout_config.enable {
                let workspace_idx: Option<usize> = komorebi_notification_state
@@ -301,72 +472,109 @@ impl BarWidget for Komorebi {
                for (name, location) in configuration_switcher.configurations.iter() {
                    let path = PathBuf::from(location);
                    if path.is_file() {
-                        config.apply_on_widget(false, ui,|ui|{
-                    if SelectableFrame::new(false).show(ui, |ui|{
-                          ui.add(Label::new(name).selectable(false))
-                            })
-                            .clicked()
-                        {
-                            let canonicalized = dunce::canonicalize(path.clone()).unwrap_or(path);
-                            let mut proceed = true;
-                            if komorebi_client::send_message(&SocketMessage::ReplaceConfiguration(
-                                canonicalized,
-                            ))
-                            .is_err()
+                        config.apply_on_widget(false, ui, |ui| {
+                            if SelectableFrame::new(false)
+                                .show(ui, |ui| ui.add(Label::new(name).selectable(false)))
+                                .clicked()
                            {
-                                tracing::error!(
-                                    "could not send message to komorebi: ReplaceConfiguration"
-                                );
-                                proceed = false;
-                            }
+                                let canonicalized =
+                                    dunce::canonicalize(path.clone()).unwrap_or(path);

-                            if let Some(rect) = komorebi_notification_state.work_area_offset {
-                                if proceed {
-                                    match komorebi_client::send_query(&SocketMessage::Query(
-                                        komorebi_client::StateQuery::FocusedMonitorIndex,
-                                    )) {
-                                        Ok(idx) => {
-                                            if let Ok(monitor_idx) = idx.parse::<usize>() {
-                                                if komorebi_client::send_message(
-                                                    &SocketMessage::MonitorWorkAreaOffset(
-                                                        monitor_idx,
-                                                        rect,
-                                                    ),
-                                                )
-                                                .is_err()
-                                                {
-                                                    tracing::error!(
-                                                    "could not send message to komorebi: MonitorWorkAreaOffset"
-                                                );
-                                                }
-                                            }
-                                        }
-                                        Err(_) => {
-                                            tracing::error!(
-                                                "could not send message to komorebi: Query"
-                                            );
-                                        }
-                                    }
+                                if komorebi_client::send_message(
+                                    &SocketMessage::ReplaceConfiguration(canonicalized),
+                                )
+                                .is_err()
+                                {
+                                    tracing::error!(
+                                        "could not send message to komorebi: ReplaceConfiguration"
+                                    );
                                }
                            }
-                        }});
+                        });
                    }
                }
            }
        }

-        if let Some(focused_window) = self.focused_window {
-            if focused_window.enable {
+        if let Some(locked_container_config) = self.locked_container {
+            if locked_container_config.enable {
+                let is_locked = komorebi_notification_state.focused_container_information.0;
+
+                if locked_container_config
+                    .show_when_unlocked
+                    .unwrap_or_default()
+                    || is_locked
+                {
+                    let titles = &komorebi_notification_state
+                        .focused_container_information
+                        .1
+                        .titles;
+
+                    if !titles.is_empty() {
+                        let display_format = locked_container_config
+                            .display
+                            .unwrap_or(DisplayFormat::Text);
+
+                        let mut layout_job = LayoutJob::simple(
+                            if display_format != DisplayFormat::Text {
+                                if is_locked {
+                                    egui_phosphor::regular::LOCK_KEY.to_string()
+                                } else {
+                                    egui_phosphor::regular::LOCK_SIMPLE_OPEN.to_string()
+                                }
+                            } else {
+                                String::new()
+                            },
+                            config.icon_font_id.clone(),
+                            ctx.style().visuals.selection.stroke.color,
+                            100.0,
+                        );
+
+                        if display_format != DisplayFormat::Icon {
+                            layout_job.append(
+                                if is_locked { "Locked" } else { "Unlocked" },
+                                10.0,
+                                TextFormat {
+                                    font_id: config.text_font_id.clone(),
+                                    color: ctx.style().visuals.text_color(),
+                                    valign: Align::Center,
+                                    ..Default::default()
+                                },
+                            );
+                        }
+
+                        config.apply_on_widget(false, ui, |ui| {
+                            if SelectableFrame::new(false)
+                                .show(ui, |ui| ui.add(Label::new(layout_job).selectable(false)))
+                                .clicked()
+                                && komorebi_client::send_batch([
+                                    SocketMessage::FocusMonitorAtCursor,
+                                    SocketMessage::ToggleLock,
+                                ])
+                                .is_err()
+                            {
+                                tracing::error!("could not send ToggleLock");
+                            }
+                        });
+                    }
+                }
+            }
+        }
+
+        if let Some(focused_container_config) = self.focused_container {
+            if focused_container_config.enable {
                let titles = &komorebi_notification_state
                    .focused_container_information
+                    .1
                    .titles;
+
                if !titles.is_empty() {
                    config.apply_on_widget(false, ui, |ui| {
                        let icons = &komorebi_notification_state
-                            .focused_container_information
+                            .focused_container_information.1
                            .icons;
                        let focused_window_idx = komorebi_notification_state
-                            .focused_container_information
+                            .focused_container_information.1
                            .focused_window_idx;

                        let iter = titles.iter().zip(icons.iter());
@@ -374,12 +582,13 @@ impl BarWidget for Komorebi {

                        for (i, (title, icon)) in iter.enumerate() {
                            let selected = i == focused_window_idx && len != 1;
+                            let text_color = if selected { ctx.style().visuals.selection.stroke.color } else { ui.style().visuals.text_color() };

                            if SelectableFrame::new(selected)
                                .show(ui, |ui| {
                                    // handle legacy setting
-                                    let format = focused_window.display.unwrap_or(
-                                        if focused_window.show_icon.unwrap_or(false) {
+                                    let format = focused_container_config.display.unwrap_or(
+                                        if focused_container_config.show_icon.unwrap_or(false) {
                                            DisplayFormat::IconAndText
                                        } else {
                                            DisplayFormat::Text
@@ -393,9 +602,9 @@ impl BarWidget for Komorebi {
                                            && i == focused_window_idx)
                                    {
                                        if let Some(img) = icon {
-                                            Frame::none()
+                                            Frame::NONE
                                                .inner_margin(Margin::same(
-                                                    ui.style().spacing.button_padding.y,
+                                                    ui.style().spacing.button_padding.y as i8,
                                                ))
                                                .show(ui, |ui| {
                                                    let response = ui.add(
@@ -425,7 +634,7 @@ impl BarWidget for Komorebi {
                                                MAX_LABEL_WIDTH.load(Ordering::SeqCst) as f32,
                                                available_height,
                                            ),
-                                            Label::new(title).selectable(false).truncate(),
+                                            Label::new(RichText::new( title).color(text_color)).selectable(false).truncate(),
                                        );
                                    }
                                })
@@ -472,17 +681,24 @@ fn img_to_texture(ctx: &Context, rgba_image: &RgbaImage) -> TextureHandle {
    ctx.load_texture("icon", color_image, TextureOptions::default())
 }

+#[allow(clippy::type_complexity)]
 #[derive(Clone, Debug)]
 pub struct KomorebiNotificationState {
-    pub workspaces: Vec<(String, KomorebiNotificationStateContainerInformation)>,
+    pub workspaces: Vec<(
+        String,
+        Vec<(bool, KomorebiNotificationStateContainerInformation)>,
+        WorkspaceLayer,
+        bool,
+    )>,
    pub selected_workspace: String,
-    pub focused_container_information: KomorebiNotificationStateContainerInformation,
+    pub focused_container_information: (bool, KomorebiNotificationStateContainerInformation),
    pub layout: KomorebiLayout,
    pub hide_empty_workspaces: bool,
    pub mouse_follows_focus: bool,
    pub work_area_offset: Option<Rect>,
    pub stack_accent: Option<Color32>,
    pub monitor_index: usize,
+    pub monitor_usr_idx_map: HashMap<usize, usize>,
 }

 impl KomorebiNotificationState {
@@ -494,7 +710,7 @@ impl KomorebiNotificationState {
    pub fn handle_notification(
        &mut self,
        ctx: &Context,
-        monitor_index: usize,
+        monitor_index: Option<usize>,
        notification: komorebi_client::Notification,
        bg_color: Rc<RefCell<Color32>>,
        bg_color_with_alpha: Rc<RefCell<Color32>>,
@@ -503,6 +719,8 @@ impl KomorebiNotificationState {
        default_theme: Option<KomobarTheme>,
        render_config: Rc<RefCell<RenderConfig>>,
    ) {
+        let show_all_icons = render_config.borrow().show_all_icons;
+
        match notification.event {
            NotificationEvent::WindowManager(_) => {}
            NotificationEvent::Monitor(_) => {}
@@ -539,7 +757,7 @@ impl KomorebiNotificationState {
                SocketMessage::Theme(theme) => {
                    apply_theme(
                        ctx,
-                        KomobarTheme::from(theme),
+                        KomobarTheme::from(*theme),
                        bg_color,
                        bg_color_with_alpha.clone(),
                        transparency_alpha,
@@ -552,6 +770,16 @@ impl KomorebiNotificationState {
            },
        }

+        self.monitor_usr_idx_map = notification.state.monitor_usr_idx_map.clone();
+
+        if monitor_index.is_none()
+            || monitor_index.is_some_and(|idx| idx >= notification.state.monitors.elements().len())
+        {
+            // The bar's monitor is diconnected, so the bar is disabled no need to check anything
+            // any further otherwise we'll get `OutOfBounds` panics.
+            return;
+        }
+        let monitor_index = monitor_index.expect("should have a monitor index");
        self.monitor_index = monitor_index;

        self.mouse_follows_focus = notification.state.mouse_follows_focus;
@@ -563,6 +791,7 @@ impl KomorebiNotificationState {
        let focused_workspace_idx = monitor.focused_workspace_idx();

        let mut workspaces = vec![];
+
        self.selected_workspace = monitor.workspaces()[focused_workspace_idx]
            .name()
            .to_owned()
@@ -570,21 +799,46 @@ impl KomorebiNotificationState {

        for (i, ws) in monitor.workspaces().iter().enumerate() {
            let should_show = if self.hide_empty_workspaces {
-                focused_workspace_idx == i
-                    || !ws.containers().is_empty()
-                    || !ws.floating_windows().is_empty()
-                    || ws.monocle_container().is_some()
-                    || ws.maximized_window().is_some()
+                focused_workspace_idx == i || !ws.is_empty()
            } else {
                true
            };

-            if should_show {
-                workspaces.push((
-                    ws.name().to_owned().unwrap_or_else(|| format!("{}", i + 1)),
-                    ws.into(),
-                ));
-            }
+            workspaces.push((
+                ws.name().to_owned().unwrap_or_else(|| format!("{}", i + 1)),
+                if show_all_icons {
+                    let mut containers = vec![];
+                    let mut has_monocle = false;
+
+                    // add monocle container
+                    if let Some(container) = ws.monocle_container() {
+                        containers.push((true, container.into()));
+                        has_monocle = true;
+                    }
+
+                    // add all tiled windows
+                    for (i, container) in ws.containers().iter().enumerate() {
+                        containers.push((
+                            !has_monocle && i == ws.focused_container_idx(),
+                            container.into(),
+                        ));
+                    }
+
+                    // add all floating windows
+                    for floating_window in ws.floating_windows() {
+                        containers.push((
+                            !has_monocle && floating_window.is_focused(),
+                            floating_window.into(),
+                        ));
+                    }
+
+                    containers
+                } else {
+                    vec![(true, ws.into())]
+                },
+                ws.layer().to_owned(),
+                should_show,
+            ));
        }

        self.workspaces = workspaces;
@@ -605,7 +859,12 @@ impl KomorebiNotificationState {
            };
        }

-        self.focused_container_information = (&monitor.workspaces()[focused_workspace_idx]).into();
+        let focused_workspace = &monitor.workspaces()[focused_workspace_idx];
+        let is_focused = focused_workspace
+            .locked_containers()
+            .contains(&focused_workspace.focused_container_idx());
+
+        self.focused_container_information = (is_focused, focused_workspace.into());
    }
 }

@@ -644,11 +903,16 @@ impl From<&Container> for KomorebiNotificationStateContainerInformation {
        for window in windows {
            let mut icon_cache = ICON_CACHE.lock().unwrap();
            let mut update_cache = false;
-            let exe = window.exe().unwrap_or_default();
+            let hwnd = window.hwnd;

-            match icon_cache.get(&exe) {
+            match icon_cache.get(&hwnd) {
                None => {
-                    icons.push(windows_icons::get_icon_by_process_id(window.process_id()));
+                    let icon = match windows_icons::get_icon_by_hwnd(window.hwnd) {
+                        None => windows_icons_fallback::get_icon_by_process_id(window.process_id()),
+                        Some(icon) => Some(icon),
+                    };
+
+                    icons.push(icon);
                    update_cache = true;
                }
                Some(icon) => {
@@ -658,7 +922,7 @@ impl From<&Container> for KomorebiNotificationStateContainerInformation {

            if update_cache {
                if let Some(Some(icon)) = icons.last() {
-                    icon_cache.insert(exe, icon.clone());
+                    icon_cache.insert(hwnd, icon.clone());
                }
            }
        }
@@ -680,11 +944,16 @@ impl From<&Window> for KomorebiNotificationStateContainerInformation {
        let mut icon_cache = ICON_CACHE.lock().unwrap();
        let mut update_cache = false;
        let mut icons = vec![];
-        let exe = value.exe().unwrap_or_default();
+        let hwnd = value.hwnd;

-        match icon_cache.get(&exe) {
+        match icon_cache.get(&hwnd) {
            None => {
-                icons.push(windows_icons::get_icon_by_process_id(value.process_id()));
+                let icon = match windows_icons::get_icon_by_hwnd(hwnd) {
+                    None => windows_icons_fallback::get_icon_by_process_id(value.process_id()),
+                    Some(icon) => Some(icon),
+                };
+
+                icons.push(icon);
                update_cache = true;
            }
            Some(icon) => {
@@ -694,7 +963,7 @@ impl From<&Window> for KomorebiNotificationStateContainerInformation {

        if update_cache {
            if let Some(Some(icon)) = icons.last() {
-                icon_cache.insert(exe, icon.clone());
+                icon_cache.insert(hwnd, icon.clone());
            }
        }

--- a/komorebi-bar/src/widgets/komorebi_layout.rs
+++ b/komorebi-bar/src/widgets/komorebi_layout.rs
@@ -1,19 +1,19 @@
 use crate::config::DisplayFormat;
-use crate::komorebi::KomorebiLayoutConfig;
 use crate::render::RenderConfig;
 use crate::selected_frame::SelectableFrame;
+use crate::widgets::komorebi::KomorebiLayoutConfig;
 use eframe::egui::vec2;
 use eframe::egui::Context;
+use eframe::egui::CornerRadius;
 use eframe::egui::FontId;
 use eframe::egui::Frame;
 use eframe::egui::Label;
-use eframe::egui::Rounding;
 use eframe::egui::Sense;
 use eframe::egui::Stroke;
+use eframe::egui::StrokeKind;
 use eframe::egui::Ui;
 use eframe::egui::Vec2;
 use komorebi_client::SocketMessage;
-use schemars::JsonSchema;
 use serde::de::Error;
 use serde::Deserialize;
 use serde::Deserializer;
@@ -22,7 +22,8 @@ use serde_json::from_str;
 use std::fmt::Display;
 use std::fmt::Formatter;

-#[derive(Copy, Clone, Debug, Serialize, JsonSchema, PartialEq)]
+#[derive(Copy, Clone, Debug, Serialize, PartialEq)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 #[serde(untagged)]
 pub enum KomorebiLayout {
    Default(komorebi_client::DefaultLayout),
@@ -104,12 +105,22 @@ impl KomorebiLayout {
                }
            }
            KomorebiLayout::Monocle => {
-                if komorebi_client::send_message(&SocketMessage::ToggleMonocle).is_err() {
+                if komorebi_client::send_batch([
+                    SocketMessage::FocusMonitorAtCursor,
+                    SocketMessage::ToggleMonocle,
+                ])
+                .is_err()
+                {
                    tracing::error!("could not send message to komorebi: ToggleMonocle");
                }
            }
            KomorebiLayout::Floating => {
-                if komorebi_client::send_message(&SocketMessage::ToggleTiling).is_err() {
+                if komorebi_client::send_batch([
+                    SocketMessage::FocusMonitorAtCursor,
+                    SocketMessage::ToggleTiling,
+                ])
+                .is_err()
+                {
                    tracing::error!("could not send message to komorebi: ToggleTiling");
                }
            }
@@ -122,18 +133,22 @@ impl KomorebiLayout {
        }
    }

-    fn show_icon(&mut self, font_id: FontId, ctx: &Context, ui: &mut Ui) {
+    fn show_icon(&mut self, is_selected: bool, font_id: FontId, ctx: &Context, ui: &mut Ui) {
        // paint custom icons for the layout
        let size = Vec2::splat(font_id.size);
        let (response, painter) = ui.allocate_painter(size, Sense::hover());
-        let color = ctx.style().visuals.selection.stroke.color;
+        let color = if is_selected {
+            ctx.style().visuals.selection.stroke.color
+        } else {
+            ui.style().visuals.text_color()
+        };
        let stroke = Stroke::new(1.0, color);
        let mut rect = response.rect;
-        let rounding = Rounding::same(rect.width() * 0.1);
+        let rounding = CornerRadius::same((rect.width() * 0.1) as u8);
        rect = rect.shrink(stroke.width);
        let c = rect.center();
        let r = rect.width() / 2.0;
-        painter.rect_stroke(rect, rounding, stroke);
+        painter.rect_stroke(rect, rounding, stroke, StrokeKind::Outside);

        match self {
            KomorebiLayout::Default(layout) => match layout {
@@ -189,7 +204,7 @@ impl KomorebiLayout {
                    rect.width() * 0.35 + stroke.width,
                ));
                painter.rect_filled(rect_left, rounding, color);
-                painter.rect_stroke(rect_right, rounding, stroke);
+                painter.rect_stroke(rect_right, rounding, stroke, StrokeKind::Outside);
            }
            KomorebiLayout::Paused => {
                let mut rect_left = response.rect;
@@ -236,7 +251,7 @@ impl KomorebiLayout {
            let layout_frame = SelectableFrame::new(false)
                .show(ui, |ui| {
                    if let DisplayFormat::Icon | DisplayFormat::IconAndText = format {
-                        self.show_icon(font_id.clone(), ctx, ui);
+                        self.show_icon(true, font_id.clone(), ctx, ui);
                    }

                    if let DisplayFormat::Text | DisplayFormat::IconAndText = format {
@@ -251,7 +266,7 @@ impl KomorebiLayout {

            if show_options {
                if let Some(workspace_idx) = workspace_idx {
-                    Frame::none().show(ui, |ui| {
+                    Frame::NONE.show(ui, |ui| {
                        ui.add(
                            Label::new(egui_phosphor::regular::ARROW_FAT_LINES_RIGHT.to_string())
                                .selectable(false),
@@ -279,8 +294,12 @@ impl KomorebiLayout {
                        ]);

                        for layout_option in &mut layout_options {
-                            if SelectableFrame::new(self == layout_option)
-                                .show(ui, |ui| layout_option.show_icon(font_id.clone(), ctx, ui))
+                            let is_selected = self == layout_option;
+
+                            if SelectableFrame::new(is_selected)
+                                .show(ui, |ui| {
+                                    layout_option.show_icon(is_selected, font_id.clone(), ctx, ui)
+                                })
                                .on_hover_text(match layout_option {
                                    KomorebiLayout::Default(layout) => layout.to_string(),
                                    KomorebiLayout::Monocle => "Toggle monocle".to_string(),
--- a/komorebi-bar/src/widgets/media.rs
+++ b/komorebi-bar/src/widgets/media.rs
@@ -1,7 +1,7 @@
 use crate::render::RenderConfig;
 use crate::selected_frame::SelectableFrame;
 use crate::ui::CustomUi;
-use crate::widget::BarWidget;
+use crate::widgets::widget::BarWidget;
 use crate::MAX_LABEL_WIDTH;
 use eframe::egui::text::LayoutJob;
 use eframe::egui::Align;
@@ -10,13 +10,13 @@ use eframe::egui::Label;
 use eframe::egui::TextFormat;
 use eframe::egui::Ui;
 use eframe::egui::Vec2;
-use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use std::sync::atomic::Ordering;
 use windows::Media::Control::GlobalSystemMediaTransportControlsSessionManager;

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct MediaConfig {
    /// Enable the Media widget
    pub enable: bool,
--- a/komorebi-bar/src/widgets/memory.rs
+++ b/komorebi-bar/src/widgets/memory.rs
@@ -1,14 +1,13 @@
 use crate::config::LabelPrefix;
 use crate::render::RenderConfig;
 use crate::selected_frame::SelectableFrame;
-use crate::widget::BarWidget;
+use crate::widgets::widget::BarWidget;
 use eframe::egui::text::LayoutJob;
 use eframe::egui::Align;
 use eframe::egui::Context;
 use eframe::egui::Label;
 use eframe::egui::TextFormat;
 use eframe::egui::Ui;
-use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use std::process::Command;
@@ -17,7 +16,8 @@ use std::time::Instant;
 use sysinfo::RefreshKind;
 use sysinfo::System;

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct MemoryConfig {
    /// Enable the Memory widget
    pub enable: bool,
@@ -25,6 +25,8 @@ pub struct MemoryConfig {
    pub data_refresh_interval: Option<u64>,
    /// Display label prefix
    pub label_prefix: Option<LabelPrefix>,
+    /// Select when the current percentage is over this value [[1-100]]
+    pub auto_select_over: Option<u8>,
 }

 impl From<MemoryConfig> for Memory {
@@ -38,6 +40,7 @@ impl From<MemoryConfig> for Memory {
            ),
            data_refresh_interval,
            label_prefix: value.label_prefix.unwrap_or(LabelPrefix::IconAndText),
+            auto_select_over: value.auto_select_over.map(|o| o.clamp(1, 100)),
            last_updated: Instant::now()
                .checked_sub(Duration::from_secs(data_refresh_interval))
                .unwrap(),
@@ -45,16 +48,23 @@ impl From<MemoryConfig> for Memory {
    }
 }

+#[derive(Clone, Debug)]
+struct MemoryOutput {
+    label: String,
+    selected: bool,
+}
+
 pub struct Memory {
    pub enable: bool,
    system: System,
    data_refresh_interval: u64,
    label_prefix: LabelPrefix,
+    auto_select_over: Option<u8>,
    last_updated: Instant,
 }

 impl Memory {
-    fn output(&mut self) -> String {
+    fn output(&mut self) -> MemoryOutput {
        let now = Instant::now();
        if now.duration_since(self.last_updated) > Duration::from_secs(self.data_refresh_interval) {
            self.system.refresh_memory();
@@ -63,11 +73,17 @@ impl Memory {

        let used = self.system.used_memory();
        let total = self.system.total_memory();
-        match self.label_prefix {
-            LabelPrefix::Text | LabelPrefix::IconAndText => {
-                format!("RAM: {}%", (used * 100) / total)
-            }
-            LabelPrefix::None | LabelPrefix::Icon => format!("{}%", (used * 100) / total),
+        let usage = ((used * 100) / total) as u8;
+        let selected = self.auto_select_over.is_some_and(|o| usage >= o);
+
+        MemoryOutput {
+            label: match self.label_prefix {
+                LabelPrefix::Text | LabelPrefix::IconAndText => {
+                    format!("RAM: {}%", usage)
+                }
+                LabelPrefix::None | LabelPrefix::Icon => format!("{}%", usage),
+            },
+            selected,
        }
    }
 }
@@ -76,7 +92,9 @@ impl BarWidget for Memory {
    fn render(&mut self, ctx: &Context, ui: &mut Ui, config: &mut RenderConfig) {
        if self.enable {
            let output = self.output();
-            if !output.is_empty() {
+            if !output.label.is_empty() {
+                let auto_text_color = config.auto_select_text.filter(|_| output.selected);
+
                let mut layout_job = LayoutJob::simple(
                    match self.label_prefix {
                        LabelPrefix::Icon | LabelPrefix::IconAndText => {
@@ -85,23 +103,25 @@ impl BarWidget for Memory {
                        LabelPrefix::None | LabelPrefix::Text => String::new(),
                    },
                    config.icon_font_id.clone(),
-                    ctx.style().visuals.selection.stroke.color,
+                    auto_text_color.unwrap_or(ctx.style().visuals.selection.stroke.color),
                    100.0,
                );

                layout_job.append(
-                    &output,
+                    &output.label,
                    10.0,
                    TextFormat {
                        font_id: config.text_font_id.clone(),
-                        color: ctx.style().visuals.text_color(),
+                        color: auto_text_color.unwrap_or(ctx.style().visuals.text_color()),
                        valign: Align::Center,
                        ..Default::default()
                    },
                );

+                let auto_focus_fill = config.auto_select_fill;
+
                config.apply_on_widget(false, ui, |ui| {
-                    if SelectableFrame::new(false)
+                    if SelectableFrame::new_auto(output.selected, auto_focus_fill)
                        .show(ui, |ui| ui.add(Label::new(layout_job).selectable(false)))
                        .clicked()
                    {
--- a/komorebi-bar/src/widgets/mod.rs
+++ b/komorebi-bar/src/widgets/mod.rs
@@ -0,0 +1,13 @@
+pub mod battery;
+pub mod cpu;
+pub mod date;
+pub mod keyboard;
+pub mod komorebi;
+mod komorebi_layout;
+pub mod media;
+pub mod memory;
+pub mod network;
+pub mod storage;
+pub mod time;
+pub mod update;
+pub mod widget;
--- a/komorebi-bar/src/widgets/network.rs
+++ b/komorebi-bar/src/widgets/network.rs
@@ -0,0 +1,540 @@
+use crate::bar::Alignment;
+use crate::config::LabelPrefix;
+use crate::render::RenderConfig;
+use crate::selected_frame::SelectableFrame;
+use crate::widgets::widget::BarWidget;
+use eframe::egui::text::LayoutJob;
+use eframe::egui::Align;
+use eframe::egui::Color32;
+use eframe::egui::Context;
+use eframe::egui::Label;
+use eframe::egui::TextFormat;
+use eframe::egui::Ui;
+use num_derive::FromPrimitive;
+use serde::Deserialize;
+use serde::Serialize;
+use std::fmt;
+use std::process::Command;
+use std::time::Duration;
+use std::time::Instant;
+use sysinfo::Networks;
+
+#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+pub struct NetworkConfig {
+    /// Enable the Network widget
+    pub enable: bool,
+    /// Show total received and transmitted activity
+    #[serde(alias = "show_total_data_transmitted")]
+    pub show_total_activity: bool,
+    /// Show received and transmitted activity
+    #[serde(alias = "show_network_activity")]
+    pub show_activity: bool,
+    /// Show default interface
+    pub show_default_interface: Option<bool>,
+    /// Characters to reserve for received and transmitted activity
+    #[serde(alias = "network_activity_fill_characters")]
+    pub activity_left_padding: Option<usize>,
+    /// Data refresh interval (default: 10 seconds)
+    pub data_refresh_interval: Option<u64>,
+    /// Display label prefix
+    pub label_prefix: Option<LabelPrefix>,
+    /// Select when the value is over a limit (1MiB is 1048576 bytes (1024*1024))
+    pub auto_select: Option<NetworkSelectConfig>,
+}
+
+#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+pub struct NetworkSelectConfig {
+    /// Select the total received data when it's over this value
+    pub total_received_over: Option<u64>,
+    /// Select the total transmitted data when it's over this value
+    pub total_transmitted_over: Option<u64>,
+    /// Select the received data when it's over this value
+    pub received_over: Option<u64>,
+    /// Select the transmitted data when it's over this value
+    pub transmitted_over: Option<u64>,
+}
+
+impl From<NetworkConfig> for Network {
+    fn from(value: NetworkConfig) -> Self {
+        let data_refresh_interval = value.data_refresh_interval.unwrap_or(10);
+
+        Self {
+            enable: value.enable,
+            show_total_activity: value.show_total_activity,
+            show_activity: value.show_activity,
+            show_default_interface: value.show_default_interface.unwrap_or(true),
+            networks_network_activity: Networks::new_with_refreshed_list(),
+            default_interface: String::new(),
+            data_refresh_interval,
+            label_prefix: value.label_prefix.unwrap_or(LabelPrefix::Icon),
+            auto_select: value.auto_select,
+            activity_left_padding: value.activity_left_padding.unwrap_or_default(),
+            last_state_total_activity: vec![],
+            last_state_activity: vec![],
+            last_updated_network_activity: Instant::now()
+                .checked_sub(Duration::from_secs(data_refresh_interval))
+                .unwrap(),
+        }
+    }
+}
+
+pub struct Network {
+    pub enable: bool,
+    pub show_total_activity: bool,
+    pub show_activity: bool,
+    pub show_default_interface: bool,
+    networks_network_activity: Networks,
+    data_refresh_interval: u64,
+    label_prefix: LabelPrefix,
+    auto_select: Option<NetworkSelectConfig>,
+    default_interface: String,
+    last_state_total_activity: Vec<NetworkReading>,
+    last_state_activity: Vec<NetworkReading>,
+    last_updated_network_activity: Instant,
+    activity_left_padding: usize,
+}
+
+impl Network {
+    fn default_interface(&mut self) {
+        if let Ok(interface) = netdev::get_default_interface() {
+            if let Some(friendly_name) = &interface.friendly_name {
+                self.default_interface.clone_from(friendly_name);
+            }
+        }
+    }
+
+    fn network_activity(&mut self) -> (Vec<NetworkReading>, Vec<NetworkReading>) {
+        let mut activity = self.last_state_activity.clone();
+        let mut total_activity = self.last_state_total_activity.clone();
+        let now = Instant::now();
+
+        if now.duration_since(self.last_updated_network_activity)
+            > Duration::from_secs(self.data_refresh_interval)
+        {
+            activity.clear();
+            total_activity.clear();
+
+            if let Ok(interface) = netdev::get_default_interface() {
+                if let Some(friendly_name) = &interface.friendly_name {
+                    self.default_interface.clone_from(friendly_name);
+
+                    self.networks_network_activity.refresh(true);
+
+                    for (interface_name, data) in &self.networks_network_activity {
+                        if friendly_name.eq(interface_name) {
+                            if self.show_activity {
+                                let received = Self::to_pretty_bytes(
+                                    data.received(),
+                                    self.data_refresh_interval,
+                                );
+                                let transmitted = Self::to_pretty_bytes(
+                                    data.transmitted(),
+                                    self.data_refresh_interval,
+                                );
+
+                                activity.push(NetworkReading::new(
+                                    NetworkReadingFormat::Speed,
+                                    ReadingValue::from(received),
+                                    ReadingValue::from(transmitted),
+                                ));
+                            }
+
+                            if self.show_total_activity {
+                                let total_received =
+                                    Self::to_pretty_bytes(data.total_received(), 1);
+                                let total_transmitted =
+                                    Self::to_pretty_bytes(data.total_transmitted(), 1);
+
+                                total_activity.push(NetworkReading::new(
+                                    NetworkReadingFormat::Total,
+                                    ReadingValue::from(total_received),
+                                    ReadingValue::from(total_transmitted),
+                                ))
+                            }
+                        }
+                    }
+                }
+            }
+
+            self.last_state_activity.clone_from(&activity);
+            self.last_state_total_activity.clone_from(&total_activity);
+            self.last_updated_network_activity = now;
+        }
+
+        (activity, total_activity)
+    }
+
+    fn reading_to_labels(
+        &self,
+        select_received: bool,
+        select_transmitted: bool,
+        ctx: &Context,
+        reading: &NetworkReading,
+        config: RenderConfig,
+    ) -> (Label, Label) {
+        let (text_down, text_up) = match self.label_prefix {
+            LabelPrefix::None | LabelPrefix::Icon => match reading.format {
+                NetworkReadingFormat::Speed => (
+                    format!(
+                        "{: >width$}/s ",
+                        reading.received.pretty,
+                        width = self.activity_left_padding
+                    ),
+                    format!(
+                        "{: >width$}/s",
+                        reading.transmitted.pretty,
+                        width = self.activity_left_padding
+                    ),
+                ),
+                NetworkReadingFormat::Total => (
+                    format!("{} ", reading.received.pretty),
+                    reading.transmitted.pretty.clone(),
+                ),
+            },
+            LabelPrefix::Text | LabelPrefix::IconAndText => match reading.format {
+                NetworkReadingFormat::Speed => (
+                    format!(
+                        "DOWN: {: >width$}/s ",
+                        reading.received.pretty,
+                        width = self.activity_left_padding
+                    ),
+                    format!(
+                        "UP: {: >width$}/s",
+                        reading.transmitted.pretty,
+                        width = self.activity_left_padding
+                    ),
+                ),
+                NetworkReadingFormat::Total => (
+                    format!("\u{2211}DOWN: {}/s ", reading.received.pretty),
+                    format!("\u{2211}UP: {}/s", reading.transmitted.pretty),
+                ),
+            },
+        };
+
+        let auto_text_color_received = config.auto_select_text.filter(|_| select_received);
+        let auto_text_color_transmitted = config.auto_select_text.filter(|_| select_transmitted);
+
+        // icon
+        let mut layout_job_down = LayoutJob::simple(
+            match self.label_prefix {
+                LabelPrefix::Icon | LabelPrefix::IconAndText => {
+                    if select_received {
+                        egui_phosphor::regular::ARROW_FAT_LINES_DOWN.to_string()
+                    } else {
+                        egui_phosphor::regular::ARROW_FAT_DOWN.to_string()
+                    }
+                }
+                LabelPrefix::None | LabelPrefix::Text => String::new(),
+            },
+            config.icon_font_id.clone(),
+            auto_text_color_received.unwrap_or(ctx.style().visuals.selection.stroke.color),
+            100.0,
+        );
+
+        // text
+        layout_job_down.append(
+            &text_down,
+            ctx.style().spacing.item_spacing.x,
+            TextFormat {
+                font_id: config.text_font_id.clone(),
+                color: auto_text_color_received.unwrap_or(ctx.style().visuals.text_color()),
+                valign: Align::Center,
+                ..Default::default()
+            },
+        );
+
+        // icon
+        let mut layout_job_up = LayoutJob::simple(
+            match self.label_prefix {
+                LabelPrefix::Icon | LabelPrefix::IconAndText => {
+                    if select_transmitted {
+                        egui_phosphor::regular::ARROW_FAT_LINES_UP.to_string()
+                    } else {
+                        egui_phosphor::regular::ARROW_FAT_UP.to_string()
+                    }
+                }
+                LabelPrefix::None | LabelPrefix::Text => String::new(),
+            },
+            config.icon_font_id.clone(),
+            auto_text_color_transmitted.unwrap_or(ctx.style().visuals.selection.stroke.color),
+            100.0,
+        );
+
+        // text
+        layout_job_up.append(
+            &text_up,
+            ctx.style().spacing.item_spacing.x,
+            TextFormat {
+                font_id: config.text_font_id.clone(),
+                color: auto_text_color_transmitted.unwrap_or(ctx.style().visuals.text_color()),
+                valign: Align::Center,
+                ..Default::default()
+            },
+        );
+
+        (
+            Label::new(layout_job_down).selectable(false),
+            Label::new(layout_job_up).selectable(false),
+        )
+    }
+
+    fn to_pretty_bytes(input_in_bytes: u64, timespan_in_s: u64) -> (u64, String) {
+        let input = input_in_bytes as f32 / timespan_in_s as f32;
+        let mut magnitude = input.log(1024f32) as u32;
+
+        // let the base unit be KiB
+        if magnitude < 1 {
+            magnitude = 1;
+        }
+
+        let base: Option<DataUnit> = num::FromPrimitive::from_u32(magnitude);
+        let result = input / ((1u64) << (magnitude * 10)) as f32;
+
+        (
+            input as u64,
+            match base {
+                Some(DataUnit::B) => format!("{result:.1} B"),
+                Some(unit) => format!("{result:.1} {unit}iB"),
+                None => String::from("Unknown data unit"),
+            },
+        )
+    }
+
+    fn show_frame<R>(
+        &self,
+        selected: bool,
+        auto_focus_fill: Option<Color32>,
+        ui: &mut Ui,
+        add_contents: impl FnOnce(&mut Ui) -> R,
+    ) {
+        if SelectableFrame::new_auto(selected, auto_focus_fill)
+            .show(ui, add_contents)
+            .clicked()
+        {
+            if let Err(error) = Command::new("cmd.exe").args(["/C", "ncpa"]).spawn() {
+                eprintln!("{}", error);
+            }
+        }
+    }
+}
+
+impl BarWidget for Network {
+    fn render(&mut self, ctx: &Context, ui: &mut Ui, config: &mut RenderConfig) {
+        if self.enable {
+            let is_reversed = matches!(config.alignment, Some(Alignment::Right));
+
+            // widget spacing: make sure to use the same config to call the apply_on_widget function
+            let mut render_config = config.clone();
+
+            if self.show_total_activity || self.show_activity {
+                let (activity, total_activity) = self.network_activity();
+
+                if self.show_total_activity {
+                    for reading in &total_activity {
+                        render_config.apply_on_widget(false, ui, |ui| {
+                            let select_received = self.auto_select.is_some_and(|f| {
+                                f.total_received_over
+                                    .is_some_and(|o| reading.received.value > o)
+                            });
+                            let select_transmitted = self.auto_select.is_some_and(|f| {
+                                f.total_transmitted_over
+                                    .is_some_and(|o| reading.transmitted.value > o)
+                            });
+
+                            let labels = self.reading_to_labels(
+                                select_received,
+                                select_transmitted,
+                                ctx,
+                                reading,
+                                config.clone(),
+                            );
+
+                            if is_reversed {
+                                self.show_frame(
+                                    select_transmitted,
+                                    config.auto_select_fill,
+                                    ui,
+                                    |ui| ui.add(labels.1),
+                                );
+                                self.show_frame(
+                                    select_received,
+                                    config.auto_select_fill,
+                                    ui,
+                                    |ui| ui.add(labels.0),
+                                );
+                            } else {
+                                self.show_frame(
+                                    select_received,
+                                    config.auto_select_fill,
+                                    ui,
+                                    |ui| ui.add(labels.0),
+                                );
+                                self.show_frame(
+                                    select_transmitted,
+                                    config.auto_select_fill,
+                                    ui,
+                                    |ui| ui.add(labels.1),
+                                );
+                            }
+                        });
+                    }
+                }
+
+                if self.show_activity {
+                    for reading in &activity {
+                        render_config.apply_on_widget(false, ui, |ui| {
+                            let select_received = self.auto_select.is_some_and(|f| {
+                                f.received_over.is_some_and(|o| reading.received.value > o)
+                            });
+                            let select_transmitted = self.auto_select.is_some_and(|f| {
+                                f.transmitted_over
+                                    .is_some_and(|o| reading.transmitted.value > o)
+                            });
+
+                            let labels = self.reading_to_labels(
+                                select_received,
+                                select_transmitted,
+                                ctx,
+                                reading,
+                                config.clone(),
+                            );
+
+                            if is_reversed {
+                                self.show_frame(
+                                    select_transmitted,
+                                    config.auto_select_fill,
+                                    ui,
+                                    |ui| ui.add(labels.1),
+                                );
+                                self.show_frame(
+                                    select_received,
+                                    config.auto_select_fill,
+                                    ui,
+                                    |ui| ui.add(labels.0),
+                                );
+                            } else {
+                                self.show_frame(
+                                    select_received,
+                                    config.auto_select_fill,
+                                    ui,
+                                    |ui| ui.add(labels.0),
+                                );
+                                self.show_frame(
+                                    select_transmitted,
+                                    config.auto_select_fill,
+                                    ui,
+                                    |ui| ui.add(labels.1),
+                                );
+                            }
+                        });
+                    }
+                }
+            }
+
+            if self.show_default_interface {
+                self.default_interface();
+
+                if !self.default_interface.is_empty() {
+                    let mut layout_job = LayoutJob::simple(
+                        match self.label_prefix {
+                            LabelPrefix::Icon | LabelPrefix::IconAndText => {
+                                egui_phosphor::regular::WIFI_HIGH.to_string()
+                            }
+                            LabelPrefix::None | LabelPrefix::Text => String::new(),
+                        },
+                        config.icon_font_id.clone(),
+                        ctx.style().visuals.selection.stroke.color,
+                        100.0,
+                    );
+
+                    if let LabelPrefix::Text | LabelPrefix::IconAndText = self.label_prefix {
+                        self.default_interface.insert_str(0, "NET: ");
+                    }
+
+                    layout_job.append(
+                        &self.default_interface,
+                        10.0,
+                        TextFormat {
+                            font_id: config.text_font_id.clone(),
+                            color: ctx.style().visuals.text_color(),
+                            valign: Align::Center,
+                            ..Default::default()
+                        },
+                    );
+
+                    render_config.apply_on_widget(false, ui, |ui| {
+                        self.show_frame(false, None, ui, |ui| {
+                            ui.add(Label::new(layout_job).selectable(false))
+                        });
+                    });
+                }
+            }
+
+            // widget spacing: pass on the config that was use for calling the apply_on_widget function
+            *config = render_config.clone();
+        }
+    }
+}
+
+#[derive(Clone)]
+enum NetworkReadingFormat {
+    Speed = 0,
+    Total = 1,
+}
+
+#[derive(Clone)]
+struct ReadingValue {
+    value: u64,
+    pretty: String,
+}
+
+impl From<(u64, String)> for ReadingValue {
+    fn from(value: (u64, String)) -> Self {
+        Self {
+            value: value.0,
+            pretty: value.1,
+        }
+    }
+}
+
+#[derive(Clone)]
+struct NetworkReading {
+    format: NetworkReadingFormat,
+    received: ReadingValue,
+    transmitted: ReadingValue,
+}
+
+impl NetworkReading {
+    fn new(
+        format: NetworkReadingFormat,
+        received: ReadingValue,
+        transmitted: ReadingValue,
+    ) -> Self {
+        Self {
+            format,
+            received,
+            transmitted,
+        }
+    }
+}
+
+#[derive(Debug, FromPrimitive)]
+enum DataUnit {
+    B = 0,
+    K = 1,
+    M = 2,
+    G = 3,
+    T = 4,
+    P = 5,
+    E = 6,
+    Z = 7,
+    Y = 8,
+}
+
+impl fmt::Display for DataUnit {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{:?}", self)
+    }
+}
--- a/komorebi-bar/src/widgets/storage.rs
+++ b/komorebi-bar/src/widgets/storage.rs
@@ -1,14 +1,14 @@
+use crate::bar::Alignment;
 use crate::config::LabelPrefix;
 use crate::render::RenderConfig;
 use crate::selected_frame::SelectableFrame;
-use crate::widget::BarWidget;
+use crate::widgets::widget::BarWidget;
 use eframe::egui::text::LayoutJob;
 use eframe::egui::Align;
 use eframe::egui::Context;
 use eframe::egui::Label;
 use eframe::egui::TextFormat;
 use eframe::egui::Ui;
-use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use std::process::Command;
@@ -16,7 +16,8 @@ use std::time::Duration;
 use std::time::Instant;
 use sysinfo::Disks;

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct StorageConfig {
    /// Enable the Storage widget
    pub enable: bool,
@@ -24,6 +25,10 @@ pub struct StorageConfig {
    pub data_refresh_interval: Option<u64>,
    /// Display label prefix
    pub label_prefix: Option<LabelPrefix>,
+    /// Select when the current percentage is over this value [[1-100]]
+    pub auto_select_over: Option<u8>,
+    /// Hide when the current percentage is under this value [[1-100]]
+    pub auto_hide_under: Option<u8>,
 }

 impl From<StorageConfig> for Storage {
@@ -33,21 +38,30 @@ impl From<StorageConfig> for Storage {
            disks: Disks::new_with_refreshed_list(),
            data_refresh_interval: value.data_refresh_interval.unwrap_or(10),
            label_prefix: value.label_prefix.unwrap_or(LabelPrefix::IconAndText),
+            auto_select_over: value.auto_select_over.map(|o| o.clamp(1, 100)),
+            auto_hide_under: value.auto_hide_under.map(|o| o.clamp(1, 100)),
            last_updated: Instant::now(),
        }
    }
 }

+struct StorageDisk {
+    label: String,
+    selected: bool,
+}
+
 pub struct Storage {
    pub enable: bool,
    disks: Disks,
    data_refresh_interval: u64,
    label_prefix: LabelPrefix,
+    auto_select_over: Option<u8>,
+    auto_hide_under: Option<u8>,
    last_updated: Instant,
 }

 impl Storage {
-    fn output(&mut self) -> Vec<String> {
+    fn output(&mut self) -> Vec<StorageDisk> {
        let now = Instant::now();
        if now.duration_since(self.last_updated) > Duration::from_secs(self.data_refresh_interval) {
            self.disks.refresh(true);
@@ -61,17 +75,26 @@ impl Storage {
            let total = disk.total_space();
            let available = disk.available_space();
            let used = total - available;
+            let percentage = ((used * 100) / total) as u8;

-            disks.push(match self.label_prefix {
-                LabelPrefix::Text | LabelPrefix::IconAndText => {
-                    format!("{} {}%", mount.to_string_lossy(), (used * 100) / total)
-                }
-                LabelPrefix::None | LabelPrefix::Icon => format!("{}%", (used * 100) / total),
-            })
+            let hide = self.auto_hide_under.is_some_and(|u| percentage <= u);
+
+            if !hide {
+                let selected = self.auto_select_over.is_some_and(|o| percentage >= o);
+
+                disks.push(StorageDisk {
+                    label: match self.label_prefix {
+                        LabelPrefix::Text | LabelPrefix::IconAndText => {
+                            format!("{} {}%", mount.to_string_lossy(), percentage)
+                        }
+                        LabelPrefix::None | LabelPrefix::Icon => format!("{}%", percentage),
+                    },
+                    selected,
+                })
+            }
        }

-        disks.sort();
-        disks.reverse();
+        disks.sort_by(|a, b| a.label.cmp(&b.label));

        disks
    }
@@ -80,7 +103,16 @@ impl Storage {
 impl BarWidget for Storage {
    fn render(&mut self, ctx: &Context, ui: &mut Ui, config: &mut RenderConfig) {
        if self.enable {
-            for output in self.output() {
+            let mut output = self.output();
+            let is_reversed = matches!(config.alignment, Some(Alignment::Right));
+
+            if is_reversed {
+                output.reverse();
+            }
+
+            for output in output {
+                let auto_text_color = config.auto_select_text.filter(|_| output.selected);
+
                let mut layout_job = LayoutJob::simple(
                    match self.label_prefix {
                        LabelPrefix::Icon | LabelPrefix::IconAndText => {
@@ -89,23 +121,25 @@ impl BarWidget for Storage {
                        LabelPrefix::None | LabelPrefix::Text => String::new(),
                    },
                    config.icon_font_id.clone(),
-                    ctx.style().visuals.selection.stroke.color,
+                    auto_text_color.unwrap_or(ctx.style().visuals.selection.stroke.color),
                    100.0,
                );

                layout_job.append(
-                    &output,
+                    &output.label,
                    10.0,
                    TextFormat {
                        font_id: config.text_font_id.clone(),
-                        color: ctx.style().visuals.text_color(),
+                        color: auto_text_color.unwrap_or(ctx.style().visuals.text_color()),
                        valign: Align::Center,
                        ..Default::default()
                    },
                );

+                let auto_focus_fill = config.auto_select_fill;
+
                config.apply_on_widget(false, ui, |ui| {
-                    if SelectableFrame::new(false)
+                    if SelectableFrame::new_auto(output.selected, auto_focus_fill)
                        .show(ui, |ui| ui.add(Label::new(layout_job).selectable(false)))
                        .clicked()
                    {
@@ -113,7 +147,7 @@ impl BarWidget for Storage {
                            .args([
                                "/C",
                                "explorer.exe",
-                                output.split(' ').collect::<Vec<&str>>()[0],
+                                output.label.split(' ').collect::<Vec<&str>>()[0],
                            ])
                            .spawn()
                        {
--- a/komorebi-bar/src/widgets/time.rs
+++ b/komorebi-bar/src/widgets/time.rs
@@ -2,22 +2,76 @@ use crate::bar::Alignment;
 use crate::config::LabelPrefix;
 use crate::render::RenderConfig;
 use crate::selected_frame::SelectableFrame;
-use crate::widget::BarWidget;
+use crate::widgets::widget::BarWidget;
+use chrono::Local;
+use chrono::NaiveTime;
+use chrono_tz::Tz;
 use eframe::egui::text::LayoutJob;
 use eframe::egui::Align;
 use eframe::egui::Context;
+use eframe::egui::CornerRadius;
 use eframe::egui::Label;
-use eframe::egui::Rounding;
 use eframe::egui::Sense;
 use eframe::egui::Stroke;
 use eframe::egui::TextFormat;
 use eframe::egui::Ui;
 use eframe::egui::Vec2;
-use schemars::JsonSchema;
+use eframe::epaint::StrokeKind;
+use lazy_static::lazy_static;
 use serde::Deserialize;
 use serde::Serialize;
+use std::time::Duration;
+use std::time::Instant;

-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
+lazy_static! {
+    static ref TIME_RANGES: Vec<(&'static str, NaiveTime)> = {
+        vec![
+            (
+                egui_phosphor::regular::MOON,
+                NaiveTime::from_hms_opt(0, 0, 0).expect("invalid"),
+            ),
+            (
+                egui_phosphor::regular::ALARM,
+                NaiveTime::from_hms_opt(6, 0, 0).expect("invalid"),
+            ),
+            (
+                egui_phosphor::regular::BREAD,
+                NaiveTime::from_hms_opt(6, 1, 0).expect("invalid"),
+            ),
+            (
+                egui_phosphor::regular::BARBELL,
+                NaiveTime::from_hms_opt(6, 30, 0).expect("invalid"),
+            ),
+            (
+                egui_phosphor::regular::COFFEE,
+                NaiveTime::from_hms_opt(8, 0, 0).expect("invalid"),
+            ),
+            (
+                egui_phosphor::regular::CLOCK,
+                NaiveTime::from_hms_opt(8, 30, 0).expect("invalid"),
+            ),
+            (
+                egui_phosphor::regular::HAMBURGER,
+                NaiveTime::from_hms_opt(12, 0, 0).expect("invalid"),
+            ),
+            (
+                egui_phosphor::regular::CLOCK_AFTERNOON,
+                NaiveTime::from_hms_opt(12, 30, 0).expect("invalid"),
+            ),
+            (
+                egui_phosphor::regular::FORK_KNIFE,
+                NaiveTime::from_hms_opt(18, 0, 0).expect("invalid"),
+            ),
+            (
+                egui_phosphor::regular::MOON_STARS,
+                NaiveTime::from_hms_opt(18, 30, 0).expect("invalid"),
+            ),
+        ]
+    };
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct TimeConfig {
    /// Enable the Time widget
    pub enable: bool,
@@ -25,19 +79,46 @@ pub struct TimeConfig {
    pub format: TimeFormat,
    /// Display label prefix
    pub label_prefix: Option<LabelPrefix>,
+    /// TimeZone (https://docs.rs/chrono-tz/latest/chrono_tz/enum.Tz.html)
+    ///
+    /// Use a custom format to display additional information, i.e.:
+    /// ```json
+    /// {
+    ///     "Time": {
+    ///         "enable": true,
+    ///         "format": { "Custom": "%T %Z (Tokyo)" },
+    ///         "timezone": "Asia/Tokyo"
+    ///      }
+    ///}
+    /// ```
+    pub timezone: Option<String>,
+    /// Change the icon depending on the time. The default icon is used between 8:30 and 12:00. (default: false)
+    pub changing_icon: Option<bool>,
 }

 impl From<TimeConfig> for Time {
    fn from(value: TimeConfig) -> Self {
+        // using 1 second made the widget look "less accurate" and lagging (especially having multiple with seconds).
+        // This is still better than getting an update every frame
+        let data_refresh_interval = 500;
+
        Self {
            enable: value.enable,
            format: value.format,
            label_prefix: value.label_prefix.unwrap_or(LabelPrefix::Icon),
+            timezone: value.timezone,
+            changing_icon: value.changing_icon.unwrap_or_default(),
+            data_refresh_interval_millis: data_refresh_interval,
+            last_state: TimeOutput::new(),
+            last_updated: Instant::now()
+                .checked_sub(Duration::from_millis(data_refresh_interval))
+                .unwrap(),
        }
    }
 }

-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum TimeFormat {
    /// Twelve-hour format (with seconds)
    TwelveHour,
@@ -81,20 +162,94 @@ impl TimeFormat {
    }
 }

+#[derive(Clone, Debug)]
+struct TimeOutput {
+    label: String,
+    icon: String,
+}
+
+impl TimeOutput {
+    fn new() -> Self {
+        Self {
+            label: String::new(),
+            icon: String::new(),
+        }
+    }
+}
+
 #[derive(Clone, Debug)]
 pub struct Time {
    pub enable: bool,
    pub format: TimeFormat,
    label_prefix: LabelPrefix,
+    timezone: Option<String>,
+    changing_icon: bool,
+    data_refresh_interval_millis: u64,
+    last_state: TimeOutput,
+    last_updated: Instant,
 }

 impl Time {
-    fn output(&mut self) -> String {
-        chrono::Local::now()
-            .format(&self.format.fmt_string())
-            .to_string()
-            .trim()
-            .to_string()
+    fn output(&mut self) -> TimeOutput {
+        let mut output = self.last_state.clone();
+        let now = Instant::now();
+
+        if now.duration_since(self.last_updated)
+            > Duration::from_millis(self.data_refresh_interval_millis)
+        {
+            let (formatted, current_time) = match &self.timezone {
+                Some(timezone) => match timezone.parse::<Tz>() {
+                    Ok(tz) => {
+                        let dt = Local::now().with_timezone(&tz);
+                        (
+                            dt.format(&self.format.fmt_string())
+                                .to_string()
+                                .trim()
+                                .to_string(),
+                            Some(dt.time()),
+                        )
+                    }
+                    Err(_) => (format!("Invalid timezone: {:?}", timezone), None),
+                },
+                None => {
+                    let dt = Local::now();
+                    (
+                        dt.format(&self.format.fmt_string())
+                            .to_string()
+                            .trim()
+                            .to_string(),
+                        Some(dt.time()),
+                    )
+                }
+            };
+
+            if current_time.is_none() {
+                return TimeOutput {
+                    label: formatted,
+                    icon: egui_phosphor::regular::WARNING_CIRCLE.to_string(),
+                };
+            }
+
+            let current_range = match &self.changing_icon {
+                true => TIME_RANGES
+                    .iter()
+                    .rev()
+                    .find(|&(_, start)| current_time.unwrap() > *start)
+                    .cloned(),
+                false => None,
+            }
+            .unwrap_or((egui_phosphor::regular::CLOCK, NaiveTime::default()));
+
+            output = TimeOutput {
+                label: formatted,
+                icon: current_range.0.to_string(),
+            };
+
+            self.last_state.clone_from(&output);
+            self.last_updated = now;
+        }
+
+        output
    }

    fn paint_binary_circle(
@@ -108,36 +263,37 @@ impl Time {
        let full_height = size;
        let height = full_height / 4.0;
        let width = height;
+        let offset = height / 2.0 - height / 8.0;

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

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

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

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

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

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

@@ -152,37 +308,46 @@ impl Time {
        let full_height = size;
        let height = full_height / 4.0;
        let width = height * 1.5;
+        let offset = height / 2.0 - height / 8.0;

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

-        let round_all = Rounding::same(response.rect.width() * 0.1);
-        let round_top = Rounding {
+        let round_all = CornerRadius::same((response.rect.width() * 0.1) as u8);
+        let round_top = CornerRadius {
            nw: round_all.nw,
            ne: round_all.ne,
            ..Default::default()
        };
-        let round_none = Rounding::ZERO;
-        let round_bottom = Rounding {
+        let round_none = CornerRadius::ZERO;
+        let round_bottom = CornerRadius {
            sw: round_all.nw,
            se: round_all.ne,
            ..Default::default()
        };

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

        let mut rect_bin = response.rect;
@@ -191,7 +356,7 @@ impl Time {
        if number == 1 || number == 5 || number == 9 {
            rect_bin.set_height(height);
            painter.rect_filled(
-                rect_bin.translate(Vec2::new(0.0, height * 3.0)),
+                rect_bin.translate(Vec2::new(stroke.width, height * 3.0 + offset * 2.0)),
                round_bottom,
                color,
            );
@@ -199,7 +364,7 @@ impl Time {
        if number == 2 {
            rect_bin.set_height(height);
            painter.rect_filled(
-                rect_bin.translate(Vec2::new(0.0, height * 2.0)),
+                rect_bin.translate(Vec2::new(stroke.width, height * 2.0 + offset * 2.0)),
                if max_power == 2 {
                    round_top
                } else {
@@ -211,7 +376,7 @@ impl Time {
        if number == 3 {
            rect_bin.set_height(height * 2.0);
            painter.rect_filled(
-                rect_bin.translate(Vec2::new(0.0, height * 2.0)),
+                rect_bin.translate(Vec2::new(stroke.width, height * 2.0 + offset * 2.0)),
                round_bottom,
                color,
            );
@@ -219,7 +384,7 @@ impl Time {
        if number == 4 || number == 5 {
            rect_bin.set_height(height);
            painter.rect_filled(
-                rect_bin.translate(Vec2::new(0.0, height * 1.0)),
+                rect_bin.translate(Vec2::new(stroke.width, height * 1.0 + offset * 2.0)),
                if max_power == 3 {
                    round_top
                } else {
@@ -231,7 +396,7 @@ impl Time {
        if number == 6 {
            rect_bin.set_height(height * 2.0);
            painter.rect_filled(
-                rect_bin.translate(Vec2::new(0.0, height * 1.0)),
+                rect_bin.translate(Vec2::new(stroke.width, height * 1.0 + offset * 2.0)),
                if max_power == 3 {
                    round_top
                } else {
@@ -243,7 +408,7 @@ impl Time {
        if number == 7 {
            rect_bin.set_height(height * 3.0);
            painter.rect_filled(
-                rect_bin.translate(Vec2::new(0.0, height)),
+                rect_bin.translate(Vec2::new(stroke.width, height + offset * 2.0)),
                if max_power == 3 {
                    round_all
                } else {
@@ -254,7 +419,11 @@ impl Time {
        }
        if number == 8 || number == 9 {
            rect_bin.set_height(height);
-            painter.rect_filled(rect_bin.translate(Vec2::new(0.0, 0.0)), round_top, color);
+            painter.rect_filled(
+                rect_bin.translate(Vec2::new(stroke.width, 0.0 + offset * 2.0)),
+                round_top,
+                color,
+            );
        }
    }
 }
@@ -263,15 +432,13 @@ impl BarWidget for Time {
    fn render(&mut self, ctx: &Context, ui: &mut Ui, config: &mut RenderConfig) {
        if self.enable {
            let mut output = self.output();
-            if !output.is_empty() {
-                let use_binary_circle = output.starts_with('c');
-                let use_binary_rectangle = output.starts_with('r');
+            if !output.label.is_empty() {
+                let use_binary_circle = output.label.starts_with('c');
+                let use_binary_rectangle = output.label.starts_with('r');

                let mut layout_job = LayoutJob::simple(
                    match self.label_prefix {
-                        LabelPrefix::Icon | LabelPrefix::IconAndText => {
-                            egui_phosphor::regular::CLOCK.to_string()
-                        }
+                        LabelPrefix::Icon | LabelPrefix::IconAndText => output.icon,
                        LabelPrefix::None | LabelPrefix::Text => String::new(),
                    },
                    config.icon_font_id.clone(),
@@ -280,12 +447,12 @@ impl BarWidget for Time {
                );

                if let LabelPrefix::Text | LabelPrefix::IconAndText = self.label_prefix {
-                    output.insert_str(0, "TIME: ");
+                    output.label.insert_str(0, "TIME: ");
                }

                if !use_binary_circle && !use_binary_rectangle {
                    layout_job.append(
-                        &output,
+                        &output.label,
                        10.0,
                        TextFormat {
                            font_id: config.text_font_id.clone(),
@@ -308,9 +475,9 @@ impl BarWidget for Time {

                            if use_binary_circle || use_binary_rectangle {
                                let ordered_output = if is_reversed {
-                                    output.chars().rev().collect()
+                                    output.label.chars().rev().collect()
                                } else {
-                                    output
+                                    output.label
                                };

                                for (section_index, section) in
--- a/komorebi-bar/src/widgets/update.rs
+++ b/komorebi-bar/src/widgets/update.rs
@@ -1,21 +1,21 @@
 use crate::config::LabelPrefix;
 use crate::render::RenderConfig;
 use crate::selected_frame::SelectableFrame;
-use crate::widget::BarWidget;
+use crate::widgets::widget::BarWidget;
 use eframe::egui::text::LayoutJob;
 use eframe::egui::Align;
 use eframe::egui::Context;
 use eframe::egui::Label;
 use eframe::egui::TextFormat;
 use eframe::egui::Ui;
-use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use std::process::Command;
 use std::time::Duration;
 use std::time::Instant;

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct UpdateConfig {
    /// Enable the Update widget
    pub enable: bool,
--- a/komorebi-bar/src/widgets/widget.rs
+++ b/komorebi-bar/src/widgets/widget.rs
@@ -1,27 +1,28 @@
-use crate::battery::Battery;
-use crate::battery::BatteryConfig;
-use crate::cpu::Cpu;
-use crate::cpu::CpuConfig;
-use crate::date::Date;
-use crate::date::DateConfig;
-use crate::komorebi::Komorebi;
-use crate::komorebi::KomorebiConfig;
-use crate::media::Media;
-use crate::media::MediaConfig;
-use crate::memory::Memory;
-use crate::memory::MemoryConfig;
-use crate::network::Network;
-use crate::network::NetworkConfig;
 use crate::render::RenderConfig;
-use crate::storage::Storage;
-use crate::storage::StorageConfig;
-use crate::time::Time;
-use crate::time::TimeConfig;
-use crate::update::Update;
-use crate::update::UpdateConfig;
+use crate::widgets::battery::Battery;
+use crate::widgets::battery::BatteryConfig;
+use crate::widgets::cpu::Cpu;
+use crate::widgets::cpu::CpuConfig;
+use crate::widgets::date::Date;
+use crate::widgets::date::DateConfig;
+use crate::widgets::keyboard::Keyboard;
+use crate::widgets::keyboard::KeyboardConfig;
+use crate::widgets::komorebi::Komorebi;
+use crate::widgets::komorebi::KomorebiConfig;
+use crate::widgets::media::Media;
+use crate::widgets::media::MediaConfig;
+use crate::widgets::memory::Memory;
+use crate::widgets::memory::MemoryConfig;
+use crate::widgets::network::Network;
+use crate::widgets::network::NetworkConfig;
+use crate::widgets::storage::Storage;
+use crate::widgets::storage::StorageConfig;
+use crate::widgets::time::Time;
+use crate::widgets::time::TimeConfig;
+use crate::widgets::update::Update;
+use crate::widgets::update::UpdateConfig;
 use eframe::egui::Context;
 use eframe::egui::Ui;
-use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;

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

-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum WidgetConfig {
    Battery(BatteryConfig),
    Cpu(CpuConfig),
    Date(DateConfig),
+    Keyboard(KeyboardConfig),
    Komorebi(KomorebiConfig),
    Media(MediaConfig),
    Memory(MemoryConfig),
@@ -49,6 +52,7 @@ impl WidgetConfig {
            WidgetConfig::Battery(config) => Box::new(Battery::from(*config)),
            WidgetConfig::Cpu(config) => Box::new(Cpu::from(*config)),
            WidgetConfig::Date(config) => Box::new(Date::from(config.clone())),
+            WidgetConfig::Keyboard(config) => Box::new(Keyboard::from(*config)),
            WidgetConfig::Komorebi(config) => Box::new(Komorebi::from(config)),
            WidgetConfig::Media(config) => Box::new(Media::from(*config)),
            WidgetConfig::Memory(config) => Box::new(Memory::from(*config)),
@@ -64,10 +68,11 @@ impl WidgetConfig {
            WidgetConfig::Battery(config) => config.enable,
            WidgetConfig::Cpu(config) => config.enable,
            WidgetConfig::Date(config) => config.enable,
+            WidgetConfig::Keyboard(config) => config.enable,
            WidgetConfig::Komorebi(config) => {
                config.workspaces.as_ref().is_some_and(|w| w.enable)
                    || config.layout.as_ref().is_some_and(|w| w.enable)
-                    || config.focused_window.as_ref().is_some_and(|w| w.enable)
+                    || config.focused_container.as_ref().is_some_and(|w| w.enable)
                    || config
                        .configuration_switcher
                        .as_ref()
--- a/komorebi-client/Cargo.toml
+++ b/komorebi-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komorebi-client"
-version = "0.1.34"
+version = "0.1.36"
 edition = "2021"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -10,3 +10,7 @@ komorebi = { path = "../komorebi" }

 uds_windows = { workspace = true }
 serde_json = { workspace = true }
+
+[features]
+default = ["schemars"]
+schemars = ["komorebi/schemars"]
--- a/komorebi-client/src/lib.rs
+++ b/komorebi-client/src/lib.rs
@@ -2,23 +2,32 @@
 #![allow(clippy::missing_errors_doc)]

 pub use komorebi::animation::prefix::AnimationPrefix;
+pub use komorebi::animation::PerAnimationPrefixConfig;
 pub use komorebi::asc::ApplicationSpecificConfiguration;
-pub use komorebi::colour::Colour;
-pub use komorebi::colour::Rgb;
+pub use komorebi::border_manager::BorderInfo;
 pub use komorebi::config_generation::ApplicationConfiguration;
+pub use komorebi::config_generation::IdWithIdentifier;
+pub use komorebi::config_generation::IdWithIdentifierAndComment;
+pub use komorebi::config_generation::MatchingRule;
+pub use komorebi::config_generation::MatchingStrategy;
 pub use komorebi::container::Container;
 pub use komorebi::core::config_generation::ApplicationConfigurationGenerator;
-pub use komorebi::core::resolve_home_path;
+pub use komorebi::core::replace_env_in_path;
 pub use komorebi::core::AnimationStyle;
 pub use komorebi::core::ApplicationIdentifier;
 pub use komorebi::core::Arrangement;
 pub use komorebi::core::Axis;
 pub use komorebi::core::BorderImplementation;
 pub use komorebi::core::BorderStyle;
+pub use komorebi::core::Column;
+pub use komorebi::core::ColumnSplit;
+pub use komorebi::core::ColumnSplitWithCapacity;
+pub use komorebi::core::ColumnWidth;
 pub use komorebi::core::CustomLayout;
 pub use komorebi::core::CycleDirection;
 pub use komorebi::core::DefaultLayout;
 pub use komorebi::core::Direction;
+pub use komorebi::core::FloatingLayerBehaviour;
 pub use komorebi::core::FocusFollowsMouseImplementation;
 pub use komorebi::core::HidingBehaviour;
 pub use komorebi::core::Layout;
@@ -36,20 +45,34 @@ pub use komorebi::core::WindowKind;
 pub use komorebi::monitor::Monitor;
 pub use komorebi::monitor_reconciliator::MonitorNotification;
 pub use komorebi::ring::Ring;
+pub use komorebi::win32_display_data;
 pub use komorebi::window::Window;
 pub use komorebi::window_manager_event::WindowManagerEvent;
 pub use komorebi::workspace::Workspace;
+pub use komorebi::workspace::WorkspaceGlobals;
+pub use komorebi::workspace::WorkspaceLayer;
+pub use komorebi::AnimationsConfig;
+pub use komorebi::AppSpecificConfigurationPath;
+pub use komorebi::AspectRatio;
 pub use komorebi::BorderColours;
+pub use komorebi::Colour;
+pub use komorebi::CrossBoundaryBehaviour;
 pub use komorebi::GlobalState;
 pub use komorebi::KomorebiTheme;
+pub use komorebi::MonitorConfig;
 pub use komorebi::Notification;
 pub use komorebi::NotificationEvent;
+pub use komorebi::PredefinedAspectRatio;
+pub use komorebi::Rgb;
 pub use komorebi::RuleDebug;
 pub use komorebi::StackbarConfig;
 pub use komorebi::State;
 pub use komorebi::StaticConfig;
 pub use komorebi::SubscribeOptions;
 pub use komorebi::TabsConfig;
+pub use komorebi::WindowContainerBehaviour;
+pub use komorebi::WindowsApi;
+pub use komorebi::WorkspaceConfig;

 use komorebi::DATA_DIR;

--- a/komorebi-gui/Cargo.toml
+++ b/komorebi-gui/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komorebi-gui"
-version = "0.1.34"
+version = "0.1.36"
 edition = "2021"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -10,6 +10,7 @@ komorebi-client = { path = "../komorebi-client" }

 eframe = { workspace = true }
 egui_extras = { workspace = true }
-random_word = { version = "0.4.3", features = ["en"] }
+random_word = { version = "0.5", features = ["en"] }
 serde_json = { workspace = true }
+windows-core = { workspace = true }
 windows = { workspace = true }
--- a/komorebi-gui/src/main.rs
+++ b/komorebi-gui/src/main.rs
@@ -41,7 +41,9 @@ struct BorderColours {
    single: Color32,
    stack: Color32,
    monocle: Color32,
+    floating: Color32,
    unfocused: Color32,
+    unfocused_locked: Color32,
 }

 struct BorderConfig {
@@ -101,7 +103,7 @@ impl From<&komorebi_client::Workspace> for WorkspaceConfig {
        let name = value
            .name()
            .to_owned()
-            .unwrap_or_else(|| random_word::gen(random_word::Lang::En).to_string());
+            .unwrap_or_else(|| random_word::get(random_word::Lang::En).to_string());

        Self {
            layout,
@@ -154,7 +156,9 @@ impl KomorebiGui {
            single: colour32(global_state.border_colours.single),
            stack: colour32(global_state.border_colours.stack),
            monocle: colour32(global_state.border_colours.monocle),
+            floating: colour32(global_state.border_colours.floating),
            unfocused: colour32(global_state.border_colours.unfocused),
+            unfocused_locked: colour32(global_state.border_colours.unfocused_locked),
        };

        let border_config = BorderConfig {
@@ -215,7 +219,7 @@ impl KomorebiGui {
 extern "system" fn enum_window(
    hwnd: windows::Win32::Foundation::HWND,
    lparam: windows::Win32::Foundation::LPARAM,
-) -> windows::Win32::Foundation::BOOL {
+) -> windows_core::BOOL {
    let windows = unsafe { &mut *(lparam.0 as *mut Vec<Window>) };
    let window = Window::from(hwnd.0 as isize);

@@ -377,6 +381,22 @@ impl eframe::App for KomorebiGui {
                            }
                        });

+                        ui.collapsing("Floating", |ui| {
+                            if egui::color_picker::color_picker_color32(
+                                ui,
+                                &mut self.border_config.border_colours.floating,
+                                Alpha::Opaque,
+                            ) {
+                                komorebi_client::send_message(&SocketMessage::BorderColour(
+                                    WindowKind::Floating,
+                                    self.border_config.border_colours.floating.r() as u32,
+                                    self.border_config.border_colours.floating.g() as u32,
+                                    self.border_config.border_colours.floating.b() as u32,
+                                ))
+                                .unwrap();
+                            }
+                        });
+
                        ui.collapsing("Unfocused", |ui| {
                            if egui::color_picker::color_picker_color32(
                                ui,
@@ -391,6 +411,22 @@ impl eframe::App for KomorebiGui {
                                ))
                                .unwrap();
                            }
+                        });
+
+                        ui.collapsing("Unfocused Locked", |ui| {
+                            if egui::color_picker::color_picker_color32(
+                                ui,
+                                &mut self.border_config.border_colours.unfocused_locked,
+                                Alpha::Opaque,
+                            ) {
+                                komorebi_client::send_message(&SocketMessage::BorderColour(
+                                    WindowKind::UnfocusedLocked,
+                                    self.border_config.border_colours.unfocused_locked.r() as u32,
+                                    self.border_config.border_colours.unfocused_locked.g() as u32,
+                                    self.border_config.border_colours.unfocused_locked.b() as u32,
+                                ))
+                                .unwrap();
+                            }
                        })
                    });

--- a/komorebi-themes/Cargo.toml
+++ b/komorebi-themes/Cargo.toml
@@ -1,14 +1,20 @@
 [package]
 name = "komorebi-themes"
-version = "0.1.34"
+version = "0.1.36"
 edition = "2021"

 [dependencies]
-base16-egui-themes = { git = "https://github.com/LGUG2Z/base16-egui-themes", rev = "24362c4" }
-catppuccin-egui = { git = "https://github.com/LGUG2Z/catppuccin-egui", rev = "f85cc3c", default-features = false, features = ["egui30"] }
+base16-egui-themes = { git = "https://github.com/LGUG2Z/base16-egui-themes", rev = "96f26c88d83781f234d42222293ec73d23a39ad8" }
+catppuccin-egui = { git = "https://github.com/LGUG2Z/catppuccin-egui", rev = "bdaff30959512c4f7ee7304117076a48633d777f", default-features = false, features = ["egui31"] }
 #catppuccin-egui = { version = "5", default-features = false, features = ["egui30"] }
 eframe = { workspace = true }
-schemars = { workspace = true }
+schemars = { workspace = true, optional = true }
 serde = { workspace = true }
 serde_variant = "0.1"
-strum = "0.26"
+strum = { workspace = true }
+hex_color = { version = "3", features = ["serde"] }
+flavours = { git = "https://github.com/LGUG2Z/flavours", version = "0.7.2" }
+
+[features]
+default = ["schemars"]
+schemars = ["dep:schemars"]
--- a/komorebi-themes/src/colour.rs
+++ b/komorebi-themes/src/colour.rs
@@ -1,14 +1,19 @@
 use hex_color::HexColor;
-use komorebi_themes::Color32;
+#[cfg(feature = "schemars")]
 use schemars::gen::SchemaGenerator;
+#[cfg(feature = "schemars")]
 use schemars::schema::InstanceType;
+#[cfg(feature = "schemars")]
 use schemars::schema::Schema;
+#[cfg(feature = "schemars")]
 use schemars::schema::SchemaObject;
-use schemars::JsonSchema;
+
+use crate::Color32;
 use serde::Deserialize;
 use serde::Serialize;

-#[derive(Debug, Copy, Clone, Serialize, Deserialize, JsonSchema)]
+#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 #[serde(untagged)]
 pub enum Colour {
    /// Colour represented as RGB
@@ -51,10 +56,11 @@ impl From<Colour> for Color32 {
    }
 }

-#[derive(Debug, Copy, Clone, Serialize, Deserialize)]
-pub struct Hex(HexColor);
+#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq)]
+pub struct Hex(pub HexColor);

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

-#[derive(Debug, Copy, Clone, Serialize, Deserialize, JsonSchema)]
+#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Rgb {
    /// Red
    pub r: u32,
@@ -120,8 +127,8 @@ impl From<u32> for Rgb {
    fn from(value: u32) -> Self {
        Self {
            r: value & 0xff,
-            g: value >> 8 & 0xff,
-            b: value >> 16 & 0xff,
+            g: (value >> 8) & 0xff,
+            b: (value >> 16) & 0xff,
        }
    }
 }
--- a/komorebi-themes/src/generator.rs
+++ b/komorebi-themes/src/generator.rs
@@ -0,0 +1,77 @@
+use crate::colour::Colour;
+use crate::colour::Hex;
+use crate::Base16ColourPalette;
+use hex_color::HexColor;
+use std::collections::VecDeque;
+use std::fmt::Display;
+use std::fmt::Formatter;
+use std::path::Path;
+
+use serde::Deserialize;
+use serde::Serialize;
+
+#[derive(Debug, Default, Copy, Clone, Serialize, Deserialize, PartialEq)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+pub enum ThemeVariant {
+    #[default]
+    Dark,
+    Light,
+}
+
+impl Display for ThemeVariant {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ThemeVariant::Dark => write!(f, "dark"),
+            ThemeVariant::Light => write!(f, "light"),
+        }
+    }
+}
+
+impl From<ThemeVariant> for flavours::operations::generate::Mode {
+    fn from(value: ThemeVariant) -> Self {
+        match value {
+            ThemeVariant::Dark => Self::Dark,
+            ThemeVariant::Light => Self::Light,
+        }
+    }
+}
+
+pub fn generate_base16_palette(
+    image_path: &Path,
+    variant: ThemeVariant,
+) -> Result<Base16ColourPalette, hex_color::ParseHexColorError> {
+    Base16ColourPalette::try_from(
+        &flavours::operations::generate::generate(image_path, variant.into(), false)
+            .unwrap_or_default(),
+    )
+}
+
+impl TryFrom<&VecDeque<String>> for Base16ColourPalette {
+    type Error = hex_color::ParseHexColorError;
+
+    fn try_from(value: &VecDeque<String>) -> Result<Self, Self::Error> {
+        let fixed = value.iter().map(|s| format!("#{s}")).collect::<Vec<_>>();
+        if fixed.len() != 16 {
+            return Err(hex_color::ParseHexColorError::Empty);
+        }
+
+        Ok(Self {
+            base_00: Colour::Hex(Hex(HexColor::parse(&fixed[0])?)),
+            base_01: Colour::Hex(Hex(HexColor::parse(&fixed[1])?)),
+            base_02: Colour::Hex(Hex(HexColor::parse(&fixed[2])?)),
+            base_03: Colour::Hex(Hex(HexColor::parse(&fixed[3])?)),
+            base_04: Colour::Hex(Hex(HexColor::parse(&fixed[4])?)),
+            base_05: Colour::Hex(Hex(HexColor::parse(&fixed[5])?)),
+            base_06: Colour::Hex(Hex(HexColor::parse(&fixed[6])?)),
+            base_07: Colour::Hex(Hex(HexColor::parse(&fixed[7])?)),
+            base_08: Colour::Hex(Hex(HexColor::parse(&fixed[8])?)),
+            base_09: Colour::Hex(Hex(HexColor::parse(&fixed[9])?)),
+            base_0a: Colour::Hex(Hex(HexColor::parse(&fixed[10])?)),
+            base_0b: Colour::Hex(Hex(HexColor::parse(&fixed[11])?)),
+            base_0c: Colour::Hex(Hex(HexColor::parse(&fixed[12])?)),
+            base_0d: Colour::Hex(Hex(HexColor::parse(&fixed[13])?)),
+            base_0e: Colour::Hex(Hex(HexColor::parse(&fixed[14])?)),
+            base_0f: Colour::Hex(Hex(HexColor::parse(&fixed[15])?)),
+        })
+    }
+}
--- a/komorebi-themes/src/lib.rs
+++ b/komorebi-themes/src/lib.rs
@@ -1,17 +1,32 @@
 #![warn(clippy::all)]
 #![allow(clippy::missing_errors_doc)]

+pub mod colour;
+mod generator;
+
+pub use generator::generate_base16_palette;
+pub use generator::ThemeVariant;
+
 use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
+use strum::Display;
 use strum::IntoEnumIterator;

+use crate::colour::Colour;
 pub use base16_egui_themes::Base16;
 pub use catppuccin_egui;
+use eframe::egui::style::Selection;
+use eframe::egui::style::WidgetVisuals;
+use eframe::egui::style::Widgets;
 pub use eframe::egui::Color32;
+use eframe::egui::Shadow;
+use eframe::egui::Stroke;
+use eframe::egui::Style;
+use eframe::egui::Visuals;
 use serde_variant::to_variant_name;

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
 #[serde(tag = "type")]
 pub enum Theme {
    /// A theme from catppuccin-egui
@@ -24,6 +39,140 @@ pub enum Theme {
        name: Base16,
        accent: Option<Base16Value>,
    },
+    /// A custom base16 palette
+    Custom {
+        palette: Box<Base16ColourPalette>,
+        accent: Option<Base16Value>,
+    },
+}
+
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
+pub struct Base16ColourPalette {
+    pub base_00: Colour,
+    pub base_01: Colour,
+    pub base_02: Colour,
+    pub base_03: Colour,
+    pub base_04: Colour,
+    pub base_05: Colour,
+    pub base_06: Colour,
+    pub base_07: Colour,
+    pub base_08: Colour,
+    pub base_09: Colour,
+    pub base_0a: Colour,
+    pub base_0b: Colour,
+    pub base_0c: Colour,
+    pub base_0d: Colour,
+    pub base_0e: Colour,
+    pub base_0f: Colour,
+}
+
+impl Base16ColourPalette {
+    pub fn background(self) -> Color32 {
+        self.base_01.into()
+    }
+    pub fn style(self) -> Style {
+        let original = Style::default();
+        Style {
+            visuals: Visuals {
+                widgets: Widgets {
+                    noninteractive: WidgetVisuals {
+                        bg_fill: self.base_01.into(),
+                        weak_bg_fill: self.base_01.into(),
+                        bg_stroke: Stroke {
+                            color: self.base_02.into(),
+                            ..original.visuals.widgets.noninteractive.bg_stroke
+                        },
+                        fg_stroke: Stroke {
+                            color: self.base_05.into(),
+                            ..original.visuals.widgets.noninteractive.fg_stroke
+                        },
+                        ..original.visuals.widgets.noninteractive
+                    },
+                    inactive: WidgetVisuals {
+                        bg_fill: self.base_02.into(),
+                        weak_bg_fill: self.base_02.into(),
+                        bg_stroke: Stroke {
+                            color: Color32::from_rgba_premultiplied(0, 0, 0, 0),
+                            ..original.visuals.widgets.inactive.bg_stroke
+                        },
+                        fg_stroke: Stroke {
+                            color: self.base_05.into(),
+                            ..original.visuals.widgets.inactive.fg_stroke
+                        },
+                        ..original.visuals.widgets.inactive
+                    },
+                    hovered: WidgetVisuals {
+                        bg_fill: self.base_02.into(),
+                        weak_bg_fill: self.base_02.into(),
+                        bg_stroke: Stroke {
+                            color: self.base_03.into(),
+                            ..original.visuals.widgets.hovered.bg_stroke
+                        },
+                        fg_stroke: Stroke {
+                            color: self.base_06.into(),
+                            ..original.visuals.widgets.hovered.fg_stroke
+                        },
+                        ..original.visuals.widgets.hovered
+                    },
+                    active: WidgetVisuals {
+                        bg_fill: self.base_02.into(),
+                        weak_bg_fill: self.base_02.into(),
+                        bg_stroke: Stroke {
+                            color: self.base_03.into(),
+                            ..original.visuals.widgets.hovered.bg_stroke
+                        },
+                        fg_stroke: Stroke {
+                            color: self.base_06.into(),
+                            ..original.visuals.widgets.hovered.fg_stroke
+                        },
+                        ..original.visuals.widgets.active
+                    },
+                    open: WidgetVisuals {
+                        bg_fill: self.base_01.into(),
+                        weak_bg_fill: self.base_01.into(),
+                        bg_stroke: Stroke {
+                            color: self.base_02.into(),
+                            ..original.visuals.widgets.open.bg_stroke
+                        },
+                        fg_stroke: Stroke {
+                            color: self.base_06.into(),
+                            ..original.visuals.widgets.open.fg_stroke
+                        },
+                        ..original.visuals.widgets.open
+                    },
+                },
+                selection: Selection {
+                    bg_fill: self.base_02.into(),
+                    stroke: Stroke {
+                        color: self.base_06.into(),
+                        ..original.visuals.selection.stroke
+                    },
+                },
+                hyperlink_color: self.base_08.into(),
+                faint_bg_color: Color32::from_rgba_premultiplied(0, 0, 0, 0),
+                extreme_bg_color: self.base_00.into(),
+                code_bg_color: self.base_02.into(),
+                warn_fg_color: self.base_0c.into(),
+                error_fg_color: self.base_0b.into(),
+                window_shadow: Shadow {
+                    color: Color32::from_rgba_premultiplied(0, 0, 0, 96),
+                    ..original.visuals.window_shadow
+                },
+                window_fill: self.base_01.into(),
+                window_stroke: Stroke {
+                    color: self.base_02.into(),
+                    ..original.visuals.window_stroke
+                },
+                panel_fill: self.base_01.into(),
+                popup_shadow: Shadow {
+                    color: Color32::from_rgba_premultiplied(0, 0, 0, 96),
+                    ..original.visuals.popup_shadow
+                },
+                ..original.visuals
+            },
+            ..original
+        }
+    }
 }

 impl Theme {
@@ -44,11 +193,12 @@ impl Theme {
                        .to_string()
                })
                .collect(),
+            Theme::Custom { .. } => vec!["Custom".to_string()],
        }
    }
 }

-#[derive(Copy, Clone, Debug, Default, Serialize, Deserialize, JsonSchema)]
+#[derive(Copy, Clone, Debug, Default, Serialize, Deserialize, JsonSchema, Display, PartialEq)]
 pub enum Base16Value {
    Base00,
    Base01,
@@ -69,30 +219,55 @@ pub enum Base16Value {
    Base0F,
 }

+pub enum Base16Wrapper {
+    Base16(Base16),
+    Custom(Box<Base16ColourPalette>),
+}
+
 impl Base16Value {
-    pub fn color32(&self, theme: Base16) -> Color32 {
-        match self {
-            Base16Value::Base00 => theme.base00(),
-            Base16Value::Base01 => theme.base01(),
-            Base16Value::Base02 => theme.base02(),
-            Base16Value::Base03 => theme.base03(),
-            Base16Value::Base04 => theme.base04(),
-            Base16Value::Base05 => theme.base05(),
-            Base16Value::Base06 => theme.base06(),
-            Base16Value::Base07 => theme.base07(),
-            Base16Value::Base08 => theme.base08(),
-            Base16Value::Base09 => theme.base09(),
-            Base16Value::Base0A => theme.base0a(),
-            Base16Value::Base0B => theme.base0b(),
-            Base16Value::Base0C => theme.base0c(),
-            Base16Value::Base0D => theme.base0d(),
-            Base16Value::Base0E => theme.base0e(),
-            Base16Value::Base0F => theme.base0f(),
+    pub fn color32(&self, theme: Base16Wrapper) -> Color32 {
+        match theme {
+            Base16Wrapper::Base16(theme) => match self {
+                Base16Value::Base00 => theme.base00(),
+                Base16Value::Base01 => theme.base01(),
+                Base16Value::Base02 => theme.base02(),
+                Base16Value::Base03 => theme.base03(),
+                Base16Value::Base04 => theme.base04(),
+                Base16Value::Base05 => theme.base05(),
+                Base16Value::Base06 => theme.base06(),
+                Base16Value::Base07 => theme.base07(),
+                Base16Value::Base08 => theme.base08(),
+                Base16Value::Base09 => theme.base09(),
+                Base16Value::Base0A => theme.base0a(),
+                Base16Value::Base0B => theme.base0b(),
+                Base16Value::Base0C => theme.base0c(),
+                Base16Value::Base0D => theme.base0d(),
+                Base16Value::Base0E => theme.base0e(),
+                Base16Value::Base0F => theme.base0f(),
+            },
+            Base16Wrapper::Custom(colours) => match self {
+                Base16Value::Base00 => colours.base_00.into(),
+                Base16Value::Base01 => colours.base_01.into(),
+                Base16Value::Base02 => colours.base_02.into(),
+                Base16Value::Base03 => colours.base_03.into(),
+                Base16Value::Base04 => colours.base_04.into(),
+                Base16Value::Base05 => colours.base_05.into(),
+                Base16Value::Base06 => colours.base_06.into(),
+                Base16Value::Base07 => colours.base_07.into(),
+                Base16Value::Base08 => colours.base_08.into(),
+                Base16Value::Base09 => colours.base_09.into(),
+                Base16Value::Base0A => colours.base_0a.into(),
+                Base16Value::Base0B => colours.base_0b.into(),
+                Base16Value::Base0C => colours.base_0c.into(),
+                Base16Value::Base0D => colours.base_0d.into(),
+                Base16Value::Base0E => colours.base_0e.into(),
+                Base16Value::Base0F => colours.base_0f.into(),
+            },
        }
    }
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, Display, PartialEq)]
 pub enum Catppuccin {
    Frappe,
    Latte,
@@ -117,7 +292,7 @@ impl From<Catppuccin> for catppuccin_egui::Theme {
    }
 }

-#[derive(Copy, Clone, Debug, Default, Serialize, Deserialize, JsonSchema)]
+#[derive(Copy, Clone, Debug, Default, Serialize, Deserialize, JsonSchema, Display, PartialEq)]
 pub enum CatppuccinValue {
    Rosewater,
    Flamingo,
--- a/komorebi/Cargo.toml
+++ b/komorebi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komorebi"
-version = "0.1.34"
+version = "0.1.36"
 description = "A tiling window manager for Windows"
 repository = "https://github.com/LGUG2Z/komorebi"
 edition = "2021"
@@ -19,22 +19,22 @@ ctrlc = { version = "3", features = ["termination"] }
 dirs = { workspace = true }
 dunce = { workspace = true }
 getset = "0.1"
-hex_color = { version = "3", features = ["serde"] }
 hotwatch = { workspace = true }
 lazy_static = { workspace = true }
 miow = "0.6"
 nanoid = "0.4"
 net2 = "0.2"
-os_info = "3.8"
+os_info = "3.10"
 parking_lot = "0.12"
 paste = { workspace = true }
+powershell_script = "1.0"
 regex = "1"
-schemars = { workspace = true }
+schemars = { workspace = true, optional = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 serde_yaml = { workspace = true }
 shadow-rs = { workspace = true }
-strum = { version = "0.26", features = ["derive"] }
+strum = { workspace = true }
 sysinfo = { workspace = true }
 tracing = { workspace = true }
 tracing-appender = { workspace = true }
@@ -44,16 +44,21 @@ which = { workspace = true }
 win32-display-data = { workspace = true }
 windows = { workspace = true }
 windows-core = { workspace = true }
+windows-numerics = { workspace = true }
 windows-implement = { workspace = true }
 windows-interface = { workspace = true }
 winput = "0.2"
 winreg = "0.55"
+serde_with = { version = "3.12", features = ["schemars_0_8"] }

 [build-dependencies]
 shadow-rs = { workspace = true }

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

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

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

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

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

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

 #[derive(
-    Copy,
-    Clone,
-    Debug,
-    Hash,
-    PartialEq,
-    Eq,
-    Serialize,
-    Deserialize,
-    Display,
-    EnumString,
-    ValueEnum,
-    JsonSchema,
+    Copy, Clone, Debug, Hash, PartialEq, Eq, Serialize, Deserialize, Display, EnumString, ValueEnum,
 )]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 #[strum(serialize_all = "snake_case")]
 #[serde(rename_all = "snake_case")]
 pub enum AnimationPrefix {
--- a/komorebi/src/border_manager/border.rs
+++ b/komorebi/src/border_manager/border.rs
@@ -1,24 +1,19 @@
 use crate::border_manager::window_kind_colour;
+use crate::border_manager::RenderTarget;
 use crate::border_manager::WindowKind;
 use crate::border_manager::BORDER_OFFSET;
 use crate::border_manager::BORDER_WIDTH;
-use crate::border_manager::FOCUS_STATE;
-use crate::border_manager::RENDER_TARGETS;
 use crate::border_manager::STYLE;
 use crate::core::BorderStyle;
 use crate::core::Rect;
 use crate::windows_api;
 use crate::WindowsApi;
 use crate::WINDOWS_11;
-use color_eyre::eyre::anyhow;
 use std::collections::HashMap;
 use std::ops::Deref;
 use std::sync::atomic::Ordering;
 use std::sync::mpsc;
 use std::sync::LazyLock;
-use std::sync::OnceLock;
-use windows::Foundation::Numerics::Matrix3x2;
-use windows::Win32::Foundation::BOOL;
 use windows::Win32::Foundation::FALSE;
 use windows::Win32::Foundation::HWND;
 use windows::Win32::Foundation::LPARAM;
@@ -32,7 +27,6 @@ use windows::Win32::Graphics::Direct2D::Common::D2D_RECT_F;
 use windows::Win32::Graphics::Direct2D::Common::D2D_SIZE_U;
 use windows::Win32::Graphics::Direct2D::D2D1CreateFactory;
 use windows::Win32::Graphics::Direct2D::ID2D1Factory;
-use windows::Win32::Graphics::Direct2D::ID2D1HwndRenderTarget;
 use windows::Win32::Graphics::Direct2D::ID2D1SolidColorBrush;
 use windows::Win32::Graphics::Direct2D::D2D1_ANTIALIAS_MODE_PER_PRIMITIVE;
 use windows::Win32::Graphics::Direct2D::D2D1_BRUSH_PROPERTIES;
@@ -55,26 +49,46 @@ use windows::Win32::UI::WindowsAndMessaging::DispatchMessageW;
 use windows::Win32::UI::WindowsAndMessaging::GetMessageW;
 use windows::Win32::UI::WindowsAndMessaging::GetSystemMetrics;
 use windows::Win32::UI::WindowsAndMessaging::GetWindowLongPtrW;
+use windows::Win32::UI::WindowsAndMessaging::LoadCursorW;
 use windows::Win32::UI::WindowsAndMessaging::PostQuitMessage;
+use windows::Win32::UI::WindowsAndMessaging::SetCursor;
 use windows::Win32::UI::WindowsAndMessaging::SetWindowLongPtrW;
 use windows::Win32::UI::WindowsAndMessaging::TranslateMessage;
 use windows::Win32::UI::WindowsAndMessaging::CREATESTRUCTW;
 use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_DESTROY;
 use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_LOCATIONCHANGE;
 use windows::Win32::UI::WindowsAndMessaging::GWLP_USERDATA;
+use windows::Win32::UI::WindowsAndMessaging::IDC_ARROW;
 use windows::Win32::UI::WindowsAndMessaging::MSG;
 use windows::Win32::UI::WindowsAndMessaging::SM_CXVIRTUALSCREEN;
 use windows::Win32::UI::WindowsAndMessaging::WM_CREATE;
 use windows::Win32::UI::WindowsAndMessaging::WM_DESTROY;
 use windows::Win32::UI::WindowsAndMessaging::WM_PAINT;
+use windows::Win32::UI::WindowsAndMessaging::WM_SETCURSOR;
 use windows::Win32::UI::WindowsAndMessaging::WNDCLASSW;
+use windows_core::BOOL;
 use windows_core::PCWSTR;
+use windows_numerics::Matrix3x2;
+
+pub struct RenderFactory(ID2D1Factory);
+unsafe impl Sync for RenderFactory {}
+unsafe impl Send for RenderFactory {}
+
+impl Deref for RenderFactory {
+    type Target = ID2D1Factory;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}

 #[allow(clippy::expect_used)]
-static RENDER_FACTORY: LazyLock<ID2D1Factory> = unsafe {
+static RENDER_FACTORY: LazyLock<RenderFactory> = unsafe {
    LazyLock::new(|| {
-        D2D1CreateFactory::<ID2D1Factory>(D2D1_FACTORY_TYPE_MULTI_THREADED, None)
-            .expect("creating RENDER_FACTORY failed")
+        RenderFactory(
+            D2D1CreateFactory::<ID2D1Factory>(D2D1_FACTORY_TYPE_MULTI_THREADED, None)
+                .expect("creating RENDER_FACTORY failed"),
+        )
    })
 };

@@ -100,7 +114,9 @@ pub extern "system" fn border_hwnds(hwnd: HWND, lparam: LPARAM) -> BOOL {
 #[derive(Debug, Clone)]
 pub struct Border {
    pub hwnd: isize,
-    pub render_target: OnceLock<ID2D1HwndRenderTarget>,
+    pub id: String,
+    pub monitor_idx: Option<usize>,
+    pub render_target: Option<RenderTarget>,
    pub tracking_hwnd: isize,
    pub window_rect: Rect,
    pub window_kind: WindowKind,
@@ -116,7 +132,9 @@ impl From<isize> for Border {
    fn from(value: isize) -> Self {
        Self {
            hwnd: value,
-            render_target: OnceLock::new(),
+            id: String::new(),
+            monitor_idx: None,
+            render_target: None,
            tracking_hwnd: 0,
            window_rect: Rect::default(),
            window_kind: WindowKind::Unfocused,
@@ -135,7 +153,11 @@ impl Border {
        HWND(windows_api::as_ptr!(self.hwnd))
    }

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

@@ -154,10 +176,13 @@ impl Border {
        let (border_sender, border_receiver) = mpsc::channel();

        let instance = h_module.0 as isize;
+        let container_id = id.to_owned();
        std::thread::spawn(move || -> color_eyre::Result<()> {
            let mut border = Self {
                hwnd: 0,
-                render_target: OnceLock::new(),
+                id: container_id,
+                monitor_idx: Some(monitor_idx),
+                render_target: None,
                tracking_hwnd,
                window_rect: WindowsApi::window_rect(tracking_hwnd).unwrap_or_default(),
                window_kind: WindowKind::Unfocused,
@@ -169,18 +194,21 @@ impl Border {
                brushes: HashMap::new(),
            };

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

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

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

            loop {
                unsafe {
-                    if !GetMessageW(&mut msg, HWND::default(), 0, 0).as_bool() {
+                    if !GetMessageW(&mut msg, None, 0, 0).as_bool() {
                        tracing::debug!("border window event processing thread shutdown");
                        break;
                    };
@@ -193,8 +221,7 @@ impl Border {
            Ok(())
        });

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

        // I have literally no idea, apparently this is to get rid of the black pixels
        // around the edges of rounded corners? @lukeyou05 borrowed this from PowerToys
@@ -214,8 +241,14 @@ impl Border {
            let _ = DwmEnableBlurBehindWindow(border.hwnd(), &bh);
        }

+        border.update_brushes()?;
+
+        Ok(border)
+    }
+
+    pub fn update_brushes(&mut self) -> color_eyre::Result<()> {
        let hwnd_render_target_properties = D2D1_HWND_RENDER_TARGET_PROPERTIES {
-            hwnd: HWND(windows_api::as_ptr!(border.hwnd)),
+            hwnd: HWND(windows_api::as_ptr!(self.hwnd)),
            pixelSize: Default::default(),
            presentOptions: D2D1_PRESENT_OPTIONS_IMMEDIATELY,
        };
@@ -236,13 +269,14 @@ impl Border {
                .CreateHwndRenderTarget(&render_target_properties, &hwnd_render_target_properties)
        } {
            Ok(render_target) => unsafe {
-                border.brush_properties = *BRUSH_PROPERTIES.deref();
+                self.brush_properties = *BRUSH_PROPERTIES.deref();
                for window_kind in [
                    WindowKind::Single,
                    WindowKind::Stack,
                    WindowKind::Monocle,
                    WindowKind::Unfocused,
                    WindowKind::Floating,
+                    WindowKind::UnfocusedLocked,
                ] {
                    let color = window_kind_colour(window_kind);
                    let color = D2D1_COLOR_F {
@@ -253,20 +287,18 @@ impl Border {
                    };

                    if let Ok(brush) =
-                        render_target.CreateSolidColorBrush(&color, Some(&border.brush_properties))
+                        render_target.CreateSolidColorBrush(&color, Some(&self.brush_properties))
                    {
-                        border.brushes.insert(window_kind, brush);
+                        self.brushes.insert(window_kind, brush);
                    }
                }

                render_target.SetAntialiasMode(D2D1_ANTIALIAS_MODE_PER_PRIMITIVE);

-                if border.render_target.set(render_target.clone()).is_err() {
-                    return Err(anyhow!("could not store border render target"));
-                }
+                self.render_target = Some(RenderTarget(render_target));

-                border.rounded_rect = {
-                    let radius = 8.0 + border.width as f32 / 2.0;
+                self.rounded_rect = {
+                    let radius = 8.0 + self.width as f32 / 2.0;
                    D2D1_ROUNDED_RECT {
                        rect: Default::default(),
                        radiusX: radius,
@@ -274,17 +306,13 @@ impl Border {
                    }
                };

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

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

@@ -300,7 +328,7 @@ impl Border {

    // this triggers WM_PAINT in the callback below
    pub fn invalidate(&self) {
-        let _ = unsafe { InvalidateRect(self.hwnd(), None, false) };
+        let _ = unsafe { InvalidateRect(Option::from(self.hwnd()), None, false) };
    }

    pub extern "system" fn callback(
@@ -311,6 +339,16 @@ impl Border {
    ) -> LRESULT {
        unsafe {
            match message {
+                WM_SETCURSOR => match LoadCursorW(None, IDC_ARROW) {
+                    Ok(cursor) => {
+                        SetCursor(Some(cursor));
+                        LRESULT(0)
+                    }
+                    Err(error) => {
+                        tracing::error!("{error}");
+                        LRESULT(1)
+                    }
+                },
                WM_CREATE => {
                    let mut border_pointer: *mut Border =
                        GetWindowLongPtrW(window, GWLP_USERDATA) as _;
@@ -343,7 +381,7 @@ impl Border {
                        return LRESULT(0);
                    }

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

                    let old_rect = (*border_pointer).window_rect;
                    let rect = WindowsApi::window_rect(reference_hwnd).unwrap_or_default();
@@ -355,7 +393,7 @@ impl Border {
                    }

                    if !rect.is_same_size_as(&old_rect) {
-                        if let Some(render_target) = (*border_pointer).render_target.get() {
+                        if let Some(render_target) = (*border_pointer).render_target.as_ref() {
                            let border_width = (*border_pointer).width;
                            let border_offset = (*border_pointer).offset;

@@ -437,7 +475,7 @@ impl Border {
                            tracing::error!("failed to update border position {error}");
                        }

-                        if let Some(render_target) = (*border_pointer).render_target.get() {
+                        if let Some(render_target) = (*border_pointer).render_target.as_ref() {
                            (*border_pointer).width = BORDER_WIDTH.load(Ordering::Relaxed);
                            (*border_pointer).offset = BORDER_OFFSET.load(Ordering::Relaxed);

@@ -457,13 +495,6 @@ impl Border {
                            });

                            // Get window kind and color
-
-                            (*border_pointer).window_kind = FOCUS_STATE
-                                .lock()
-                                .get(&(window.0 as isize))
-                                .copied()
-                                .unwrap_or(WindowKind::Unfocused);
-
                            let window_kind = (*border_pointer).window_kind;
                            if let Some(brush) = (*border_pointer).brushes.get(&window_kind) {
                                render_target.BeginDraw();
@@ -508,7 +539,7 @@ impl Border {
                            }
                        }
                    }
-                    let _ = ValidateRect(window, None);
+                    let _ = ValidateRect(Option::from(window), None);
                    LRESULT(0)
                }
                WM_DESTROY => {
--- a/komorebi/src/border_manager/mod.rs
+++ b/komorebi/src/border_manager/mod.rs
@@ -5,9 +5,8 @@ use crate::core::BorderImplementation;
 use crate::core::BorderStyle;
 use crate::core::WindowKind;
 use crate::ring::Ring;
-use crate::workspace_reconciliator::ALT_TAB_HWND;
-use crate::Colour;
-use crate::Rgb;
+use crate::windows_api;
+use crate::workspace::WorkspaceLayer;
 use crate::WindowManager;
 use crate::WindowsApi;
 use border::border_hwnds;
@@ -16,19 +15,23 @@ use crossbeam_channel::Receiver;
 use crossbeam_channel::Sender;
 use crossbeam_utils::atomic::AtomicCell;
 use crossbeam_utils::atomic::AtomicConsume;
+use komorebi_themes::colour::Colour;
+use komorebi_themes::colour::Rgb;
 use lazy_static::lazy_static;
 use parking_lot::Mutex;
-use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use std::collections::hash_map::Entry;
 use std::collections::HashMap;
+use std::ops::Deref;
 use std::sync::atomic::AtomicBool;
 use std::sync::atomic::AtomicI32;
 use std::sync::atomic::AtomicU32;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
 use std::sync::OnceLock;
+use strum::Display;
+use windows::Win32::Foundation::HWND;
 use windows::Win32::Graphics::Direct2D::ID2D1HwndRenderTarget;

 pub static BORDER_WIDTH: AtomicI32 = AtomicI32::new(8);
@@ -44,6 +47,8 @@ lazy_static! {
        AtomicU32::new(u32::from(Colour::Rgb(Rgb::new(66, 165, 245))));
    pub static ref UNFOCUSED: AtomicU32 =
        AtomicU32::new(u32::from(Colour::Rgb(Rgb::new(128, 128, 128))));
+    pub static ref UNFOCUSED_LOCKED: AtomicU32 =
+        AtomicU32::new(u32::from(Colour::Rgb(Rgb::new(158, 8, 8))));
    pub static ref MONOCLE: AtomicU32 =
        AtomicU32::new(u32::from(Colour::Rgb(Rgb::new(255, 51, 153))));
    pub static ref STACK: AtomicU32 = AtomicU32::new(u32::from(Colour::Rgb(Rgb::new(0, 165, 66))));
@@ -52,15 +57,38 @@ lazy_static! {
 }

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

-pub struct Notification(pub Option<isize>);
+#[derive(Debug, Clone)]
+pub struct RenderTarget(pub ID2D1HwndRenderTarget);
+unsafe impl Send for RenderTarget {}
+
+impl Deref for RenderTarget {
+    type Target = ID2D1HwndRenderTarget;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+pub enum Notification {
+    Update(Option<isize>),
+    ForceUpdate,
+}
+
+#[derive(Debug, Default, Clone, Copy, PartialEq)]
+pub struct BorderInfo {
+    pub border_hwnd: isize,
+    pub window_kind: WindowKind,
+}
+
+impl BorderInfo {
+    pub fn hwnd(&self) -> HWND {
+        HWND(windows_api::as_ptr!(self.border_hwnd))
+    }
+}

 static CHANNEL: OnceLock<(Sender<Notification>, Receiver<Notification>)> = OnceLock::new();

@@ -76,12 +104,23 @@ fn event_rx() -> Receiver<Notification> {
    channel().1.clone()
 }

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

 pub fn send_notification(hwnd: Option<isize>) {
-    if event_tx().try_send(Notification(hwnd)).is_err() {
+    if event_tx().try_send(Notification::Update(hwnd)).is_err() {
+        tracing::warn!("channel is full; dropping notification")
+    }
+}
+
+pub fn send_force_update() {
+    if event_tx().try_send(Notification::ForceUpdate).is_err() {
        tracing::warn!("channel is full; dropping notification")
    }
 }
@@ -93,14 +132,11 @@ pub fn destroy_all_borders() -> color_eyre::Result<()> {
        borders.iter().map(|b| b.1.hwnd).collect::<Vec<_>>()
    );

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

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

    let mut remaining_hwnds = vec![];

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

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

@@ -123,6 +159,7 @@ pub fn destroy_all_borders() -> color_eyre::Result<()> {
 fn window_kind_colour(focus_kind: WindowKind) -> u32 {
    match focus_kind {
        WindowKind::Unfocused => UNFOCUSED.load(Ordering::Relaxed),
+        WindowKind::UnfocusedLocked => UNFOCUSED_LOCKED.load(Ordering::Relaxed),
        WindowKind::Single => FOCUSED.load(Ordering::Relaxed),
        WindowKind::Stack => STACK.load(Ordering::Relaxed),
        WindowKind::Monocle => MONOCLE.load(Ordering::Relaxed),
@@ -147,12 +184,13 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
    tracing::info!("listening");

    let receiver = event_rx();
-    event_tx().send(Notification(None))?;
+    event_tx().send(Notification::Update(None))?;

    let mut previous_snapshot = Ring::default();
    let mut previous_pending_move_op = None;
    let mut previous_is_paused = false;
    let mut previous_notification: Option<Notification> = None;
+    let mut previous_layer = WorkspaceLayer::default();

    'receiver: for notification in receiver {
        // Check the wm state every time we receive a notification
@@ -169,6 +207,9 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
            .iter()
            .map(|w| w.hwnd)
            .collect::<Vec<_>>();
+        let workspace_layer = *state.monitors.elements()[focused_monitor_idx].workspaces()
+            [focused_workspace_idx]
+            .layer();
        let foreground_window = WindowsApi::foreground_window().unwrap_or_default();

        drop(state);
@@ -199,7 +240,11 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                            let window_kind = if idx != ws.focused_container_idx()
                                || monitor_idx != focused_monitor_idx
                            {
-                                WindowKind::Unfocused
+                                if ws.locked_containers().contains(&idx) {
+                                    WindowKind::UnfocusedLocked
+                                } else {
+                                    WindowKind::Unfocused
+                                }
                            } else if c.windows().len() > 1 {
                                WindowKind::Stack
                            } else {
@@ -211,57 +256,89 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                                .unwrap_or_default()
                                .set_accent(window_kind_colour(window_kind))?;
                        }
+
+                        for window in ws.floating_windows() {
+                            let mut window_kind = WindowKind::Unfocused;
+
+                            if foreground_window == window.hwnd {
+                                window_kind = WindowKind::Floating;
+                            }
+
+                            window.set_accent(window_kind_colour(window_kind))?;
+                        }
                    }
                }
            }
            BorderImplementation::Komorebi => {
-                let mut should_process_notification = true;
+                let should_process_notification = match notification {
+                    Notification::Update(notification_hwnd) => {
+                        let mut should_process_notification = true;

-                if monitors == previous_snapshot
-                    // handle the window dragging edge case
-                    && pending_move_op == previous_pending_move_op
-                {
-                    should_process_notification = false;
-                }
+                        if monitors == previous_snapshot
+                        // handle the window dragging edge case
+                        && pending_move_op == previous_pending_move_op
+                        {
+                            should_process_notification = false;
+                        }

-                // handle the pause edge case
-                if is_paused && !previous_is_paused {
-                    should_process_notification = true;
-                }
-
-                // handle the unpause edge case
-                if previous_is_paused && !is_paused {
-                    should_process_notification = true;
-                }
-
-                // handle the retile edge case
-                if !should_process_notification && BORDER_STATE.lock().is_empty() {
-                    should_process_notification = true;
-                }
-
-                // when we switch focus to/from a floating window
-                let switch_focus_to_from_floating_window = floating_window_hwnds.iter().any(|fw| {
-                    // if we switch focus to a floating window
-                    fw == &notification.0.unwrap_or_default() ||
-                    // if there is any floating window with a `WindowKind::Floating` border
-                    // that no longer is the foreground window then we need to update that
-                    // border.
-                    (fw != &foreground_window
-                        && window_border(*fw)
-                        .map(|b| b.window_kind == WindowKind::Floating)
-                        .unwrap_or_default())
-                });
-                if !should_process_notification && switch_focus_to_from_floating_window {
-                    should_process_notification = true;
-                }
-
-                if !should_process_notification {
-                    if let Some(ref previous) = previous_notification {
-                        if previous.0.unwrap_or_default() != notification.0.unwrap_or_default() {
+                        // handle the pause edge case
+                        if is_paused && !previous_is_paused {
                            should_process_notification = true;
                        }
+
+                        // handle the unpause edge case
+                        if previous_is_paused && !is_paused {
+                            should_process_notification = true;
+                        }
+
+                        // handle the retile edge case
+                        if !should_process_notification && BORDER_STATE.lock().is_empty() {
+                            should_process_notification = true;
+                        }
+
+                        // when we switch focus to/from a floating window
+                        let switch_focus_to_from_floating_window =
+                            floating_window_hwnds.iter().any(|fw| {
+                                // if we switch focus to a floating window
+                                fw == &notification_hwnd.unwrap_or_default() ||
+                        // if there is any floating window with a `WindowKind::Floating` border
+                        // that no longer is the foreground window then we need to update that
+                        // border.
+                        (fw != &foreground_window
+                            && window_border(*fw)
+                            .is_some_and(|b| b.window_kind == WindowKind::Floating))
+                            });
+
+                        // when the focused window has an `Unfocused` border kind, usually this happens if
+                        // we focus an admin window and then refocus the previously focused window. For
+                        // komorebi it will have the same state has before, however the previously focused
+                        // window changed its border to unfocused so now we need to update it again.
+                        if !should_process_notification
+                            && window_border(notification_hwnd.unwrap_or_default())
+                                .is_some_and(|b| b.window_kind == WindowKind::Unfocused)
+                        {
+                            should_process_notification = true;
+                        }
+
+                        if !should_process_notification && switch_focus_to_from_floating_window {
+                            should_process_notification = true;
+                        }
+
+                        if !should_process_notification {
+                            if let Some(Notification::Update(ref previous)) = previous_notification
+                            {
+                                if previous.unwrap_or_default()
+                                    != notification_hwnd.unwrap_or_default()
+                                {
+                                    should_process_notification = true;
+                                }
+                            }
+                        }
+
+                        should_process_notification
                    }
-                }
+                    Notification::ForceUpdate => true,
+                };

                if !should_process_notification {
                    tracing::trace!("monitor state matches latest snapshot, skipping notification");
@@ -269,22 +346,18 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                }

                let mut borders = BORDER_STATE.lock();
-                let mut borders_monitors = BORDERS_MONITORS.lock();
                let mut windows_borders = WINDOWS_BORDERS.lock();

                // If borders are disabled
                if !BORDER_ENABLED.load_consume()
                    // Or if the wm is paused
                    || is_paused
-                    // Or if we are handling an alt-tab across workspaces
-                    || ALT_TAB_HWND.load().is_some()
                {
                    // Destroy the borders we know about
-                    for (_, border) in borders.iter() {
-                        border.destroy()?;
+                    for (_, border) in borders.drain() {
+                        destroy_border(border)?;
                    }

-                    borders.clear();
                    windows_borders.clear();

                    previous_is_paused = is_paused;
@@ -296,19 +369,13 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                    if let Some(ws) = m.focused_workspace() {
                        // Workspaces with tiling disabled don't have borders
                        if !ws.tile() {
-                            let mut to_remove = vec![];
-                            for (id, border) in borders.iter() {
-                                if borders_monitors.get(id).copied().unwrap_or_default()
-                                    == monitor_idx
-                                {
-                                    border.destroy()?;
-                                    to_remove.push(id.clone());
-                                }
-                            }
-
-                            for id in &to_remove {
-                                borders.remove(id);
-                            }
+                            // Remove all borders on this monitor
+                            remove_borders(
+                                &mut borders,
+                                &mut windows_borders,
+                                monitor_idx,
+                                |_, _| true,
+                            )?;

                            continue 'monitors;
                        }
@@ -316,12 +383,16 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                        // Handle the monocle container separately
                        if let Some(monocle) = ws.monocle_container() {
                            let mut new_border = false;
-                            let border = match borders.entry(monocle.id().clone()) {
+                            let focused_window_hwnd =
+                                monocle.focused_window().map(|w| w.hwnd).unwrap_or_default();
+                            let id = monocle.id().clone();
+                            let border = match borders.entry(id.clone()) {
                                Entry::Occupied(entry) => entry.into_mut(),
                                Entry::Vacant(entry) => {
                                    if let Ok(border) = Border::create(
                                        monocle.id(),
-                                        monocle.focused_window().copied().unwrap_or_default().hwnd,
+                                        focused_window_hwnd,
+                                        monitor_idx,
                                    ) {
                                        new_border = true;
                                        entry.insert(border)
@@ -337,43 +408,52 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                                WindowKind::Monocle
                            };
                            border.window_kind = new_focus_state;
-                            {
-                                let mut focus_state = FOCUS_STATE.lock();
-                                focus_state.insert(border.hwnd, new_focus_state);
+
+                            // Update the borders tracking_hwnd in case it changed and remove the
+                            // old `tracking_hwnd` from `WINDOWS_BORDERS` if needed.
+                            if border.tracking_hwnd != focused_window_hwnd {
+                                if let Some(previous) = windows_borders.get(&border.tracking_hwnd) {
+                                    // Only remove the border from `windows_borders` if it
+                                    // still corresponds to the same border, if doesn't then
+                                    // it means it was already updated by another border for
+                                    // that window and in that case we don't want to remove it.
+                                    if previous == &id {
+                                        windows_borders.remove(&border.tracking_hwnd);
+                                    }
+                                }
+                                border.tracking_hwnd = focused_window_hwnd;
+                                if !WindowsApi::is_window_visible(border.hwnd) {
+                                    WindowsApi::restore_window(border.hwnd);
+                                }
                            }

-                            let reference_hwnd =
-                                monocle.focused_window().copied().unwrap_or_default().hwnd;
+                            // Update the border's monitor idx in case it changed
+                            border.monitor_idx = Some(monitor_idx);

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

                            if new_border {
-                                border.set_position(&rect, reference_hwnd)?;
+                                border.set_position(&rect, focused_window_hwnd)?;
+                            } else if matches!(notification, Notification::ForceUpdate) {
+                                // Update the border brushes if there was a forced update
+                                // notification and this is not a new border (new border's
+                                // already have their brushes updated on creation)
+                                border.update_brushes()?;
                            }

                            border.invalidate();

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

                            let border_hwnd = border.hwnd;
-                            let mut to_remove = vec![];
-                            for (id, b) in borders.iter() {
-                                if borders_monitors.get(id).copied().unwrap_or_default()
-                                    == monitor_idx
-                                    && border_hwnd != b.hwnd
-                                {
-                                    b.destroy()?;
-                                    to_remove.push(id.clone());
-                                }
-                            }
-
-                            for id in &to_remove {
-                                borders.remove(id);
-                            }
+                            // Remove all borders on this monitor except monocle
+                            remove_borders(
+                                &mut borders,
+                                &mut windows_borders,
+                                monitor_idx,
+                                |_, b| border_hwnd != b.hwnd,
+                            )?;

                            continue 'monitors;
                        }
@@ -385,24 +465,18 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                            && WindowsApi::is_zoomed(foreground_hwnd);

                        if is_maximized {
-                            let mut to_remove = vec![];
-                            for (id, border) in borders.iter() {
-                                if borders_monitors.get(id).copied().unwrap_or_default()
-                                    == monitor_idx
-                                {
-                                    border.destroy()?;
-                                    to_remove.push(id.clone());
-                                }
-                            }
-
-                            for id in &to_remove {
-                                borders.remove(id);
-                            }
+                            // Remove all borders on this monitor
+                            remove_borders(
+                                &mut borders,
+                                &mut windows_borders,
+                                monitor_idx,
+                                |_, _| true,
+                            )?;

                            continue 'monitors;
                        }

-                        // Destroy any borders not associated with the focused workspace
+                        // Collect focused workspace container and floating windows ID's
                        let mut container_and_floating_window_ids = ws
                            .containers()
                            .iter()
@@ -413,30 +487,27 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                            container_and_floating_window_ids.push(w.hwnd.to_string());
                        }

-                        let mut to_remove = vec![];
-                        for (id, border) in borders.iter() {
-                            if borders_monitors.get(id).copied().unwrap_or_default() == monitor_idx
-                                && !container_and_floating_window_ids.contains(id)
-                            {
-                                border.destroy()?;
-                                to_remove.push(id.clone());
-                            }
-                        }
-
-                        for id in &to_remove {
-                            borders.remove(id);
-                        }
+                        // Remove any borders not associated with the focused workspace
+                        remove_borders(
+                            &mut borders,
+                            &mut windows_borders,
+                            monitor_idx,
+                            |id, _| !container_and_floating_window_ids.contains(id),
+                        )?;

                        'containers: for (idx, c) in ws.containers().iter().enumerate() {
+                            let focused_window_hwnd =
+                                c.focused_window().map(|w| w.hwnd).unwrap_or_default();
+                            let id = c.id().clone();
+
                            // Get the border entry for this container from the map or create one
                            let mut new_border = false;
-                            let border = match borders.entry(c.id().clone()) {
+                            let border = match borders.entry(id.clone()) {
                                Entry::Occupied(entry) => entry.into_mut(),
                                Entry::Vacant(entry) => {
-                                    if let Ok(border) = Border::create(
-                                        c.id(),
-                                        c.focused_window().copied().unwrap_or_default().hwnd,
-                                    ) {
+                                    if let Ok(border) =
+                                        Border::create(c.id(), focused_window_hwnd, monitor_idx)
+                                    {
                                        new_border = true;
                                        entry.insert(border)
                                    } else {
@@ -445,73 +516,92 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                                }
                            };

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

                            let new_focus_state = if idx != ws.focused_container_idx()
                                || monitor_idx != focused_monitor_idx
-                                || c.focused_window()
-                                    .map(|w| w.hwnd != foreground_window)
-                                    .unwrap_or_default()
+                                || focused_window_hwnd != foreground_window
                            {
-                                WindowKind::Unfocused
+                                if ws.locked_containers().contains(&idx) {
+                                    WindowKind::UnfocusedLocked
+                                } else {
+                                    WindowKind::Unfocused
+                                }
                            } else if c.windows().len() > 1 {
                                WindowKind::Stack
                            } else {
                                WindowKind::Single
                            };
+
                            border.window_kind = new_focus_state;

-                            // Update the focused state for all containers on this workspace
-                            {
-                                let mut focus_state = FOCUS_STATE.lock();
-                                last_focus_state = focus_state.insert(border.hwnd, new_focus_state);
+                            // Update the borders `tracking_hwnd` in case it changed and remove the
+                            // old `tracking_hwnd` from `WINDOWS_BORDERS` if needed.
+                            if border.tracking_hwnd != focused_window_hwnd {
+                                if let Some(previous) = windows_borders.get(&border.tracking_hwnd) {
+                                    // Only remove the border from `windows_borders` if it
+                                    // still corresponds to the same border, if doesn't then
+                                    // it means it was already updated by another border for
+                                    // that window and in that case we don't want to remove it.
+                                    if previous == &id {
+                                        windows_borders.remove(&border.tracking_hwnd);
+                                    }
+                                }
+                                border.tracking_hwnd = focused_window_hwnd;
+                                if !WindowsApi::is_window_visible(border.hwnd) {
+                                    WindowsApi::restore_window(border.hwnd);
+                                }
                            }

-                            let reference_hwnd =
-                                c.focused_window().copied().unwrap_or_default().hwnd;
+                            // Update the border's monitor idx in case it changed
+                            border.monitor_idx = Some(monitor_idx);

                            // avoid getting into a thread restart loop if we try to look up
                            // rect info for a window that has been destroyed by the time
                            // we get here
-                            let rect = match WindowsApi::window_rect(reference_hwnd) {
+                            let rect = match WindowsApi::window_rect(focused_window_hwnd) {
                                Ok(rect) => rect,
                                Err(_) => {
-                                    let _ = border.destroy();
-                                    borders.remove(c.id());
+                                    remove_border(c.id(), &mut borders, &mut windows_borders)?;
                                    continue 'containers;
                                }
                            };
+                            border.window_rect = rect;

-                            let should_invalidate = match last_focus_state {
-                                None => true,
-                                Some(last_focus_state) => last_focus_state != new_focus_state,
-                            };
+                            let layer_changed = previous_layer != workspace_layer;
+                            let forced_update = matches!(notification, Notification::ForceUpdate);

-                            if new_border {
-                                border.set_position(&rect, reference_hwnd)?;
-                            }
+                            let should_invalidate = new_border
+                                || (last_focus_state != new_focus_state)
+                                || layer_changed
+                                || forced_update;

                            if should_invalidate {
+                                if forced_update && !new_border {
+                                    // Update the border brushes if there was a forced update
+                                    // notification and this is not a new border (new border's
+                                    // already have their brushes updated on creation)
+                                    border.update_brushes()?;
+                                }
+                                border.set_position(&rect, focused_window_hwnd)?;
                                border.invalidate();
                            }

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

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

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

-                                if foreground_window == window.hwnd {
-                                    new_focus_state = WindowKind::Floating;
-                                }
-
-                                border.window_kind = new_focus_state;
-                                {
-                                    let mut focus_state = FOCUS_STATE.lock();
-                                    last_focus_state =
-                                        focus_state.insert(border.hwnd, new_focus_state);
-                                }
-
-                                let rect = WindowsApi::window_rect(window.hwnd)?;
-
-                                let should_invalidate = match last_focus_state {
-                                    None => true,
-                                    Some(last_focus_state) => last_focus_state != new_focus_state,
+                                let new_focus_state = if foreground_window == window.hwnd {
+                                    WindowKind::Floating
+                                } else {
+                                    WindowKind::Unfocused
                                };

-                                if new_border {
-                                    border.set_position(&rect, window.hwnd)?;
-                                }
+                                border.window_kind = new_focus_state;
+
+                                // Update the border's monitor idx in case it changed
+                                border.monitor_idx = Some(monitor_idx);
+
+                                let rect = WindowsApi::window_rect(window.hwnd)?;
+                                border.window_rect = rect;
+
+                                let layer_changed = previous_layer != workspace_layer;
+                                let forced_update =
+                                    matches!(notification, Notification::ForceUpdate);
+
+                                let should_invalidate = new_border
+                                    || (last_focus_state != new_focus_state)
+                                    || layer_changed
+                                    || forced_update;

                                if should_invalidate {
+                                    if forced_update && !new_border {
+                                        // Update the border brushes if there was a forced update
+                                        // notification and this is not a new border (new border's
+                                        // already have their brushes updated on creation)
+                                        border.update_brushes()?;
+                                    }
+                                    border.set_position(&rect, window.hwnd)?;
                                    border.invalidate();
                                }

-                                borders_monitors.insert(window.hwnd.to_string(), monitor_idx);
-                                windows_borders.insert(window.hwnd, border.clone());
+                                windows_borders.insert(window.hwnd, id);
                            }
                        }
                    }
@@ -563,12 +658,113 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
        previous_pending_move_op = pending_move_op;
        previous_is_paused = is_paused;
        previous_notification = Some(notification);
+        previous_layer = workspace_layer;
    }

    Ok(())
 }

-#[derive(Debug, Copy, Clone, Serialize, Deserialize, JsonSchema)]
+/// Removes all borders from monitor with index `monitor_idx` filtered by
+/// `condition`. This condition is a function that will take a reference to
+/// the container id and the border and returns a bool, if true that border
+/// will be removed.
+fn remove_borders(
+    borders: &mut HashMap<String, Box<Border>>,
+    windows_borders: &mut HashMap<isize, String>,
+    monitor_idx: usize,
+    condition: impl Fn(&String, &Border) -> bool,
+) -> color_eyre::Result<()> {
+    let mut to_remove = vec![];
+    for (id, border) in borders.iter() {
+        // if border is on this monitor
+        if border.monitor_idx.is_some_and(|idx| idx == monitor_idx)
+            // and the condition applies
+            && condition(id, border)
+            // and the border is visible (we don't remove hidden borders)
+            && WindowsApi::is_window_visible(border.hwnd)
+        {
+            // we mark it to be removed
+            to_remove.push(id.clone());
+        }
+    }
+
+    for id in &to_remove {
+        remove_border(id, borders, windows_borders)?;
+    }
+
+    Ok(())
+}
+
+/// Removes the border with `id` and all its related info from all maps
+fn remove_border(
+    id: &str,
+    borders: &mut HashMap<String, Box<Border>>,
+    windows_borders: &mut HashMap<isize, String>,
+) -> color_eyre::Result<()> {
+    if let Some(removed_border) = borders.remove(id) {
+        windows_borders.remove(&removed_border.tracking_hwnd);
+        destroy_border(removed_border)?;
+    }
+
+    Ok(())
+}
+
+/// IMPORTANT: BEWARE when changing this function. We need to make sure that we don't let the
+/// `Box<Border>` be dropped normally. We need to turn the `Box` into the raw pointer and use that
+/// pointer to call the `.destroy()` funtion of the border so it closes the window. This way the
+/// `Box` is consumed and the pointer is dropped like a normal `Copy` number instead of trying to
+/// drop the struct it points to. The actual border is owned by the thread that created the window
+/// and once the window closes that thread gets out of its loop, finishes and properly disposes of
+/// the border.
+fn destroy_border(border: Box<Border>) -> color_eyre::Result<()> {
+    let raw_pointer = Box::into_raw(border);
+    unsafe {
+        (*raw_pointer).destroy()?;
+    }
+    Ok(())
+}
+
+/// Removes the border around window with `tracking_hwnd` if it exists
+pub fn delete_border(tracking_hwnd: isize) {
+    std::thread::spawn(move || {
+        let id = {
+            WINDOWS_BORDERS
+                .lock()
+                .get(&tracking_hwnd)
+                .cloned()
+                .unwrap_or_default()
+        };
+
+        let mut borders = BORDER_STATE.lock();
+        let mut windows_borders = WINDOWS_BORDERS.lock();
+
+        if let Err(error) = remove_border(&id, &mut borders, &mut windows_borders) {
+            tracing::error!("Failed to delete border: {}", error);
+        }
+    });
+}
+
+/// Shows the border around window with `tracking_hwnd` if it exists
+pub fn show_border(tracking_hwnd: isize) {
+    std::thread::spawn(move || {
+        if let Some(border_info) = window_border(tracking_hwnd) {
+            WindowsApi::restore_window(border_info.border_hwnd);
+        }
+    });
+}
+
+/// Hides the border around window with `tracking_hwnd` if it exists, unless the border kind is a
+/// `Stack` border.
+pub fn hide_border(tracking_hwnd: isize) {
+    std::thread::spawn(move || {
+        if let Some(border_info) = window_border(tracking_hwnd) {
+            WindowsApi::hide_window(border_info.border_hwnd);
+        }
+    });
+}
+
+#[derive(Debug, Copy, Clone, Display, Serialize, Deserialize, PartialEq)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum ZOrder {
    Top,
    NoTopMost,
--- a/komorebi/src/com/interfaces.rs
+++ b/komorebi/src/com/interfaces.rs
@@ -13,11 +13,11 @@ use windows::core::HRESULT;
 use windows::core::HSTRING;
 use windows::core::PCWSTR;
 use windows::core::PWSTR;
-use windows::Win32::Foundation::BOOL;
 use windows::Win32::Foundation::HWND;
 use windows::Win32::Foundation::RECT;
 use windows::Win32::Foundation::SIZE;
 use windows::Win32::UI::Shell::Common::IObjectArray;
+use windows_core::BOOL;

 type DesktopID = GUID;

--- a/komorebi/src/container.rs
+++ b/komorebi/src/container.rs
@@ -2,14 +2,14 @@ use std::collections::VecDeque;

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

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

-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Getters, JsonSchema)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Getters)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Container {
    #[getset(get = "pub")]
    id: String,
@@ -52,13 +52,17 @@ impl Container {
        }
    }

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

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

-        idx
+        None
    }

    pub fn remove_window_by_idx(&mut self, idx: usize) -> Option<Window> {
@@ -137,3 +140,114 @@ impl Container {
        self.windows.focus(idx);
    }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_contains_window() {
+        let mut container = Container::default();
+
+        for i in 0..3 {
+            container.add_window(Window::from(i));
+        }
+
+        // Should return true for existing windows
+        assert!(container.contains_window(1));
+        assert_eq!(container.idx_for_window(1), Some(1));
+
+        // Should return false since window 4 doesn't exist
+        assert!(!container.contains_window(4));
+        assert_eq!(container.idx_for_window(4), None);
+    }
+
+    #[test]
+    fn test_remove_window_by_idx() {
+        let mut container = Container::default();
+
+        for i in 0..3 {
+            container.add_window(Window::from(i));
+        }
+
+        // Remove window 1
+        container.remove_window_by_idx(1);
+
+        // Should only have 2 windows left
+        assert_eq!(container.windows().len(), 2);
+
+        // Should return false since window 1 was removed
+        assert!(!container.contains_window(1));
+    }
+
+    #[test]
+    fn test_remove_focused_window() {
+        let mut container = Container::default();
+
+        for i in 0..3 {
+            container.add_window(Window::from(i));
+        }
+
+        // Should be focused on the last created window
+        assert_eq!(container.focused_window_idx(), 2);
+
+        // Remove the focused window
+        container.remove_focused_window();
+
+        // Should be focused on the window before the removed one
+        assert_eq!(container.focused_window_idx(), 1);
+
+        // Should only have 2 windows left
+        assert_eq!(container.windows().len(), 2);
+    }
+
+    #[test]
+    fn test_add_window() {
+        let mut container = Container::default();
+
+        container.add_window(Window::from(1));
+
+        assert_eq!(container.windows().len(), 1);
+        assert_eq!(container.focused_window_idx(), 0);
+        assert!(container.contains_window(1));
+    }
+
+    #[test]
+    fn test_focus_window() {
+        let mut container = Container::default();
+
+        for i in 0..3 {
+            container.add_window(Window::from(i));
+        }
+
+        // Should focus on the last created window
+        assert_eq!(container.focused_window_idx(), 2);
+
+        // focus on the window at index 1
+        container.focus_window(1);
+
+        // Should be focused on window 1
+        assert_eq!(container.focused_window_idx(), 1);
+
+        // focus on the window at index 0
+        container.focus_window(0);
+
+        // Should be focused on window 0
+        assert_eq!(container.focused_window_idx(), 0);
+    }
+
+    #[test]
+    fn test_idx_for_window() {
+        let mut container = Container::default();
+
+        for i in 0..3 {
+            container.add_window(Window::from(i));
+        }
+
+        // Should return the index of the window
+        assert_eq!(container.idx_for_window(1), Some(1));
+
+        // Should return None since window 4 doesn't exist
+        assert_eq!(container.idx_for_window(4), None);
+    }
+}
--- a/komorebi/src/core/animation.rs
+++ b/komorebi/src/core/animation.rs
@@ -1,13 +1,12 @@
 use clap::ValueEnum;
-use schemars::JsonSchema;
+
 use serde::Deserialize;
 use serde::Serialize;
 use strum::Display;
 use strum::EnumString;

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

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

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

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

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

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

 use super::ApplicationIdentifier;

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

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

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

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

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

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

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

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

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

 use super::Rect;

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

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

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

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

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

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

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

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

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

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

-#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, PartialEq)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum Layout {
    Default(DefaultLayout),
    Custom(CustomLayout),
--- a/komorebi/src/core/mod.rs
+++ b/komorebi/src/core/mod.rs
@@ -1,14 +1,11 @@
 #![warn(clippy::all)]
 #![allow(clippy::missing_errors_doc, clippy::use_self, clippy::doc_markdown)]

-use std::path::Path;
 use std::path::PathBuf;
 use std::str::FromStr;

 use clap::ValueEnum;
-use color_eyre::eyre::anyhow;
 use color_eyre::Result;
-use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use strum::Display;
@@ -19,13 +16,20 @@ use crate::KomorebiTheme;
 pub use animation::AnimationStyle;
 pub use arrangement::Arrangement;
 pub use arrangement::Axis;
+pub use custom_layout::Column;
+pub use custom_layout::ColumnSplit;
+pub use custom_layout::ColumnSplitWithCapacity;
+pub use custom_layout::ColumnWidth;
 pub use custom_layout::CustomLayout;
 pub use cycle_direction::CycleDirection;
 pub use default_layout::DefaultLayout;
 pub use direction::Direction;
 pub use layout::Layout;
 pub use operation_direction::OperationDirection;
+pub use pathext::replace_env_in_path;
+pub use pathext::resolve_option_hashmap_usize_path;
 pub use pathext::PathExt;
+pub use pathext::ResolvedPathBuf;
 pub use rect::Rect;

 pub mod animation;
@@ -41,7 +45,10 @@ pub mod operation_direction;
 pub mod pathext;
 pub mod rect;

-#[derive(Clone, Debug, Serialize, Deserialize, Display, JsonSchema)]
+// serde_as must be before derive
+#[serde_with::serde_as]
+#[derive(Clone, Debug, Serialize, Deserialize, Display)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 #[serde(tag = "type", content = "content")]
 pub enum SocketMessage {
    // Window / Container Commands
@@ -58,6 +65,8 @@ pub enum SocketMessage {
    UnstackAll,
    ResizeWindowEdge(OperationDirection, Sizing),
    ResizeWindowAxis(Axis, Sizing),
+    MoveContainerToLastWorkspace,
+    SendContainerToLastWorkspace,
    MoveContainerToMonitorNumber(usize),
    CycleMoveContainerToMonitor(CycleDirection),
    MoveContainerToWorkspaceNumber(usize),
@@ -80,6 +89,9 @@ pub enum SocketMessage {
    PromoteFocus,
    PromoteWindow(OperationDirection),
    EagerFocus(String),
+    LockMonitorWorkspaceContainer(usize, usize, usize),
+    UnlockMonitorWorkspaceContainer(usize, usize, usize),
+    ToggleLock,
    ToggleFloat,
    ToggleMonocle,
    ToggleMaximize,
@@ -96,7 +108,7 @@ pub enum SocketMessage {
    AdjustWorkspacePadding(Sizing, i32),
    ChangeLayout(DefaultLayout),
    CycleLayout(CycleDirection),
-    ChangeLayoutCustom(PathBuf),
+    ChangeLayoutCustom(#[serde_as(as = "ResolvedPathBuf")] PathBuf),
    FlipLayout(Axis),
    ToggleWorkspaceWindowContainerBehaviour,
    ToggleWorkspaceFloatOverride,
@@ -114,11 +126,13 @@ pub enum SocketMessage {
    RetileWithResizeDimensions,
    QuickSave,
    QuickLoad,
-    Save(PathBuf),
-    Load(PathBuf),
+    Save(#[serde_as(as = "ResolvedPathBuf")] PathBuf),
+    Load(#[serde_as(as = "ResolvedPathBuf")] PathBuf),
    CycleFocusMonitor(CycleDirection),
    CycleFocusWorkspace(CycleDirection),
+    CycleFocusEmptyWorkspace(CycleDirection),
    FocusMonitorNumber(usize),
+    FocusMonitorAtCursor,
    FocusLastWorkspace,
    CloseWorkspace,
    FocusWorkspaceNumber(usize),
@@ -136,22 +150,28 @@ pub enum SocketMessage {
    WorkspaceName(usize, usize, String),
    WorkspaceLayout(usize, usize, DefaultLayout),
    NamedWorkspaceLayout(String, DefaultLayout),
-    WorkspaceLayoutCustom(usize, usize, PathBuf),
-    NamedWorkspaceLayoutCustom(String, PathBuf),
+    WorkspaceLayoutCustom(usize, usize, #[serde_as(as = "ResolvedPathBuf")] PathBuf),
+    NamedWorkspaceLayoutCustom(String, #[serde_as(as = "ResolvedPathBuf")] PathBuf),
    WorkspaceLayoutRule(usize, usize, usize, DefaultLayout),
    NamedWorkspaceLayoutRule(String, usize, DefaultLayout),
-    WorkspaceLayoutCustomRule(usize, usize, usize, PathBuf),
-    NamedWorkspaceLayoutCustomRule(String, usize, PathBuf),
+    WorkspaceLayoutCustomRule(
+        usize,
+        usize,
+        usize,
+        #[serde_as(as = "ResolvedPathBuf")] PathBuf,
+    ),
+    NamedWorkspaceLayoutCustomRule(String, usize, #[serde_as(as = "ResolvedPathBuf")] PathBuf),
    ClearWorkspaceLayoutRules(usize, usize),
    ClearNamedWorkspaceLayoutRules(String),
+    ToggleWorkspaceLayer,
    // Configuration
    ReloadConfiguration,
-    ReplaceConfiguration(PathBuf),
-    ReloadStaticConfiguration(PathBuf),
+    ReplaceConfiguration(#[serde_as(as = "ResolvedPathBuf")] PathBuf),
+    ReloadStaticConfiguration(#[serde_as(as = "ResolvedPathBuf")] PathBuf),
    WatchConfiguration(bool),
    CompleteConfiguration,
    AltFocusHack(bool),
-    Theme(KomorebiTheme),
+    Theme(Box<KomorebiTheme>),
    Animation(bool, Option<AnimationPrefix>),
    AnimationDuration(u64, Option<AnimationPrefix>),
    AnimationFps(u64),
@@ -180,6 +200,7 @@ pub enum SocketMessage {
    StackbarFontFamily(Option<String>),
    WorkAreaOffset(Rect),
    MonitorWorkAreaOffset(usize, Rect),
+    ToggleWindowBasedWorkAreaOffset,
    ResizeDelta(i32),
    InitialWorkspaceRule(ApplicationIdentifier, String, usize, usize),
    InitialNamedWorkspaceRule(ApplicationIdentifier, String, String),
@@ -189,6 +210,9 @@ pub enum SocketMessage {
    ClearNamedWorkspaceRules(String),
    ClearAllWorkspaceRules,
    EnforceWorkspaceRules,
+    SessionFloatRule,
+    SessionFloatRules,
+    ClearSessionFloatRules,
    #[serde(alias = "FloatRule")]
    IgnoreRule(ApplicationIdentifier, String),
    ManageRule(ApplicationIdentifier, String),
@@ -234,24 +258,23 @@ impl FromStr for SocketMessage {
    }
 }

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

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

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

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

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

-#[derive(
-    Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum StateQuery {
    FocusedMonitorIndex,
    FocusedWorkspaceIndex,
    FocusedContainerIndex,
    FocusedWindowIndex,
    FocusedWorkspaceName,
+    FocusedWorkspaceLayout,
+    Version,
 }

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

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

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

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

 #[derive(
-    Clone,
-    Copy,
-    Debug,
-    PartialEq,
-    Serialize,
-    Deserialize,
-    Display,
-    EnumString,
-    ValueEnum,
-    JsonSchema,
+    Clone, Copy, Debug, Default, Serialize, Deserialize, Display, EnumString, ValueEnum, PartialEq,
 )]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+pub enum FloatingLayerBehaviour {
+    /// Tile new windows (unless they match a float rule)
+    #[default]
+    Tile,
+    /// Float new windows
+    Float,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize, Display, EnumString, ValueEnum)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum MoveBehaviour {
    /// Swap the window container with the window container at the edge of the adjacent monitor
    Swap,
@@ -430,9 +414,8 @@ pub enum MoveBehaviour {
    NoOp,
 }

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

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

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

-#[derive(
-    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum Sizing {
    Increase,
    Decrease,
@@ -495,45 +466,28 @@ impl Sizing {
    }
 }

-pub fn resolve_home_path<P: AsRef<Path>>(path: P) -> Result<PathBuf> {
-    let mut resolved_path = PathBuf::new();
-    let mut resolved = false;
-    for c in path.as_ref().components() {
-        match c {
-            std::path::Component::Normal(c)
-                if (c == "~" || c == "$Env:USERPROFILE" || c == "$HOME") && !resolved =>
-            {
-                let home = dirs::home_dir().ok_or_else(|| anyhow!("there is no home directory"))?;
+#[cfg(test)]
+mod tests {
+    use super::*;

-                resolved_path.extend(home.components());
-                resolved = true;
-            }
+    #[test]
+    fn deserializes() {
+        // Set a variable for testing
+        std::env::set_var("VAR", "VALUE");

-            std::path::Component::Normal(c) if (c == "$Env:KOMOREBI_CONFIG_HOME") && !resolved => {
-                let komorebi_config_home =
-                    PathBuf::from(std::env::var("KOMOREBI_CONFIG_HOME").ok().ok_or_else(|| {
-                        anyhow!("there is no KOMOREBI_CONFIG_HOME environment variable set")
-                    })?);
+        let json = r#"{"type":"WorkspaceLayoutCustomRule","content":[0,0,0,"/path/%VAR%/d"]}"#;
+        let message: SocketMessage = serde_json::from_str(json).unwrap();

-                resolved_path.extend(komorebi_config_home.components());
-                resolved = true;
-            }
+        let SocketMessage::WorkspaceLayoutCustomRule(
+            _workspace_index,
+            _workspace_number,
+            _monitor_index,
+            path,
+        ) = message
+        else {
+            panic!("Expected WorkspaceLayoutCustomRule");
+        };

-            _ => resolved_path.push(c),
-        }
+        assert_eq!(path, PathBuf::from("/path/VALUE/d"));
    }
-
-    let parent = resolved_path
-        .parent()
-        .ok_or_else(|| anyhow!("cannot parse parent directory"))?;
-
-    Ok(if parent.is_dir() {
-        let file = resolved_path
-            .components()
-            .last()
-            .ok_or_else(|| anyhow!("cannot parse filename"))?;
-        dunce::canonicalize(parent)?.join(file)
-    } else {
-        resolved_path
-    })
 }
--- a/komorebi/src/core/operation_direction.rs
+++ b/komorebi/src/core/operation_direction.rs
@@ -1,7 +1,6 @@
 use std::num::NonZeroUsize;

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

-#[derive(
-    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum OperationDirection {
    Left,
    Right,
--- a/komorebi/src/core/pathext.rs
+++ b/komorebi/src/core/pathext.rs
@@ -1,48 +1,192 @@
+use std::collections::HashMap;
 use std::env;
+use std::ffi::OsStr;
 use std::path::Component;
+use std::path::Path;
 use std::path::PathBuf;

+use serde::Deserialize;
+use serde::Serialize;
+
+/// Path extension trait
 pub trait PathExt {
+    /// Resolve environment variables components in a path.
+    ///
+    /// Resolves the follwing formats:
+    /// - CMD: `%variable%`
+    /// - PowerShell: `$Env:variable`
+    /// - Bash: `$variable`.
    fn replace_env(&self) -> PathBuf;
 }

-impl PathExt for PathBuf {
+/// Blanket implementation for all types that can be converted to a `Path`.
+impl<P: AsRef<Path>> PathExt for P {
    fn replace_env(&self) -> PathBuf {
-        let mut result = PathBuf::new();
+        let mut out = PathBuf::new();

-        for component in self.components() {
-            match component {
-                Component::Normal(segment) => {
-                    // Check if it starts with `$` or `$Env:`
-                    if let Some(stripped_segment) = segment.to_string_lossy().strip_prefix('$') {
-                        let var_name = if let Some(env_name) = stripped_segment.strip_prefix("Env:")
-                        {
-                            // Extract the variable name after `$Env:`
-                            env_name
-                        } else if stripped_segment == "HOME" {
-                            // Special case for `$HOME`
-                            "USERPROFILE"
-                        } else {
-                            // Extract the variable name after `$`
-                            stripped_segment
-                        };
-
-                        if let Ok(value) = env::var(var_name) {
-                            result.push(&value); // Replace with the value
-                        } else {
-                            result.push(segment); // Keep as-is if variable is not found
-                        }
-                    } else {
-                        result.push(segment); // Keep as-is if not an environment variable
+        for c in self.as_ref().components() {
+            match c {
+                Component::Normal(mut c) => {
+                    // Special case for ~ and $HOME, replace with $Env:USERPROFILE
+                    if c == OsStr::new("~") || c.eq_ignore_ascii_case("$HOME") {
+                        c = OsStr::new("$Env:USERPROFILE");
                    }
+
+                    let bytes = c.as_encoded_bytes();
+
+                    // %LOCALAPPDATA%
+                    let var = if bytes[0] == b'%' && bytes[bytes.len() - 1] == b'%' {
+                        Some(&bytes[1..bytes.len() - 1])
+                    } else {
+                        // prefix length is 5 for $Env: and 1 for $
+                        // so we take the minimum of 5 and the length of the bytes
+                        let prefix = &bytes[..5.min(bytes.len())];
+                        let prefix = unsafe { OsStr::from_encoded_bytes_unchecked(prefix) };
+
+                        // $Env:LOCALAPPDATA
+                        if prefix.eq_ignore_ascii_case("$Env:") {
+                            Some(&bytes[5..])
+                        } else if bytes[0] == b'$' {
+                            // $LOCALAPPDATA
+                            Some(&bytes[1..])
+                        } else {
+                            // not a variable
+                            None
+                        }
+                    };
+
+                    // if component is a variable, get the value from the environment
+                    if let Some(var) = var {
+                        let var = unsafe { OsStr::from_encoded_bytes_unchecked(var) };
+                        if let Some(value) = env::var_os(var) {
+                            out.push(value);
+                            continue;
+                        }
+                    }
+
+                    // if not a variable, or a value couldn't be obtained from environemnt
+                    // then push the component as is
+                    out.push(c);
                }
-                _ => {
-                    // Add other components (e.g., root, parent) as-is
-                    result.push(component.as_os_str());
-                }
+
+                // other components are pushed as is
+                _ => out.push(c),
            }
        }

-        result
+        out
+    }
+}
+
+/// Replace environment variables in a path. This is a wrapper around
+/// [`PathExt::replace_env`] to be used in Clap arguments parsing.
+pub fn replace_env_in_path(input: &str) -> Result<PathBuf, std::convert::Infallible> {
+    Ok(input.replace_env())
+}
+
+/// A wrapper around [`PathBuf`] that has a custom [Deserialize] implementation
+/// that uses [`PathExt::replace_env`] to resolve environment variables
+#[derive(Clone, Debug)]
+pub struct ResolvedPathBuf(PathBuf);
+
+impl ResolvedPathBuf {
+    /// Create a new [`ResolvedPathBuf`] from a [`PathBuf`]
+    pub fn new(path: PathBuf) -> Self {
+        Self(path.replace_env())
+    }
+}
+
+impl From<ResolvedPathBuf> for PathBuf {
+    fn from(path: ResolvedPathBuf) -> Self {
+        path.0
+    }
+}
+
+impl serde_with::SerializeAs<PathBuf> for ResolvedPathBuf {
+    fn serialize_as<S>(path: &PathBuf, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        path.serialize(serializer)
+    }
+}
+
+impl<'de> serde_with::DeserializeAs<'de, PathBuf> for ResolvedPathBuf {
+    fn deserialize_as<D>(deserializer: D) -> Result<PathBuf, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        let path = PathBuf::deserialize(deserializer)?;
+        Ok(path.replace_env())
+    }
+}
+
+#[cfg(feature = "schemars")]
+impl serde_with::schemars_0_8::JsonSchemaAs<PathBuf> for ResolvedPathBuf {
+    fn schema_name() -> String {
+        "PathBuf".to_owned()
+    }
+
+    fn json_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
+        <PathBuf as schemars::JsonSchema>::json_schema(gen)
+    }
+}
+
+/// Custom deserializer for [`Option<HashMap<usize, PathBuf>>`] that uses
+/// [`PathExt::replace_env`] to resolve environment variables in the paths.
+///
+/// This is used in `WorkspaceConfig` struct because we can't use
+/// #[serde_with::serde_as] as it doesn't handle [`Option<HashMap<usize, ResolvedPathBuf>>`]
+/// quite well and generated compiler errors that can't be fixed because of Rust's orphan rule.
+pub fn resolve_option_hashmap_usize_path<'de, D>(
+    deserializer: D,
+) -> Result<Option<HashMap<usize, PathBuf>>, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    let map = Option::<HashMap<usize, PathBuf>>::deserialize(deserializer)?;
+    Ok(map.map(|map| map.into_iter().map(|(k, v)| (k, v.replace_env())).collect()))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    // helper functions
+    fn expected<P: AsRef<Path>>(p: P) -> PathBuf {
+        // Ensure that the path is using the correct path separator for the OS.
+        p.as_ref().components().collect::<PathBuf>()
+    }
+
+    fn resolve<P: AsRef<Path>>(p: P) -> PathBuf {
+        p.replace_env()
+    }
+
+    #[test]
+    fn resolves_env_vars() {
+        // Set a variable for testing
+        std::env::set_var("VAR", "VALUE");
+
+        // %VAR% format
+        assert_eq!(resolve("/path/%VAR%/d"), expected("/path/VALUE/d"));
+        // $env:VAR format
+        assert_eq!(resolve("/path/$env:VAR/d"), expected("/path/VALUE/d"));
+        // $VAR format
+        assert_eq!(resolve("/path/$VAR/d"), expected("/path/VALUE/d"));
+
+        // non-existent variable
+        assert_eq!(resolve("/path/%ASD%/to/d"), expected("/path/%ASD%/to/d"));
+        assert_eq!(
+            resolve("/path/$env:ASD/to/d"),
+            expected("/path/$env:ASD/to/d")
+        );
+        assert_eq!(resolve("/path/$ASD/to/d"), expected("/path/$ASD/to/d"));
+
+        // Set a $env:USERPROFILE variable for testing
+        std::env::set_var("USERPROFILE", "C:\\Users\\user");
+
+        // ~ and $HOME should be replaced with $Env:USERPROFILE
+        assert_eq!(resolve("~"), expected("C:\\Users\\user"));
+        assert_eq!(resolve("$HOME"), expected("C:\\Users\\user"));
    }
 }
--- a/komorebi/src/core/rect.rs
+++ b/komorebi/src/core/rect.rs
@@ -1,9 +1,9 @@
-use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use windows::Win32::Foundation::RECT;

-#[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, Eq, PartialEq, JsonSchema)]
+#[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, Eq, PartialEq)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Rect {
    /// The left point in a Win32 Rect
    pub left: i32,
--- a/komorebi/src/lib.rs
+++ b/komorebi/src/lib.rs
@@ -5,10 +5,10 @@ pub mod border_manager;
 pub mod com;
 #[macro_use]
 pub mod ring;
-pub mod colour;
 pub mod container;
 pub mod core;
 pub mod focus_manager;
+pub mod locked_deque;
 pub mod monitor;
 pub mod monitor_reconciliator;
 pub mod process_command;
@@ -29,7 +29,6 @@ pub mod windows_callbacks;
 pub mod winevent;
 pub mod winevent_listener;
 pub mod workspace;
-pub mod workspace_reconciliator;

 use lazy_static::lazy_static;
 use monitor_reconciliator::MonitorNotification;
@@ -47,11 +46,12 @@ use std::sync::atomic::AtomicU64;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;

-pub use colour::*;
 pub use core::*;
+pub use komorebi_themes::colour::*;
 pub use process_command::*;
 pub use process_event::*;
 pub use static_config::*;
+pub use win32_display_data;
 pub use window::*;
 pub use window_manager::*;
 pub use window_manager_event::*;
@@ -65,8 +65,8 @@ use crate::core::config_generation::WorkspaceMatchingRule;
 use color_eyre::Result;
 use os_info::Version;
 use parking_lot::Mutex;
+use parking_lot::RwLock;
 use regex::Regex;
-use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use uds_windows::UnixStream;
@@ -132,8 +132,8 @@ lazy_static! {
    static ref TRANSPARENCY_BLACKLIST: Arc<Mutex<Vec<MatchingRule>>> = Arc::new(Mutex::new(Vec::new()));
    static ref MONITOR_INDEX_PREFERENCES: Arc<Mutex<HashMap<usize, Rect>>> =
        Arc::new(Mutex::new(HashMap::new()));
-    static ref DISPLAY_INDEX_PREFERENCES: Arc<Mutex<HashMap<usize, String>>> =
-        Arc::new(Mutex::new(HashMap::new()));
+    static ref DISPLAY_INDEX_PREFERENCES: Arc<RwLock<HashMap<usize, String>>> =
+        Arc::new(RwLock::new(HashMap::new()));
    static ref WORKSPACE_MATCHING_RULES: Arc<Mutex<Vec<WorkspaceMatchingRule>>> =
        Arc::new(Mutex::new(Vec::new()));
    static ref REGEX_IDENTIFIERS: Arc<Mutex<HashMap<String, Regex>>> =
@@ -158,6 +158,7 @@ lazy_static! {
            matching_strategy: Option::from(MatchingStrategy::Equals),
        })
    ]));
+    static ref SESSION_FLOATING_APPLICATIONS: Arc<Mutex<Vec<MatchingRule>>> = Arc::new(Mutex::new(Vec::new()));
    static ref FLOATING_APPLICATIONS: Arc<Mutex<Vec<MatchingRule>>> = Arc::new(Mutex::new(Vec::new()));
    static ref PERMAIGNORE_CLASSES: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![
        "Chrome_RenderWidgetHostHWND".to_string(),
@@ -173,6 +174,8 @@ lazy_static! {
            matching_strategy: Option::from(MatchingStrategy::Equals),
        }),
    ]));
+    static ref DUPLICATE_MONITOR_SERIAL_IDS: Arc<RwLock<Vec<String>>> =
+        Arc::new(RwLock::new(Vec::new()));
    static ref SUBSCRIPTION_PIPES: Arc<Mutex<HashMap<String, File>>> =
        Arc::new(Mutex::new(HashMap::new()));
    pub static ref SUBSCRIPTION_SOCKETS: Arc<Mutex<HashMap<String, PathBuf>>> =
@@ -182,18 +185,19 @@ lazy_static! {
    static ref TCP_CONNECTIONS: Arc<Mutex<HashMap<String, TcpStream>>> =
        Arc::new(Mutex::new(HashMap::new()));
    static ref HIDING_BEHAVIOUR: Arc<Mutex<HidingBehaviour>> =
-        Arc::new(Mutex::new(HidingBehaviour::Minimize));
+        Arc::new(Mutex::new(HidingBehaviour::Cloak));
    pub static ref HOME_DIR: PathBuf = {
        std::env::var("KOMOREBI_CONFIG_HOME").map_or_else(|_| dirs::home_dir().expect("there is no home directory"), |home_path| {
-            let home = PathBuf::from(&home_path);
+            let home = home_path.replace_env();

-            if home.as_path().is_dir() {
-                home
-            } else {
-                panic!(
-                    "$Env:KOMOREBI_CONFIG_HOME is set to '{home_path}', which is not a valid directory",
-                );
-            }
+            assert!(
+                home.is_dir(),
+                "$Env:KOMOREBI_CONFIG_HOME is set to '{}', which is not a valid directory",
+                home_path
+            );
+
+
+            home
        })
    };
    pub static ref DATA_DIR: PathBuf = dirs::data_local_dir().expect("there is no local data directory").join("komorebi");
@@ -236,6 +240,8 @@ pub static REMOVE_TITLEBARS: AtomicBool = AtomicBool::new(false);

 pub static SLOW_APPLICATION_COMPENSATION_TIME: AtomicU64 = AtomicU64::new(20);

+shadow_rs::shadow!(build);
+
 #[must_use]
 pub fn current_virtual_desktop() -> Option<Vec<u8>> {
    let hkcu = RegKey::predef(HKEY_CURRENT_USER);
@@ -280,7 +286,8 @@ pub fn current_virtual_desktop() -> Option<Vec<u8>> {
    current
 }

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

-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Notification {
    pub event: NotificationEvent,
    pub state: State,
--- a/komorebi/src/locked_deque.rs
+++ b/komorebi/src/locked_deque.rs
@@ -0,0 +1,316 @@
+use std::collections::BTreeSet;
+use std::collections::VecDeque;
+
+pub struct LockedDeque<'a, T> {
+    deque: &'a mut VecDeque<T>,
+    locked_indices: &'a mut BTreeSet<usize>,
+}
+
+impl<'a, T: PartialEq> LockedDeque<'a, T> {
+    pub fn new(deque: &'a mut VecDeque<T>, locked_indices: &'a mut BTreeSet<usize>) -> Self {
+        Self {
+            deque,
+            locked_indices,
+        }
+    }
+
+    pub fn insert(&mut self, index: usize, value: T) -> usize {
+        insert_respecting_locks(self.deque, self.locked_indices, index, value)
+    }
+
+    pub fn remove(&mut self, index: usize) -> Option<T> {
+        remove_respecting_locks(self.deque, self.locked_indices, index)
+    }
+}
+
+pub fn insert_respecting_locks<T>(
+    deque: &mut VecDeque<T>,
+    locked_idx: &mut BTreeSet<usize>,
+    idx: usize,
+    value: T,
+) -> usize {
+    if idx == deque.len() {
+        deque.push_back(value);
+        return idx;
+    }
+
+    let mut new_deque = VecDeque::with_capacity(deque.len() + 1);
+    let mut temp_locked_deque = VecDeque::new();
+    let mut j = 0;
+    let mut corrected_idx = idx;
+
+    for (i, el) in deque.drain(..).enumerate() {
+        if i == idx {
+            corrected_idx = j;
+        }
+        if locked_idx.contains(&i) {
+            temp_locked_deque.push_back(el);
+        } else {
+            new_deque.push_back(el);
+            j += 1;
+        }
+    }
+
+    new_deque.insert(corrected_idx, value);
+
+    for (locked_el, locked_idx) in temp_locked_deque.into_iter().zip(locked_idx.iter()) {
+        new_deque.insert(*locked_idx, locked_el);
+        if *locked_idx <= corrected_idx {
+            corrected_idx += 1;
+        }
+    }
+
+    *deque = new_deque;
+
+    corrected_idx
+}
+
+pub fn remove_respecting_locks<T>(
+    deque: &mut VecDeque<T>,
+    locked_idx: &mut BTreeSet<usize>,
+    idx: usize,
+) -> Option<T> {
+    if idx >= deque.len() {
+        return None;
+    }
+
+    let final_size = deque.len() - 1;
+
+    let mut new_deque = VecDeque::with_capacity(final_size);
+    let mut temp_locked_deque = VecDeque::new();
+    let mut removed = None;
+    let mut removed_locked_idx = None;
+
+    for (i, el) in deque.drain(..).enumerate() {
+        if i == idx {
+            removed = Some(el);
+            removed_locked_idx = locked_idx.contains(&i).then_some(i);
+        } else if locked_idx.contains(&i) {
+            temp_locked_deque.push_back(el);
+        } else {
+            new_deque.push_back(el);
+        }
+    }
+
+    if let Some(i) = removed_locked_idx {
+        let mut above = locked_idx.split_off(&i);
+        above.pop_first();
+        locked_idx.extend(above.into_iter().map(|i| i - 1));
+    }
+
+    while locked_idx.last().is_some_and(|i| *i >= final_size) {
+        locked_idx.pop_last();
+    }
+
+    let extra_invalid_idx = (new_deque.len()
+        ..(new_deque.len() + temp_locked_deque.len() - locked_idx.len()))
+        .collect::<Vec<_>>();
+
+    for (locked_el, locked_idx) in temp_locked_deque
+        .into_iter()
+        .zip(locked_idx.iter().chain(extra_invalid_idx.iter()))
+    {
+        new_deque.insert(*locked_idx, locked_el);
+    }
+
+    *deque = new_deque;
+
+    removed
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::collections::BTreeSet;
+    use std::collections::VecDeque;
+
+    #[test]
+    fn test_insert_respecting_locks() {
+        // Test case 1: Basic insertion with locked index
+        {
+            let mut deque = VecDeque::from(vec![0, 1, 2, 3, 4]);
+            let mut locked = BTreeSet::new();
+            locked.insert(2); // Lock index 2
+
+            // Insert at index 0, should shift elements while keeping index 2 locked
+            insert_respecting_locks(&mut deque, &mut locked, 0, 99);
+            assert_eq!(deque, VecDeque::from(vec![99, 0, 2, 1, 3, 4]));
+            // Element '2' remains at index 2, element '1' that was at index 1 is now at index 3
+        }
+
+        // Test case 2: Insert at a locked index
+        {
+            let mut deque = VecDeque::from(vec![0, 1, 2, 3, 4]);
+            let mut locked = BTreeSet::new();
+            locked.insert(2); // Lock index 2
+
+            // Try to insert at locked index 2, should insert at index 3 instead
+            let actual_index = insert_respecting_locks(&mut deque, &mut locked, 2, 99);
+            assert_eq!(actual_index, 3);
+            assert_eq!(deque, VecDeque::from(vec![0, 1, 2, 99, 3, 4]));
+        }
+
+        // Test case 3: Multiple locked indices
+        {
+            let mut deque = VecDeque::from(vec![0, 1, 2, 3, 4]);
+            let mut locked = BTreeSet::new();
+            locked.insert(1); // Lock index 1
+            locked.insert(3); // Lock index 3
+
+            // Insert at index 0, should maintain locked indices
+            insert_respecting_locks(&mut deque, &mut locked, 0, 99);
+            assert_eq!(deque, VecDeque::from(vec![99, 1, 0, 3, 2, 4]));
+            // Elements '1' and '3' remain at indices 1 and 3
+        }
+
+        // Test case 4: Insert at end
+        {
+            let mut deque = VecDeque::from(vec![0, 1, 2, 3, 4]);
+            let mut locked = BTreeSet::new();
+            locked.insert(2); // Lock index 2
+
+            // Insert at end of deque
+            let actual_index = insert_respecting_locks(&mut deque, &mut locked, 5, 99);
+            assert_eq!(actual_index, 5);
+            assert_eq!(deque, VecDeque::from(vec![0, 1, 2, 3, 4, 99]));
+        }
+
+        // Test case 5: Empty deque
+        {
+            let mut deque = VecDeque::new();
+            let mut locked = BTreeSet::new();
+
+            // Insert into empty deque
+            let actual_index = insert_respecting_locks(&mut deque, &mut locked, 0, 99);
+            assert_eq!(actual_index, 0);
+            assert_eq!(deque, VecDeque::from(vec![99]));
+        }
+
+        // Test case 6: All indices locked
+        {
+            let mut deque = VecDeque::from(vec![0, 1, 2, 3, 4]);
+            let mut locked = BTreeSet::new();
+            for i in 0..5 {
+                locked.insert(i); // Lock all indices
+            }
+
+            // Try to insert at index 2, should insert at the end
+            let actual_index = insert_respecting_locks(&mut deque, &mut locked, 2, 99);
+            assert_eq!(actual_index, 5);
+            assert_eq!(deque, VecDeque::from(vec![0, 1, 2, 3, 4, 99]));
+        }
+
+        // Test case 7: Consecutive locked indices
+        {
+            let mut deque = VecDeque::from(vec![0, 1, 2, 3, 4]);
+            let mut locked = BTreeSet::new();
+            locked.insert(2); // Lock index 2
+            locked.insert(3); // Lock index 3
+
+            // Insert at index 1, should maintain consecutive locked indices
+            insert_respecting_locks(&mut deque, &mut locked, 1, 99);
+            assert_eq!(deque, VecDeque::from(vec![0, 99, 2, 3, 1, 4]));
+            // Elements '2' and '3' remain at indices 2 and 3
+        }
+    }
+
+    #[test]
+    fn test_remove_respecting_locks() {
+        // Test case 1: Remove a non-locked index before a locked index
+        {
+            let mut deque = VecDeque::from(vec![0, 1, 2, 3, 4]);
+            let mut locked = BTreeSet::new();
+            locked.insert(2); // Lock index 2
+
+            let removed = remove_respecting_locks(&mut deque, &mut locked, 0);
+            assert_eq!(removed, Some(0));
+            assert_eq!(deque, VecDeque::from(vec![1, 3, 2, 4]));
+            assert!(locked.contains(&2)); // Index 2 should still be locked
+        }
+
+        // Test case 2: Remove a locked index
+        {
+            let mut deque = VecDeque::from(vec![0, 1, 2, 3, 4]);
+            let mut locked = BTreeSet::new();
+            locked.insert(2); // Lock index 2
+
+            let removed = remove_respecting_locks(&mut deque, &mut locked, 2);
+            assert_eq!(removed, Some(2));
+            assert_eq!(deque, VecDeque::from(vec![0, 1, 3, 4]));
+            assert!(!locked.contains(&2)); // Index 2 should be unlocked
+        }
+
+        // Test case 3: Remove an index after a locked index
+        {
+            let mut deque = VecDeque::from(vec![0, 1, 2, 3, 4]);
+            let mut locked = BTreeSet::new();
+            locked.insert(1); // Lock index 1
+
+            let removed = remove_respecting_locks(&mut deque, &mut locked, 3);
+            assert_eq!(removed, Some(3));
+            assert_eq!(deque, VecDeque::from(vec![0, 1, 2, 4]));
+            assert!(locked.contains(&1)); // Index 1 should still be locked
+        }
+
+        // Test case 4: Multiple locked indices
+        {
+            let mut deque = VecDeque::from(vec![0, 1, 2, 3, 4]);
+            let mut locked = BTreeSet::new();
+            locked.insert(1); // Lock index 1
+            locked.insert(3); // Lock index 3
+
+            let removed = remove_respecting_locks(&mut deque, &mut locked, 0);
+            assert_eq!(removed, Some(0));
+            assert_eq!(deque, VecDeque::from(vec![2, 1, 4, 3]));
+            assert!(locked.contains(&1) && locked.contains(&3)); // Both indices should still be locked
+        }
+
+        // Test case 5: Remove the last element
+        {
+            let mut deque = VecDeque::from(vec![0, 1, 2, 3, 4]);
+            let mut locked = BTreeSet::new();
+            locked.insert(2); // Lock index 2
+
+            let removed = remove_respecting_locks(&mut deque, &mut locked, 4);
+            assert_eq!(removed, Some(4));
+            assert_eq!(deque, VecDeque::from(vec![0, 1, 2, 3]));
+            assert!(locked.contains(&2)); // Index 2 should still be locked
+        }
+
+        // Test case 6: Invalid index
+        {
+            let mut deque = VecDeque::from(vec![0, 1, 2, 3, 4]);
+            let mut locked = BTreeSet::new();
+            locked.insert(2); // Lock index 2
+
+            let removed = remove_respecting_locks(&mut deque, &mut locked, 10);
+            assert_eq!(removed, None);
+            assert_eq!(deque, VecDeque::from(vec![0, 1, 2, 3, 4])); // Deque unchanged
+            assert!(locked.contains(&2)); // Lock unchanged
+        }
+
+        // Test case 7: Remove enough elements to make a locked index invalid
+        {
+            let mut deque = VecDeque::from(vec![0, 1, 2]);
+            let mut locked = BTreeSet::new();
+            locked.insert(2); // Lock index 2
+
+            remove_respecting_locks(&mut deque, &mut locked, 0);
+            assert_eq!(deque, VecDeque::from(vec![1, 2]));
+            assert!(!locked.contains(&2)); // Index 2 should now be invalid
+        }
+
+        // Test case 8: Removing an element before multiple locked indices
+        {
+            let mut deque = VecDeque::from(vec![0, 1, 2, 3, 4, 5]);
+            let mut locked = BTreeSet::new();
+            locked.insert(2); // Lock index 2
+            locked.insert(4); // Lock index 4
+
+            let removed = remove_respecting_locks(&mut deque, &mut locked, 1);
+            assert_eq!(removed, Some(1));
+            assert_eq!(deque, VecDeque::from(vec![0, 3, 2, 5, 4]));
+            assert!(locked.contains(&2) && locked.contains(&4)); // Both indices should still be locked
+        }
+    }
+}
--- a/komorebi/src/main.rs
+++ b/komorebi/src/main.rs
@@ -16,14 +16,17 @@ use std::sync::Arc;
 use std::time::Duration;

 use clap::Parser;
+use clap::ValueEnum;
 use color_eyre::Result;
 use crossbeam_utils::Backoff;
 use komorebi::animation::AnimationEngine;
 use komorebi::animation::ANIMATION_ENABLED_GLOBAL;
 use komorebi::animation::ANIMATION_ENABLED_PER_ANIMATION;
+use komorebi::replace_env_in_path;
 #[cfg(feature = "deadlock_detection")]
 use parking_lot::deadlock;
 use parking_lot::Mutex;
+use serde::Deserialize;
 use sysinfo::Process;
 use sysinfo::ProcessesToUpdate;
 use tracing_appender::non_blocking::WorkerGuard;
@@ -48,16 +51,13 @@ use komorebi::window_manager::State;
 use komorebi::window_manager::WindowManager;
 use komorebi::windows_api::WindowsApi;
 use komorebi::winevent_listener;
-use komorebi::workspace_reconciliator;
 use komorebi::CUSTOM_FFM;
 use komorebi::DATA_DIR;
 use komorebi::HOME_DIR;
 use komorebi::INITIAL_CONFIGURATION_LOADED;
 use komorebi::SESSION_ID;

-shadow_rs::shadow!(build);
-
-fn setup() -> Result<(WorkerGuard, WorkerGuard)> {
+fn setup(log_level: LogLevel) -> Result<(WorkerGuard, WorkerGuard)> {
    if std::env::var("RUST_LIB_BACKTRACE").is_err() {
        std::env::set_var("RUST_LIB_BACKTRACE", "1");
    }
@@ -65,7 +65,16 @@ fn setup() -> Result<(WorkerGuard, WorkerGuard)> {
    color_eyre::install()?;

    if std::env::var("RUST_LOG").is_err() {
-        std::env::set_var("RUST_LOG", "info");
+        std::env::set_var(
+            "RUST_LOG",
+            match log_level {
+                LogLevel::Error => "error",
+                LogLevel::Warn => "warn",
+                LogLevel::Info => "info",
+                LogLevel::Debug => "debug",
+                LogLevel::Trace => "trace",
+            },
+        );
    }

    let appender = tracing_appender::rolling::daily(std::env::temp_dir(), "komorebi_plaintext.log");
@@ -143,8 +152,19 @@ fn detect_deadlocks() {
    });
 }

+#[derive(Default, Deserialize, ValueEnum, Clone)]
+#[serde(rename_all = "snake_case")]
+enum LogLevel {
+    Error,
+    Warn,
+    #[default]
+    Info,
+    Debug,
+    Trace,
+}
+
 #[derive(Parser)]
-#[clap(author, about, version = build::CLAP_LONG_VERSION)]
+#[clap(author, about, version = komorebi::build::CLAP_LONG_VERSION)]
 struct Opts {
    /// Allow the use of komorebi's custom focus-follows-mouse implementation
    #[clap(short, long = "ffm")]
@@ -157,10 +177,14 @@ struct Opts {
    tcp_port: Option<usize>,
    /// Path to a static configuration JSON file
    #[clap(short, long)]
+    #[clap(value_parser = replace_env_in_path)]
    config: Option<PathBuf>,
    /// Do not attempt to auto-apply a dumped state temp file from a previously running instance of komorebi
    #[clap(long)]
    clean_state: bool,
+    /// Level of log output verbosity
+    #[clap(long, value_enum, default_value_t=LogLevel::Info)]
+    log_level: LogLevel,
 }

 #[tracing::instrument]
@@ -176,7 +200,7 @@ fn main() -> Result<()> {
    let session_id = WindowsApi::process_id_to_session_id()?;
    SESSION_ID.store(session_id, Ordering::SeqCst);

-    let mut system = sysinfo::System::new_all();
+    let mut system = sysinfo::System::new();
    system.refresh_processes(ProcessesToUpdate::All, true);

    let matched_procs: Vec<&Process> = system.processes_by_name("komorebi.exe".as_ref()).collect();
@@ -198,7 +222,7 @@ fn main() -> Result<()> {
    }

    // File logging worker guard has to have an assignment in the main fn to work
-    let (_guard, _color_guard) = setup()?;
+    let (_guard, _color_guard) = setup(opts.log_level)?;

    WindowsApi::foreground_lock_timeout()?;

@@ -235,6 +259,7 @@ fn main() -> Result<()> {
    } else {
        Arc::new(Mutex::new(WindowManager::new(
            winevent_listener::event_rx(),
+            None,
        )?))
    };

@@ -244,16 +269,10 @@ fn main() -> Result<()> {
        StaticConfig::postload(config, &wm)?;
    }

-    listen_for_commands(wm.clone());
-
    if !opts.await_configuration && !INITIAL_CONFIGURATION_LOADED.load(Ordering::SeqCst) {
        INITIAL_CONFIGURATION_LOADED.store(true, Ordering::SeqCst);
    };

-    if let Some(port) = opts.tcp_port {
-        listen_for_commands_tcp(wm.clone(), port);
-    }
-
    if static_config.is_none() {
        std::thread::spawn(|| load_configuration().expect("could not load configuration"));

@@ -268,27 +287,38 @@ fn main() -> Result<()> {
    let dumped_state = temp_dir().join("komorebi.state.json");

    if !opts.clean_state && dumped_state.is_file() {
-        let state: State = serde_json::from_str(&std::fs::read_to_string(&dumped_state)?)?;
-        wm.lock().apply_state(state);
+        if let Ok(state) = serde_json::from_str(&std::fs::read_to_string(&dumped_state)?) {
+            wm.lock().apply_state(state);
+        } else {
+            tracing::warn!(
+                "cannot apply state from {}; state struct is not up to date",
+                dumped_state.display()
+            );
+        }
    }

    wm.lock().retile_all(false)?;

+    border_manager::listen_for_notifications(wm.clone());
+    stackbar_manager::listen_for_notifications(wm.clone());
+    transparency_manager::listen_for_notifications(wm.clone());
+    monitor_reconciliator::listen_for_notifications(wm.clone())?;
+    reaper::listen_for_notifications(wm.clone(), wm.lock().known_hwnds.clone());
+    focus_manager::listen_for_notifications(wm.clone());
+    theme_manager::listen_for_notifications();
+
+    listen_for_commands(wm.clone());
+
+    if let Some(port) = opts.tcp_port {
+        listen_for_commands_tcp(wm.clone(), port);
+    }
+
    listen_for_events(wm.clone());

    if CUSTOM_FFM.load(Ordering::SeqCst) {
        listen_for_movements(wm.clone());
    }

-    border_manager::listen_for_notifications(wm.clone());
-    stackbar_manager::listen_for_notifications(wm.clone());
-    transparency_manager::listen_for_notifications(wm.clone());
-    workspace_reconciliator::listen_for_notifications(wm.clone());
-    monitor_reconciliator::listen_for_notifications(wm.clone())?;
-    reaper::watch_for_orphans(wm.clone());
-    focus_manager::listen_for_notifications(wm.clone());
-    theme_manager::listen_for_notifications();
-
    let (ctrlc_sender, ctrlc_receiver) = crossbeam_channel::bounded(1);
    ctrlc::set_handler(move || {
        ctrlc_sender
--- a/komorebi/src/monitor.rs
+++ b/komorebi/src/monitor.rs
@@ -1,5 +1,6 @@
 use std::collections::HashMap;
 use std::collections::VecDeque;
+use std::sync::atomic::Ordering;

 use color_eyre::eyre::anyhow;
 use color_eyre::eyre::bail;
@@ -8,59 +9,64 @@ use getset::CopyGetters;
 use getset::Getters;
 use getset::MutGetters;
 use getset::Setters;
-use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;

+use crate::border_manager::BORDER_ENABLED;
+use crate::border_manager::BORDER_OFFSET;
+use crate::border_manager::BORDER_WIDTH;
 use crate::core::Rect;

 use crate::container::Container;
 use crate::ring::Ring;
 use crate::workspace::Workspace;
+use crate::workspace::WorkspaceGlobals;
+use crate::workspace::WorkspaceLayer;
 use crate::DefaultLayout;
 use crate::Layout;
 use crate::OperationDirection;
+use crate::Wallpaper;
 use crate::WindowsApi;
+use crate::DEFAULT_CONTAINER_PADDING;
+use crate::DEFAULT_WORKSPACE_PADDING;

 #[derive(
-    Debug,
-    Clone,
-    Serialize,
-    Deserialize,
-    Getters,
-    CopyGetters,
-    MutGetters,
-    Setters,
-    JsonSchema,
-    PartialEq,
+    Debug, Clone, Serialize, Deserialize, Getters, CopyGetters, MutGetters, Setters, PartialEq,
 )]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Monitor {
    #[getset(get_copy = "pub", set = "pub")]
-    id: isize,
+    pub id: isize,
    #[getset(get = "pub", set = "pub")]
-    name: String,
+    pub name: String,
    #[getset(get = "pub", set = "pub")]
-    device: String,
+    pub device: String,
    #[getset(get = "pub", set = "pub")]
-    device_id: String,
+    pub device_id: String,
    #[getset(get = "pub", set = "pub")]
-    serial_number_id: Option<String>,
+    pub serial_number_id: Option<String>,
    #[getset(get = "pub", set = "pub")]
-    size: Rect,
+    pub size: Rect,
    #[getset(get = "pub", set = "pub")]
-    work_area_size: Rect,
+    pub work_area_size: Rect,
    #[getset(get_copy = "pub", set = "pub")]
-    work_area_offset: Option<Rect>,
+    pub work_area_offset: Option<Rect>,
    #[getset(get_copy = "pub", set = "pub")]
-    window_based_work_area_offset: Option<Rect>,
+    pub window_based_work_area_offset: Option<Rect>,
    #[getset(get_copy = "pub", set = "pub")]
-    window_based_work_area_offset_limit: isize,
-    workspaces: Ring<Workspace>,
+    pub window_based_work_area_offset_limit: isize,
+    pub workspaces: Ring<Workspace>,
    #[serde(skip_serializing_if = "Option::is_none")]
    #[getset(get_copy = "pub", set = "pub")]
-    last_focused_workspace: Option<usize>,
+    pub last_focused_workspace: Option<usize>,
    #[getset(get_mut = "pub")]
-    workspace_names: HashMap<usize, String>,
+    pub workspace_names: HashMap<usize, String>,
+    #[getset(get_copy = "pub", set = "pub")]
+    pub container_padding: Option<i32>,
+    #[getset(get_copy = "pub", set = "pub")]
+    pub workspace_padding: Option<i32>,
+    #[getset(get = "pub", get_mut = "pub", set = "pub")]
+    pub wallpaper: Option<Wallpaper>,
 }

 impl_ring_elements!(Monitor, Workspace);
@@ -114,10 +120,33 @@ pub fn new(
        workspaces,
        last_focused_workspace: None,
        workspace_names: HashMap::default(),
+        container_padding: None,
+        workspace_padding: None,
+        wallpaper: None,
    }
 }

 impl Monitor {
+    pub fn new(
+        id: isize,
+        size: Rect,
+        work_area_size: Rect,
+        name: String,
+        device: String,
+        device_id: String,
+        serial_number_id: Option<String>,
+    ) -> Self {
+        new(
+            id,
+            size,
+            work_area_size,
+            name,
+            device,
+            device_id,
+            serial_number_id,
+        )
+    }
+
    pub fn placeholder() -> Self {
        Self {
            id: 0,
@@ -133,6 +162,9 @@ impl Monitor {
            workspaces: Default::default(),
            last_focused_workspace: None,
            workspace_names: Default::default(),
+            container_padding: None,
+            workspace_padding: None,
+            wallpaper: None,
        }
    }

@@ -142,11 +174,23 @@ impl Monitor {
            .unwrap_or(None)
    }

+    pub fn focused_workspace_layout(&self) -> Option<Layout> {
+        self.focused_workspace().and_then(|workspace| {
+            if *workspace.tile() {
+                Some(workspace.layout().clone())
+            } else {
+                None
+            }
+        })
+    }
+
    pub fn load_focused_workspace(&mut self, mouse_follows_focus: bool) -> Result<()> {
        let focused_idx = self.focused_workspace_idx();
+        let hmonitor = self.id();
+        let monitor_wp = self.wallpaper.clone();
        for (i, workspace) in self.workspaces_mut().iter_mut().enumerate() {
            if i == focused_idx {
-                workspace.restore(mouse_follows_focus)?;
+                workspace.restore(mouse_follows_focus, hmonitor, &monitor_wp)?;
            } else {
                workspace.hide(None);
            }
@@ -155,6 +199,80 @@ impl Monitor {
        Ok(())
    }

+    /// Updates the `globals` field of all workspaces
+    pub fn update_workspaces_globals(&mut self, offset: Option<Rect>) {
+        let container_padding = self
+            .container_padding()
+            .or(Some(DEFAULT_CONTAINER_PADDING.load(Ordering::SeqCst)));
+        let workspace_padding = self
+            .workspace_padding()
+            .or(Some(DEFAULT_WORKSPACE_PADDING.load(Ordering::SeqCst)));
+        let (border_width, border_offset) = {
+            let border_enabled = BORDER_ENABLED.load(Ordering::SeqCst);
+            if border_enabled {
+                let border_width = BORDER_WIDTH.load(Ordering::SeqCst);
+                let border_offset = BORDER_OFFSET.load(Ordering::SeqCst);
+                (border_width, border_offset)
+            } else {
+                (0, 0)
+            }
+        };
+        let work_area = *self.work_area_size();
+        let work_area_offset = self.work_area_offset.or(offset);
+        let window_based_work_area_offset = self.window_based_work_area_offset();
+        let window_based_work_area_offset_limit = self.window_based_work_area_offset_limit();
+
+        for workspace in self.workspaces_mut() {
+            workspace.globals = WorkspaceGlobals {
+                container_padding,
+                workspace_padding,
+                border_width,
+                border_offset,
+                work_area,
+                work_area_offset,
+                window_based_work_area_offset,
+                window_based_work_area_offset_limit,
+            }
+        }
+    }
+
+    /// Updates the `globals` field of workspace with index `workspace_idx`
+    pub fn update_workspace_globals(&mut self, workspace_idx: usize, offset: Option<Rect>) {
+        let container_padding = self
+            .container_padding()
+            .or(Some(DEFAULT_CONTAINER_PADDING.load(Ordering::SeqCst)));
+        let workspace_padding = self
+            .workspace_padding()
+            .or(Some(DEFAULT_WORKSPACE_PADDING.load(Ordering::SeqCst)));
+        let (border_width, border_offset) = {
+            let border_enabled = BORDER_ENABLED.load(Ordering::SeqCst);
+            if border_enabled {
+                let border_width = BORDER_WIDTH.load(Ordering::SeqCst);
+                let border_offset = BORDER_OFFSET.load(Ordering::SeqCst);
+                (border_width, border_offset)
+            } else {
+                (0, 0)
+            }
+        };
+        let work_area = *self.work_area_size();
+        let work_area_offset = self.work_area_offset.or(offset);
+        let window_based_work_area_offset = self.window_based_work_area_offset();
+        let window_based_work_area_offset_limit = self.window_based_work_area_offset_limit();
+
+        if let Some(workspace) = self.workspaces_mut().get_mut(workspace_idx) {
+            workspace.globals = WorkspaceGlobals {
+                container_padding,
+                workspace_padding,
+                border_width,
+                border_offset,
+                work_area,
+                work_area_offset,
+                window_based_work_area_offset,
+                window_based_work_area_offset_limit,
+            }
+        }
+    }
+
    pub fn add_container(
        &mut self,
        container: Container,
@@ -301,19 +419,20 @@ impl Monitor {
            .position(|w| w.hwnd == foreground_hwnd);

        if let Some(idx) = floating_window_index {
-            let window = workspace.floating_windows_mut().remove(idx);
+            if let Some(window) = workspace.floating_windows_mut().remove(idx) {
+                let workspaces = self.workspaces_mut();
+                #[allow(clippy::option_if_let_else)]
+                let target_workspace = match workspaces.get_mut(target_workspace_idx) {
+                    None => {
+                        workspaces.resize(target_workspace_idx + 1, Workspace::default());
+                        workspaces.get_mut(target_workspace_idx).unwrap()
+                    }
+                    Some(workspace) => workspace,
+                };

-            let workspaces = self.workspaces_mut();
-            #[allow(clippy::option_if_let_else)]
-            let target_workspace = match workspaces.get_mut(target_workspace_idx) {
-                None => {
-                    workspaces.resize(target_workspace_idx + 1, Workspace::default());
-                    workspaces.get_mut(target_workspace_idx).unwrap()
-                }
-                Some(workspace) => workspace,
-            };
-
-            target_workspace.floating_windows_mut().push(window);
+                target_workspace.floating_windows_mut().push_back(window);
+                target_workspace.set_layer(WorkspaceLayer::Floating);
+            }
        } else {
            let container = workspace
                .remove_focused_container()
@@ -330,6 +449,8 @@ impl Monitor {
                Some(workspace) => workspace,
            };

+            target_workspace.set_layer(WorkspaceLayer::Tiling);
+
            if let Some(direction) = direction {
                self.add_container_with_direction(
                    container,
@@ -381,22 +502,267 @@ impl Monitor {
    }

    pub fn update_focused_workspace(&mut self, offset: Option<Rect>) -> Result<()> {
-        let work_area = *self.work_area_size();
-        let window_based_work_area_offset = (
-            self.window_based_work_area_offset_limit(),
-            self.window_based_work_area_offset(),
-        );
-
        let offset = if self.work_area_offset().is_some() {
            self.work_area_offset()
        } else {
            offset
        };

+        let focused_workspace_idx = self.focused_workspace_idx();
+        self.update_workspace_globals(focused_workspace_idx, offset);
        self.focused_workspace_mut()
            .ok_or_else(|| anyhow!("there is no workspace"))?
-            .update(&work_area, offset, window_based_work_area_offset)?;
+            .update()?;

        Ok(())
    }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_add_container() {
+        let mut m = Monitor::new(
+            0,
+            Rect::default(),
+            Rect::default(),
+            "TestMonitor".to_string(),
+            "TestDevice".to_string(),
+            "TestDeviceID".to_string(),
+            Some("TestMonitorID".to_string()),
+        );
+
+        // Add container to the default workspace
+        m.add_container(Container::default(), Some(0)).unwrap();
+
+        // Should contain a container in the current focused workspace
+        let workspace = m.focused_workspace_mut().unwrap();
+        assert_eq!(workspace.containers().len(), 1);
+    }
+
+    #[test]
+    fn test_remove_workspace_by_idx() {
+        let mut m = Monitor::new(
+            0,
+            Rect::default(),
+            Rect::default(),
+            "TestMonitor".to_string(),
+            "TestDevice".to_string(),
+            "TestDeviceID".to_string(),
+            Some("TestMonitorID".to_string()),
+        );
+
+        let new_workspace_index = m.new_workspace_idx();
+        assert_eq!(new_workspace_index, 1);
+
+        // Create workspace 2
+        m.focus_workspace(new_workspace_index).unwrap();
+
+        // Should have 2 workspaces
+        assert_eq!(m.workspaces().len(), 2);
+
+        // Create workspace 3
+        m.focus_workspace(new_workspace_index + 1).unwrap();
+
+        // Should have 3 workspaces
+        assert_eq!(m.workspaces().len(), 3);
+
+        // Remove workspace 1
+        m.remove_workspace_by_idx(1);
+
+        // Should have only 2 workspaces
+        assert_eq!(m.workspaces().len(), 2);
+    }
+
+    #[test]
+    fn test_remove_workspaces() {
+        let mut m = Monitor::new(
+            0,
+            Rect::default(),
+            Rect::default(),
+            "TestMonitor".to_string(),
+            "TestDevice".to_string(),
+            "TestDeviceID".to_string(),
+            Some("TestMonitorID".to_string()),
+        );
+
+        let new_workspace_index = m.new_workspace_idx();
+        assert_eq!(new_workspace_index, 1);
+
+        // Create workspace 2
+        m.focus_workspace(new_workspace_index).unwrap();
+
+        // Should have 2 workspaces
+        assert_eq!(m.workspaces().len(), 2);
+
+        // Create workspace 3
+        m.focus_workspace(new_workspace_index + 1).unwrap();
+
+        // Should have 3 workspaces
+        assert_eq!(m.workspaces().len(), 3);
+
+        // Remove all workspaces
+        m.remove_workspaces();
+
+        // All workspaces should be removed
+        assert_eq!(m.workspaces().len(), 0);
+    }
+
+    #[test]
+    fn test_focus_workspace() {
+        let mut m = Monitor::new(
+            0,
+            Rect::default(),
+            Rect::default(),
+            "TestMonitor".to_string(),
+            "TestDevice".to_string(),
+            "TestDeviceID".to_string(),
+            Some("TestMonitorID".to_string()),
+        );
+
+        let new_workspace_index = m.new_workspace_idx();
+        assert_eq!(new_workspace_index, 1);
+
+        // Focus workspace 2
+        m.focus_workspace(new_workspace_index).unwrap();
+
+        // Should have 2 workspaces
+        assert_eq!(m.workspaces().len(), 2);
+
+        // Should be focused on workspace 2
+        assert_eq!(m.focused_workspace_idx(), 1);
+    }
+
+    #[test]
+    fn test_new_workspace_idx() {
+        let m = Monitor::new(
+            0,
+            Rect::default(),
+            Rect::default(),
+            "TestMonitor".to_string(),
+            "TestDevice".to_string(),
+            "TestDeviceID".to_string(),
+            Some("TestMonitorID".to_string()),
+        );
+
+        let new_workspace_index = m.new_workspace_idx();
+
+        // Should be the last workspace index: 1
+        assert_eq!(new_workspace_index, 1);
+    }
+
+    #[test]
+    fn test_move_container_to_workspace() {
+        let mut m = Monitor::new(
+            0,
+            Rect::default(),
+            Rect::default(),
+            "TestMonitor".to_string(),
+            "TestDevice".to_string(),
+            "TestDeviceID".to_string(),
+            Some("TestMonitorID".to_string()),
+        );
+
+        let new_workspace_index = m.new_workspace_idx();
+        assert_eq!(new_workspace_index, 1);
+
+        {
+            // Create workspace 1 and add 3 containers
+            let workspace = m.focused_workspace_mut().unwrap();
+            for _ in 0..3 {
+                let container = Container::default();
+                workspace.add_container_to_back(container);
+            }
+
+            // Should have 3 containers in workspace 1
+            assert_eq!(m.focused_workspace().unwrap().containers().len(), 3);
+        }
+
+        // Create and focus workspace 2
+        m.focus_workspace(new_workspace_index).unwrap();
+
+        // Focus workspace 1
+        m.focus_workspace(0).unwrap();
+
+        // Move container to workspace 2
+        m.move_container_to_workspace(1, true, None).unwrap();
+
+        // Should be focused on workspace 2
+        assert_eq!(m.focused_workspace_idx(), 1);
+
+        // Workspace 2 should have 1 container now
+        assert_eq!(m.focused_workspace().unwrap().containers().len(), 1);
+
+        // Move to workspace 1
+        m.focus_workspace(0).unwrap();
+
+        // Workspace 1 should have 2 containers
+        assert_eq!(m.focused_workspace().unwrap().containers().len(), 2);
+
+        // Move a another container from workspace 1 to workspace 2 without following
+        m.move_container_to_workspace(1, false, None).unwrap();
+
+        // Should have 1 container
+        assert_eq!(m.focused_workspace().unwrap().containers().len(), 1);
+
+        // Should still be focused on workspace 1
+        assert_eq!(m.focused_workspace_idx(), 0);
+
+        // Switch to workspace 2
+        m.focus_workspace(1).unwrap();
+
+        // Workspace 2 should now have 2 containers
+        assert_eq!(m.focused_workspace().unwrap().containers().len(), 2);
+    }
+
+    #[test]
+    fn test_ensure_workspace_count_workspace_contains_two_workspaces() {
+        let mut m = Monitor::new(
+            0,
+            Rect::default(),
+            Rect::default(),
+            "TestMonitor".to_string(),
+            "TestDevice".to_string(),
+            "TestDeviceID".to_string(),
+            Some("TestMonitorID".to_string()),
+        );
+
+        // Create and focus another workspace
+        let new_workspace_index = m.new_workspace_idx();
+        m.focus_workspace(new_workspace_index).unwrap();
+
+        // Should have 2 workspaces now
+        assert_eq!(m.workspaces().len(), 2, "Monitor should have 2 workspaces");
+
+        // Ensure the monitor has at least 5 workspaces
+        m.ensure_workspace_count(5);
+
+        // Monitor should have 5 workspaces
+        assert_eq!(m.workspaces().len(), 5, "Monitor should have 5 workspaces");
+    }
+
+    #[test]
+    fn test_ensure_workspace_count_only_default_workspace() {
+        let mut m = Monitor::new(
+            0,
+            Rect::default(),
+            Rect::default(),
+            "TestMonitor".to_string(),
+            "TestDevice".to_string(),
+            "TestDeviceID".to_string(),
+            Some("TestMonitorID".to_string()),
+        );
+
+        // Ensure the monitor has at least 5 workspaces
+        m.ensure_workspace_count(5);
+
+        // Monitor should have 5 workspaces
+        assert_eq!(m.workspaces().len(), 5, "Monitor should have 5 workspaces");
+
+        // Try to call the ensure workspace count again to ensure it doesn't change
+        m.ensure_workspace_count(3);
+        assert_eq!(m.workspaces().len(), 5, "Monitor should have 5 workspaces");
+    }
+}
--- a/komorebi/src/monitor_reconciliator/hidden.rs
+++ b/komorebi/src/monitor_reconciliator/hidden.rs
@@ -2,21 +2,33 @@ use std::sync::mpsc;
 use std::time::Duration;

 use windows::core::PCWSTR;
+use windows::Win32::Devices::Display::GUID_DEVINTERFACE_DISPLAY_ADAPTER;
+use windows::Win32::Devices::Display::GUID_DEVINTERFACE_MONITOR;
+use windows::Win32::Devices::Display::GUID_DEVINTERFACE_VIDEO_OUTPUT_ARRIVAL;
 use windows::Win32::Foundation::HWND;
 use windows::Win32::Foundation::LPARAM;
 use windows::Win32::Foundation::LRESULT;
 use windows::Win32::Foundation::WPARAM;
+use windows::Win32::System::Power::POWERBROADCAST_SETTING;
+use windows::Win32::System::SystemServices::GUID_LIDSWITCH_STATE_CHANGE;
 use windows::Win32::UI::WindowsAndMessaging::DefWindowProcW;
 use windows::Win32::UI::WindowsAndMessaging::DispatchMessageW;
 use windows::Win32::UI::WindowsAndMessaging::GetMessageW;
 use windows::Win32::UI::WindowsAndMessaging::TranslateMessage;
 use windows::Win32::UI::WindowsAndMessaging::CS_HREDRAW;
 use windows::Win32::UI::WindowsAndMessaging::CS_VREDRAW;
+use windows::Win32::UI::WindowsAndMessaging::DBT_CONFIGCHANGED;
+use windows::Win32::UI::WindowsAndMessaging::DBT_DEVICEARRIVAL;
+use windows::Win32::UI::WindowsAndMessaging::DBT_DEVICEREMOVECOMPLETE;
 use windows::Win32::UI::WindowsAndMessaging::DBT_DEVNODES_CHANGED;
+use windows::Win32::UI::WindowsAndMessaging::DBT_DEVTYP_DEVICEINTERFACE;
+use windows::Win32::UI::WindowsAndMessaging::DEV_BROADCAST_DEVICEINTERFACE_W;
 use windows::Win32::UI::WindowsAndMessaging::MSG;
 use windows::Win32::UI::WindowsAndMessaging::PBT_APMRESUMEAUTOMATIC;
 use windows::Win32::UI::WindowsAndMessaging::PBT_APMRESUMESUSPEND;
 use windows::Win32::UI::WindowsAndMessaging::PBT_APMSUSPEND;
+use windows::Win32::UI::WindowsAndMessaging::PBT_POWERSETTINGCHANGE;
+use windows::Win32::UI::WindowsAndMessaging::REGISTER_NOTIFICATION_FLAGS;
 use windows::Win32::UI::WindowsAndMessaging::SPI_SETWORKAREA;
 use windows::Win32::UI::WindowsAndMessaging::WM_DEVICECHANGE;
 use windows::Win32::UI::WindowsAndMessaging::WM_DISPLAYCHANGE;
@@ -75,7 +87,7 @@ impl Hidden {

            loop {
                unsafe {
-                    if !GetMessageW(&mut msg, HWND::default(), 0, 0).as_bool() {
+                    if !GetMessageW(&mut msg, None, 0, 0).as_bool() {
                        tracing::debug!("hidden window event processing thread shutdown");
                        break;
                    };
@@ -92,8 +104,57 @@ impl Hidden {

        let hwnd = hwnd_receiver.recv()?;

+        // Register Session Lock/Unlock events
        WindowsApi::wts_register_session_notification(hwnd)?;

+        // Register Laptop lid open/close events
+        WindowsApi::register_power_setting_notification(
+            hwnd,
+            &GUID_LIDSWITCH_STATE_CHANGE,
+            REGISTER_NOTIFICATION_FLAGS(0),
+        )?;
+
+        // Register device interface events for multiple display related devices. Some of this
+        // device interfaces might not be needed but it doesn't hurt to have them in case some user
+        // uses some output device as monitor that falls into one of these device interface class
+        // GUID.
+        let monitor_filter = DEV_BROADCAST_DEVICEINTERFACE_W {
+            dbcc_size: std::mem::size_of::<DEV_BROADCAST_DEVICEINTERFACE_W>() as u32,
+            dbcc_devicetype: DBT_DEVTYP_DEVICEINTERFACE.0,
+            dbcc_reserved: 0,
+            dbcc_classguid: GUID_DEVINTERFACE_MONITOR,
+            dbcc_name: [0; 1],
+        };
+        let display_adapter_filter = DEV_BROADCAST_DEVICEINTERFACE_W {
+            dbcc_size: std::mem::size_of::<DEV_BROADCAST_DEVICEINTERFACE_W>() as u32,
+            dbcc_devicetype: DBT_DEVTYP_DEVICEINTERFACE.0,
+            dbcc_reserved: 0,
+            dbcc_classguid: GUID_DEVINTERFACE_DISPLAY_ADAPTER,
+            dbcc_name: [0; 1],
+        };
+        let video_output_filter = DEV_BROADCAST_DEVICEINTERFACE_W {
+            dbcc_size: std::mem::size_of::<DEV_BROADCAST_DEVICEINTERFACE_W>() as u32,
+            dbcc_devicetype: DBT_DEVTYP_DEVICEINTERFACE.0,
+            dbcc_reserved: 0,
+            dbcc_classguid: GUID_DEVINTERFACE_VIDEO_OUTPUT_ARRIVAL,
+            dbcc_name: [0; 1],
+        };
+        WindowsApi::register_device_notification(
+            hwnd,
+            monitor_filter,
+            REGISTER_NOTIFICATION_FLAGS(0),
+        )?;
+        WindowsApi::register_device_notification(
+            hwnd,
+            display_adapter_filter,
+            REGISTER_NOTIFICATION_FLAGS(0),
+        )?;
+        WindowsApi::register_device_notification(
+            hwnd,
+            video_output_filter,
+            REGISTER_NOTIFICATION_FLAGS(0),
+        )?;
+
        Ok(Self { hwnd })
    }

@@ -128,6 +189,35 @@ impl Hidden {
                            );
                            LRESULT(0)
                        }
+                        // Monitor change power status
+                        PBT_POWERSETTINGCHANGE => {
+                            if let POWERBROADCAST_SETTING {
+                                PowerSetting: GUID_LIDSWITCH_STATE_CHANGE,
+                                DataLength: _,
+                                Data: [0],
+                            } = *(lparam.0 as *const POWERBROADCAST_SETTING)
+                            {
+                                tracing::debug!(
+                                    "WM_POWERBROADCAST event received - laptop lid closed"
+                                );
+                                monitor_reconciliator::send_notification(
+                                    monitor_reconciliator::MonitorNotification::DisplayConnectionChange,
+                                );
+                            } else if let POWERBROADCAST_SETTING {
+                                PowerSetting: GUID_LIDSWITCH_STATE_CHANGE,
+                                DataLength: _,
+                                Data: [1],
+                            } = *(lparam.0 as *const POWERBROADCAST_SETTING)
+                            {
+                                tracing::debug!(
+                                    "WM_POWERBROADCAST event received - laptop lid opened"
+                                );
+                                monitor_reconciliator::send_notification(
+                                    monitor_reconciliator::MonitorNotification::DisplayConnectionChange,
+                                );
+                            }
+                            LRESULT(0)
+                        }
                        _ => LRESULT(0),
                    }
                }
@@ -188,10 +278,15 @@ impl Hidden {
                // Original idea from https://stackoverflow.com/a/33762334
                WM_DEVICECHANGE => {
                    #[allow(clippy::cast_possible_truncation)]
-                    if wparam.0 as u32 == DBT_DEVNODES_CHANGED {
+                    let event = wparam.0 as u32;
+                    if event == DBT_DEVNODES_CHANGED
+                        || event == DBT_CONFIGCHANGED
+                        || event == DBT_DEVICEARRIVAL
+                        || event == DBT_DEVICEREMOVECOMPLETE
+                    {
                        tracing::debug!(
-                                "WM_DEVICECHANGE event received with DBT_DEVNODES_CHANGED - display added or removed"
-                            );
+                            "WM_DEVICECHANGE event received with one of [DBT_DEVNODES_CHANGED, DBT_CONFIGCHANGED, DBT_DEVICEARRIVAL, DBT_DEVICEREMOVECOMPLETE] - display added or removed"
+                        );
                        monitor_reconciliator::send_notification(
                            monitor_reconciliator::MonitorNotification::DisplayConnectionChange,
                        );
--- a/komorebi/src/monitor_reconciliator/mod.rs
+++ b/komorebi/src/monitor_reconciliator/mod.rs
@@ -1,22 +1,24 @@
 #![deny(clippy::unwrap_used, clippy::expect_used)]

 use crate::border_manager;
+use crate::config_generation::WorkspaceMatchingRule;
 use crate::core::Rect;
 use crate::monitor;
 use crate::monitor::Monitor;
 use crate::monitor_reconciliator::hidden::Hidden;
 use crate::notify_subscribers;
-use crate::MonitorConfig;
 use crate::Notification;
 use crate::NotificationEvent;
 use crate::State;
 use crate::WindowManager;
 use crate::WindowsApi;
+use crate::DISPLAY_INDEX_PREFERENCES;
+use crate::DUPLICATE_MONITOR_SERIAL_IDS;
+use crate::WORKSPACE_MATCHING_RULES;
 use crossbeam_channel::Receiver;
 use crossbeam_channel::Sender;
 use crossbeam_utils::atomic::AtomicConsume;
 use parking_lot::Mutex;
-use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use std::collections::HashMap;
@@ -27,7 +29,8 @@ use std::sync::OnceLock;

 pub mod hidden;

-#[derive(Debug, Copy, Clone, Serialize, Deserialize, JsonSchema)]
+#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 #[serde(tag = "type", content = "content")]
 pub enum MonitorNotification {
    ResolutionScalingChanged,
@@ -44,10 +47,10 @@ static ACTIVE: AtomicBool = AtomicBool::new(true);
 static CHANNEL: OnceLock<(Sender<MonitorNotification>, Receiver<MonitorNotification>)> =
    OnceLock::new();

-static MONITOR_CACHE: OnceLock<Mutex<HashMap<String, MonitorConfig>>> = OnceLock::new();
+static MONITOR_CACHE: OnceLock<Mutex<HashMap<String, Monitor>>> = OnceLock::new();

 pub fn channel() -> &'static (Sender<MonitorNotification>, Receiver<MonitorNotification>) {
-    CHANNEL.get_or_init(|| crossbeam_channel::bounded(1))
+    CHANNEL.get_or_init(|| crossbeam_channel::bounded(20))
 }

 fn event_tx() -> Sender<MonitorNotification> {
@@ -64,18 +67,52 @@ pub fn send_notification(notification: MonitorNotification) {
    }
 }

-pub fn insert_in_monitor_cache(device_id: &str, config: MonitorConfig) {
+pub fn insert_in_monitor_cache(serial_or_device_id: &str, monitor: Monitor) {
+    let dip = DISPLAY_INDEX_PREFERENCES.read();
+    let mut dip_ids = dip.values();
+    let preferred_id = if dip_ids.any(|id| id == monitor.device_id()) {
+        monitor.device_id().clone()
+    } else if dip_ids.any(|id| Some(id) == monitor.serial_number_id().as_ref()) {
+        monitor.serial_number_id().clone().unwrap_or_default()
+    } else {
+        serial_or_device_id.to_string()
+    };
    let mut monitor_cache = MONITOR_CACHE
        .get_or_init(|| Mutex::new(HashMap::new()))
        .lock();

-    monitor_cache.insert(device_id.to_string(), config);
+    monitor_cache.insert(preferred_id, monitor);
 }

-pub fn attached_display_devices() -> color_eyre::Result<Vec<Monitor>> {
-    Ok(win32_display_data::connected_displays_all()
-        .flatten()
-        .map(|display| {
+pub fn attached_display_devices<F, I>(display_provider: F) -> color_eyre::Result<Vec<Monitor>>
+where
+    F: Fn() -> I + Copy,
+    I: Iterator<Item = Result<win32_display_data::Device, win32_display_data::Error>>,
+{
+    let all_displays = display_provider().flatten().collect::<Vec<_>>();
+
+    let mut serial_id_map = HashMap::new();
+
+    for d in &all_displays {
+        if let Some(id) = &d.serial_number_id {
+            *serial_id_map.entry(id.clone()).or_insert(0) += 1;
+        }
+    }
+
+    for d in &all_displays {
+        if let Some(id) = &d.serial_number_id {
+            if serial_id_map.get(id).copied().unwrap_or_default() > 1 {
+                let mut dupes = DUPLICATE_MONITOR_SERIAL_IDS.write();
+                if !dupes.contains(id) {
+                    (*dupes).push(id.clone());
+                }
+            }
+        }
+    }
+
+    Ok(all_displays
+        .into_iter()
+        .map(|mut display| {
            let path = display.device_path;

            let (device, device_id) = if path.is_empty() {
@@ -92,6 +129,13 @@ pub fn attached_display_devices() -> color_eyre::Result<Vec<Monitor>> {
            let name = display.device_name.trim_start_matches(r"\\.\").to_string();
            let name = name.split('\\').collect::<Vec<_>>()[0].to_string();

+            if let Some(id) = &display.serial_number_id {
+                let dupes = DUPLICATE_MONITOR_SERIAL_IDS.read();
+                if dupes.contains(id) {
+                    display.serial_number_id = None;
+                }
+            }
+
            monitor::new(
                display.hmonitor,
                display.size.into(),
@@ -112,7 +156,7 @@ pub fn listen_for_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Re
    tracing::info!("created hidden window to listen for monitor-related events");

    std::thread::spawn(move || loop {
-        match handle_notifications(wm.clone()) {
+        match handle_notifications(wm.clone(), win32_display_data::connected_displays_all) {
            Ok(()) => {
                tracing::warn!("restarting finished thread");
            }
@@ -129,27 +173,32 @@ pub fn listen_for_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Re
    Ok(())
 }

-pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result<()> {
+pub fn handle_notifications<F, I>(
+    wm: Arc<Mutex<WindowManager>>,
+    display_provider: F,
+) -> color_eyre::Result<()>
+where
+    F: Fn() -> I + Copy,
+    I: Iterator<Item = Result<win32_display_data::Device, win32_display_data::Error>>,
+{
    tracing::info!("listening");

    let receiver = event_rx();

    'receiver: for notification in receiver {
-        if !ACTIVE.load_consume() {
-            if matches!(
+        if !ACTIVE.load_consume()
+            && matches!(
                notification,
                MonitorNotification::ResumingFromSuspendedState
                    | MonitorNotification::SessionUnlocked
-            ) {
-                tracing::debug!(
-                    "reactivating reconciliator - system has resumed from suspended state or session has been unlocked"
-                );
+            )
+        {
+            tracing::debug!(
+                "reactivating reconciliator - system has resumed from suspended state or session has been unlocked"
+            );

-                ACTIVE.store(true, Ordering::SeqCst);
-                border_manager::send_notification(None);
-            }
-
-            continue 'receiver;
+            ACTIVE.store(true, Ordering::SeqCst);
+            border_manager::send_notification(None);
        }

        let mut wm = wm.lock();
@@ -163,10 +212,6 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                );
                ACTIVE.store(false, Ordering::SeqCst);
            }
-            MonitorNotification::ResumingFromSuspendedState
-            | MonitorNotification::SessionUnlocked => {
-                // this is only handled above if the reconciliator is paused
-            }
            MonitorNotification::WorkAreaChanged => {
                tracing::debug!("handling work area changed notification");
                let offset = wm.work_area_offset;
@@ -246,7 +291,12 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                    }
                }
            }
-            MonitorNotification::DisplayConnectionChange => {
+            // this is handled above if the reconciliator is paused but we should still check if
+            // there were any changes to the connected monitors while the system was
+            // suspended/locked.
+            MonitorNotification::ResumingFromSuspendedState
+            | MonitorNotification::SessionUnlocked
+            | MonitorNotification::DisplayConnectionChange => {
                tracing::debug!("handling display connection change notification");
                let mut monitor_cache = MONITOR_CACHE
                    .get_or_init(|| Mutex::new(HashMap::new()))
@@ -255,13 +305,24 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                let initial_monitor_count = wm.monitors().len();

                // Get the currently attached display devices
-                let attached_devices = attached_display_devices()?;
+                let attached_devices = attached_display_devices(display_provider)?;

                // Make sure that in our state any attached displays have the latest Win32 data
                for monitor in wm.monitors_mut() {
                    for attached in &attached_devices {
-                        if attached.device_id().eq(monitor.device_id()) {
+                        let serial_number_ids_match = if let (Some(attached_snid), Some(m_snid)) =
+                            (attached.serial_number_id(), monitor.serial_number_id())
+                        {
+                            attached_snid.eq(m_snid)
+                        } else {
+                            false
+                        };
+
+                        if serial_number_ids_match || attached.device_id().eq(monitor.device_id()) {
                            monitor.set_id(attached.id());
+                            monitor.set_device(attached.device().clone());
+                            monitor.set_device_id(attached.device_id().clone());
+                            monitor.set_serial_number_id(attached.serial_number_id().clone());
                            monitor.set_name(attached.name().clone());
                            monitor.set_size(*attached.size());
                            monitor.set_work_area_size(*attached.work_area_size());
@@ -271,6 +332,7 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result

                if initial_monitor_count == attached_devices.len() {
                    tracing::debug!("monitor counts match, reconciliation not required");
+                    drop(wm);
                    continue 'receiver;
                }

@@ -278,6 +340,7 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                    tracing::debug!(
                        "no devices found, skipping reconciliation to avoid breaking state"
                    );
+                    drop(wm);
                    continue 'receiver;
                }

@@ -287,41 +350,118 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                        attached_devices.len()
                    );

-                    // Gather all the containers that will be orphaned from disconnected and invalid displays
-                    let mut orphaned_containers = vec![];
+                    // Windows to remove from `known_hwnds`
+                    let mut windows_to_remove = Vec::new();

                    // Collect the ids in our state which aren't in the current attached display ids
                    // These are monitors that have been removed
                    let mut newly_removed_displays = vec![];

-                    for m in wm.monitors().iter() {
-                        if !attached_devices
-                            .iter()
-                            .any(|attached| attached.device_id().eq(m.device_id()))
-                        {
-                            newly_removed_displays.push(m.device_id().clone());
-                            for workspace in m.workspaces() {
-                                for container in workspace.containers() {
-                                    // Save the orphaned containers from the removed monitor
-                                    orphaned_containers.push(container.clone());
+                    for (m_idx, m) in wm.monitors().iter().enumerate() {
+                        if !attached_devices.iter().any(|attached| {
+                            attached.serial_number_id().eq(m.serial_number_id())
+                                || attached.device_id().eq(m.device_id())
+                        }) {
+                            let id = m
+                                .serial_number_id()
+                                .as_ref()
+                                .map_or(m.device_id().clone(), |sn| sn.clone());
+
+                            newly_removed_displays.push(id.clone());
+
+                            let focused_workspace_idx = m.focused_workspace_idx();
+
+                            for (idx, workspace) in m.workspaces().iter().enumerate() {
+                                let is_focused_workspace = idx == focused_workspace_idx;
+                                let focused_container_idx = workspace.focused_container_idx();
+                                for (c_idx, container) in workspace.containers().iter().enumerate()
+                                {
+                                    let focused_window_idx = container.focused_window_idx();
+                                    for (w_idx, window) in container.windows().iter().enumerate() {
+                                        windows_to_remove.push(window.hwnd);
+                                        if is_focused_workspace
+                                            && c_idx == focused_container_idx
+                                            && w_idx == focused_window_idx
+                                        {
+                                            // Minimize the focused window since Windows might try
+                                            // to move it to another monitor if it was focused.
+                                            if window.is_focused() {
+                                                window.minimize();
+                                            }
+                                        }
+                                    }
+                                }
+
+                                if let Some(maximized) = workspace.maximized_window() {
+                                    windows_to_remove.push(maximized.hwnd);
+                                    // Minimize the focused window since Windows might try
+                                    // to move it to another monitor if it was focused.
+                                    if maximized.is_focused() {
+                                        maximized.minimize();
+                                    }
+                                }
+
+                                if let Some(container) = workspace.monocle_container() {
+                                    for window in container.windows() {
+                                        windows_to_remove.push(window.hwnd);
+                                    }
+                                    if let Some(window) = container.focused_window() {
+                                        // Minimize the focused window since Windows might try
+                                        // to move it to another monitor if it was focused.
+                                        if window.is_focused() {
+                                            window.minimize();
+                                        }
+                                    }
+                                }
+
+                                for window in workspace.floating_windows() {
+                                    windows_to_remove.push(window.hwnd);
+                                    // Minimize the focused window since Windows might try
+                                    // to move it to another monitor if it was focused.
+                                    if window.is_focused() {
+                                        window.minimize();
+                                    }
                                }
                            }

-                            // Let's add their state to the cache for later
-                            monitor_cache.insert(m.device_id().clone(), m.into());
+                            // Remove any workspace_rules for this specific monitor
+                            let mut workspace_rules = WORKSPACE_MATCHING_RULES.lock();
+                            let mut rules_to_remove = Vec::new();
+                            for (i, rule) in workspace_rules.iter().enumerate().rev() {
+                                if rule.monitor_index == m_idx {
+                                    rules_to_remove.push(i);
+                                }
+                            }
+                            for i in rules_to_remove {
+                                workspace_rules.remove(i);
+                            }
+
+                            // Let's add their state to the cache for later, make sure to use what
+                            // the user set as preference as the id.
+                            let dip = DISPLAY_INDEX_PREFERENCES.read();
+                            let mut dip_ids = dip.values();
+                            let preferred_id = if dip_ids.any(|id| id == m.device_id()) {
+                                m.device_id().clone()
+                            } else if dip_ids.any(|id| Some(id) == m.serial_number_id().as_ref()) {
+                                m.serial_number_id().clone().unwrap_or_default()
+                            } else {
+                                id
+                            };
+                            monitor_cache.insert(preferred_id, m.clone());
                        }
                    }

-                    if !orphaned_containers.is_empty() {
-                        tracing::info!(
-                            "removed orphaned containers from: {newly_removed_displays:?}"
-                        );
-                    }
+                    // Update known_hwnds
+                    wm.known_hwnds.retain(|i, _| !windows_to_remove.contains(i));

                    if !newly_removed_displays.is_empty() {
                        // After we have cached them, remove them from our state
-                        wm.monitors_mut()
-                            .retain(|m| !newly_removed_displays.contains(m.device_id()));
+                        wm.monitors_mut().retain(|m| {
+                            !newly_removed_displays.iter().any(|id| {
+                                m.serial_number_id().as_ref().is_some_and(|sn| sn == id)
+                                    || m.device_id() == id
+                            })
+                        });
                    }

                    let post_removal_monitor_count = wm.monitors().len();
@@ -330,24 +470,6 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                        wm.focus_monitor(0)?;
                    }

-                    if !orphaned_containers.is_empty() {
-                        if let Some(primary) = wm.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_to_back(container);
-                                }
-
-                                // Gotta reset the focus or the movement will feel "off"
-                                if initial_monitor_count != post_removal_monitor_count {
-                                    focused_ws.focus_container(focused_container_idx);
-                                }
-                            }
-                        }
-                    }
-
                    let offset = wm.work_area_offset;

                    for monitor in wm.monitors_mut() {
@@ -360,7 +482,11 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result

                let post_removal_monitor_count = wm.monitors().len();

-                // This is the list of device ids after we have removed detached displays
+                // This is the list of device ids after we have removed detached displays. We can
+                // keep this with just the device_ids without the serial numbers since this is used
+                // only to check which one is the newly added monitor below if there is a new
+                // monitor. Everything done after with said new monitor will again consider both
+                // serial number and device ids.
                let post_removal_device_ids = wm
                    .monitors()
                    .iter()
@@ -370,7 +496,7 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result

                // Check for and add any new monitors that may have been plugged in
                // Monitor and display index preferences get applied in this function
-                WindowsApi::load_monitor_information(&mut wm.monitors)?;
+                WindowsApi::load_monitor_information(&mut wm)?;

                let post_addition_monitor_count = wm.monitors().len();

@@ -379,42 +505,204 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                        "monitor count mismatch ({post_removal_monitor_count} vs {post_addition_monitor_count}), adding connected monitors",
                    );

+                    let known_hwnds = wm.known_hwnds.clone();
+                    let offset = wm.work_area_offset;
+                    let mouse_follows_focus = wm.mouse_follows_focus;
+                    let focused_monitor_idx = wm.focused_monitor_idx();
+                    let focused_workspace_idx = wm.focused_workspace_idx()?;
+
                    // Look in the updated state for new monitors
-                    for m in wm.monitors_mut() {
-                        let device_id = m.device_id().clone();
+                    for (i, m) in wm.monitors_mut().iter_mut().enumerate() {
+                        let device_id = m.device_id();
                        // We identify a new monitor when we encounter a new device id
-                        if !post_removal_device_ids.contains(&device_id) {
+                        if !post_removal_device_ids.contains(device_id) {
                            let mut cache_hit = false;
+                            let mut cached_id = String::new();
                            // Check if that device id exists in the cache for this session
-                            if let Some(cached) = monitor_cache.get(&device_id) {
+                            if let Some((id, cached)) = monitor_cache.get_key_value(device_id).or(m
+                                .serial_number_id()
+                                .as_ref()
+                                .and_then(|sn| monitor_cache.get_key_value(sn)))
+                            {
                                cache_hit = true;
+                                cached_id = id.clone();

-                                tracing::info!("found monitor and workspace configuration for {device_id} in the monitor cache, applying");
+                                tracing::info!("found monitor and workspace configuration for {id} in the monitor cache, applying");

-                                // If it does, load all the monitor settings from the cache entry
-                                m.ensure_workspace_count(cached.workspaces.len());
-                                m.set_work_area_offset(cached.work_area_offset);
-                                m.set_window_based_work_area_offset(
-                                    cached.window_based_work_area_offset,
-                                );
-                                m.set_window_based_work_area_offset_limit(
-                                    cached.window_based_work_area_offset_limit.unwrap_or(1),
-                                );
+                                // If it does, update the cached monitor info with the new one and
+                                // load the cached monitor removing any window that has since been
+                                // closed or moved to another workspace
+                                *m = Monitor {
+                                    // Data that should be the one just read from `win32-display-data`
+                                    id: m.id,
+                                    name: m.name.clone(),
+                                    device: m.device.clone(),
+                                    device_id: m.device_id.clone(),
+                                    serial_number_id: m.serial_number_id.clone(),
+                                    size: m.size,
+                                    work_area_size: m.work_area_size,

-                                for (w_idx, workspace) in m.workspaces_mut().iter_mut().enumerate()
-                                {
-                                    if let Some(cached_workspace) = cached.workspaces.get(w_idx) {
-                                        workspace.load_static_config(cached_workspace)?;
+                                    // The rest should come from the cached monitor
+                                    work_area_offset: cached.work_area_offset,
+                                    window_based_work_area_offset: cached
+                                        .window_based_work_area_offset,
+                                    window_based_work_area_offset_limit: cached
+                                        .window_based_work_area_offset_limit,
+                                    workspaces: cached.workspaces.clone(),
+                                    last_focused_workspace: cached.last_focused_workspace,
+                                    workspace_names: cached.workspace_names.clone(),
+                                    container_padding: cached.container_padding,
+                                    workspace_padding: cached.workspace_padding,
+                                    wallpaper: cached.wallpaper.clone(),
+                                };
+
+                                let focused_workspace_idx = m.focused_workspace_idx();
+
+                                for (j, workspace) in m.workspaces_mut().iter_mut().enumerate() {
+                                    // If this is the focused workspace we need to show (restore) all
+                                    // windows that were visible since they were probably minimized by
+                                    // Windows.
+                                    let is_focused_workspace = j == focused_workspace_idx;
+                                    let focused_container_idx = workspace.focused_container_idx();
+
+                                    let mut empty_containers = Vec::new();
+                                    for (idx, container) in
+                                        workspace.containers_mut().iter_mut().enumerate()
+                                    {
+                                        container.windows_mut().retain(|window| {
+                                            window.exe().is_ok()
+                                                && !known_hwnds.contains_key(&window.hwnd)
+                                        });
+
+                                        if container.windows().is_empty() {
+                                            empty_containers.push(idx);
+                                        }
+
+                                        if is_focused_workspace {
+                                            if let Some(window) = container.focused_window() {
+                                                tracing::debug!(
+                                                    "restoring window: {}",
+                                                    window.hwnd
+                                                );
+                                                WindowsApi::restore_window(window.hwnd);
+                                            } else {
+                                                // If the focused window was moved or removed by
+                                                // the user after the disconnect then focus the
+                                                // first window and show that one
+                                                container.focus_window(0);
+
+                                                if let Some(window) = container.focused_window() {
+                                                    WindowsApi::restore_window(window.hwnd);
+                                                }
+                                            }
+                                        }
+                                    }
+
+                                    // Remove empty containers
+                                    for empty_idx in empty_containers {
+                                        if empty_idx == focused_container_idx {
+                                            workspace.remove_container(empty_idx);
+                                        } else {
+                                            workspace.remove_container_by_idx(empty_idx);
+                                        }
+                                    }
+
+                                    if let Some(window) = workspace.maximized_window() {
+                                        if window.exe().is_err()
+                                            || known_hwnds.contains_key(&window.hwnd)
+                                        {
+                                            workspace.set_maximized_window(None);
+                                        } else if is_focused_workspace {
+                                            WindowsApi::restore_window(window.hwnd);
+                                        }
+                                    }
+
+                                    if let Some(container) = workspace.monocle_container_mut() {
+                                        container.windows_mut().retain(|window| {
+                                            window.exe().is_ok()
+                                                && !known_hwnds.contains_key(&window.hwnd)
+                                        });
+
+                                        if container.windows().is_empty() {
+                                            workspace.set_monocle_container(None);
+                                        } else if is_focused_workspace {
+                                            if let Some(window) = container.focused_window() {
+                                                WindowsApi::restore_window(window.hwnd);
+                                            } else {
+                                                // If the focused window was moved or removed by
+                                                // the user after the disconnect then focus the
+                                                // first window and show that one
+                                                container.focus_window(0);
+
+                                                if let Some(window) = container.focused_window() {
+                                                    WindowsApi::restore_window(window.hwnd);
+                                                }
+                                            }
+                                        }
+                                    }
+
+                                    workspace.floating_windows_mut().retain(|window| {
+                                        window.exe().is_ok()
+                                            && !known_hwnds.contains_key(&window.hwnd)
+                                    });
+
+                                    if is_focused_workspace {
+                                        for window in workspace.floating_windows() {
+                                            WindowsApi::restore_window(window.hwnd);
+                                        }
+                                    }
+
+                                    // Apply workspace rules
+                                    let mut workspace_matching_rules =
+                                        WORKSPACE_MATCHING_RULES.lock();
+                                    if let Some(rules) = workspace
+                                        .workspace_config()
+                                        .as_ref()
+                                        .and_then(|c| c.workspace_rules.as_ref())
+                                    {
+                                        for r in rules {
+                                            workspace_matching_rules.push(WorkspaceMatchingRule {
+                                                monitor_index: i,
+                                                workspace_index: j,
+                                                matching_rule: r.clone(),
+                                                initial_only: false,
+                                            });
+                                        }
+                                    }
+
+                                    if let Some(rules) = workspace
+                                        .workspace_config()
+                                        .as_ref()
+                                        .and_then(|c| c.initial_workspace_rules.as_ref())
+                                    {
+                                        for r in rules {
+                                            workspace_matching_rules.push(WorkspaceMatchingRule {
+                                                monitor_index: i,
+                                                workspace_index: j,
+                                                matching_rule: r.clone(),
+                                                initial_only: true,
+                                            });
+                                        }
                                    }
                                }
+
+                                // Restore windows from new monitor and update the focused
+                                // workspace
+                                m.load_focused_workspace(mouse_follows_focus)?;
+                                m.update_focused_workspace(offset)?;
                            }

                            // Entries in the cache should only be used once; remove the entry there was a cache hit
-                            if cache_hit {
-                                monitor_cache.remove(&device_id);
+                            if cache_hit && !cached_id.is_empty() {
+                                monitor_cache.remove(&cached_id);
                            }
                        }
                    }
+
+                    // Refocus the previously focused monitor since the code above might
+                    // steal the focus away.
+                    wm.focus_monitor(focused_monitor_idx)?;
+                    wm.focus_workspace(focused_workspace_idx)?;
                }

                let final_count = wm.monitors().len();
@@ -440,3 +728,304 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result

    Ok(())
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::window_manager_event::WindowManagerEvent;
+    use crossbeam_channel::bounded;
+    use crossbeam_channel::Sender;
+    use std::path::PathBuf;
+    use uuid::Uuid;
+    use windows::Win32::Devices::Display::DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY;
+    // NOTE: Using RECT instead of RECT since I get a mismatched type error. Can be updated if
+    // needed.
+    use windows::Win32::Foundation::RECT;
+
+    // Creating a Mock Display Provider
+    #[derive(Clone)]
+    struct MockDevice {
+        hmonitor: isize,
+        device_path: String,
+        device_name: String,
+        device_description: String,
+        serial_number_id: Option<String>,
+        size: RECT,
+        work_area_size: RECT,
+        device_key: String,
+        output_technology: Option<DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY>,
+    }
+
+    impl From<MockDevice> for win32_display_data::Device {
+        fn from(mock: MockDevice) -> Self {
+            win32_display_data::Device {
+                hmonitor: mock.hmonitor,
+                device_path: mock.device_path,
+                device_name: mock.device_name,
+                device_description: mock.device_description,
+                serial_number_id: mock.serial_number_id,
+                size: mock.size,
+                work_area_size: mock.work_area_size,
+                device_key: mock.device_key,
+                output_technology: mock.output_technology,
+            }
+        }
+    }
+
+    // Creating a Window Manager Instance
+    struct TestContext {
+        socket_path: Option<PathBuf>,
+    }
+
+    impl Drop for TestContext {
+        fn drop(&mut self) {
+            if let Some(socket_path) = &self.socket_path {
+                // Clean up the socket file
+                if let Err(e) = std::fs::remove_file(socket_path) {
+                    tracing::warn!("Failed to remove socket file: {}", e);
+                }
+            }
+        }
+    }
+
+    fn setup_window_manager() -> (WindowManager, TestContext) {
+        let (_sender, receiver): (Sender<WindowManagerEvent>, Receiver<WindowManagerEvent>) =
+            bounded(1);
+
+        // Temporary socket path for testing
+        let socket_name = format!("komorebi-test-{}.sock", Uuid::new_v4());
+        let socket_path = PathBuf::from(socket_name);
+
+        // Create a new WindowManager instance
+        let wm = match WindowManager::new(receiver, Some(socket_path.clone())) {
+            Ok(manager) => manager,
+            Err(e) => {
+                panic!("Failed to create WindowManager: {}", e);
+            }
+        };
+
+        (
+            wm,
+            TestContext {
+                socket_path: Some(socket_path),
+            },
+        )
+    }
+
+    #[test]
+    fn test_send_notification() {
+        // Create a monitor notification
+        let notification = MonitorNotification::ResolutionScalingChanged;
+
+        // Use the send_notification function to send the notification
+        send_notification(notification);
+
+        // Receive the notification from the channel
+        let received = event_rx().try_recv();
+
+        // Check if we received the notification and if it matches what we sent
+        match received {
+            Ok(notification) => {
+                assert_eq!(notification, MonitorNotification::ResolutionScalingChanged);
+            }
+            Err(e) => panic!("Failed to receive MonitorNotification: {}", e),
+        }
+    }
+
+    #[test]
+    fn test_channel_bounded_capacity() {
+        let (_, receiver) = channel();
+
+        // Fill the channel to its capacity (20 messages)
+        for _ in 0..20 {
+            send_notification(MonitorNotification::WorkAreaChanged);
+        }
+
+        // Attempt to send another message (should be dropped)
+        send_notification(MonitorNotification::ResolutionScalingChanged);
+
+        // Verify the channel contains only the first 20 messages
+        for _ in 0..20 {
+            let notification = match receiver.try_recv() {
+                Ok(notification) => notification,
+                Err(e) => panic!("Failed to receive MonitorNotification: {}", e),
+            };
+            assert_eq!(
+                notification,
+                MonitorNotification::WorkAreaChanged,
+                "Unexpected notification in the channel"
+            );
+        }
+
+        // Verify that no additional messages are in the channel
+        assert!(
+            receiver.try_recv().is_err(),
+            "Channel should be empty after consuming all messages"
+        );
+    }
+
+    #[test]
+    fn test_insert_in_monitor_cache() {
+        let m = monitor::new(
+            0,
+            Rect::default(),
+            Rect::default(),
+            "Test Monitor".to_string(),
+            "Test Device".to_string(),
+            "Test Device ID".to_string(),
+            Some("TestMonitorID".to_string()),
+        );
+
+        // Insert the monitor into the cache
+        insert_in_monitor_cache("TestMonitorID", m.clone());
+
+        // Retrieve the monitor from the cache
+        let cache = MONITOR_CACHE
+            .get_or_init(|| Mutex::new(HashMap::new()))
+            .lock();
+        let retrieved_monitor = cache.get("TestMonitorID");
+
+        // Check that the monitor was inserted correctly and matches the expected value
+        assert_eq!(retrieved_monitor, Some(&m));
+    }
+
+    #[test]
+    fn test_insert_two_monitors_cache() {
+        let m1 = monitor::new(
+            0,
+            Rect::default(),
+            Rect::default(),
+            "Test Monitor".to_string(),
+            "Test Device".to_string(),
+            "Test Device ID".to_string(),
+            Some("TestMonitorID".to_string()),
+        );
+
+        let m2 = monitor::new(
+            0,
+            Rect::default(),
+            Rect::default(),
+            "Test Monitor 2".to_string(),
+            "Test Device 2".to_string(),
+            "Test Device ID 2".to_string(),
+            Some("TestMonitorID2".to_string()),
+        );
+
+        // Insert the first monitor into the cache
+        insert_in_monitor_cache("TestMonitorID", m1.clone());
+
+        // Insert the second monitor into the cache
+        insert_in_monitor_cache("TestMonitorID2", m2.clone());
+
+        // Retrieve the cache to check if the first and second monitors are present
+        let cache = MONITOR_CACHE
+            .get_or_init(|| Mutex::new(HashMap::new()))
+            .lock();
+
+        // Check if Monitor 1 was found in the cache
+        assert_eq!(
+            cache.get("TestMonitorID"),
+            Some(&m1),
+            "Monitor cache should contain monitor 1"
+        );
+
+        // Check if Monitor 2 was found in the cache
+        assert_eq!(
+            cache.get("TestMonitorID2"),
+            Some(&m2),
+            "Monitor cache should contain monitor 2"
+        );
+    }
+
+    #[test]
+    fn test_listen_for_notifications() {
+        // Create a WindowManager instance for testing
+        let (wm, _test_context) = setup_window_manager();
+
+        // Start the notification listener
+        let result = listen_for_notifications(Arc::new(Mutex::new(wm)));
+
+        // Check if the listener started successfully
+        assert!(result.is_ok(), "Failed to start notification listener");
+
+        // Test sending a notification
+        send_notification(MonitorNotification::DisplayConnectionChange);
+
+        // Receive the notification from the channel
+        let received = event_rx().try_recv();
+
+        // Check if we received the notification and if it matches what we sent
+        match received {
+            Ok(notification) => {
+                assert_eq!(notification, MonitorNotification::DisplayConnectionChange);
+            }
+            Err(e) => panic!("Failed to receive MonitorNotification: {}", e),
+        }
+    }
+
+    #[test]
+    fn test_attached_display_devices() {
+        // Define mock display data
+        let mock_monitor = MockDevice {
+            hmonitor: 1,
+            device_path: String::from(
+                "\\\\?\\DISPLAY#ABC123#4&123456&0&UID0#{saucepackets-4321-5678-2468-abc123456789}",
+            ),
+            device_name: String::from("\\\\.\\DISPLAY1"),
+            device_description: String::from("Display description"),
+            serial_number_id: Some(String::from("SaucePackets123")),
+            device_key: String::from("Mock Key"),
+            size: RECT {
+                left: 0,
+                top: 0,
+                right: 1920,
+                bottom: 1080,
+            },
+            work_area_size: RECT {
+                left: 0,
+                top: 0,
+                right: 1920,
+                bottom: 1080,
+            },
+            output_technology: Some(DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY(0)),
+        };
+
+        // Create a closure to simulate the display provider
+        let display_provider = || {
+            vec![Ok::<win32_display_data::Device, win32_display_data::Error>(
+                win32_display_data::Device::from(mock_monitor.clone()),
+            )]
+            .into_iter()
+        };
+
+        // Should contain the mock monitor
+        let result = attached_display_devices(display_provider).ok();
+        if let Some(monitors) = result {
+            // Check Number of monitors
+            assert_eq!(monitors.len(), 1, "Expected one monitor");
+
+            // hmonitor
+            assert_eq!(monitors[0].id(), 1);
+
+            // device name
+            assert_eq!(monitors[0].name(), &String::from("DISPLAY1"));
+
+            // Device
+            assert_eq!(monitors[0].device(), &String::from("ABC123"));
+
+            // Device ID
+            assert_eq!(
+                monitors[0].device_id(),
+                &String::from("ABC123-4&123456&0&UID0")
+            );
+
+            // Check monitor serial number id
+            assert_eq!(
+                monitors[0].serial_number_id,
+                Some(String::from("SaucePackets123")),
+            );
+        } else {
+            panic!("No monitors found");
+        }
+    }
+}
--- a/komorebi/src/process_command.rs
+++ b/komorebi/src/process_command.rs
@@ -1,3 +1,10 @@
+use color_eyre::eyre::anyhow;
+use color_eyre::eyre::OptionExt;
+use color_eyre::Result;
+use komorebi_themes::colour::Rgb;
+use miow::pipe::connect;
+use net2::TcpStreamExt;
+use parking_lot::Mutex;
 use std::collections::HashMap;
 use std::fs::File;
 use std::fs::OpenOptions;
@@ -11,20 +18,20 @@ use std::str::FromStr;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
 use std::time::Duration;
-
-use color_eyre::eyre::anyhow;
-use color_eyre::Result;
-use miow::pipe::connect;
-use net2::TcpStreamExt;
-use parking_lot::Mutex;
-use schemars::gen::SchemaSettings;
-use schemars::schema_for;
 use uds_windows::UnixStream;

+use crate::animation::ANIMATION_DURATION_GLOBAL;
 use crate::animation::ANIMATION_DURATION_PER_ANIMATION;
+use crate::animation::ANIMATION_ENABLED_GLOBAL;
 use crate::animation::ANIMATION_ENABLED_PER_ANIMATION;
+use crate::animation::ANIMATION_FPS;
+use crate::animation::ANIMATION_STYLE_GLOBAL;
 use crate::animation::ANIMATION_STYLE_PER_ANIMATION;
-use crate::core::config_generation::ApplicationConfiguration;
+use crate::border_manager;
+use crate::border_manager::IMPLEMENTATION;
+use crate::border_manager::STYLE;
+use crate::build;
+use crate::config_generation::WorkspaceMatchingRule;
 use crate::core::config_generation::IdWithIdentifier;
 use crate::core::config_generation::MatchingRule;
 use crate::core::config_generation::MatchingStrategy;
@@ -41,16 +48,6 @@ use crate::core::SocketMessage;
 use crate::core::StateQuery;
 use crate::core::WindowContainerBehaviour;
 use crate::core::WindowKind;
-
-use crate::animation::ANIMATION_DURATION_GLOBAL;
-use crate::animation::ANIMATION_ENABLED_GLOBAL;
-use crate::animation::ANIMATION_FPS;
-use crate::animation::ANIMATION_STYLE_GLOBAL;
-use crate::border_manager;
-use crate::border_manager::IMPLEMENTATION;
-use crate::border_manager::STYLE;
-use crate::colour::Rgb;
-use crate::config_generation::WorkspaceMatchingRule;
 use crate::current_virtual_desktop;
 use crate::monitor::MonitorInformation;
 use crate::notify_subscribers;
@@ -66,6 +63,7 @@ use crate::window_manager;
 use crate::window_manager::WindowManager;
 use crate::windows_api::WindowsApi;
 use crate::winevent_listener;
+use crate::workspace::WorkspaceLayer;
 use crate::workspace::WorkspaceWindowLocation;
 use crate::GlobalState;
 use crate::Notification;
@@ -74,6 +72,7 @@ use crate::State;
 use crate::CUSTOM_FFM;
 use crate::DATA_DIR;
 use crate::DISPLAY_INDEX_PREFERENCES;
+use crate::FLOATING_APPLICATIONS;
 use crate::HIDING_BEHAVIOUR;
 use crate::IGNORE_IDENTIFIERS;
 use crate::INITIAL_CONFIGURATION_LOADED;
@@ -83,6 +82,7 @@ use crate::MONITOR_INDEX_PREFERENCES;
 use crate::NO_TITLEBAR;
 use crate::OBJECT_NAME_CHANGE_ON_LAUNCH;
 use crate::REMOVE_TITLEBARS;
+use crate::SESSION_FLOATING_APPLICATIONS;
 use crate::SUBSCRIPTION_PIPES;
 use crate::SUBSCRIPTION_SOCKETS;
 use crate::SUBSCRIPTION_SOCKET_OPTIONS;
@@ -208,7 +208,9 @@ impl WindowManager {
        let initial_state = State::from(self.as_ref());

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

+        let mut force_update_borders = false;
        match message {
            SocketMessage::Promote => self.promote_container_to_front()?,
            SocketMessage::PromoteFocus => self.promote_focus_to_front()?,
@@ -251,9 +254,11 @@ impl WindowManager {
                if let Some((monitor_idx, workspace_idx)) = monitor_workspace_indices {
                    if monitor_idx != focused_monitor_idx {
                        self.focus_monitor(monitor_idx)?;
-                    }
-
-                    if workspace_idx != focused_workspace_idx {
+                        let focused_ws_idx = self.focused_workspace_idx()?;
+                        if focused_ws_idx != workspace_idx {
+                            self.focus_workspace(workspace_idx)?;
+                        }
+                    } else if workspace_idx != focused_workspace_idx {
                        self.focus_workspace(workspace_idx)?;
                    }
                }
@@ -291,13 +296,37 @@ impl WindowManager {
                }
            }
            SocketMessage::FocusWindow(direction) => {
-                self.focus_container_in_direction(direction)?;
+                let focused_workspace = self.focused_workspace()?;
+                match focused_workspace.layer() {
+                    WorkspaceLayer::Tiling => {
+                        self.focus_container_in_direction(direction)?;
+                    }
+                    WorkspaceLayer::Floating => {
+                        self.focus_floating_window_in_direction(direction)?;
+                    }
+                }
            }
            SocketMessage::MoveWindow(direction) => {
-                self.move_container_in_direction(direction)?;
+                let focused_workspace = self.focused_workspace()?;
+                match focused_workspace.layer() {
+                    WorkspaceLayer::Tiling => {
+                        self.move_container_in_direction(direction)?;
+                    }
+                    WorkspaceLayer::Floating => {
+                        self.move_floating_window_in_direction(direction)?;
+                    }
+                }
            }
            SocketMessage::CycleFocusWindow(direction) => {
-                self.focus_container_in_cycle_direction(direction)?;
+                let focused_workspace = self.focused_workspace()?;
+                match focused_workspace.layer() {
+                    WorkspaceLayer::Tiling => {
+                        self.focus_container_in_cycle_direction(direction)?;
+                    }
+                    WorkspaceLayer::Floating => {
+                        self.focus_floating_window_in_cycle_direction(direction)?;
+                    }
+                }
            }
            SocketMessage::CycleMoveWindow(direction) => {
                self.move_container_in_cycle_direction(direction)?;
@@ -308,11 +337,9 @@ impl WindowManager {
            SocketMessage::UnstackAll => self.unstack_all()?,
            SocketMessage::CycleStack(direction) => {
                self.cycle_container_window_in_direction(direction)?;
-                self.focused_window()?.focus(self.mouse_follows_focus)?;
            }
            SocketMessage::CycleStackIndex(direction) => {
                self.cycle_container_window_index_in_direction(direction)?;
-                self.focused_window()?.focus(self.mouse_follows_focus)?;
            }
            SocketMessage::FocusStackWindow(idx) => {
                // In case you are using this command on a bar on a monitor
@@ -323,7 +350,6 @@ impl WindowManager {
                    self.focus_monitor(monitor_idx)?;
                }
                self.focus_container_window(idx)?;
-                self.focused_window()?.focus(self.mouse_follows_focus)?;
            }
            SocketMessage::ForceFocus => {
                let focused_window = self.focused_window()?;
@@ -337,7 +363,42 @@ impl WindowManager {
            SocketMessage::Minimize => {
                Window::from(WindowsApi::foreground_window()?).minimize();
            }
-            SocketMessage::ToggleFloat => self.toggle_float()?,
+            SocketMessage::LockMonitorWorkspaceContainer(
+                monitor_idx,
+                workspace_idx,
+                container_idx,
+            ) => {
+                let monitor = self
+                    .monitors_mut()
+                    .get_mut(monitor_idx)
+                    .ok_or_eyre("no monitor at the given index")?;
+
+                let workspace = monitor
+                    .workspaces_mut()
+                    .get_mut(workspace_idx)
+                    .ok_or_eyre("no workspace at the given index")?;
+
+                workspace.locked_containers.insert(container_idx);
+            }
+            SocketMessage::UnlockMonitorWorkspaceContainer(
+                monitor_idx,
+                workspace_idx,
+                container_idx,
+            ) => {
+                let monitor = self
+                    .monitors_mut()
+                    .get_mut(monitor_idx)
+                    .ok_or_eyre("no monitor at the given index")?;
+
+                let workspace = monitor
+                    .workspaces_mut()
+                    .get_mut(workspace_idx)
+                    .ok_or_eyre("no workspace at the given index")?;
+
+                workspace.locked_containers.remove(&container_idx);
+            }
+            SocketMessage::ToggleLock => self.toggle_lock()?,
+            SocketMessage::ToggleFloat => self.toggle_float(false)?,
            SocketMessage::ToggleMonocle => self.toggle_monocle()?,
            SocketMessage::ToggleMaximize => self.toggle_maximize()?,
            SocketMessage::ContainerPadding(monitor_idx, workspace_idx, size) => {
@@ -484,6 +545,53 @@ impl WindowManager {
                    }));
                }
            }
+            SocketMessage::SessionFloatRule => {
+                let foreground_window = WindowsApi::foreground_window()?;
+                let window = Window::from(foreground_window);
+                if let (Ok(exe), Ok(title), Ok(class)) =
+                    (window.exe(), window.title(), window.class())
+                {
+                    let rule = MatchingRule::Composite(vec![
+                        IdWithIdentifier {
+                            kind: ApplicationIdentifier::Exe,
+                            id: exe,
+                            matching_strategy: Option::from(MatchingStrategy::Equals),
+                        },
+                        IdWithIdentifier {
+                            kind: ApplicationIdentifier::Title,
+                            id: title,
+                            matching_strategy: Option::from(MatchingStrategy::Equals),
+                        },
+                        IdWithIdentifier {
+                            kind: ApplicationIdentifier::Class,
+                            id: class,
+                            matching_strategy: Option::from(MatchingStrategy::Equals),
+                        },
+                    ]);
+
+                    let mut floating_applications = FLOATING_APPLICATIONS.lock();
+                    floating_applications.push(rule.clone());
+                    let mut session_floating_applications = SESSION_FLOATING_APPLICATIONS.lock();
+                    session_floating_applications.push(rule.clone());
+
+                    self.toggle_float(true)?;
+                }
+            }
+            SocketMessage::SessionFloatRules => {
+                let session_floating_applications = SESSION_FLOATING_APPLICATIONS.lock();
+                let rules = match serde_json::to_string_pretty(&*session_floating_applications) {
+                    Ok(rules) => rules,
+                    Err(error) => error.to_string(),
+                };
+
+                reply.write_all(rules.as_bytes())?;
+            }
+            SocketMessage::ClearSessionFloatRules => {
+                let mut floating_applications = FLOATING_APPLICATIONS.lock();
+                let mut session_floating_applications = SESSION_FLOATING_APPLICATIONS.lock();
+                floating_applications.retain(|r| !session_floating_applications.contains(r));
+                session_floating_applications.clear()
+            }
            SocketMessage::IgnoreRule(identifier, ref id) => {
                let mut ignore_identifiers = IGNORE_IDENTIFIERS.lock();

@@ -582,6 +690,67 @@ impl WindowManager {
            SocketMessage::AdjustWorkspacePadding(sizing, adjustment) => {
                self.adjust_workspace_padding(sizing, adjustment)?;
            }
+            SocketMessage::MoveContainerToLastWorkspace => {
+                // This is to ensure that even on an empty workspace on a secondary monitor, the
+                // secondary monitor where the cursor is focused will be used as the target for
+                // the workspace switch op
+                if let Some(monitor_idx) = self.monitor_idx_from_current_pos() {
+                    if monitor_idx != self.focused_monitor_idx() {
+                        if let Some(monitor) = self.monitors().get(monitor_idx) {
+                            if let Some(workspace) = monitor.focused_workspace() {
+                                if workspace.is_empty() {
+                                    self.focus_monitor(monitor_idx)?;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                let idx = self
+                    .focused_monitor()
+                    .ok_or_else(|| anyhow!("there is no monitor"))?
+                    .focused_workspace_idx();
+
+                if let Some(monitor) = self.focused_monitor_mut() {
+                    if let Some(last_focused_workspace) = monitor.last_focused_workspace() {
+                        self.move_container_to_workspace(last_focused_workspace, true, None)?;
+                    }
+                }
+
+                self.focused_monitor_mut()
+                    .ok_or_else(|| anyhow!("there is no monitor"))?
+                    .set_last_focused_workspace(Option::from(idx));
+            }
+            SocketMessage::SendContainerToLastWorkspace => {
+                // This is to ensure that even on an empty workspace on a secondary monitor, the
+                // secondary monitor where the cursor is focused will be used as the target for
+                // the workspace switch op
+                if let Some(monitor_idx) = self.monitor_idx_from_current_pos() {
+                    if monitor_idx != self.focused_monitor_idx() {
+                        if let Some(monitor) = self.monitors().get(monitor_idx) {
+                            if let Some(workspace) = monitor.focused_workspace() {
+                                if workspace.is_empty() {
+                                    self.focus_monitor(monitor_idx)?;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                let idx = self
+                    .focused_monitor()
+                    .ok_or_else(|| anyhow!("there is no monitor"))?
+                    .focused_workspace_idx();
+
+                if let Some(monitor) = self.focused_monitor_mut() {
+                    if let Some(last_focused_workspace) = monitor.last_focused_workspace() {
+                        self.move_container_to_workspace(last_focused_workspace, false, None)?;
+                    }
+                }
+                self.focused_monitor_mut()
+                    .ok_or_else(|| anyhow!("there is no monitor"))?
+                    .set_last_focused_workspace(Option::from(idx));
+            }
            SocketMessage::MoveContainerToWorkspaceNumber(workspace_idx) => {
                self.move_container_to_workspace(workspace_idx, true, None)?;
            }
@@ -735,12 +904,19 @@ impl WindowManager {
                self.focus_monitor(monitor_idx)?;
                self.update_focused_workspace(self.mouse_follows_focus, true)?;
            }
+            SocketMessage::FocusMonitorAtCursor => {
+                if let Some(monitor_idx) = self.monitor_idx_from_current_pos() {
+                    self.focus_monitor(monitor_idx)?;
+                }
+            }
            SocketMessage::Retile => {
                border_manager::destroy_all_borders()?;
+                force_update_borders = true;
                self.retile_all(false)?
            }
            SocketMessage::RetileWithResizeDimensions => {
                border_manager::destroy_all_borders()?;
+                force_update_borders = true;
                self.retile_all(true)?
            }
            SocketMessage::FlipLayout(layout_flip) => self.flip_layout(layout_flip)?,
@@ -848,7 +1024,15 @@ impl WindowManager {
                // secondary monitor where the cursor is focused will be used as the target for
                // the workspace switch op
                if let Some(monitor_idx) = self.monitor_idx_from_current_pos() {
-                    self.focus_monitor(monitor_idx)?;
+                    if monitor_idx != self.focused_monitor_idx() {
+                        if let Some(monitor) = self.monitors().get(monitor_idx) {
+                            if let Some(workspace) = monitor.focused_workspace() {
+                                if workspace.is_empty() {
+                                    self.focus_monitor(monitor_idx)?;
+                                }
+                            }
+                        }
+                    }
                }

                let focused_monitor = self
@@ -866,12 +1050,69 @@ impl WindowManager {

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

                let mut can_close = false;
@@ -907,7 +1148,15 @@ impl WindowManager {
                // secondary monitor where the cursor is focused will be used as the target for
                // the workspace switch op
                if let Some(monitor_idx) = self.monitor_idx_from_current_pos() {
-                    self.focus_monitor(monitor_idx)?;
+                    if monitor_idx != self.focused_monitor_idx() {
+                        if let Some(monitor) = self.monitors().get(monitor_idx) {
+                            if let Some(workspace) = monitor.focused_workspace() {
+                                if workspace.is_empty() {
+                                    self.focus_monitor(monitor_idx)?;
+                                }
+                            }
+                        }
+                    }
                }

                let idx = self
@@ -930,7 +1179,15 @@ impl WindowManager {
                // secondary monitor where the cursor is focused will be used as the target for
                // the workspace switch op
                if let Some(monitor_idx) = self.monitor_idx_from_current_pos() {
-                    self.focus_monitor(monitor_idx)?;
+                    if monitor_idx != self.focused_monitor_idx() {
+                        if let Some(monitor) = self.monitors().get(monitor_idx) {
+                            if let Some(workspace) = monitor.focused_workspace() {
+                                if workspace.is_empty() {
+                                    self.focus_monitor(monitor_idx)?;
+                                }
+                            }
+                        }
+                    }
                }

                if self.focused_workspace_idx().unwrap_or_default() != workspace_idx {
@@ -942,7 +1199,15 @@ impl WindowManager {
                // secondary monitor where the cursor is focused will be used as the target for
                // the workspace switch op
                if let Some(monitor_idx) = self.monitor_idx_from_current_pos() {
-                    self.focus_monitor(monitor_idx)?;
+                    if monitor_idx != self.focused_monitor_idx() {
+                        if let Some(monitor) = self.monitors().get(monitor_idx) {
+                            if let Some(workspace) = monitor.focused_workspace() {
+                                if workspace.is_empty() {
+                                    self.focus_monitor(monitor_idx)?;
+                                }
+                            }
+                        }
+                    }
                }

                let focused_monitor_idx = self.focused_monitor_idx();
@@ -975,6 +1240,84 @@ impl WindowManager {
                    self.focus_workspace(workspace_idx)?;
                }
            }
+            SocketMessage::ToggleWorkspaceLayer => {
+                let mouse_follows_focus = self.mouse_follows_focus;
+                let workspace = self.focused_workspace_mut()?;
+
+                let mut to_focus = None;
+                match workspace.layer() {
+                    WorkspaceLayer::Tiling => {
+                        workspace.set_layer(WorkspaceLayer::Floating);
+
+                        let focused_idx = workspace.focused_floating_window_idx();
+                        let mut window_idx_pairs = workspace
+                            .floating_windows_mut()
+                            .make_contiguous()
+                            .iter()
+                            .enumerate()
+                            .collect::<Vec<_>>();
+
+                        // Sort by window area
+                        window_idx_pairs.sort_by_key(|(_, w)| {
+                            let rect = WindowsApi::window_rect(w.hwnd).unwrap_or_default();
+                            rect.right * rect.bottom
+                        });
+                        window_idx_pairs.reverse();
+
+                        for (i, window) in window_idx_pairs {
+                            if i == focused_idx {
+                                to_focus = Some(*window);
+                            } else {
+                                window.raise()?;
+                            }
+                        }
+
+                        if let Some(focused_window) = &to_focus {
+                            // The focused window should be the last one raised to make sure it is
+                            // on top
+                            focused_window.raise()?;
+                        }
+
+                        for container in workspace.containers() {
+                            if let Some(window) = container.focused_window() {
+                                window.lower()?;
+                            }
+                        }
+                    }
+                    WorkspaceLayer::Floating => {
+                        workspace.set_layer(WorkspaceLayer::Tiling);
+
+                        let focused_container_idx = workspace.focused_container_idx();
+                        for (i, container) in workspace.containers_mut().iter_mut().enumerate() {
+                            if let Some(window) = container.focused_window() {
+                                if i == focused_container_idx {
+                                    to_focus = Some(*window);
+                                }
+                                window.raise()?;
+                            }
+                        }
+
+                        let mut window_idx_pairs = workspace
+                            .floating_windows_mut()
+                            .make_contiguous()
+                            .iter()
+                            .collect::<Vec<_>>();
+
+                        // Sort by window area
+                        window_idx_pairs.sort_by_key(|w| {
+                            let rect = WindowsApi::window_rect(w.hwnd).unwrap_or_default();
+                            rect.right * rect.bottom
+                        });
+
+                        for window in window_idx_pairs {
+                            window.lower()?;
+                        }
+                    }
+                };
+                if let Some(window) = to_focus {
+                    window.focus(mouse_follows_focus)?;
+                }
+            }
            SocketMessage::Stop => {
                self.stop(false)?;
            }
@@ -994,7 +1337,7 @@ impl WindowManager {
                );
            }
            SocketMessage::DisplayIndexPreference(index_preference, ref display) => {
-                let mut display_index_preferences = DISPLAY_INDEX_PREFERENCES.lock();
+                let mut display_index_preferences = DISPLAY_INDEX_PREFERENCES.write();
                display_index_preferences.insert(index_preference, display.clone());
            }
            SocketMessage::EnsureWorkspaces(monitor_idx, workspace_count) => {
@@ -1086,6 +1429,20 @@ impl WindowManager {
                            .focused_workspace_name()
                            .unwrap_or_else(|| focused_monitor.focused_workspace_idx().to_string())
                    }
+                    StateQuery::Version => build::RUST_VERSION.to_string(),
+                    StateQuery::FocusedWorkspaceLayout => {
+                        let focused_monitor = self
+                            .focused_monitor()
+                            .ok_or_else(|| anyhow!("there is no monitor"))?;
+
+                        focused_monitor.focused_workspace_layout().map_or_else(
+                            || "None".to_string(),
+                            |layout| match layout {
+                                Layout::Default(default_layout) => default_layout.to_string(),
+                                Layout::Custom(_) => "Custom".to_string(),
+                            },
+                        )
+                    }
                };

                reply.write_all(response.as_bytes())?;
@@ -1295,6 +1652,7 @@ impl WindowManager {
            }
            SocketMessage::ReloadConfiguration => {
                Self::reload_configuration();
+                force_update_borders = true;
            }
            SocketMessage::ReplaceConfiguration(ref config) => {
                // Check that this is a valid static config file first
@@ -1323,15 +1681,78 @@ impl WindowManager {

                    // Set self to the new wm instance
                    *self = wm;
+
+                    // check if there are any bars
+                    let mut system = sysinfo::System::new_all();
+                    system.refresh_processes(sysinfo::ProcessesToUpdate::All, true);
+
+                    let has_bar = system
+                        .processes_by_name("komorebi-bar.exe".as_ref())
+                        .next()
+                        .is_some();
+
+                    // stop bar(s)
+                    if has_bar {
+                        let script = r"
+Stop-Process -Name:komorebi-bar -ErrorAction SilentlyContinue
+                ";
+                        match powershell_script::run(script) {
+                            Ok(_) => {
+                                println!("{script}");
+
+                                // start new bar(s)
+                                let mut config = StaticConfig::read(config)?;
+                                if let Some(display_bar_configurations) =
+                                    &mut config.bar_configurations
+                                {
+                                    for config_file_path in &mut *display_bar_configurations {
+                                        let script = r#"Start-Process "komorebi-bar" '"--config" "CONFIGFILE"' -WindowStyle hidden"#
+                            .replace("CONFIGFILE", &config_file_path.to_string_lossy());
+
+                                        match powershell_script::run(&script) {
+                                            Ok(_) => {
+                                                println!("{script}");
+                                            }
+                                            Err(error) => {
+                                                println!("Error: {error}");
+                                            }
+                                        }
+                                    }
+                                } else {
+                                    let script = r"
+if (!(Get-Process komorebi-bar -ErrorAction SilentlyContinue))
+{
+  Start-Process komorebi-bar -WindowStyle hidden
+}
+                ";
+                                    match powershell_script::run(script) {
+                                        Ok(_) => {
+                                            println!("{script}");
+                                        }
+                                        Err(error) => {
+                                            println!("Error: {error}");
+                                        }
+                                    }
+                                }
+                            }
+                            Err(error) => {
+                                println!("Error: {error}");
+                            }
+                        }
+                    }
+
+                    force_update_borders = true;
                }
            }
            SocketMessage::ReloadStaticConfiguration(ref pathbuf) => {
                self.reload_static_configuration(pathbuf)?;
+                force_update_borders = true;
            }
            SocketMessage::CompleteConfiguration => {
                if !INITIAL_CONFIGURATION_LOADED.load(Ordering::SeqCst) {
                    INITIAL_CONFIGURATION_LOADED.store(true, Ordering::SeqCst);
                    self.update_focused_workspace(false, false)?;
+                    force_update_borders = true;
                }
            }
            SocketMessage::WatchConfiguration(enable) => {
@@ -1413,6 +1834,14 @@ impl WindowManager {
                    self.retile_all(false)?;
                }
            }
+            SocketMessage::ToggleWindowBasedWorkAreaOffset => {
+                let workspace = self.focused_workspace_mut()?;
+                workspace.set_apply_window_based_work_area_offset(
+                    !workspace.apply_window_based_work_area_offset(),
+                );
+
+                self.retile_all(true)?;
+            }
            SocketMessage::QuickSave => {
                let workspace = self.focused_workspace()?;
                let resize = workspace.resize_dimensions();
@@ -1581,6 +2010,8 @@ impl WindowManager {
                            self.remove_all_accents()?;
                        }
                    }
+                } else if matches!(IMPLEMENTATION.load(), BorderImplementation::Komorebi) {
+                    force_update_borders = true;
                }
            }
            SocketMessage::BorderImplementation(implementation) => {
@@ -1593,40 +2024,49 @@ impl WindowManager {
                    match IMPLEMENTATION.load() {
                        BorderImplementation::Komorebi => {
                            self.remove_all_accents()?;
+                            force_update_borders = true;
                        }
                        BorderImplementation::Windows => {
                            border_manager::destroy_all_borders()?;
                        }
                    }
-
-                    border_manager::send_notification(None);
                }
            }
-            SocketMessage::BorderColour(kind, r, g, b) => match kind {
-                WindowKind::Single => {
-                    border_manager::FOCUSED.store(Rgb::new(r, g, b).into(), Ordering::SeqCst);
+            SocketMessage::BorderColour(kind, r, g, b) => {
+                match kind {
+                    WindowKind::Single => {
+                        border_manager::FOCUSED.store(Rgb::new(r, g, b).into(), Ordering::SeqCst);
+                    }
+                    WindowKind::Stack => {
+                        border_manager::STACK.store(Rgb::new(r, g, b).into(), Ordering::SeqCst);
+                    }
+                    WindowKind::Monocle => {
+                        border_manager::MONOCLE.store(Rgb::new(r, g, b).into(), Ordering::SeqCst);
+                    }
+                    WindowKind::Unfocused => {
+                        border_manager::UNFOCUSED.store(Rgb::new(r, g, b).into(), Ordering::SeqCst);
+                    }
+                    WindowKind::UnfocusedLocked => {
+                        border_manager::UNFOCUSED_LOCKED
+                            .store(Rgb::new(r, g, b).into(), Ordering::SeqCst);
+                    }
+                    WindowKind::Floating => {
+                        border_manager::FLOATING.store(Rgb::new(r, g, b).into(), Ordering::SeqCst);
+                    }
                }
-                WindowKind::Stack => {
-                    border_manager::STACK.store(Rgb::new(r, g, b).into(), Ordering::SeqCst);
-                }
-                WindowKind::Monocle => {
-                    border_manager::MONOCLE.store(Rgb::new(r, g, b).into(), Ordering::SeqCst);
-                }
-                WindowKind::Unfocused => {
-                    border_manager::UNFOCUSED.store(Rgb::new(r, g, b).into(), Ordering::SeqCst);
-                }
-                WindowKind::Floating => {
-                    border_manager::FLOATING.store(Rgb::new(r, g, b).into(), Ordering::SeqCst);
-                }
-            },
+                force_update_borders = true;
+            }
            SocketMessage::BorderStyle(style) => {
                STYLE.store(style);
+                force_update_borders = true;
            }
            SocketMessage::BorderWidth(width) => {
                border_manager::BORDER_WIDTH.store(width, Ordering::SeqCst);
+                force_update_borders = true;
            }
            SocketMessage::BorderOffset(offset) => {
                border_manager::BORDER_OFFSET.store(offset, Ordering::SeqCst);
+                force_update_borders = true;
            }
            SocketMessage::Animation(enable, prefix) => match prefix {
                Some(prefix) => {
@@ -1706,35 +2146,49 @@ impl WindowManager {
                *STACKBAR_FONT_FAMILY.lock() = font_family.clone();
            }
            SocketMessage::ApplicationSpecificConfigurationSchema => {
-                let asc = schema_for!(Vec<ApplicationConfiguration>);
-                let schema = serde_json::to_string_pretty(&asc)?;
+                #[cfg(feature = "schemars")]
+                {
+                    let asc = schemars::schema_for!(
+                        Vec<crate::core::config_generation::ApplicationConfiguration>
+                    );
+                    let schema = serde_json::to_string_pretty(&asc)?;

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

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

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

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

-                reply.write_all(schema.as_bytes())?;
+                    reply.write_all(schema.as_bytes())?;
+                }
            }
            SocketMessage::GenerateStaticConfig => {
                let config = serde_json::to_string_pretty(&StaticConfig::from(&*self))?;
@@ -1774,14 +2228,17 @@ impl WindowManager {

                reply.write_all(schema.as_bytes())?;
            }
-            SocketMessage::Theme(theme) => {
-                theme_manager::send_notification(theme);
+            SocketMessage::Theme(ref theme) => {
+                theme_manager::send_notification(*theme.clone());
            }
            // Deprecated commands
            SocketMessage::AltFocusHack(_)
            | SocketMessage::IdentifyBorderOverflowApplication(_, _) => {}
        };

+        // Update list of known_hwnds and their monitor/workspace index pair
+        self.update_known_hwnds();
+
        notify_subscribers(
            Notification {
                event: NotificationEvent::Socket(message.clone()),
@@ -1790,7 +2247,11 @@ impl WindowManager {
            initial_state.has_been_modified(self.as_ref()),
        )?;

-        border_manager::send_notification(None);
+        if force_update_borders {
+            border_manager::send_force_update();
+        } else {
+            border_manager::send_notification(None);
+        }
        transparency_manager::send_notification();
        stackbar_manager::send_notification();

@@ -1883,3 +2344,73 @@ pub fn read_commands_tcp(

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

 use color_eyre::eyre::anyhow;
 use color_eyre::Result;
@@ -27,13 +24,11 @@ use crate::window_manager::WindowManager;
 use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_api::WindowsApi;
 use crate::winevent::WinEvent;
-use crate::workspace_reconciliator;
-use crate::workspace_reconciliator::ALT_TAB_HWND;
-use crate::workspace_reconciliator::ALT_TAB_HWND_INSTANT;
+use crate::workspace::WorkspaceLayer;
 use crate::Notification;
 use crate::NotificationEvent;
 use crate::State;
-use crate::DATA_DIR;
+use crate::Window;
 use crate::FLOATING_APPLICATIONS;
 use crate::HIDDEN_HWNDS;
 use crate::REGEX_IDENTIFIERS;
@@ -254,7 +249,12 @@ impl WindowManager {
                already_moved_window_handles.remove(&window.hwnd);
            }
            WindowManagerEvent::FocusChange(_, window) => {
-                self.update_focused_workspace(self.mouse_follows_focus, false)?;
+                // don't want to trigger the full workspace updates when there are no managed
+                // containers - this makes floating windows on empty workspaces go into very
+                // annoying focus change loops which prevents users from interacting with them
+                if !self.focused_workspace()?.containers().is_empty() {
+                    self.update_focused_workspace(self.mouse_follows_focus, false)?;
+                }

                let workspace = self.focused_workspace_mut()?;
                let floating_window_idx = workspace
@@ -277,10 +277,12 @@ impl WindowManager {
                        } else {
                            workspace.focus_container_by_window(window.hwnd)?;
                        }
+
+                        workspace.set_layer(WorkspaceLayer::Tiling);
                    }
                    Some(idx) => {
-                        if let Some(window) = workspace.floating_windows().get(idx) {
-                            window.focus(false)?;
+                        if let Some(_window) = workspace.floating_windows().get(idx) {
+                            workspace.set_layer(WorkspaceLayer::Floating);
                        }
                    }
                }
@@ -298,36 +300,7 @@ impl WindowManager {
                    let focused_workspace_idx =
                        self.focused_workspace_idx_for_monitor_idx(focused_monitor_idx)?;

-                    let focused_pair = (focused_monitor_idx, focused_workspace_idx);
-
-                    let mut needs_reconciliation = false;
-
-                    for (i, monitors) in self.monitors().iter().enumerate() {
-                        for (j, workspace) in monitors.workspaces().iter().enumerate() {
-                            if workspace.contains_window(window.hwnd) && focused_pair != (i, j) {
-                                // At this point we know we are going to send a notification to the workspace reconciliator
-                                // So we get the topmost window returned by EnumWindows, which is almost always the window
-                                // that has been selected by alt-tab
-                                if let Ok(alt_tab_windows) = WindowsApi::alt_tab_windows() {
-                                    if let Some(first) =
-                                        alt_tab_windows.iter().find(|w| w.title().is_ok())
-                                    {
-                                        // If our record of this HWND hasn't been updated in over a minute
-                                        let mut instant = ALT_TAB_HWND_INSTANT.lock();
-                                        if instant.elapsed().gt(&Duration::from_secs(1)) {
-                                            // Update our record with the HWND we just found
-                                            ALT_TAB_HWND.store(Some(first.hwnd));
-                                            // Update the timestamp of our record
-                                            *instant = Instant::now();
-                                        }
-                                    }
-                                }
-
-                                workspace_reconciliator::send_notification(i, j);
-                                needs_reconciliation = true;
-                            }
-                        }
-                    }
+                    let mut needs_reconciliation = None;

                    // There are some applications such as Firefox where, if they are focused when a
                    // workspace switch takes place, it will fire an additional Show event, which will
@@ -336,11 +309,31 @@ impl WindowManager {
                    // duplicates across multiple workspaces, as it results in ghost layout tiles.
                    let mut proceed = true;

-                    for (i, monitor) in self.monitors().iter().enumerate() {
-                        for (j, workspace) in monitor.workspaces().iter().enumerate() {
-                            if workspace.contains_window(window.hwnd)
-                                && i != self.focused_monitor_idx()
-                                && j != monitor.focused_workspace_idx()
+                    // Check for potential `alt-tab` event
+                    if matches!(
+                        event,
+                        WindowManagerEvent::Uncloak(_, _) | WindowManagerEvent::Show(_, _)
+                    ) {
+                        needs_reconciliation = self.needs_reconciliation(window)?;
+
+                        if let Some((m_idx, ws_idx)) = needs_reconciliation {
+                            self.perform_reconciliation(window, (m_idx, ws_idx))?;
+
+                            // Since there was a reconciliation after an `alt-tab`, that means this
+                            // window is already handled by komorebi so we shouldn't proceed with
+                            // adding it as a new window.
+                            proceed = false;
+                        }
+                    }
+
+                    if let Some((m_idx, w_idx)) = self.known_hwnds.get(&window.hwnd) {
+                        if let Some(focused_workspace_idx) = self
+                            .monitors()
+                            .get(*m_idx)
+                            .map(|m| m.focused_workspace_idx())
+                        {
+                            if *m_idx != self.focused_monitor_idx()
+                                && *w_idx != focused_workspace_idx
                            {
                                tracing::debug!(
                                    "ignoring show event for window already associated with another workspace"
@@ -361,7 +354,7 @@ impl WindowManager {
                        let workspace_contains_window = workspace.contains_window(window.hwnd);
                        let monocle_container = workspace.monocle_container().clone();

-                        if !workspace_contains_window && !needs_reconciliation {
+                        if !workspace_contains_window && needs_reconciliation.is_none() {
                            let floating_applications = FLOATING_APPLICATIONS.lock();
                            let mut should_float = false;

@@ -388,12 +381,25 @@ impl WindowManager {
                                    && !matches!(event, WindowManagerEvent::Manage(_)));

                            if behaviour.float_override {
-                                workspace.floating_windows_mut().push(window);
+                                // Center floating windows if we are already on the `Floating`
+                                // layer and the window doesn't match a `floating_windows` rule and
+                                // the workspace is not a floating workspace
+                                let center_spawned_floats =
+                                    matches!(workspace.layer, WorkspaceLayer::Floating)
+                                        && !should_float
+                                        && workspace.tile;
+                                workspace.floating_windows_mut().push_back(window);
+                                workspace.set_layer(WorkspaceLayer::Floating);
+                                if center_spawned_floats {
+                                    let mut floating_window = window;
+                                    floating_window.center(&workspace.globals().work_area)?;
+                                }
                                self.update_focused_workspace(false, false)?;
                            } else {
                                match behaviour.current_behaviour {
                                    WindowContainerBehaviour::Create => {
                                        workspace.new_container_for_window(window);
+                                        workspace.set_layer(WorkspaceLayer::Tiling);
                                        self.update_focused_workspace(false, false)?;
                                    }
                                    WindowContainerBehaviour::Append => {
@@ -403,6 +409,7 @@ impl WindowManager {
                                                anyhow!("there is no focused container")
                                            })?
                                            .add_window(window);
+                                        workspace.set_layer(WorkspaceLayer::Tiling);
                                        self.update_focused_workspace(true, false)?;
                                        stackbar_manager::send_notification();
                                    }
@@ -499,15 +506,9 @@ impl WindowManager {
                // This will be true if we have moved to another monitor
                let mut moved_across_monitors = false;

-                for (i, monitors) in self.monitors().iter().enumerate() {
-                    for workspace in monitors.workspaces() {
-                        if workspace.contains_window(window.hwnd) && i != target_monitor_idx {
-                            moved_across_monitors = true;
-                            break;
-                        }
-                    }
-                    if moved_across_monitors {
-                        break;
+                if let Some((m_idx, _)) = self.known_hwnds.get(&window.hwnd) {
+                    if *m_idx != target_monitor_idx {
+                        moved_across_monitors = true;
                    }
                }

@@ -615,7 +616,7 @@ impl WindowManager {
                                window.focus(self.mouse_follows_focus)?;
                            }
                        } else if window_management_behaviour.float_override {
-                            workspace.floating_windows_mut().push(window);
+                            workspace.floating_windows_mut().push_back(window);
                            self.update_focused_workspace(false, false)?;
                        } else {
                            match window_management_behaviour.current_behaviour {
@@ -711,40 +712,8 @@ impl WindowManager {
            window.center(&self.focused_monitor_work_area()?)?;
        }

-        tracing::trace!("updating list of known hwnds");
-        let mut known_hwnds = vec![];
-        for monitor in self.monitors() {
-            for workspace in monitor.workspaces() {
-                for container in workspace.containers() {
-                    for window in container.windows() {
-                        known_hwnds.push(window.hwnd);
-                    }
-                }
-
-                for window in workspace.floating_windows() {
-                    known_hwnds.push(window.hwnd);
-                }
-
-                if let Some(window) = workspace.maximized_window() {
-                    known_hwnds.push(window.hwnd);
-                }
-
-                if let Some(container) = workspace.monocle_container() {
-                    for window in container.windows() {
-                        known_hwnds.push(window.hwnd);
-                    }
-                }
-            }
-        }
-
-        let hwnd_json = DATA_DIR.join("komorebi.hwnd.json");
-        let file = OpenOptions::new()
-            .write(true)
-            .truncate(true)
-            .create(true)
-            .open(hwnd_json)?;
-
-        serde_json::to_writer_pretty(&file, &known_hwnds)?;
+        // Update list of known_hwnds and their monitor/workspace index pair
+        self.update_known_hwnds();

        notify_subscribers(
            Notification {
@@ -770,4 +739,119 @@ impl WindowManager {

        Ok(())
    }
+
+    /// Checks if this window is from another unfocused workspace or is an unfocused window on a
+    /// stack container. If it is it will return the monitor/workspace index pair of this window so
+    /// that a reconciliation of that monitor/workspace can be done.
+    fn needs_reconciliation(&self, window: Window) -> color_eyre::Result<Option<(usize, usize)>> {
+        let focused_monitor_idx = self.focused_monitor_idx();
+        let focused_workspace_idx =
+            self.focused_workspace_idx_for_monitor_idx(focused_monitor_idx)?;
+
+        let focused_pair = (focused_monitor_idx, focused_workspace_idx);
+
+        let mut needs_reconciliation = None;
+
+        if let Some((m_idx, ws_idx)) = self.known_hwnds.get(&window.hwnd) {
+            if (*m_idx, *ws_idx) == focused_pair {
+                if let Some(target_workspace) = self
+                    .monitors()
+                    .get(*m_idx)
+                    .and_then(|m| m.workspaces().get(*ws_idx))
+                {
+                    if let Some(monocle_with_window) = target_workspace
+                        .monocle_container()
+                        .as_ref()
+                        .and_then(|m| m.contains_window(window.hwnd).then_some(m))
+                    {
+                        if monocle_with_window.focused_window() != Some(&window) {
+                            tracing::debug!("Needs reconciliation within a monocled stack");
+                            needs_reconciliation = Some((*m_idx, *ws_idx));
+                        }
+                    } else {
+                        let c_idx = target_workspace.container_idx_for_window(window.hwnd);
+
+                        if let Some(target_container) =
+                            c_idx.and_then(|c_idx| target_workspace.containers().get(c_idx))
+                        {
+                            if target_container.focused_window() != Some(&window) {
+                                tracing::debug!(
+                                    "Needs reconciliation within a stack on the focused workspace"
+                                );
+                                needs_reconciliation = Some((*m_idx, *ws_idx));
+                            }
+                        }
+                    }
+                }
+            } else {
+                tracing::debug!("Needs reconciliation for a different monitor/workspace pair");
+                needs_reconciliation = Some((*m_idx, *ws_idx));
+            }
+        }
+
+        Ok(needs_reconciliation)
+    }
+
+    /// When there was an `alt-tab` to a hidden window we need to perform a reconciliation, meaning
+    /// we need to update the focused monitor, workspace, container and window indices to the ones
+    /// corresponding to the window the user just alt-tabbed into.
+    fn perform_reconciliation(
+        &mut self,
+        window: Window,
+        reconciliation_pair: (usize, usize),
+    ) -> color_eyre::Result<()> {
+        let (m_idx, ws_idx) = reconciliation_pair;
+
+        tracing::debug!("performing reconciliation");
+        self.focus_monitor(m_idx)?;
+        let mouse_follows_focus = self.mouse_follows_focus;
+        let offset = self.work_area_offset;
+
+        if let Some(monitor) = self.focused_monitor_mut() {
+            if ws_idx != monitor.focused_workspace_idx() {
+                let previous_idx = monitor.focused_workspace_idx();
+                monitor.set_last_focused_workspace(Option::from(previous_idx));
+                monitor.focus_workspace(ws_idx)?;
+            }
+            if let Some(workspace) = monitor.focused_workspace_mut() {
+                let mut layer = WorkspaceLayer::Tiling;
+                if let Some((monocle, idx)) = workspace
+                    .monocle_container_mut()
+                    .as_mut()
+                    .and_then(|m| m.idx_for_window(window.hwnd).map(|i| (m, i)))
+                {
+                    monocle.focus_window(idx);
+                } else if workspace
+                    .floating_windows()
+                    .iter()
+                    .any(|w| w.hwnd == window.hwnd)
+                {
+                    layer = WorkspaceLayer::Floating;
+                } else if !workspace
+                    .maximized_window()
+                    .is_some_and(|w| w.hwnd == window.hwnd)
+                {
+                    // If the window is the maximized window do nothing, else we
+                    // reintegrate the monocle if it exists and then focus the
+                    // container
+                    if workspace.monocle_container().is_some() {
+                        tracing::info!("disabling monocle");
+                        for container in workspace.containers_mut() {
+                            container.restore();
+                        }
+                        for window in workspace.floating_windows_mut() {
+                            window.restore();
+                        }
+                        workspace.reintegrate_monocle_container()?;
+                    }
+                    workspace.focus_container_by_window(window.hwnd)?;
+                }
+                workspace.set_layer(layer);
+            }
+            monitor.load_focused_workspace(mouse_follows_focus)?;
+            monitor.update_focused_workspace(offset)?;
+        }
+
+        Ok(())
+    }
 }
--- a/komorebi/src/reaper.rs
+++ b/komorebi/src/reaper.rs
@@ -1,14 +1,155 @@
 #![deny(clippy::unwrap_used, clippy::expect_used)]

 use crate::border_manager;
+use crate::notify_subscribers;
+use crate::winevent::WinEvent;
+use crate::NotificationEvent;
+use crate::Window;
 use crate::WindowManager;
+use crate::WindowManagerEvent;
+use crate::DATA_DIR;
+
+use crossbeam_channel::Receiver;
+use crossbeam_channel::Sender;
+use lazy_static::lazy_static;
 use parking_lot::Mutex;
+use std::collections::HashMap;
+use std::fs::OpenOptions;
 use std::sync::Arc;
+use std::sync::OnceLock;
 use std::time::Duration;

-pub fn watch_for_orphans(wm: Arc<Mutex<WindowManager>>) {
+lazy_static! {
+    pub static ref HWNDS_CACHE: Arc<Mutex<HashMap<isize, (usize, usize)>>> =
+        Arc::new(Mutex::new(HashMap::new()));
+}
+
+pub struct ReaperNotification(pub HashMap<isize, (usize, usize)>);
+
+static CHANNEL: OnceLock<(Sender<ReaperNotification>, Receiver<ReaperNotification>)> =
+    OnceLock::new();
+
+pub fn channel() -> &'static (Sender<ReaperNotification>, Receiver<ReaperNotification>) {
+    CHANNEL.get_or_init(|| crossbeam_channel::bounded(50))
+}
+
+fn event_tx() -> Sender<ReaperNotification> {
+    channel().0.clone()
+}
+
+fn event_rx() -> Receiver<ReaperNotification> {
+    channel().1.clone()
+}
+
+pub fn send_notification(hwnds: HashMap<isize, (usize, usize)>) {
+    if event_tx().try_send(ReaperNotification(hwnds)).is_err() {
+        tracing::warn!("channel is full; dropping notification")
+    }
+}
+
+pub fn listen_for_notifications(
+    wm: Arc<Mutex<WindowManager>>,
+    known_hwnds: HashMap<isize, (usize, usize)>,
+) {
+    watch_for_orphans(known_hwnds);
+
    std::thread::spawn(move || loop {
-        match find_orphans(wm.clone()) {
+        match handle_notifications(wm.clone()) {
+            Ok(()) => {
+                tracing::warn!("restarting finished thread");
+            }
+            Err(error) => {
+                tracing::warn!("restarting failed thread: {}", error);
+            }
+        }
+    });
+}
+
+fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result<()> {
+    tracing::info!("listening");
+
+    let receiver = event_rx();
+
+    for notification in receiver {
+        let orphan_hwnds = notification.0;
+        let mut wm = wm.lock();
+
+        let mut update_borders = false;
+
+        for (hwnd, (m_idx, w_idx)) in orphan_hwnds.iter() {
+            if let Some(monitor) = wm.monitors_mut().get_mut(*m_idx) {
+                let focused_workspace_idx = monitor.focused_workspace_idx();
+
+                if let Some(workspace) = monitor.workspaces_mut().get_mut(*w_idx) {
+                    // Remove orphan window
+                    if let Err(error) = workspace.remove_window(*hwnd) {
+                        tracing::warn!(
+                            "error reaping orphan window ({}) on monitor: {}, workspace: {}. Error: {}",
+                            hwnd,
+                            m_idx,
+                            w_idx,
+                            error,
+                        );
+                    }
+
+                    if focused_workspace_idx == *w_idx {
+                        // If this is not a focused workspace there is no need to update the
+                        // workspace or the borders. That will already be done when the user
+                        // changes to this workspace.
+                        workspace.update()?;
+                        update_borders = true;
+                    }
+                    tracing::info!(
+                        "reaped orphan window ({}) on monitor: {}, workspace: {}",
+                        hwnd,
+                        m_idx,
+                        w_idx,
+                    );
+                }
+            }
+
+            wm.known_hwnds.remove(hwnd);
+
+            let window = Window::from(*hwnd);
+            notify_subscribers(
+                crate::Notification {
+                    event: NotificationEvent::WindowManager(WindowManagerEvent::Destroy(
+                        WinEvent::ObjectDestroy,
+                        window,
+                    )),
+                    state: wm.as_ref().into(),
+                },
+                true,
+            )?;
+        }
+
+        if update_borders {
+            border_manager::send_notification(None);
+        }
+
+        // Save to file
+        let hwnd_json = DATA_DIR.join("komorebi.hwnd.json");
+        let file = OpenOptions::new()
+            .write(true)
+            .truncate(true)
+            .create(true)
+            .open(hwnd_json)?;
+
+        serde_json::to_writer_pretty(&file, &wm.known_hwnds.keys().collect::<Vec<_>>())?;
+    }
+
+    Ok(())
+}
+
+fn watch_for_orphans(known_hwnds: HashMap<isize, (usize, usize)>) {
+    // Cache current hwnds
+    {
+        let mut cache = HWNDS_CACHE.lock();
+        *cache = known_hwnds;
+    }
+
+    std::thread::spawn(move || loop {
+        match find_orphans() {
            Ok(()) => {
                tracing::warn!("restarting finished thread");
            }
@@ -23,50 +164,37 @@ pub fn watch_for_orphans(wm: Arc<Mutex<WindowManager>>) {
    });
 }

-pub fn find_orphans(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result<()> {
+fn find_orphans() -> color_eyre::Result<()> {
    tracing::info!("watching");

-    let arc = wm.clone();
-
    loop {
-        std::thread::sleep(Duration::from_secs(1));
+        std::thread::sleep(Duration::from_millis(20));

-        let mut wm = arc.lock();
-        let offset = wm.work_area_offset;
+        let mut cache = HWNDS_CACHE.lock();
+        let mut orphan_hwnds = HashMap::new();

-        let mut update_borders = false;
+        for (hwnd, (m_idx, w_idx)) in cache.iter() {
+            let window = Window::from(*hwnd);

-        for (i, monitor) in wm.monitors_mut().iter_mut().enumerate() {
-            let work_area = *monitor.work_area_size();
-            let window_based_work_area_offset = (
-                monitor.window_based_work_area_offset_limit(),
-                monitor.window_based_work_area_offset(),
-            );
-
-            let offset = if monitor.work_area_offset().is_some() {
-                monitor.work_area_offset()
-            } else {
-                offset
-            };
-
-            for (j, workspace) in monitor.workspaces_mut().iter_mut().enumerate() {
-                let reaped_orphans = workspace.reap_orphans()?;
-                if reaped_orphans.0 > 0 || reaped_orphans.1 > 0 {
-                    workspace.update(&work_area, offset, window_based_work_area_offset)?;
-                    update_borders = true;
-                    tracing::info!(
-                        "reaped {} orphan window(s) and {} orphaned container(s) on monitor: {}, workspace: {}",
-                        reaped_orphans.0,
-                        reaped_orphans.1,
-                        i,
-                        j
-                    );
-                }
+            if !window.is_window()
+                // This one is a hack because WINWORD.EXE is an absolute trainwreck of an app
+                // when multiple docs are open, it keeps open an invisible window, with WS_EX_LAYERED
+                // (A STYLE THAT THE REGULAR WINDOWS NEED IN ORDER TO BE MANAGED!) when one of the
+                // docs is closed
+                //
+                // I hate every single person who worked on Microsoft Office 365, especially Word
+                || !window.is_visible()
+            {
+                orphan_hwnds.insert(window.hwnd, (*m_idx, *w_idx));
            }
        }

-        if update_borders {
-            border_manager::send_notification(None);
+        if !orphan_hwnds.is_empty() {
+            // Update reaper cache
+            cache.retain(|h, _| !orphan_hwnds.contains_key(h));
+
+            // Send handles to remove
+            event_tx().send(ReaperNotification(orphan_hwnds))?;
        }
    }
 }
--- a/komorebi/src/ring.rs
+++ b/komorebi/src/ring.rs
@@ -1,10 +1,10 @@
 use std::collections::VecDeque;

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

-#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, PartialEq)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Ring<T> {
    elements: VecDeque<T>,
    focused: usize,
@@ -76,4 +76,36 @@ macro_rules! impl_ring_elements {
            }
        }
    };
+    // This allows passing a different name to be used for the functions. For instance, the
+    // `floating_windows` ring calls this as:
+    // ```rust
+    // impl_ring_elements!(Workspace, Window, "floating_window");
+    // ```
+    // Which allows using the `Window` element but name the functions as `floating_window`
+    ($name:ty, $element:ident, $el_name:literal) => {
+        paste::paste! {
+            impl $name {
+                pub const fn [<$el_name:lower s>](&self) -> &VecDeque<$element> {
+                    self.[<$el_name:lower s>].elements()
+                }
+
+                pub fn [<$el_name:lower s_mut>](&mut self) -> &mut VecDeque<$element> {
+                    self.[<$el_name:lower s>].elements_mut()
+                }
+
+                #[allow(dead_code)]
+                pub fn [<focused_ $el_name:lower>](&self) -> Option<&$element> {
+                    self.[<$el_name:lower s>].focused()
+                }
+
+                pub const fn [<focused_ $el_name:lower _idx>](&self) -> usize {
+                    self.[<$el_name:lower s>].focused_idx()
+                }
+
+                pub fn [<focused_ $el_name:lower _mut>](&mut self) -> Option<&mut $element> {
+                    self.[<$el_name:lower s>].focused_mut()
+                }
+            }
+        }
+    };
 }
--- a/komorebi/src/stackbar_manager/stackbar.rs
+++ b/komorebi/src/stackbar_manager/stackbar.rs
@@ -123,7 +123,7 @@ impl Stackbar {
                    0,
                    None,
                    None,
-                    HINSTANCE(windows_api::as_ptr!(instance)),
+                    Option::from(HINSTANCE(windows_api::as_ptr!(instance))),
                    None,
                )?;

@@ -133,7 +133,7 @@ impl Stackbar {
                let mut msg: MSG = MSG::default();

                loop {
-                    if !GetMessageW(&mut msg, HWND::default(), 0, 0).as_bool() {
+                    if !GetMessageW(&mut msg, None, 0, 0).as_bool() {
                        tracing::debug!("stackbar window event processing thread shutdown");
                        break;
                    };
@@ -183,13 +183,13 @@ impl Stackbar {
        WindowsApi::position_window(self.hwnd, &layout, false)?;

        unsafe {
-            let hdc = GetDC(self.hwnd());
+            let hdc = GetDC(Option::from(self.hwnd()));

            let hpen = CreatePen(PS_SOLID, 0, COLORREF(background));
            let hbrush = CreateSolidBrush(COLORREF(background));

-            SelectObject(hdc, hpen);
-            SelectObject(hdc, hbrush);
+            SelectObject(hdc, hpen.into());
+            SelectObject(hdc, hbrush.into());
            SetBkColor(hdc, COLORREF(background));

            let mut logfont = LOGFONTW {
@@ -209,14 +209,14 @@ impl Stackbar {
            let logical_height = -MulDiv(
                STACKBAR_FONT_SIZE.load(Ordering::SeqCst),
                72,
-                GetDeviceCaps(hdc, LOGPIXELSY),
+                GetDeviceCaps(Option::from(hdc), LOGPIXELSY),
            );

            logfont.lfHeight = logical_height;

            let hfont = CreateFontIndirectW(&logfont);

-            SelectObject(hdc, hfont);
+            SelectObject(hdc, hfont.into());

            for (i, window) in container.windows().iter().enumerate() {
                if window.hwnd == container.focused_window().copied().unwrap_or_default().hwnd {
@@ -283,13 +283,13 @@ impl Stackbar {
                );
            }

-            ReleaseDC(self.hwnd(), hdc);
+            ReleaseDC(Option::from(self.hwnd()), hdc);
            // TODO: error handling
-            let _ = DeleteObject(hpen);
+            let _ = DeleteObject(hpen.into());
            // TODO: error handling
-            let _ = DeleteObject(hbrush);
+            let _ = DeleteObject(hbrush.into());
            // TODO: error handling
-            let _ = DeleteObject(hfont);
+            let _ = DeleteObject(hfont.into());
        }

        Ok(())
@@ -350,7 +350,7 @@ impl Stackbar {
                                }

                                // Restore the window corresponding to the tab we have clicked
-                                window.restore();
+                                window.restore_with_border(false);
                                if let Err(err) = window.focus(false) {
                                    tracing::error!(
                                        "stackbar WMLBUTTONDOWN focus error: hwnd {} ({})",
@@ -361,7 +361,7 @@ impl Stackbar {
                            } else {
                                // Hide any windows in the stack that don't correspond to the window
                                // we have clicked
-                                window.hide();
+                                window.hide_with_border(false);
                            }
                        }
                    }
--- a/komorebi/src/static_config.rs
+++ b/komorebi/src/static_config.rs
--- a/komorebi/src/theme_manager.rs
+++ b/komorebi/src/theme_manager.rs
@@ -5,11 +5,12 @@ use crate::stackbar_manager;
 use crate::stackbar_manager::STACKBAR_FOCUSED_TEXT_COLOUR;
 use crate::stackbar_manager::STACKBAR_TAB_BACKGROUND_COLOUR;
 use crate::stackbar_manager::STACKBAR_UNFOCUSED_TEXT_COLOUR;
-use crate::Colour;
 use crate::KomorebiTheme;
 use crossbeam_channel::Receiver;
 use crossbeam_channel::Sender;
 use crossbeam_utils::atomic::AtomicCell;
+use komorebi_themes::colour::Colour;
+use komorebi_themes::Base16Wrapper;
 use std::ops::Deref;
 use std::sync::atomic::Ordering;
 use std::sync::OnceLock;
@@ -76,6 +77,7 @@ pub fn handle_notifications() -> color_eyre::Result<()> {
            monocle_border,
            floating_border,
            unfocused_border,
+            unfocused_locked_border,
            stackbar_focused_text,
            stackbar_unfocused_text,
            stackbar_background,
@@ -87,6 +89,7 @@ pub fn handle_notifications() -> color_eyre::Result<()> {
                monocle_border,
                floating_border,
                unfocused_border,
+                unfocused_locked_border,
                stackbar_focused_text,
                stackbar_unfocused_text,
                stackbar_background,
@@ -112,6 +115,10 @@ pub fn handle_notifications() -> color_eyre::Result<()> {
                    .unwrap_or(komorebi_themes::CatppuccinValue::Base)
                    .color32(name.as_theme());

+                let unfocused_locked_border = unfocused_locked_border
+                    .unwrap_or(komorebi_themes::CatppuccinValue::Red)
+                    .color32(name.as_theme());
+
                let stackbar_focused_text = stackbar_focused_text
                    .unwrap_or(komorebi_themes::CatppuccinValue::Green)
                    .color32(name.as_theme());
@@ -130,6 +137,7 @@ pub fn handle_notifications() -> color_eyre::Result<()> {
                    monocle_border,
                    floating_border,
                    unfocused_border,
+                    unfocused_locked_border,
                    stackbar_focused_text,
                    stackbar_unfocused_text,
                    stackbar_background,
@@ -142,6 +150,7 @@ pub fn handle_notifications() -> color_eyre::Result<()> {
                monocle_border,
                floating_border,
                unfocused_border,
+                unfocused_locked_border,
                stackbar_focused_text,
                stackbar_unfocused_text,
                stackbar_background,
@@ -149,35 +158,39 @@ pub fn handle_notifications() -> color_eyre::Result<()> {
            } => {
                let single_border = single_border
                    .unwrap_or(komorebi_themes::Base16Value::Base0D)
-                    .color32(*name);
+                    .color32(Base16Wrapper::Base16(*name));

                let stack_border = stack_border
                    .unwrap_or(komorebi_themes::Base16Value::Base0B)
-                    .color32(*name);
+                    .color32(Base16Wrapper::Base16(*name));

                let monocle_border = monocle_border
                    .unwrap_or(komorebi_themes::Base16Value::Base0F)
-                    .color32(*name);
+                    .color32(Base16Wrapper::Base16(*name));

                let unfocused_border = unfocused_border
                    .unwrap_or(komorebi_themes::Base16Value::Base01)
-                    .color32(*name);
+                    .color32(Base16Wrapper::Base16(*name));
+
+                let unfocused_locked_border = unfocused_locked_border
+                    .unwrap_or(komorebi_themes::Base16Value::Base08)
+                    .color32(Base16Wrapper::Base16(*name));

                let floating_border = floating_border
                    .unwrap_or(komorebi_themes::Base16Value::Base09)
-                    .color32(*name);
+                    .color32(Base16Wrapper::Base16(*name));

                let stackbar_focused_text = stackbar_focused_text
                    .unwrap_or(komorebi_themes::Base16Value::Base0B)
-                    .color32(*name);
+                    .color32(Base16Wrapper::Base16(*name));

                let stackbar_unfocused_text = stackbar_unfocused_text
                    .unwrap_or(komorebi_themes::Base16Value::Base05)
-                    .color32(*name);
+                    .color32(Base16Wrapper::Base16(*name));

                let stackbar_background = stackbar_background
                    .unwrap_or(komorebi_themes::Base16Value::Base01)
-                    .color32(*name);
+                    .color32(Base16Wrapper::Base16(*name));

                (
                    single_border,
@@ -185,6 +198,68 @@ pub fn handle_notifications() -> color_eyre::Result<()> {
                    monocle_border,
                    floating_border,
                    unfocused_border,
+                    unfocused_locked_border,
+                    stackbar_focused_text,
+                    stackbar_unfocused_text,
+                    stackbar_background,
+                )
+            }
+            KomorebiTheme::Custom {
+                colours,
+                single_border,
+                stack_border,
+                monocle_border,
+                floating_border,
+                unfocused_border,
+                unfocused_locked_border,
+                stackbar_focused_text,
+                stackbar_unfocused_text,
+                stackbar_background,
+                ..
+            } => {
+                let single_border = single_border
+                    .unwrap_or(komorebi_themes::Base16Value::Base0D)
+                    .color32(Base16Wrapper::Custom(colours.clone()));
+
+                let stack_border = stack_border
+                    .unwrap_or(komorebi_themes::Base16Value::Base0B)
+                    .color32(Base16Wrapper::Custom(colours.clone()));
+
+                let monocle_border = monocle_border
+                    .unwrap_or(komorebi_themes::Base16Value::Base0F)
+                    .color32(Base16Wrapper::Custom(colours.clone()));
+
+                let unfocused_border = unfocused_border
+                    .unwrap_or(komorebi_themes::Base16Value::Base01)
+                    .color32(Base16Wrapper::Custom(colours.clone()));
+
+                let unfocused_locked_border = unfocused_locked_border
+                    .unwrap_or(komorebi_themes::Base16Value::Base08)
+                    .color32(Base16Wrapper::Custom(colours.clone()));
+
+                let floating_border = floating_border
+                    .unwrap_or(komorebi_themes::Base16Value::Base09)
+                    .color32(Base16Wrapper::Custom(colours.clone()));
+
+                let stackbar_focused_text = stackbar_focused_text
+                    .unwrap_or(komorebi_themes::Base16Value::Base0B)
+                    .color32(Base16Wrapper::Custom(colours.clone()));
+
+                let stackbar_unfocused_text = stackbar_unfocused_text
+                    .unwrap_or(komorebi_themes::Base16Value::Base05)
+                    .color32(Base16Wrapper::Custom(colours.clone()));
+
+                let stackbar_background = stackbar_background
+                    .unwrap_or(komorebi_themes::Base16Value::Base01)
+                    .color32(Base16Wrapper::Custom(colours.clone()));
+
+                (
+                    single_border,
+                    stack_border,
+                    monocle_border,
+                    floating_border,
+                    unfocused_border,
+                    unfocused_locked_border,
                    stackbar_focused_text,
                    stackbar_unfocused_text,
                    stackbar_background,
@@ -198,6 +273,10 @@ pub fn handle_notifications() -> color_eyre::Result<()> {
        border_manager::FLOATING.store(u32::from(Colour::from(floating_border)), Ordering::SeqCst);
        border_manager::UNFOCUSED
            .store(u32::from(Colour::from(unfocused_border)), Ordering::SeqCst);
+        border_manager::UNFOCUSED_LOCKED.store(
+            u32::from(Colour::from(unfocused_locked_border)),
+            Ordering::SeqCst,
+        );

        STACKBAR_TAB_BACKGROUND_COLOUR.store(
            u32::from(Colour::from(stackbar_background)),
@@ -216,7 +295,7 @@ pub fn handle_notifications() -> color_eyre::Result<()> {

        CURRENT_THEME.store(Some(notification.0));

-        border_manager::send_notification(None);
+        border_manager::send_force_update();
        stackbar_manager::send_notification();
    }

--- a/Show More
+++ b/Show More